From b6aef9821019c2e400e833313aec053db1b866a8 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 9 Sep 2024 18:23:21 +0800
Subject: [PATCH] =?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))