chenrui 4 mesiacov pred
rodič
commit
a8e72a9061

+ 25 - 3
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -816,21 +816,43 @@ export default {
       const ajax_data = {
         warehouseSn: row.warehouseSn,
         salesBillDetailSnList: snArr,
-        salesBillSn: this.salesBillSn
+        salesBillSn: this.salesBillSn,
+        salesPromoDetailSnSet: row.salesPromoDetailList ? [row.salesPromoDetailList[0].salesPromoDetailSn] : undefined
       }
       this.setWarehouseInfo(ajax_data)
     },
     // 选择仓库确认
     chooseWarehouseOk (sn) {
       const _this = this
+      const selectedRows = _this.dataSource.filter(item => _this.selectedRowKeys.includes(item.id))
+      const obj = selectedRows ? selectedRows.map(item => item.salesBillDetailSn) : []
+      // 将Set转换回数组
+      const mergedArr = _this.getSalesPromoSnList(selectedRows)
       const ajaxData = {
         warehouseSn: sn,
-        salesBillDetailSnList: _this.selectedRowKeys,
+        salesBillDetailSnList: obj,
         salesBillSn: _this.salesBillSn,
-        allFlag: _this.warehouseTit ? true : undefined
+        allFlag: obj && obj.length === 0 ? true : undefined, // 设置全部参数
+        salesPromoDetailSnSet: mergedArr
       }
       _this.setWarehouseInfo(ajaxData)
     },
+    // 筛选salesPromoSnSet值
+    getSalesPromoSnList (arr) {
+      // 借助reduce方法和Set来合并val值并去重
+      const mergedAndUniqueVals = arr.reduce((acc, item) => {
+        // 遍历当前项的obj数组
+        item.salesPromoDetailList.forEach(subItem => {
+          // 将每个subItem的val添加到累加器Set中
+          acc.add(subItem.salesPromoDetailSn)
+        })
+        // 返回累加器Set供下一次迭代使用
+        return acc
+      }, new Set())
+
+      const resultArr = Array.from(mergedAndUniqueVals)
+      return resultArr
+    },
     // 更改仓库信息
     setWarehouseInfo (data) {
       const _this = this

+ 1 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -303,7 +303,7 @@ export default {
             {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
             {record.bakConvertPromoGiftsQty ? (<a-badge count="转" numberStyle={{ backgroundColor: '#ffaa00', zoom: '80%' }}></a-badge>) : ''}
-            {Number((_this.showLockStockQty ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" numberStyle={{ zoom: '0.7' }}></a-badge>) : ''}
+            {Number((record.tireFlag != 0 ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" numberStyle={{ zoom: '0.7' }}></a-badge>) : ''}
           </div>
         )
       }