fix: 销售政策

src/views/sales_policy/components/AddPolicy.vue

@@ -677,9 +677,9 @@ export default {
               }
             }
           })
-          if (NoRebateWalletListId.length && this.importWallet.walletId && !~NoRebateWalletListId.indexOf(this.importWallet.walletId)) {
+          if (NoRebateWalletListId.length && this.importWallet.id && !~NoRebateWalletListId.indexOf(this.importWallet.id)) {
             this.NoRebateWalletList2.push(this.importWallet)
-            NoRebateWalletListId.push(this.importWallet.walletId)
+            NoRebateWalletListId.push(this.importWallet.id)
           }
           if (rebateListId.length && this.importRebate.walletRebateId && !~rebateListId.indexOf(this.importRebate.walletRebateId)) {
             this.rebateList2.push(this.importRebate)
@@ -840,6 +840,12 @@ export default {
       this.$set(row, 'saleTypeName', item.saleName)
       this.$set(row, 'priceType', '')
       this.priceList = []
+      this.rebateList2 = []
+      this.NoRebateWalletList2 = []
+      this.$set(row, 'walletIds', [])
+      this.$set(row, 'rebateWalletIds', [])
+      this.dataList[index].walletIds = []
+      this.dataList[index].rebateWalletIds = []
       // this.$set(row,'saleTypeId',item.id)
     },
     // 修改条件名称

src/views/sales_policy/components/editPolicy.vue

@@ -724,9 +724,9 @@ export default {
               }
             }
           })
-          if (NoRebateWalletListId.length && this.importWallet.walletId && !~NoRebateWalletListId.indexOf(this.importWallet.walletId)) {
+          if (NoRebateWalletListId.length && this.importWallet.id && !~NoRebateWalletListId.indexOf(this.importWallet.id)) {
             this.NoRebateWalletList2.push(this.importWallet)
-            NoRebateWalletListId.push(this.importWallet.walletId)
+            NoRebateWalletListId.push(this.importWallet.id)
           }
           if (rebateListId.length && this.importRebate.walletRebateId && !~rebateListId.indexOf(this.importRebate.walletRebateId)) {
             this.rebateList2.push(this.importRebate)
@@ -899,7 +899,12 @@ export default {
       this.$set(row, 'saleTypeName', item.saleName)
       this.$set(row, 'priceType', '')
       this.priceList = []
-
+      this.rebateList2 = []
+      this.NoRebateWalletList2 = []
+      this.$set(row, 'walletIds', [])
+      this.$set(row, 'rebateWalletIds', [])
+      this.dataList[index].walletIds = []
+      this.dataList[index].rebateWalletIds = []
       // this.$set(row,'saleTypeId',item.id)
     },
     // 修改条件名称
@@ -1048,8 +1053,10 @@ export default {
               d.name = d.walletName
               if (d.type === 'REBATE') {
                 k.rebateWalletIds = [...k.rebateWalletIds, d.walletId]
+                k.ovalRebateWalletIds = [...k.rebateWalletIds, d.walletId]
               } else {
                 k.walletIds = [...k.walletIds, d.walletId]
+                k.ovalWalletIds = [...k.rebateWalletIds, d.walletId]
               }
             }
             // this.priceList.forEach(l => {
@@ -1302,12 +1309,13 @@ export default {
               }
             }
           })
-          if (row.walletIds && row.walletIds.length) {
-            row.walletIds.forEach(k => {
+          if (row.ovalWalletIds && row.ovalWalletIds.length) {
+            row.ovalWalletIds.forEach(k => {
               if (!~NoRebateWalletListId.indexOf(k)) {
                 const item = this.NoRebateWalletList.find(e => e.id === k)
                 this.importWallet = item
                 this.NoRebateWalletList2.push(item)
+                NoRebateWalletListId.push(item.id)
               }
               if (~NoRebateWalletListId.indexOf(k)) {
                 const item = this.NoRebateWalletList.find(e => e.id === k)
@@ -1315,12 +1323,14 @@ export default {
               }
             })
           }
-          if (row.rebateWalletIds && row.rebateWalletIds.length) {
-            row.rebateWalletIds.forEach(k => {
+          console.log(row.ovalRebateWalletIds, this.rebateList)
+          if (row.ovalRebateWalletIds && row.ovalRebateWalletIds.length) {
+            row.ovalRebateWalletIds.forEach(k => {
               if (!~rebateListId.indexOf(k)) {
                 const item = this.rebateList.find(e => e.walletRebateId === k)
                 this.importRebate = item
                 this.rebateList2.push(item)
+                rebateListId.push(item.walletRebateId)
               }
               if (~rebateListId.indexOf(k)) {
                 const item = this.rebateList.find(e => e.walletRebateId === k)
@@ -1328,6 +1338,7 @@ export default {
               }
             })
           }
+
           this.$set(row, 'walletIds', [...new Set([...row.walletIds, ...NoRebateWalletListId])])
           this.$set(row, 'rebateWalletIds', [...new Set([...row.rebateWalletIds, ...rebateListId])])
           this.dataList[index].walletIds = [...new Set([...row.walletIds, ...NoRebateWalletListId])]