11月14日 库存扣减更新

src/components/Popup/index.vue

@@ -63,7 +63,8 @@ export default {
       this.show = false;
     },
     toClick(id) {
-      this.$router.push("/good/order/edit?id=" + id);
+      
+      this.$router.push({path:"/good/order/edit?id=" + id});
     },
   },
 };

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
          <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
+        </div>
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -556,33 +556,10 @@ export default {
                 drugList[i].drug_type = this.drugTypeList[y].name;
               }
             }
-            drugList[i].supply_name =
-              drugList[i].drug_name +
-              " " +
-              drugList[i].dose +
-              drugList[i].dose_unit +
-              "*" +
-              drugList[i].min_number +
-              drugList[i].min_unit +
-              "/" +
-              drugList[i].max_unit +
-              " " +
-              drugList[i].manufacturer;
+            drugList[i].supply_name =drugList[i].drug_name +" " +drugList[i].dose +drugList[i].dose_unit +"*" +drugList[i].min_number +drugList[i].min_unit +"/" +drugList[i].max_unit +" " +drugList[i].manufacturer;
             drugList[i].supply_type = drugList[i].drug_type;
-            drugList[i].supply_specification_name =
-              drugList[i].dose +
-              drugList[i].dose_unit +
-              "*" +
-              drugList[i].min_number +
-              drugList[i].min_unit +
-              "/" +
-              drugList[i].max_unit;
-            drugList[i].supply_total = this.getWarehoseInfo(
-              drugList[i].drug_warehouse_info,
-              drugList[i].max_unit,
-              drugList[i].min_unit,
-              drugList[i].min_number
-            );
+            drugList[i].supply_specification_name =drugList[i].dose + drugList[i].dose_unit +"*" +drugList[i].min_number +drugList[i].min_unit +"/" +drugList[i].max_unit;
+            drugList[i].supply_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
             drugList[i].supply_count = "";
             drugList[i].supply_total_price = "";
             drugList[i].supply_manufacturer = drugList[i].manufacturer;
@@ -629,19 +606,11 @@ export default {
                 goodList[i].good_type_id = this.goodTypeList[y].type_name;
               }
             }
-            goodList[i].supply_name =
-              goodList[i].good_name +
-              " " +
-              goodList[i].specification_name +
-              " " +
-              goodList[i].manufacturer;
+            goodList[i].supply_name =goodList[i].good_name +" " +goodList[i].specification_name +" " +goodList[i].manufacturer;
             goodList[i].supply_type = goodList[i].good_type_id;
-            goodList[i].supply_specification_name =
-              goodList[i].specification_name;
+            goodList[i].supply_specification_name =goodList[i].specification_name;
             goodList[i].supply_price = goodList[i].buy_price;
-            goodList[i].supply_total = this.getTotalStockCount(
-              goodList[i].good_warehouse_info
-            );
+            goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info);
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
@@ -1111,17 +1080,91 @@ export default {
         if (response.data.state == 1) {
           var cancelList = response.data.data.cancelList;
           console.log("cancelList23232232323323223", cancelList);
-          if (cancelList.length > 0) {
-          }
-          var outList = response.data.data.outList;
-          console.log("outList2332232332", outList);
+           var drugList = response.data.data.drugList;
+          console.log("drugList233223232323232", drugList);
           var cancelOrderList = response.data.data.cancelOrderList;
           console.log("cancelOrderList2323322322332", cancelOrderList);
-          var drugList = response.data.data.drugList;
-          console.log("drugList233223232323232", drugList);
+          if(cancelList.length == 0){
+            this.$router.push({ path: "/good/return/add?id=" + this.id });
+          }
+          if (cancelList.length > 0) {
+            var outList = response.data.data.outList;
+            for(let i=0;i<outList.length;i++){
+              if(outList[i].is_source == 1){
+                for(let j=0;j<drugList.length;j++){
+                  if(outList[i].project_id == drugList[j].id){
+                    if(outList[i].supply_unit == drugList[j].max_unit){
+                      outList[i].count = outList[i].count * drugList[j].min_number
+                    }
+
+                  }
+                }
+              }
+            }
+
+            for(let i=0;i<cancelOrderList.length;i++){
+             if(cancelOrderList[i].is_source == 1){
+                for(let j=0;j<drugList.length;j++){
+                  if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
+                    cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+                  }
+                 }
+               }
+            }
+            
+            let objInfo = {};
+            if(cancelOrderList.length >0){
+              cancelOrderList.forEach((item, index) => {
+                let { project_id } = item;
+                if (!objInfo[project_id]) {
+                  objInfo[project_id] = {
+                    project_id,
+                    child: [],
+                    count: 0,
+                  };
+                }
+              });
+              let newArr = Object.values(objInfo)
+
+              console.log("outList2332232332", outList)
+              for (let i = 0; i < cancelOrderList.length; i++) {
+                for (let j = 0; j < newArr.length; j++) {
+                  if (cancelOrderList[i].project_id == newArr[j].project_id) {
+                    newArr[j].child.push(cancelOrderList[i])
+                }
+              }
+              console.log("newAr2332232323", newArr)
+
+                //如果采购单有数据，则需要比较数量
+            if (newArr.length > 0) {
+              for (let i = 0; i < purcaseOrder.length; i++) {
+                for (let j = 0; j < newArr.length; j++) {
+                  if (purcaseOrder[i].project_id == newArr[j].project_id) {
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
+                    if (purcaseOrder[i].count > newArr[j].count) {
+                      arr.push(purcaseOrder[i].project_id);
+                    }
+                  }
+                }
+              }
+              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+
+              if (arr.length == 0) {
+                this.$message.error("该订单已全部生成采购单，请知悉!");
+                return;
+              }
+
+              if (total != goodOrder.length) {
+                str = arr.join(",");
+                this.$router.push({ path: "/good/order/add?id=" + id + "&ids=" + str});
+              }
+             }
+            }
+          }
+         }
         }
       });
-      this.$router.push({ path: "/good/return/add?id=" + this.id });
+     
     },
     //反审核
     MofyGoodOrder() {

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -904,8 +904,7 @@ export default {
             for (let j = 0; j < drugList.length; j++) {
               if (purcaseOrder[i].is_source == 1) {
                 if (purcaseOrder[i].supply_unit == drugList[j].max_unit) {
-                  purcaseOrder[i].count =
-                    purcaseOrder[i].count * drugList[j].min_number;
+                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -915,8 +914,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;
                 }
               }
             }
@@ -998,11 +996,11 @@ export default {
       //获取购货订单号
       getGoodOrderList(id).then((response) => {
         if (response.data.state == 1) {
-          var list = response.data.data.list;
-          this.orderList = list;
+          var list = response.data.data.list
+          console.log("list23232323",list)
+          this.orderList = list
           //如果长度大于0,有购货单不能反审核
-          if (list.length < 0) {
-            // this.dialogVisible = true
+          if (list.length > 0) {
             this.$popup({
               title: "系统提示",
               content: this.number,
@@ -1012,10 +1010,10 @@ export default {
             });
           }
           if (list.length == 0) {
-            this.getReturnOrder();
-            this.showOne = false;
-            this.showTwo = true;
-            this.showThree = false;
+            this.getReturnOrder()
+            this.showOne = false
+            this.showTwo = true
+            this.showThree = false
           }
         }
       });
@@ -1032,7 +1030,7 @@ export default {
       });
     },
     toClick(id) {
-      this.$router.push("/good/order/edit?id=" + id);
+      this.$router.push({path:"/good/order/edit?id=" + id});
     },
   },
   created() {