From b6aef9821019c2e400e833313aec053db1b866a8 Mon Sep 17 00:00:00 2001 From: fanfan Date: Mon, 9 Sep 2024 18:23:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/model/goods/MultiSpec.js | 14 ++++++-------- src/views/goods/Index.vue | 1 - src/views/market/settle/modules/details.vue | 1 + 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/common/model/goods/MultiSpec.js b/src/common/model/goods/MultiSpec.js index e385d70..75cb300 100644 --- a/src/common/model/goods/MultiSpec.js +++ b/src/common/model/goods/MultiSpec.js @@ -213,25 +213,24 @@ export default class MultiSpec { this.multiSpecData.skuList = this.oldSkuList(newSkuList) } - // 合并已存在的sku数据 - oldSkuList (newSkuList) { + // 合并已存在的sku数据 + oldSkuList (newSkuList) { // const oldSkuList = _.cloneDeep(this.multiSpecData.skuList) const oldSkuList = this.multiSpecData.skuList.concat() if (!oldSkuList.length || !newSkuList.length) { return newSkuList } - console.log(oldSkuList, newSkuList) for (const index in newSkuList) { // 查找符合的旧记录 let oldSkuItem = {} // if (oldSkuList.length === newSkuList.length) { - // oldSkuItem = _.cloneDeep(oldSkuList[index]) + // oldSkuItem = _.cloneDeep(oldSkuList[index]) // } else { - oldSkuItem = oldSkuList.find( + oldSkuItem = oldSkuList.find( (item) => newSkuList[index].tempId === - (item.goods_props && item.goods_props.length > 0) ? item.goods_props.map((v) => v.value.name).join('_') : item.tempId - ) + ((item.goods_props && item.goods_props.length > 0) ? item.goods_props.map((v) => v.value.name).join('_') : item.tempId) + ) // } const item = newSkuList[index] @@ -262,7 +261,6 @@ export default class MultiSpec { } return newSkuList } - // 生成sku表格字段名 buildSkuColumns (rowSpanArr) { const specList = this.multiSpecData.specList diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue index 94b26b3..6563528 100644 --- a/src/views/goods/Index.vue +++ b/src/views/goods/Index.vue @@ -236,7 +236,6 @@ const columns = [ width: '90px', dataIndex: 'spec_type', scopedSlots: { customRender: 'spec_type' }, - sorter: true, }, { title: '商品价格', diff --git a/src/views/market/settle/modules/details.vue b/src/views/market/settle/modules/details.vue index f2f2e5e..e884f19 100644 --- a/src/views/market/settle/modules/details.vue +++ b/src/views/market/settle/modules/details.vue @@ -210,6 +210,7 @@ export default { this.visible = true Api.detail({ id: info }) .then((result) => { + this.record={} this.record = result.data.detail }) .finally(() => (this.isLoading = false)) From 9e16529327bb20ceb1dcc0c0b32755c32d758bf0 Mon Sep 17 00:00:00 2001 From: fanfan Date: Mon, 9 Sep 2024 20:28:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/goods/modules/MultiSpec.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/goods/modules/MultiSpec.vue b/src/views/goods/modules/MultiSpec.vue index e5aa068..729b424 100644 --- a/src/views/goods/modules/MultiSpec.vue +++ b/src/views/goods/modules/MultiSpec.vue @@ -134,7 +134,7 @@ - 去修改 + 去修改 取消选择 From eef3a7d9775b4a1c20ab443784b1ece97e1b5583 Mon Sep 17 00:00:00 2001 From: fanfan Date: Mon, 9 Sep 2024 20:52:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/goods/modules/MultiSpec.vue | 1 - src/views/market/settle/modules/details.vue | 31 ++++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/views/goods/modules/MultiSpec.vue b/src/views/goods/modules/MultiSpec.vue index 729b424..37bfc86 100644 --- a/src/views/goods/modules/MultiSpec.vue +++ b/src/views/goods/modules/MultiSpec.vue @@ -194,7 +194,6 @@ export default { created() { // 获取规格及SKU信息 this.getData() - console.log(this.multiSpecData) }, methods: { handleEdit(item) { diff --git a/src/views/market/settle/modules/details.vue b/src/views/market/settle/modules/details.vue index e884f19..a57dded 100644 --- a/src/views/market/settle/modules/details.vue +++ b/src/views/market/settle/modules/details.vue @@ -109,20 +109,23 @@ - + - + - { - this.record={} + this.idCardShow = true + this.businesShow = true this.record = result.data.detail }) .finally(() => (this.isLoading = false)) }, - // 显示对话框 - show(record) { - // 显示窗口 - this.visible = true - // 当前记录 - this.record = record - }, - // 关闭对话框事件 handleCancel() { this.visible = false + this.idCardShow = false + this.businesShow = false this.form.resetFields() }, },