chenrui 4 ay önce
ebeveyn
işleme
d07c254320

+ 4 - 4
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -832,18 +832,18 @@ export default {
         warehouseSn: sn,
         salesBillDetailSnList: obj,
         salesBillSn: _this.salesBillSn,
-        allFlag: obj && obj.length === 0 ? true : undefined, // 设置全部参数
+        allFlag: obj && obj.length === 0, // 设置全部参数
         salesPromoDetailSnSet: mergedArr
       }
       _this.setWarehouseInfo(ajaxData)
     },
     // 筛选salesPromoSnSet值
     getSalesPromoSnList (arr) {
-      // 借助reduce方法和Set来合并val值并去重
+      // 借助reduce方法和Set来合并salesPromoDetailSn值并去重
       const mergedAndUniqueVals = arr.reduce((acc, item) => {
-        // 遍历当前项的obj数组
+        // 遍历当前项的salesPromoDetailList数组
         item.salesPromoDetailList.forEach(subItem => {
-          // 将每个subItem的val添加到累加器Set中
+          // 将每个subItem的salesPromoDetailSn添加到累加器Set中
           acc.add(subItem.salesPromoDetailSn)
         })
         // 返回累加器Set供下一次迭代使用

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -504,7 +504,7 @@ export default {
         warehouseSn: sn,
         salesBillDetailSnList: snArr,
         salesBillSn: _this.salesBillSn,
-        allFlag: snArr.length == 0 ? true : undefined
+        allFlag: snArr.length == 0
       }
       _this.setWarehouseInfo(ajax_data)
     },

+ 9 - 9
src/views/salesManagement/salesQueryNew/comps/updateActiveModal.vue

@@ -105,22 +105,22 @@ export default {
       this.spinning = true
       salesPromoMatchProduct(data).then(res => {
         this.activeList = res.data || []
-        // 回显选中
+        // 回显选中
         if (record.promoRuleSnList) {
-
+          if (record.stackFlag == 0) { // 非叠加
+            const pos = res.data.findIndex(item => item.promoRuleSn == record.promoRuleSnList[0])
+            this.upActiveVal = pos >= 0 ? res.data[pos].salesPromoSn : '-1'
+          } else { // 叠加
+            const resultSnArr = res.data.filter(item => record.promoRuleSnList.includes(item.promoRuleSn)) // 过滤出promoRuleSn在promoRuleSnList中的对象
+              .map(item => item.salesPromoSn) // 映射出这些对象的salesPromoSn属性
+            this.upActiveValArr = resultSnArr
+          }
         } else {
           this.upActiveVal = '-1'
         }
         this.spinning = false
       })
     },
-    getSnArrayById (arr1, arr2) {
-      // 使用 map 遍历 arr1,对每个 id 使用 filter 从 arr2 中提取 sn
-      return arr1.filter(id => {
-        // filter 返回的是一个数组,但我们想要的是数组中的 sn 值
-        return arr2.filter(item => item.promoRuleSn === id).map(item => item.salesPromoSn)
-      })
-    },
     //  保存
     handleSubmit (e) {
       e.preventDefault()