11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -528,7 +528,8 @@ export default {
       showTwo: false,
       warese_out_id: 0,
       return_remark: "",
-      is_warehouse:0
+      is_warehouse:0,
+      tableDataList:[]
     };
   },
   methods: {
@@ -851,7 +852,6 @@ export default {
             orderInfo[i].supply_product_date = "";
             orderInfo[i].supply_expiry_date = "";
           }
-          console.log("drugli323322332", orderInfo);
           var drugList = response.data.data.baseList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
@@ -893,8 +893,10 @@ export default {
 
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
-
-          console.log("orderINFO23323232", this.recordInfo.tableList);
+          //用来判断是否删除了从采购订单的数据
+          this.tableDataList = []
+          this.tableDataList = orderInfo
+         
         }
       });
     },
@@ -910,9 +912,7 @@ export default {
       }
 
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        this.recordInfo.tableList[i].supply_count = parseInt(
-          this.recordInfo.tableList[i].supply_count
-        );
+        this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count);
         this.recordInfo.tableList[i].supply_price =
           this.recordInfo.tableList[i].supply_price.toString();
         this.recordInfo.tableList[i].supply_total_price =
@@ -942,6 +942,15 @@ export default {
         if (valid) {
           this.loading = true;
           var warehousing_id = this.$route.query.id;
+          //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
+        
+          if(this.tableDataList.length != this.recordInfo.tableList){
+             warehousing_id = 0
+             for(let i=0;i<this.recordInfo.tableList.length;i++){
+              this.recordInfo.tableList[i].id = 0
+              this.number = ""
+             }
+          }
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
@@ -1089,7 +1098,7 @@ export default {
     checkGoodOrder() {
       var id = this.warese_out_id;
       var warehousing_id = this.warehousing_id;
-      console.log("hhh2323232323232323",id,warehousing_id)
+      
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
@@ -1098,12 +1107,9 @@ export default {
           this.showTwo = true;
           this.showThree = true;
           var purcaseOrder = response.data.data.purcaseOrder;
-          console.log("采购订单", purcaseOrder);
-
           var goodOrder = response.data.data.goodOrder;
-          console.log("采购单", goodOrder);
           var drugList = response.data.data.drugList;
-          console.log("druglist23323223", drugList);
+     
           var is_warehouse = 0;
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
@@ -1173,17 +1179,17 @@ export default {
                 }
               }
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
-
+             console.log("审核长度2332322323323332",arr)
               if (arr.length == 0) {
                 this.is_warehouse = 1;
-                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+                this.ModefySupplyWarehousing(this.is_warehouse, warehousing_id);
               }
 
               //部分入库
-              if (total != goodOrder.length) {
+              if (arr.length > 0) {
                 //修改订购单
                 this.is_warehouse = 3;
-                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+                this.ModefySupplyWarehousing(this.is_warehouse, warehousing_id);
               }
             }
           }

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -74,9 +74,16 @@
             size="small"
             type="primary"
             @click="checkPurchaseOrder"
-            v-show="showOne"
-            >审核</el-button
-          >
+            v-show="showOne">审核
+         </el-button>
+
+         <!-- <el-button
+            size="small"
+            type="primary"
+            @click="checkReturnOrder"
+            v-if="is_check == 1">反审核
+         </el-button> -->
+         
           <el-button
             size="small"
             type="primary"
@@ -357,6 +364,7 @@ import {
   savePurchaseOrder,
   updatePurchaseOrder,
   checkPurchaseOrder,
+  getReturnOrder
 } from "@/api/supply";
 import { getDataConfig } from "@/utils/data";
 export default {
@@ -427,6 +435,7 @@ export default {
       goodList: [{ id: 1, name: "" }],
       total_price: 0,
       return_remark:"",
+      is_check:2,
     };
   },
   methods: {
@@ -519,7 +528,7 @@ export default {
         this.tabList.push(goodList[i])
         }
         this.goodList = goodList
-        console.log(this.goodList,'oo')
+        
     } 
     })
 },
@@ -631,7 +640,7 @@ export default {
             return_remake:this.return_remark,
           };
 
-          console.log("params23322323", params);
+         
           savePurchaseOrder(
             params,
             this.supplier_name,
@@ -645,8 +654,10 @@ export default {
               this.loading = false;
               this.$message.success("保存成功!");
               var warehouseInfo = response.data.data.warehouseInfo;
+              this.is_check = warehouseInfo.is_check
               if(warehouseInfo.is_check == 1){
                 this.Reviewed = true
+               
               }
               this.number = warehouseInfo.number;
               this.id = warehouseInfo.id;
@@ -682,7 +693,7 @@ export default {
                 orderInfo[i].project_id = orderInfo[i].project_id;
                 orderInfo[i].supply_unit = orderInfo[i].supply_unit;
               }
-              console.log("orderINFO23323232", orderInfo);
+            
               this.recordInfo.tableList = orderInfo;
               for(let i=0;i<orderInfo.length;i++){
                  orderInfo[i].name = ""
@@ -797,7 +808,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake:this.return_remark,
           };
-          console.log("params23232233223", params);
+         
 
           updatePurchaseOrder(
             params,
@@ -838,6 +849,7 @@ export default {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
+              this.is_check = info.is_check
               this.disabled = true;
               this.$message.success("审核成功!");
               this.Reviewed = true
@@ -863,6 +875,18 @@ export default {
       }
       this.discount_amount = discount_amount;
     },
+    checkReturnOrder() {
+      var id = this.id;
+      getReturnOrder(id).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+          this.disabled = false;
+          this.showOne = true
+          this.is_check =2 
+          this.$message.success("反审核成功!");
+        }
+      });
+    },
   },
 
   created() {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -59,9 +59,7 @@
           <span>单据编码:{{ good_number }}</span>
         </div>
         <div>
-          <el-button size="small" type="primary" @click="updateGoodOrder"
-            >保存</el-button
-          >
+          <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
           <el-button
             size="small"
             type="primary"
@@ -542,6 +540,7 @@ export default {
       orderInfo: [],
       warese_out_id: 0,
       return_remark: "",
+      tableDataList:[],
     };
   },
   methods: {
@@ -845,8 +844,7 @@ export default {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -932,6 +930,9 @@ export default {
 
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
+          this.tableDataList = []
+          this.tableDataList = orderInfo
+          
         }
       });
     },
@@ -971,8 +972,18 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           }
-          console.log("param23322332323",params)
+          //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
         
+          if(this.tableDataList.length != this.recordInfo.tableList){
+             warehousing_id = 0
+             for(let i=0;i<this.recordInfo.tableList.length;i++){
+              this.recordInfo.tableList[i].id = 0
+              this.recordInfo.tableDataList[i].order_number = ""
+              this.number = ""
+             }
+          }
+          console.log("param23322332323",params)
+          return
           updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then((response) => {
             if (response.data.state == 1) {
               this.loading = false;
@@ -1015,8 +1026,7 @@ export default {
             for (let j = 0; j < drugList.length; j++) {
               if (goodOrder[i].is_source == 1) {
                 if (goodOrder[i].supply_unit == drugList[j].max_unit) {
-                  goodOrder[i].count =
-                    goodOrder[i].count * drugList[j].min_number;
+                  goodOrder[i].count = goodOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -1062,20 +1072,20 @@ export default {
                   if (purcaseOrder[i].project_id == newArr[j].project_id) {
                     //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据,部分入库
                     if (purcaseOrder[i].count > newArr[j].count) {
-                      arr.push(purcaseOrder[i].project_id);
+                       arr.push(purcaseOrder[i].project_id);
                     }
                   }
                 }
               }
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
-
+              console.log("审核23232323323",arr)
               if (arr.length == 0) {
-                is_warehouse = 1;
+                 is_warehouse = 1;
                 this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
               }
 
               //部分入库
-              if (total != goodOrder.length) {
+              if (arr.length >0) {
                 //修改订购单
                 is_warehouse = 3;
                 this.ModefySupplyWarehousing(is_warehouse, warehousing_id);

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -569,7 +569,7 @@ export default {
             this.tabList.push(goodList[i]);
           }
           this.goodList = goodList;
-          console.log(this.goodList, "oo");
+          
         }
       });
     },
@@ -730,8 +730,7 @@ export default {
       this.$refs["tableForm"].validate((valid) => {
         if (valid) {
           this.loading = true;
-          console.log("生产厂商", this.recordInfo.tableList);
-          console.log("生产上次", this.manufactuerList);
+         
           for (let i = 0; i < this.recordInfo.tableList.length; i++) {
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count);
             this.recordInfo.tableList[i].supply_license_number =this.recordInfo.tableList[i].supply_license_number.toString();
@@ -761,7 +760,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          console.log("param23232332", params);
+         
 
           updatePurchaseOrder(
             params,
@@ -845,7 +844,7 @@ export default {
             this.showTwo = false;
             this.showThree = true;
           }
-          console.log("drugli323322332", this.drugList);
+         
           var drugList = response.data.data.baseList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
@@ -882,7 +881,7 @@ export default {
               }
             }
           }
-          console.log("orderINFO23323232", orderInfo);
+         
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
         }
@@ -902,12 +901,11 @@ export default {
       getAllOrderCountList(id).then((response) => {
         if (response.data.state == 1) {
           var purcaseOrder = response.data.data.purcaseOrder;
-          console.log("采购订单", purcaseOrder);
 
           var goodOrder = response.data.data.goodOrder;
-          console.log("采购单", goodOrder);
+         
           var drugList = response.data.data.drugList;
-          console.log("druglist23323223", drugList);
+      
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
@@ -954,7 +952,7 @@ export default {
                 }
               }
             }
-            console.log("newAr2332232323", newArr);
+     
 
             for (let i = 0; i < newArr.length; i++) {
               for (let j = 0; j < newArr[i].child.length; j++) {
@@ -1008,7 +1006,7 @@ export default {
       getGoodOrderList(id).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list
-          console.log("list23232323",list)
+        
           this.orderList = list
           //如果长度大于0,有购货单不能反审核
           if (list.length > 0) {
@@ -1030,6 +1028,7 @@ export default {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
           this.disabled = false;
+          this.Reviewed = false
           this.$message.success("反审核成功!");
           this.getPurchaseOrderDetail();
         }