11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -17,15 +17,11 @@
           <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/dialysis/batch_print/batch_print_order_six.vue

@@ -734,7 +734,7 @@
                               : "/"
                           }}
                         </div>
-                        ml
+                        L
                       </div>
                       <div class="inline_block" style="flex:1;">
                         干体重：

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -107,11 +107,18 @@
       </ul>
 
       <ul>
-        <li v-if="isShow('目标超滤量')">
+        <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id != 10290">
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 && this.$store.getters.xt_user.template_info.org_id != 9671"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 9671" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+        </li>
+
+         <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">
+          <label>目标超滤量 : </label>
+          <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
+          <span class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
         </li>
         <!-- <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -65,6 +65,8 @@
                   showValue='临时股静脉导管'></label-box>
               &nbsp;
               <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('长期插管')>-1?true:false : false"
+                  showValue='长期插管'></label-box>
+              <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('长期静脉导管')>-1?true:false : false"
                   showValue='长期静脉导管'></label-box>
               &nbsp;
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -407,7 +407,7 @@
                       <div class="under_line" style="width: 100px;text-align: center">
                         {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                       </div>
-                      L
+                     L
                     </div>
                     <div class="inline_block" style="flex:1;">
                       干体重：

src/xt_pages/stock/stockInOrder.vue

@@ -1059,10 +1059,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      // this.$router.push({
-      //   name: "stockInDetail",
-      //   query: { id: row.id, type: this.type }
-      // });
+      console.log("rowe232323232332",row)
       this.$router.push({path:"/stock/in/order/edit?id="+row.id})
     },
     handleDelete: function(index, row) {

src/xt_pages/supply/components/addGoodOrder.vue

@@ -943,8 +943,9 @@ export default {
           this.loading = true;
           var warehousing_id = this.$route.query.id;
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
-        
-          if(this.tableDataList.length != this.recordInfo.tableList){
+          console.log("长度2332233232",this.tableDataList.length)
+          console.log("产股2333223232323",this.recordInfo.tableList)
+          if(this.tableDataList.length != this.recordInfo.tableList.length){
              warehousing_id = 0
              for(let i=0;i<this.recordInfo.tableList.length;i++){
               this.recordInfo.tableList[i].id = 0
@@ -1097,8 +1098,10 @@ export default {
     },
     checkGoodOrder() {
       var id = this.warese_out_id;
-      var warehousing_id = this.warehousing_id;
-      
+      var warehousing_id = this.id;
+      console.log("id23322332233223",id)
+      console.log("checkGoodOrder23323",warehousing_id)
+    
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -76,13 +76,19 @@
             @click="checkPurchaseOrder"
             v-show="showOne">审核
          </el-button>
-
-         <!-- <el-button
+        
+        <el-button
+            size="small"
+            type="primary"
+            @click="toAdd"
+            v-if="is_check == 1">生成采购单
+         </el-button>
+         <el-button
             size="small"
             type="primary"
             @click="checkReturnOrder"
             v-if="is_check == 1">反审核
-         </el-button> -->
+         </el-button>
          
           <el-button
             size="small"
@@ -365,7 +371,8 @@ import {
   savePurchaseOrder,
   updatePurchaseOrder,
   checkPurchaseOrder,
-  getReturnOrder
+  getReturnOrder,
+  getAllOrderCountList
 } from "@/api/supply";
 import { getDataConfig } from "@/utils/data";
 export default {
@@ -857,6 +864,7 @@ export default {
             if (response.data.state == 1) {
               var info = response.data.data.info;
               this.is_check = info.is_check
+              this.showOne = false
               this.disabled = true;
               this.$message.success("审核成功!");
               this.Reviewed = true
@@ -894,6 +902,106 @@ export default {
         }
       });
     },
+     toAdd() {
+      if (this.is_check == 2) {
+        this.$message.error("该采购订单未审核,不能生成采购数据!");
+        return false;
+      }
+      //获取商品购货订单 和 购货单的总数量
+      getAllOrderCountList(this.id).then((response) => {
+        if (response.data.state == 1) {
+          var purcaseOrder = response.data.data.purcaseOrder;
+
+          var goodOrder = response.data.data.goodOrder;
+         
+          var drugList = response.data.data.drugList;
+      
+          var ids = "";
+          // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+          if (goodOrder.length == 0) {
+            this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + ids});
+          }
+          for (let i = 0; i < purcaseOrder.length; i++) {
+            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;
+                }
+              }
+            }
+          }
+
+          for (let i = 0; i < goodOrder.length; i++) {
+            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;
+                }
+              }
+            }
+          }
+
+          let objInfo = {};
+          if (goodOrder.length > 0) {
+            goodOrder.forEach((item, index) => {
+              let { project_id } = item;
+              if (!objInfo[project_id]) {
+                objInfo[project_id] = {
+                  project_id,
+                  child: [],
+                  count: 0,
+                };
+              }
+            });
+            let newArr = Object.values(objInfo);
+
+            for (let i = 0; i < goodOrder.length; i++) {
+              for (let j = 0; j < newArr.length; j++) {
+                if (goodOrder[i].project_id == newArr[j].project_id) {
+                  newArr[j].child.push(goodOrder[i]);
+                }
+              }
+            }
+     
+
+            for (let i = 0; i < newArr.length; i++) {
+              for (let j = 0; j < newArr[i].child.length; j++) {
+                newArr[i].count += newArr[i].child[j].count;
+              }
+            }
+
+            var arr = [];
+            var total = 0;
+            var str = "";
+
+            //如果采购单有数据，则需要比较数量
+            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 (arr.length >0) {
+                str = arr.join(",");
+                this.$router.push({path: "/good/order/add?id=" + this.id + "&ids=" + str});
+              }
+            }
+          }
+        }
+      });
+    },
   },
 
   created() {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -46,11 +46,8 @@
           <span>单据编码:{{ good_number }}</span>
         </div>
       
-          <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
-        <div style="display: flex;" >
-          <el-button size="small" type="primary" @click="updateGoodOrder"
-            >保存</el-button
-          >
+         <div style="display: flex;" >
+           <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
           <el-button
             size="small"
             type="primary"
@@ -478,9 +475,7 @@ export default {
       showOne: true,
       showTwo: false,
       showThree: false,
-      recordInfo: {
-        tableList: [],
-      },
+      recordInfo: {tableList: []},
       keywords: "",
       total: 0,
       multipleSelection: [],
@@ -700,6 +695,10 @@ export default {
       }
     },
     handleEdit() {
+      if (this.is_check == 1) {
+        this.$message.error("已审核的不能新增!");
+        return false;
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["name"] = "";
@@ -893,6 +892,7 @@ export default {
           var drugList = response.data.data.drugList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
+            orderInfo[i].id = orderInfo[i].id
             orderInfo[i].supply_count = orderInfo[i].count;
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
@@ -900,9 +900,7 @@ export default {
             orderInfo[i].project_id = orderInfo[i].project_id;
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
-            orderInfo[i].supply_total_price = (
-              orderInfo[i].count * orderInfo[i].price
-            ).toFixed(2);
+            orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2);
             orderInfo[i].supply_expiry_date = this.getTimes(
               orderInfo[i].supply_expiry_date
             );
@@ -936,12 +934,42 @@ export default {
               }
             }
           }
+          if(orderInfo.length == 0){
+            const tempObj = {};
+            tempObj["id"] = 0;
+            tempObj["name"] = "";
+            tempObj["supply_name"] = "";
+            tempObj["supply_type"] = "";
+            tempObj["supply_specification_name"] = "";
+            tempObj["supply_total"] = "";
+            tempObj["supply_count"] = "";
+            tempObj["supply_price"] = "";
+            tempObj["supply_total_price"] = "";
+            tempObj["supply_manufacturer"] = "";
+            tempObj["supply_license_number"] = "";
+            tempObj["supply_remake"] = "";
+            tempObj["type"] = 0;
+            tempObj["is_total"] = 1;
+            tempObj["project_id"] = 0;
+            tempObj["supply_unit"] = "";
+            tempObj["supply_batch_number"] = "";
+            tempObj["supply_product_date"] = "";
+            tempObj["order_number"] = "";
+            tempObj["supply_expiry_date"] = "";
+            tempObj["manufacturer_id"] = "";
+            tempObj["warehouse_info_id"] = "";
+            tempObj["warehousing_id"] = "";
+            tempObj["number"] = "";
+            tempObj["good_number"] = "";
+            this.recordInfo.tableList = [];
+            this.recordInfo.tableList.push(tempObj);
+          }else{
+            this.recordInfo.tableList = [];
+            this.recordInfo.tableList = orderInfo;
+            this.tableDataList = []
 
-          this.recordInfo.tableList = [];
-          this.recordInfo.tableList = orderInfo;
-          this.tableDataList = []
-          this.tableDataList = orderInfo
-
+            this.tableDataList = orderInfo
+          }
         }
       });
     },
@@ -983,16 +1011,17 @@ export default {
           }
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
 
-          if(this.tableDataList.length != this.recordInfo.tableList){
-             warehousing_id = 0
+          if(this.tableDataList.length != this.recordInfo.tableList.length){
+            
              for(let i=0;i<this.recordInfo.tableList.length;i++){
-              this.recordInfo.tableList[i].id = 0
-              this.recordInfo.tableDataList[i].order_number = ""
+              this.recordInfo.tableList[i].warehousing_id = 0
+              this.recordInfo.tableList[i].warehouse_info_id = 0
+              this.recordInfo.tableList[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;
@@ -1241,6 +1270,8 @@ export default {
           var msg = response.data.data.msg;
           if (msg == 1) {
             this.$message.success("反审核成功!");
+            this.disabled = false
+            this.Reviewed = false
             return
           }
           if (msg == 2) {

src/xt_pages/supply/components/editGoodReturn.vue

@@ -599,6 +599,10 @@ export default {
       }
     },
     handleEdit() {
+      if (this.is_check == 1) {
+        this.$message.error("已审核的不能新增!");
+        return false;
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["name"] = "";

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -894,7 +894,30 @@ export default {
           }
          
           this.recordInfo.tableList = [];
-          this.recordInfo.tableList = orderInfo;
+          if(orderInfo.length == 0){
+              const tempObj = {};
+              tempObj["id"] = 0;
+              tempObj["name"] = "";
+              tempObj["supply_name"] = "";
+              tempObj["supply_type"] = "";
+              tempObj["supply_specification_name"] = "";
+              tempObj["supply_total"] = "";
+              tempObj["supply_count"] = "";
+              tempObj["supply_price"] = "";
+              tempObj["supply_total_price"] = "";
+              tempObj["supply_manufacturer"] = "";
+              tempObj["supply_license_number"] = "";
+              tempObj["supply_remake"] = "";
+              tempObj["type"] = 0;
+              tempObj["is_total"] = 1;
+              tempObj["project_id"] = 0;
+              tempObj["supply_unit"] = "";
+              tempObj["manufacturer_id"] = "";
+              this.recordInfo.tableList.push(tempObj);
+          }else{
+            this.recordInfo.tableList = orderInfo;
+          }
+         
         }
       });
     },