1、按钮风格修改,eslint格式化

This commit is contained in:
cuiyouliang 2025-06-25 18:16:55 +08:00
parent 2fd90bb4a0
commit 08326b2fec
5 changed files with 90 additions and 40 deletions

View File

@ -16,10 +16,10 @@ export default {
computed: {
radioValue: {
get() {
return this.value;
return this.radioValue;
},
set(v) {
this.$emit('input', v);
this.$emit('update:modelValue', v);
}
}
},
@ -35,7 +35,7 @@ export default {
},
methods: {
change(val) {
this.$emit('change', val);
this.$emit('update:modelValue', val);
}
}
};

View File

@ -44,7 +44,7 @@ import { getToken } from '@/utils/auth';
export default {
props: {
value: [String, Object, Array],
modelValue: [String, Object, Array],
//
limit: {
type: Number,
@ -82,11 +82,11 @@ export default {
};
},
watch: {
value: {
modelValue: {
handler(val) {
if (val) {
//
const list = Array.isArray(val) ? val : this.value.split(',');
const list = Array.isArray(val) ? val : this.modelValue.split(',');
//
this.fileList = list.map((item) => {
if (typeof item === 'string') {
@ -115,7 +115,7 @@ export default {
const findex = this.fileList.map((f) => f.name).indexOf(file.name);
if (findex > -1) {
this.fileList.splice(findex, 1);
this.$emit('input', this.listToString(this.fileList));
this.$emit('update:modelValue', this.listToString(this.fileList));
}
},
//
@ -126,7 +126,7 @@ export default {
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
this.$emit('input', this.listToString(this.fileList));
this.$emit('update:modelValue', this.listToString(this.fileList));
this.$modal.closeLoading();
}
},

View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="状态" prop="showStatus">
<DictRadio v-model="queryParams.showStatus" @change="handleQuery" radioData="sys_normal_disable" :showAll="'all'" />
<DictRadio v-model="queryParams.showStatus" @change="handleQuery" :radioList="normalStatusMap" radioData="sys_normal_disable" :showAll="'all'" />
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
@ -20,17 +20,16 @@
</el-row>
<el-table v-loading="loading" :data="pmsBrandList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="品牌logo" prop="logo">
<template v-slot="{ row }">
<el-image v-if="row.logo" :src="row.logo" :preview-src-list="[row.logo]" class="small-img circle-img" />
<el-image v-if="row.logo" :src="row.logo" fit="cover" :preview-teleported="true" :preview-src-list="[row.logo]" />
</template>
</el-table-column>
<el-table-column label="名称" prop="name" />
<el-table-column label="排序" prop="sort" />
<el-table-column label="状态" prop="showStatus">
<template v-slot="{ row }">
<dict-tag :value="row.showStatus" prop-name="sys_normal_disable" />
<dict-tag :options="normalStatusMap" :value="row.showStatus" prop-name="sys_normal_disable" />
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
@ -47,7 +46,7 @@
<el-dialog :title="title" v-model="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
<el-form-item label="状态">
<DictRadio v-model="form.showStatus" radioData="sys_normal_disable" />
<DictRadio v-model="form.showStatus" :radioList="normalStatusMap" radioData="sys_normal_disable" />
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="名称" />
@ -74,7 +73,6 @@ import { addPmsBrand, delPmsBrand, exportPmsBrand, getPmsBrand, listPmsBrand, up
export default {
name: 'PmsBrand',
dicts: ['sys_normal_disable'],
data() {
return {
//
@ -108,11 +106,14 @@ export default {
//
form: {},
//
rules: {}
rules: {},
normalStatusMap:[]
};
},
created() {
async created() {
this.getList();
const normalStatusMap = await this.getDictionaryByKey('sys_normal_disable');
this.normalStatusMap = normalStatusMap;
},
methods: {
/** 查询品牌管理列表 */
@ -175,7 +176,9 @@ export default {
this.reset();
const id = row.id || this.ids;
getPmsBrand(id).then((response) => {
this.form = response;
const { data } = response || {};
data.showStatus = data.showStatus.toString();
this.form = data || {};
this.open = true;
this.title = '修改品牌管理';
});

View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="状态" prop="showStatus">
<DictRadio v-model="queryParams.showStatus" @change="handleQuery" radioData="sys_show_status" :showAll="'all'" />
<DictRadio v-model="queryParams.showStatus" @change="handleQuery" :radioList="showStatusMap" radioData="sys_show_status" :showAll="'all'" />
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
@ -31,13 +31,13 @@
<el-table-column label="名称" prop="name" />
<el-table-column label="图片" prop="icon">
<template v-slot="{ row }">
<el-image v-if="row.icon" :src="row.icon" :preview-src-list="[row.icon]" class="small-img circle-img" />
<el-image v-if="row.icon" :src="row.icon" :preview-teleported="true" :preview-src-list="[row.icon]" class="small-img circle-img" />
</template>
</el-table-column>
<el-table-column label="排序" prop="sort" />
<el-table-column label="状态" prop="showStatus">
<template v-slot="{ row }">
<dict-tag :value="row.showStatus" prop-name="sys_show_status"></dict-tag>
<dict-tag :options="showStatusMap" :value="row.showStatus" prop-name="sys_show_status"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
@ -58,7 +58,7 @@
<oss-image-upload v-model="form.icon" :limit="1" />
</el-form-item>
<el-form-item label="状态">
<DictRadio v-model="form.showStatus" radioData="sys_show_status" />
<DictRadio v-model="form.showStatus" :radioList="showStatusMap" radioData="sys_show_status" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="排序" />
@ -89,12 +89,10 @@ import {
updatePmsProductCategory,
exportPmsProductCategory
} from '@/api/pms/productCategory';
import ProductCategorySelect from '@/views/components/ProductCategorySelect';
import { useMallStore } from '@/store/modules/mall.js';
export default {
name: 'PmsProductCategory',
dicts: ['sys_show_status'],
components: { ProductCategorySelect },
data() {
return {
//
@ -130,11 +128,14 @@ export default {
//
form: {},
//
rules: {}
rules: {},
showStatusMap: []
};
},
created() {
async created() {
this.getList();
const showStatusMap = await this.getDictionaryByKey('sys_show_status');
this.showStatusMap = showStatusMap;
},
methods: {
/** 查询商品分类列表 */
@ -198,7 +199,9 @@ export default {
this.reset();
const id = row.id || this.ids;
getPmsProductCategory(id).then((response) => {
this.form = response;
const { data } = response || {};
data.showStatus = data.showStatus.toString();
this.form = data || {};
this.open = true;
this.title = '修改商品分类';
});
@ -225,7 +228,8 @@ export default {
});
}
p.then(() => {
this.$store.dispatch('mall/loadProductCategories', true);
useMallStore().loadProductCategories();
// this.$store.dispatch('mall/loadProductCategories', true);
});
}
});

View File

@ -1,13 +1,26 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="PRODUCT_ID" prop="productId">
<el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />
<el-form-item label="商品名称" prop="productId">
<!-- <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />-->
<el-select
v-model="queryParams.productId"
placeholder="请选择商品"
filterable
remote
reserve-keyword
:remote-method="getProductListByName"
:loading="productSelectLoading"
clearable
style="width: 100%"
>
<el-option v-for="item in productSelectOption" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="sku编码" prop="outSkuId">
<el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="PRICE" prop="price">
<el-form-item label="价格" prop="price">
<el-input v-model="queryParams.price" placeholder="请输入PRICE" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="展示图片" prop="pic">
@ -26,10 +39,9 @@
</el-row>
<el-table v-loading="loading" :data="pmsSkuList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="PRODUCT_ID" align="center" prop="productId" />
<el-table-column label="商品名称" align="center" prop="productId" />
<el-table-column label="sku编码" align="center" prop="outSkuId" />
<el-table-column label="PRICE" align="center" prop="price" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="展示图片" align="center" prop="pic" />
<el-table-column label="商品销售属性json格式" align="center" prop="spData" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -45,13 +57,26 @@
<!-- 添加或修改sku信息对话框 -->
<el-dialog :title="title" v-model="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="138px" inline class="dialog-form-two">
<el-form-item label="PRODUCT_ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入PRODUCT_ID" />
<el-form-item label="商品名称" prop="productId">
<!-- <el-input v-model="form.productId" placeholder="请输入商品名称" />-->
<el-select
v-model="form.productId"
placeholder="请选择商品"
filterable
remote
reserve-keyword
:remote-method="getProductListByName"
:loading="productSelectLoading"
clearable
style="width: 100%"
>
<el-option v-for="item in productSelectOption" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="sku编码" prop="outSkuId">
<el-input v-model="form.outSkuId" placeholder="请输入sku编码" />
</el-form-item>
<el-form-item label="PRICE" prop="price">
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入PRICE" />
</el-form-item>
<el-form-item label="展示图片" prop="pic">
@ -73,7 +98,7 @@
<script>
import { listPmsSku, getPmsSku, delPmsSku, addPmsSku, updatePmsSku, exportPmsSku } from '@/api/pms/sku';
import { listPmsProduct } from '@/api/pms/product';
export default {
name: 'PmsSku',
data() {
@ -113,13 +138,31 @@ export default {
//
rules: {
outSkuId: [{ required: true, message: 'sku编码不能为空', trigger: 'blur' }]
}
},
productSelectLoading: false,
productSelectOption: []
};
},
created() {
this.getList();
},
methods: {
//
getProductListByName(params) {
if (params) {
this.productSelectLoading = true;
const query = { current: 1, size: 200, name: params };
const pageReq = { current: 1, size: 200 };
listPmsProduct(query, pageReq).then((response) => {
const { records = [] } = response.data || {};
this.productSelectOption = records || [];
this.productSelectLoading = false;
});
} else {
this.productSelectOption = [];
this.productSelectLoading = false;
}
},
/** 查询sku信息列表 */
getList() {
this.loading = true;
@ -181,7 +224,7 @@ export default {
this.reset();
const id = row.id || this.ids;
getPmsSku(id).then((response) => {
this.form = response;
this.form = response.data || {};
this.open = true;
this.title = '修改sku信息';
});