11月14日 库存扣减更新

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -639,6 +639,10 @@ export default {
     },
 
     handleDelete: function(index, row) {
+      if(row.supply_cancel_out_id >0){
+        this.$message.error("采购出库数据不能删除!")
+        return
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -694,11 +698,14 @@ export default {
       this.getExportOutOrderDrugList()
     },
     batchDelete() {
+      console.log("232322323",this.selectedTableData)
+      
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
         return;
       }
       const ids = [];
+      const idsOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
         if(this.selectedTableData[i].is_sys == 1){
           this.$message.error("自动出库数据不能删除!")
@@ -706,8 +713,13 @@ export default {
         }
         if(this.selectedTableData[i].is_sys == 0){
           ids.push(this.selectedTableData[i].id);
+          idsOne.push(this.selectedTableData[i].supply_cancel_out_id)
         }
       }
+      if(idsOne.length > 0){
+        this.$message.error("采购出库数据不能删除!")
+        return 
+      }
       const idStr = ids.join(",");
       const params = {
         ids: idStr

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -429,6 +429,10 @@
         return name;
       },
        handleEdit: function(index, row) {
+        if(row.supply_cancel_out_id >0){
+         this.$message.error("采购出库数据不能新增!")
+         return
+        } 
         this.unitShow = false
         if(this.drug_show == true){
           this.$message.error("自动出库数据不能编辑")
@@ -449,8 +453,14 @@
         tempObj['warehouse_info_id'] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
+        console.log("row323232232",row)
+        if(row.supply_cancel_out_id >0){
+         this.$message.error("采购出库数据不能删除!")
+         return
+        }
+       
         if(this.drug_show == true){
-          this.$message.error("自动出库数据不能编辑")
+          this.$message.error("采购出库数据不能编辑")
           return
         }
         if (row.id == 0) {

src/xt_pages/stock/stockInOrder.vue

@@ -1065,7 +1065,7 @@ export default {
     handleDelete: function(index, row) {
      
       if(row.supply_warehouse_id > 0){
-        this.$message.error("自动生成入库单不能删除!")
+        this.$message.error("采购入库单不能删除!")
         return false
       }
       const ids = [];
@@ -1132,7 +1132,7 @@ export default {
       console.log("idson23322323",idOne)
       for(let i=0;i<idOne.length;i++){
         if(idOne[i] >0){
-          this.$message.error("自动入库数据不能删除!")
+          this.$message.error("采购入库数据不能删除!")
           return false
         }
       }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -494,7 +494,7 @@ export default {
     },
     handleEdit: function(index, row) {
       if(row.supply_warehouse_id > 0){
-        this.$message.error("自动入库数据不能新增!")
+        this.$message.error("采购入库数据不能新增!")
         return false
       }
       const tempObj = {};
@@ -514,9 +514,8 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
-      console.log("Row2332233232",row)
       if(row.supply_warehouse_id >0){
-        this.$message.error("自动入库数据不能删除!")
+        this.$message.error("采购入库数据不能删除!")
         return false
       }
       if (row.id == 0) {

src/xt_pages/stock/stockOutOrder.vue

@@ -959,6 +959,11 @@ export default {
        
     },
     handleDelete: function(index, row) {
+     
+      if(row.supply_cancel_out_id >0){
+        this.$message.error("采购出库数据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -1018,12 +1023,14 @@ export default {
 
     },
     batchDelete() {
-    
+      console.log("this.selectedTableData",this.selectedTableData)
+      
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
         return;
       }
       const ids = [];
+      const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
         if(this.selectedTableData[i].is_sys == 1){
           this.$message.error("自动出库数据不能删除!")
@@ -1031,8 +1038,13 @@ export default {
         }
          if(this.selectedTableData[i].is_sys == 0){
            ids.push(this.selectedTableData[i].id);
+           idOne.push(this.selectedTableData[i].supply_cancel_out_id)
          }
       }
+      if(idOne.length >0){
+        this.$message.error("采购出库数据不能删除!")
+        return false
+      }
       const idStr = ids.join(",");
       const params = {
         ids: idStr

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -400,7 +400,10 @@
         return name;
       }, 
       handleEdit: function(index, row) {
-        console.log("hhh2322332323",this.recordInfo.recordData)
+       if(row.supply_cancel_out_id >0){
+          this.$message.error("采购出库数据不能新增!")
+          return 
+        }
         this.stockTrue = false
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法编辑")
@@ -420,6 +423,12 @@
         this.recordInfo.recordData.push(tempObj)
       }, 
       handleDelete: function(index, row) {
+      
+        if(row.supply_cancel_out_id >0){
+          this.$message.error("采购出库数据不能删除!")
+          return 
+        }
+ 
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法删除")
          return

src/xt_pages/supply/components/editGoodReturn.vue

@@ -1130,12 +1130,14 @@ export default {
                   orderInfo[i].unitList = [{ id: 1, name: "" }];
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                 }
+                orderInfo[i].count = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
+                orderInfo[i].supply_total = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
               }
               orderInfo[i].sum_count = orderInfo[i].count
               orderInfo[i].min_number = 0
               //orderInfo[i].count = orderInfo[i].count;
-              orderInfo[i].count = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
-              orderInfo[i].supply_total = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
+            
+             
               orderInfo[i].max_unit =""
               orderInfo[i].min_unit =""
             }

src/xt_pages/supply/goodreturn.vue

@@ -158,7 +158,7 @@
            <span v-if="scope.row.is_check == 1">已审核</span> -->
            <span v-if="scope.row.payment == 0">未退款</span>
            <span v-if="scope.row.payment > 0 && scope.row.payment< getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">部分退款</span>
-           <span v-if="scope.row.payment == getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">全部退款</span>
+           <span v-if="scope.row.payment > 0 && scope.row.payment == getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">全部退款</span>
           </template>
         </el-table-column>