diff --git a/src/common/model/goods/MultiSpec.js b/src/common/model/goods/MultiSpec.js index a8b02ec..2c696c5 100644 --- a/src/common/model/goods/MultiSpec.js +++ b/src/common/model/goods/MultiSpec.js @@ -213,21 +213,20 @@ 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) @@ -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/goods/modules/MultiSpec.vue b/src/views/goods/modules/MultiSpec.vue index e5aa068..37bfc86 100644 --- a/src/views/goods/modules/MultiSpec.vue +++ b/src/views/goods/modules/MultiSpec.vue @@ -134,7 +134,7 @@ - 去修改 + 去修改 取消选择 @@ -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 f2f2e5e..a57dded 100644 --- a/src/views/market/settle/modules/details.vue +++ b/src/views/market/settle/modules/details.vue @@ -109,20 +109,23 @@ - + - + - { + 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() }, },