lilei 1 year ago
parent
commit
e0f9dce9a3

+ 14 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -552,10 +552,23 @@
         }
       },
       // 换促销
-      upActiveOk(data, editRow){
+      async upActiveOk(data, editRow){
         console.log(data)
         console.log(editRow)
+        this.spinning = true
+        // 先删除当前活动
+        const delRet = await salesDetailDel({ 
+          salesBillDetailSn: editRow.salesBillDetailSn, 
+          salesBillSn: this.salesBillSn, 
+          salesPromoSn: this.promo.salesPromoSn 
+        })
+        // 当删除成功且不是”不参与活动“时
+        if(delRet.status == 200 && data != 0){
+          // 再添加到其它活动
+
+        }
         this.openUpActiveModal = false
+        this.spinning = false
       },
       handleUpdateActive(record){
         this.$refs.updateActive.getActiveList({

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

@@ -406,7 +406,7 @@ export default {
           item.productOrigUnit = productOrigUnit || '--'
           // 库存为0或待下推数为0,不可添加
           if(item.stockQty<0 || !item.stockQty || !item.surplusQty || item.surplusQty<0){
-            this.disableSelectedRowKeys.push(item.id)
+            // this.disableSelectedRowKeys.push(item.id)
           }
         })
         this.tableHeight = (this.showEmpty ? 200 : this.maxHeight) + 'px'