diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 84b9f29..1f520eb 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -220,11 +220,11 @@
+
- 详情
- 记录
- 核销
+ 详情
+ 记录
+ 核销
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 7af6c81..9d3bad9 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -2,7 +2,13 @@
-
+
@@ -22,7 +28,7 @@
-
+
@@ -107,7 +113,7 @@ export default {
form: {},
// 表单校验
rules: {},
- normalStatusMap:[]
+ normalStatusMap: []
};
},
async created() {
@@ -177,7 +183,9 @@ export default {
const id = row.id || this.ids;
getPmsBrand(id).then((response) => {
const { data } = response || {};
- data.showStatus = data.showStatus.toString();
+ if (data.showStatus != null) {
+ data.showStatus = data.showStatus.toString();
+ }
this.form = data || {};
this.open = true;
this.title = '修改品牌管理';
diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue
index 8ed77ba..13f284f 100644
--- a/src/views/pms/productCategory/index.vue
+++ b/src/views/pms/productCategory/index.vue
@@ -200,7 +200,9 @@ export default {
const id = row.id || this.ids;
getPmsProductCategory(id).then((response) => {
const { data } = response || {};
- data.showStatus = data.showStatus.toString();
+ if (data.showStatus != null) {
+ data.showStatus = data.showStatus.toString();
+ }
this.form = data || {};
this.open = true;
this.title = '修改商品分类';
diff --git a/src/views/pms/sku/index.vue b/src/views/pms/sku/index.vue
index 5d71577..04f6027 100644
--- a/src/views/pms/sku/index.vue
+++ b/src/views/pms/sku/index.vue
@@ -21,11 +21,11 @@
-
+
-
+
搜索
重置
@@ -42,12 +42,17 @@
-
-
-
+
+
+
+
+
+
+
+
- 修改
- 删除
+ 修改
+ 删除
@@ -65,25 +70,27 @@
filterable
remote
reserve-keyword
- :remote-method="getProductListByName"
- :loading="productSelectLoading"
+ :remote-method="getModalProductListByName"
+ :loading="productModalSelectLoading"
clearable
style="width: 100%"
>
-
+
-
+
-
+
+
-
-
+
+
+ 商品销售属性,json 格式
@@ -140,18 +147,20 @@ export default {
outSkuId: [{ required: true, message: 'sku编码不能为空', trigger: 'blur' }]
},
productSelectLoading: false,
- productSelectOption: []
+ productSelectOption: [],
+ productModalSelectLoading: false,
+ productModalSelectOption: []
};
},
created() {
this.getList();
},
methods: {
- // 查询人员列表
+ // 列表查询,查询人员列表
getProductListByName(params) {
if (params) {
this.productSelectLoading = true;
- const query = { current: 1, size: 200, name: params };
+ const query = { current: 1, size: 200, nameLike: params };
const pageReq = { current: 1, size: 200 };
listPmsProduct(query, pageReq).then((response) => {
const { records = [] } = response.data || {};
@@ -163,6 +172,24 @@ export default {
this.productSelectLoading = false;
}
},
+
+ // 弹框新建编辑SKU信息,查询人员列表
+ getModalProductListByName(params) {
+ if (params) {
+ this.productModalSelectLoading = true;
+ const query = { current: 1, size: 200, nameLike: params };
+ const pageReq = { current: 1, size: 200 };
+ listPmsProduct(query, pageReq).then((response) => {
+ const { records = [] } = response.data || {};
+ this.productModalSelectOption = records || [];
+ this.productModalSelectLoading = false;
+ });
+ } else {
+ this.productModalSelectOption = [];
+ this.productModalSelectLoading = false;
+ }
+ },
+
/** 查询sku信息列表 */
getList() {
this.loading = true;
@@ -226,6 +253,12 @@ export default {
getPmsSku(id).then((response) => {
this.form = response.data || {};
this.open = true;
+ this.productModalSelectOption = [
+ {
+ id: this.form.productId,
+ name: this.form.productName
+ }
+ ];
this.title = '修改sku信息';
});
},