11月14日 库存扣减更新

src/api/supply.js

@@ -322,9 +322,9 @@ export function deleteReturnOrder(id, params) {
   })
 }
 
-export function deleteReturnOrderById(id, params) {
+export function deleteReturnOrderById(params) {
   return request({
-    url: '/api/supply/deletereturnorderbyid?id=' + id,
+    url: '/api/supply/deletereturnorderbyid',
     method: 'get',
     params: params
   })

src/views/layout/Layout.vue

@@ -17,10 +17,10 @@
           <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>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -56,7 +56,7 @@
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 )">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
@@ -145,10 +145,10 @@
         <li v-if=" isShow('首剂') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>首剂 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.template_id != 45">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 45)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
@@ -241,10 +241,10 @@
         <li v-if="isShow('维持') && getValueStr('anticoagulant', 'anticoagulant') != 5">
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 45">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 45)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -201,9 +201,9 @@
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.template_id != 45'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -212,14 +212,18 @@
                             </el-form-item>
 
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 && dialysisPrescription.anticoagulant == 2'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
+
+                           
+
                           </div>
+
                           <div v-else>
                             <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -242,12 +246,14 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
+                          
                             <el-form-item v-else :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
+                            
                         </div>
 
                     </el-col>
@@ -255,16 +261,16 @@
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 45">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 ||  this.$store.getters.xt_user.template_info.template_id == 45">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987  ">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -307,9 +313,9 @@
 
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -317,7 +323,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987'
                                     :label="'总量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -2160,9 +2166,10 @@
           this.dialysisPrescription.anticoagulant_zongliang = ""
           this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
         }
-
+     
 
       },
+
       handleCommit: function() {
         console.log("触发了么2323323233223")
         if(!this.isLoading){

src/xt_pages/supply/components/addGoodOrder.vue

@@ -575,13 +575,8 @@ export default {
           this.supplyList = response.data.data.supplyList;
           for (let i = 0; i < drugList.length; i++) {
             for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
-              if (
-                drugList[i].max_unit ==
-                drugList[i].drug_warehouse_info[z].max_unit
-              ) {
-                drugList[i].drug_warehouse_info[z].stock_max_number =
-                  drugList[i].drug_warehouse_info[z].stock_max_number *
-                  drugList[i].min_number;
+              if (drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit) {
+                drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
               }
             }
             for (let j = 0; j < this.manufactuerList.length; j++) {
@@ -794,7 +789,9 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
+     
       return max_str + min_str;
+    
     },
     getTotalStockCount(arr) {
       var total_count = 0;
@@ -1145,7 +1142,7 @@ export default {
       var warehousing_id = this.id;
       console.log("采购单ID",id)
       console.log("采购订单ID",warehousing_id)
-    
+      this.loading = true
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
@@ -1154,6 +1151,7 @@ export default {
           this.showOne = false;
           this.showTwo = true;
           this.showThree = true;
+          this.loading = false
           var purcaseOrder = response.data.data.purcaseOrder;
           var goodOrder = response.data.data.goodOrder;
           var drugList = response.data.data.drugList;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -488,9 +488,10 @@ export default {
           this.supplyList = response.data.data.supplyList;
           for (let i = 0; i < drugList.length; i++) {
             for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
-              drugList[i].drug_warehouse_info[z].stock_max_number =
-                drugList[i].drug_warehouse_info[z].stock_max_number *
-                drugList[i].min_number;
+
+              if (drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit) {
+                drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+              }
             }
             for (let j = 0; j < this.manufactuerList.length; j++) {
               if (drugList[i].manufacturer == this.manufactuerList[j].id) {
@@ -692,6 +693,7 @@ export default {
           total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
         }
       }
+    
       if (total < min_number) {
         min_str = total + min_unit;
       }
@@ -707,6 +709,7 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
+      console.log("hh2332232332",max_str + min_str)
       return max_str + min_str;
     },
     getTotalStockCount(arr) {
@@ -736,17 +739,20 @@ export default {
       }
       return uParseTime(time, "{y}-{m}-{d}");
     },
-   
-    getAllPrice() {
+
+     getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count;
+        total_price +=(this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count*this.recordInfo.tableList[i].deposit_rate/100))
       }
       this.total_price = total_price;
-      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
-      return total_price.toFixed(2);
+      if(total_price > 0){
+         return total_price.toFixed(2);
+      }else{
+        return ""
+      }
+     
     },
-
     addressChange() {
       var discount_amount = 0;
       if (this.rate_of_concession > 0) {
@@ -804,8 +810,7 @@ export default {
           this.supplier_name = out.supplier_id;
           this.rate_of_concession = out.rate_of_concession;
           this.discount_amount = out.discount_amount;
-          this.payment = out.payment;
-          this.arrearage = out.arrearage;
+      
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.list;
           console.log("orderINFO233232232332", orderInfo);
@@ -819,13 +824,15 @@ export default {
                  }
               }
               orderInfo[i].supply_total = this.getWarehoseInfo(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number)
+              orderInfo[i].count =this.getWarehoseInfo(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number)
             }
             if(orderInfo[i].is_source == 2){
                orderInfo[i].supply_total = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
+               orderInfo[i].count = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
             }
             orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].supply_count;
-            orderInfo[i].count = orderInfo[i].count
+           
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -1041,6 +1048,7 @@ export default {
        warehouse_out_id:this.warehouse_out_id,
        id:this.id,
      }
+     console.log("审核2322323232323",params)
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
       

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -1031,31 +1031,57 @@ export default {
             var arr = [];
             var total = 0;
             var str = "";
+            console.log("长度111",purcaseOrder.length)
+            console.log("长度222",goodOrder.length)
+            if(purcaseOrder.length <=goodOrder.length){
+              //如果采购单有数据，则需要比较数量
+              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});
+                }
+              }
+            }
 
-            //如果采购单有数据，则需要比较数量
+             //如果采购订单的商品个数不等与 采购单里面的商品个数
+          if(purcaseOrder.length>goodOrder.length){
+           var arrList = []
+           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);
-                    }
+                  //如果采购订单的商品个数不等与 采购单里面的商品个数
+                  if(purcaseOrder[i].project_id != newArr[j].project_id){
+                     arrList.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});
+              console.log("are232323323223322323",arrList)
+              if(arrList.length > 0){
+                str = arrList.join(",");
+                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
               }
             }
+           }
+     
           }
         }
       });

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1124,6 +1124,7 @@ export default {
       var warehousing_id = this.$route.query.warehousing_id;
       console.log("采购单ID",id)
       console.log("采购订单ID",warehousing_id)
+      this.loading = true
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
@@ -1132,6 +1133,7 @@ export default {
           this.showTwo = true;
           this.showThree = true;
           this.disabled = true
+          this.loading = false
           var purcaseOrder = response.data.data.purcaseOrder;
           this.Reviewed = true;
           console.log("采购订单", purcaseOrder);

src/xt_pages/supply/components/editGoodReturn.vue

@@ -241,7 +241,7 @@
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-          <el-table-column label="折扣率" align="center" width="120px">
+          <el-table-column label="折扣率(%)" align="center" width="120px">
             <template slot-scope="scope">
                <el-input
                   v-model="scope.row.deposit_rate"
@@ -506,9 +506,9 @@ export default {
           this.supplyList = response.data.data.supplyList;
           for (let i = 0; i < drugList.length; i++) {
             for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
-              drugList[i].drug_warehouse_info[z].stock_max_number =
-                drugList[i].drug_warehouse_info[z].stock_max_number *
-                drugList[i].min_number;
+              if (drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit) {
+                drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+              }
             }
             for (let j = 0; j < this.manufactuerList.length; j++) {
               if (drugList[i].manufacturer == this.manufactuerList[j].id) {
@@ -697,6 +697,11 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
+      console.log("3232323223",row,this.is_check)
+      if (this.is_check == 1) {
+          this.$message.error("已审核单据，不能删除!");
+          return false;
+      }
       if (row.id == 0) {
         if (this.recordInfo.tableList.length <= 1) {
           this.$message.error("只有一条记录的时候无法删除");
@@ -706,27 +711,27 @@ export default {
         }
       }
       if (row.id > 0) {
-        if (this.is_check == 1) {
-          this.$message.error("已审核单据，不能删除!");
-          return false;
-        }
-        this.$confirm("确认删除吗?", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning",
-        })
-          .then(() => {
-            deleteReturnOrderById(val.id).then((response) => {
-              if (response.data.state == 1) {
-                var msg = response.data.data.msg;
-                this.recordInfo.tableList.splice(index, 1);
-                this.$message.success("删除成功");
+        const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除吗?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteReturnOrderById(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
               } else {
-                this.$message.error("删除失败");
+                 var msg = response.data.data.msg;
+                 this.recordInfo.tableList.splice(index, 1);
+                this.$message.success('删除成功')
               }
-            });
-          })
-          .catch(() => {});
+            })
+          }).catch(() => {
+        })
+   
       }
     },
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
@@ -844,12 +849,15 @@ export default {
     getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price +=
-          this.recordInfo.tableList[i].supply_price *
-          this.recordInfo.tableList[i].supply_count;
+        total_price +=(this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count*this.recordInfo.tableList[i].deposit_rate/100))
       }
       this.total_price = total_price;
-      return total_price.toFixed(2);
+      if(total_price > 0){
+         return total_price.toFixed(2);
+      }else{
+        return ""
+      }
+     
     },
 
     addressChange() {

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -953,6 +953,8 @@ export default {
           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) {
@@ -1002,10 +1004,17 @@ export default {
               }
             }
 
-            var arr = [];
+            var arr = []; 
             var total = 0;
             var str = "";
+            console.log("newArr2323223323223",newArr)
+            console.log("newArr2323223323223",purcaseOrder)
+            
+
+           console.log("长度1",goodOrder.length)
+           console.log("长度2",purcaseOrder.length)
 
+          if(purcaseOrder.length <=goodOrder.length){
             //如果采购单有数据，则需要比较数量
             if (newArr.length > 0) {
               for (let i = 0; i < purcaseOrder.length; i++) {
@@ -1019,7 +1028,7 @@ export default {
                 }
               }
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-
+             
               if (arr.length == 0) {
                 this.$message.error("该订单已全部生成采购单，请知悉!");
                 return;
@@ -1029,7 +1038,31 @@ export default {
                 str = arr.join(",");
                 this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
               }
+
+            }
+
+          }
+          //如果采购订单的商品个数不等与 采购单里面的商品个数
+          if(purcaseOrder.length>goodOrder.length){
+           var arrList = []
+           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){
+                     arrList.push(purcaseOrder[i].project_id)
+                  }
+                }
+              }
+              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+              console.log("are232323323223322323",arrList)
+              if(arrList.length > 0){
+                str = arrList.join(",");
+                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
+              }
             }
+           }
           }
         }
       });