11月14日 库存扣减更新

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -618,7 +618,7 @@ export default {
     handleEdit:function(index,row){
        this.$router.push({
          name:"drugStockInOrderEdit",
-         query:{id:row.id,type:this.type}
+         query:{id:row.id,type:this.type,supply_warehouse_id:row.supply_warehouse_id}
        })
     },
     handleSearch(id){
@@ -649,6 +649,11 @@ export default {
       });
     },
     handleDelete: function(index, row) {
+      console.log("rowe23323223",row)
+      if(row.supply_warehouse_id >0 ){
+        this.$message.error("自动入库数据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -709,8 +714,17 @@ export default {
         return;
       }
       const ids = [];
+      const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
         ids.push(this.selectedTableData[i].id);
+        idOne.push(this.selectedTableData[i].supply_warehouse_id)
+      }
+      console.log("idson233223233223",idOne)
+      for(let i=0;i<idOne.length;i++){
+        if(idOne[i] >0 ){
+           this.$message.error("自动入库数据不能删除!")
+           return false
+        }
       }
       const idStr = ids.join(",");
       const params = {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -48,6 +48,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :disabled="disabled"
         >
         </el-date-picker>
       </div>
@@ -83,7 +84,8 @@
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
-                    :disabled="drug_show"
+                    :disabled="disabled"
+                   
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -99,12 +101,14 @@
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商" :disabled="disabled">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"
                   :label="option.name"
-                  :value="option.id">
+                  :value="option.id"
+                  
+                  >
                 </el-option>
                </el-select>
             </template>
@@ -130,6 +134,7 @@
               <template slot-scope="scope">
                 <el-form-item style="padding-top: 20px" :rules="tableRules.batch_number"  :prop="'recordData.' + scope.$index + '.batch_number'">
                   <el-input
+                   :disabled="disabled"
                     placeholder="请输入批号"
                     v-model="scope.row.batch_number"
                   ></el-input>
@@ -150,6 +155,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   :disabled="disabled"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     placeholder="请输入入库数量"
                     type="number"
@@ -157,12 +163,13 @@
                     style="width:80px"
                   ></el-input>
                    <!-- {{scope.row.max_unit}} -->
-                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
                     <el-option
                       v-for="(option, index) in unitList"
                       :key="index"
                       :label="option.name"
-                      :value="option.name">
+                      :value="option.name"
+                     >
                     </el-option>
                   </el-select>
                 </div>
@@ -226,6 +233,7 @@
                 :rules="tableRules.expiry_date"
                 style="padding-top: 20px">
                 <el-date-picker
+                 :disabled="disabled"
                   prefix-icon="el-icon-date"
                   style="width: 145px"
                   v-model="scope.row.expiry_date"
@@ -241,6 +249,7 @@
           <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
+              :disabled="disabled"
                 prefix-icon="el-icon-date"
                 style="width: 145px"
                 v-model="scope.row.product_date"
@@ -255,12 +264,13 @@
              
           <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled="disabled">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
                   :label="option.manufacturer_name"
-                  :value="option.id">
+                  :value="option.id"
+                 >
                 </el-option>
                </el-select>
             </template>
@@ -274,7 +284,8 @@
                   v-for="(option, index) in dealerList"
                   :key="index"
                   :label="option.dealer_name"
-                  :value="option.id">
+                  :value="option.id"
+                  :disabled="disabled">
                 </el-option>
                 </el-select>
             </template>
@@ -285,6 +296,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                 :disabled="disabled"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
@@ -294,7 +306,7 @@
  
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark" :disabled="disabled"></el-input>
             </template>
           </el-table-column>
 
@@ -439,6 +451,7 @@ export default {
       unitList:[],
       drug_show:false,
       loading:false,
+      disabled:false,
     };
   },
   methods: {
@@ -538,6 +551,11 @@ export default {
       return name;
     },
     handleEdit: function(index, row) {
+      console.log("row23323223",row)
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动入库数据不能新增!")
+        return false
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["drug_id"] = 0;
@@ -555,6 +573,10 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动入库数据不能删除!")
+        return false
+      }
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -883,11 +905,13 @@ export default {
   created() {
    
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-    //this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);
     this.unitList =  getDataConfig('hemodialysis','units')
+    if( parseInt(this.$route.query.supply_warehouse_id)>0){
+      this.disabled = true
+    }
   }
 };
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -1060,9 +1060,14 @@ export default {
     },
     handleEdit: function(index, row) {
       console.log("rowe232323232332",row)
-      this.$router.push({path:"/stock/in/order/edit?id="+row.id})
+      this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id})
     },
     handleDelete: function(index, row) {
+     
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动生成入库单不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -1119,9 +1124,19 @@ export default {
         return;
       }
       const ids = [];
+      const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
         ids.push(this.selectedTableData[i].id);
+        idOne.push(this.selectedTableData[i].supply_warehouse_id)
+      }
+      console.log("idson23322323",idOne)
+      for(let i=0;i<idOne.length;i++){
+        if(idOne[i] >0){
+          this.$message.error("自动入库数据不能删除!")
+          return false
+        }
       }
+    
       const idStr = ids.join(",");
       const params = {
         ids: idStr
@@ -1368,6 +1383,7 @@ export default {
       },
 
      DeleteWarehouseInfoItem: function(index, row) {
+       
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {

src/xt_pages/stock/stockInOrderEdit.vue

@@ -46,6 +46,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :disabled="disabled"
         >
         </el-date-picker>
       </div>
@@ -74,6 +75,7 @@
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:150px;"
+                    :disabled ="disabled"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -93,6 +95,7 @@
                   placeholder="请输入耗材类型"
                   v-model="scope.row.good_type_id"
                   :value="typeName(scope.row.good_type_id)"
+                   :disabled ="disabled"
                 ></el-input>
               </el-form-item>
             </template>
@@ -105,7 +108,7 @@
             <template slot-scope="scope">
 
               <el-form-item style="padding-top: 20px">
-                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"  :disabled ="disabled"></el-input>
               </el-form-item>
 
             </template>
@@ -118,7 +121,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.number'"
                             :rules='tableRules.number' >
-                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
+                <el-input placeholder="请输入批号" v-model="scope.row.number"  :disabled ="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -172,6 +175,7 @@
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
+                   :disabled ="disabled"
                 ></el-input>
                 {{scope.row.min_unit}}
               </el-form-item>
@@ -192,7 +196,7 @@
                 :rules="tableRules.expiry_date">
                 <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
                                 type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd">
+                                value-format="yyyy-MM-dd"  :disabled ="disabled">
                 </el-date-picker>
              </el-form-item>
             </template>
@@ -209,13 +213,14 @@
                 placeholder="选择日期时间"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :disabled ="disabled"
               ></el-date-picker>
             </template>
           </el-table-column>
 
            <el-table-column label="生产厂家" align="center" width="150">
              <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled ="disabled">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -237,7 +242,7 @@
                 <el-input
                   placeholder="请输入批准文号"
                   v-model="scope.row.license_number"
-                  
+                  :disabled ="disabled"
                 ></el-input>
               </el-form-item>
             </template>
@@ -249,14 +254,15 @@
                   v-for="(option, index) in dealerList"
                   :key="index"
                   :label="option.dealer_name"
-                  :value="option.id">
+                  :value="option.id"
+                   :disabled ="disabled">
                 </el-option>
                </el-select>
             </template>
           </el-table-column>
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark"  :disabled ="disabled"></el-input>
             </template>
           </el-table-column>
 
@@ -395,6 +401,7 @@ export default {
       manufacturerList:[],
       numberList:[],
       loading:false,
+      disabled:false,
     };
   },
   methods: {
@@ -486,6 +493,10 @@ export default {
       return name;
     },
     handleEdit: function(index, row) {
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动入库数据不能新增!")
+        return false
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["good_type_id"] = 0;
@@ -503,6 +514,11 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      console.log("Row2332233232",row)
+      if(row.supply_warehouse_id >0){
+        this.$message.error("自动入库数据不能删除!")
+        return false
+      }
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -819,7 +835,12 @@ export default {
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
+    var supply_warehouse_id =  parseInt(this.$route.query.supply_warehouse_id)  
+    if(supply_warehouse_id > 0){
+      this.disabled = true
+    }
     this.GetOrderDetail(order_id);
+
   }
 };
 </script>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -71,7 +71,9 @@
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="checkGoodOrder" >审核</el-button>
+          <el-button size="small" type="primary" @click="checkGoodOrder" v-if="is_check == 2" >审核</el-button>
+          <el-button size="small" type="primary" @click="MofyGoodOrder" v-if="is_check == 1">反审核</el-button>
+          <el-button size="small" type="primary" @click="" v-if="is_check == 1" >生成采购退货单</el-button>
         </div>
       </div>
 
@@ -238,6 +240,18 @@
             </template>
           </el-table-column>
 
+           <el-table-column label="拆零零售价" align="center" width="180px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.min_price"
+                style="width: 140px"
+                :disabled="disabled"
+                placeholder="请输入拆零零售价"
+              ></el-input>
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="采购单价" align="center" width="180px">
             <template slot-scope="scope">
               <el-input
@@ -449,7 +463,8 @@ import {
   updateGoodOrder,
   checkGoodOrderById,
   getGoodOrderCountList,
-  ModefySupplyWarehousing
+  ModefySupplyWarehousing,
+  MofyGoodOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -518,7 +533,7 @@ export default {
       goodList: [],
       id: 0,
       disabled: false,
-      is_check: 0,
+      is_check: 2,
       dialogVisible: false,
       arrearage: "",
       payment: "",
@@ -597,6 +612,7 @@ export default {
             drugList[i].supply_remake = "";
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
+            drugList[i].min_price = drugList[i].min_price
             drugList[i].name = drugList[i].drug_name;
             if (drugList[i].max_unit != drugList[i].min_unit) {
               drugList[i].unitList = [
@@ -652,6 +668,7 @@ export default {
             goodList[i].name = goodList[i].good_name;
             goodList[i].unitList = [{ id: 1, name: "" }];
             goodList[i].supply_unit = goodList[i].packing_unit;
+            goodList[i].min_price = goodList[i].retail_price
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
@@ -672,9 +689,9 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =
-            val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
+          this.recordInfo.tableList[i].min_price = val.min_price  
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
           } else {
@@ -723,6 +740,7 @@ export default {
       tempObj["order_number"] = "";
       tempObj["supply_expiry_date"] = "";
       tempObj["manufacturer_id"] = "";
+      tempObj["min_price"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -839,7 +857,9 @@ export default {
       getPurchaseOrderInfo(id, ids).then((response) => {
         if (response.data.state == 1) {
           var info = response.data.data.info;
-          this.is_check = info.is_check;
+          
+         
+
           this.id = info.id;
           this.supplier_name = info.supplier_id;
           this.rate_of_concession = info.rate_of_concession;
@@ -862,6 +882,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].min_price = ""
             orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2);
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
@@ -919,6 +940,7 @@ export default {
           this.recordInfo.tableList[i].supply_total_price.toString();
         this.recordInfo.tableList[i].supply_total =
           this.recordInfo.tableList[i].supply_total.toString();
+          this.recordInfo.tableList[i].min_price = this.recordInfo.tableList[i].min_price.toString()
 
         for (let j = 0; j < this.manufactuerList.length; j++) {
           if (
@@ -944,7 +966,7 @@ export default {
           var warehousing_id = this.$route.query.id;
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
           console.log("长度2332233232",this.tableDataList.length)
-          console.log("产股2333223232323",this.recordInfo.tableList)
+          console.log("产股2333223232323",this.recordInfo.tableList.length)
           if(this.tableDataList.length != this.recordInfo.tableList.length){
              warehousing_id = 0
              for(let i=0;i<this.recordInfo.tableList.length;i++){
@@ -964,6 +986,7 @@ export default {
               this.showTwo = true;
               var orderInfo = response.data.data.list;
               var warehouseOut = response.data.data.warehouseOut;
+              console.log("采购单323322323",warehouseOut)
               this.warese_out_id = warehouseOut.id;
               this.good_number = warehouseOut.good_number;
               this.rate_of_concession = warehouseOut.rate_of_concession;
@@ -994,23 +1017,13 @@ export default {
                 if (orderInfo[i].is_source == 1) {
                   for (let j = 0; j < this.drugList.length; j++) {
                     if (orderInfo[i].project_id == this.drugList[j].id) {
-                      if (
-                        this.drugList[j].max_unit != this.drugList[j].min_unit
-                      ) {
-                        orderInfo[i].unitList = [
-                          { id: 1, name: "" },
-                          { id: 2, name: "" },
-                        ];
-                        orderInfo[i].unitList[0].name =
-                          this.drugList[j].max_unit;
-                        orderInfo[i].unitList[1].name =
-                          this.drugList[j].min_unit;
+                      if (this.drugList[j].max_unit != this.drugList[j].min_unit) {
+                        orderInfo[i].unitList = [{ id: 1, name: "" },{ id: 2, name: "" }];
+                        orderInfo[i].unitList[0].name = this.drugList[j].max_unit;
+                        orderInfo[i].unitList[1].name = this.drugList[j].min_unit;
                       }
-                      if (
-                        this.drugList[j].max_unit == this.drugList[j].min_unit
-                      ) {
-                        orderInfo[i].unitList[0].name =
-                          this.drugList[j].max_unit;
+                      if (this.drugList[j].max_unit == this.drugList[j].min_unit) {
+                        orderInfo[i].unitList[0].name = this.drugList[j].max_unit;
                       }
                     }
                   }
@@ -1019,8 +1032,7 @@ export default {
                   for (let j = 0; j < this.goodList.length; j++) {
                     if (orderInfo[i].project_id == this.goodList[j].id) {
                       orderInfo[i].unitList = [{ id: 1, name: "" }];
-                      orderInfo[i].unitList[0].name =
-                        this.goodList[j].packing_unit;
+                      orderInfo[i].unitList[0].name = this.goodList[j].packing_unit;
                     }
                   }
                 }
@@ -1048,7 +1060,7 @@ export default {
           this.recordInfo.tableList[i].supply_total_price.toString();
         this.recordInfo.tableList[i].supply_total =
           this.recordInfo.tableList[i].supply_total.toString();
-
+        this.recordInfo.tableList[i].min_price = this.recordInfo.tableList[i].min_price.toString()
         for (let j = 0; j < this.manufactuerList.length; j++) {
           if (
             this.recordInfo.tableList[i].supply_manufacturer ==
@@ -1099,12 +1111,13 @@ export default {
     checkGoodOrder() {
       var id = this.warese_out_id;
       var warehousing_id = this.id;
-      console.log("id23322332233223",id)
-      console.log("checkGoodOrder23323",warehousing_id)
+      console.log("采购单ID",id)
+      console.log("采购订单ID",warehousing_id)
     
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
+          
           this.is_check = 1
           this.showOne = false;
           this.showTwo = true;
@@ -1210,6 +1223,128 @@ export default {
         }
       });
     },
+    MofyGoodOrder() {
+      var id = this.warese_out_id;
+      console.log("采购单ID",id)
+      var params = {
+        id: id,
+      };
+      MofyGoodOrder(params).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+          if (msg == 1) {
+            this.$message.success("反审核成功!");
+            this.is_check = 2
+            this.disabled = false
+            this.Reviewed = false
+            return
+          }
+          if (msg == 2) {
+            var cancelList = response.data.data.cancelList
+            console.log("cancelLIST2332322332232323",cancelList)
+            this.orderList = cancelList
+            this.$refs.Popup.dialogVisible = true
+            return
+          }
+
+          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) {
+            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]);
+                }
+              }
+            }
+            console.log("newAr2332232323", newArr);
+
+            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比较数量大小,如果采购单的数量大于采购订单的数据
+                    if (purcaseOrder[i].count < newArr[j].count) {
+                      arr.push(purcaseOrder[i].project_id);
+                    }
+                  }
+                }
+              }
+              //如果total的长度等于0,怎修改该订单的状态为全部入库
+
+              if (arr.length > 0) {
+                //修改采购订单的状态为全部入库
+                this.UpdateSupplyWahouseingInfo();
+              }
+            }
+          }
+        }
+      });
+    },
+    UpdateSupplyWahouseingInfo() {
+      var params = {
+        warehousing_id: this.$route.query.warehousing_id,
+      };
+      console.log("采购单ID",params)
+      UpdateSupplyWahouseingInfo(params).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+        }
+      });
+    },
   },
   created() {
     const tempObj = {};
@@ -1234,6 +1369,7 @@ export default {
     tempObj["order_number"] = "";
     tempObj["supply_expiry_date"] = "";
     tempObj["manufacturer_id"] = "";
+    tempObj["min_price"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     if (parseInt(this.$route.query.id) > 0) {

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -94,9 +94,8 @@
             size="small"
             type="primary"
             @click="updatePurchaseOrder"
-            v-show="showOne"
-            >保存</el-button
-          >
+            v-show="showThree">保存
+          </el-button>
         </div>
       </div>
 
@@ -390,6 +389,7 @@ export default {
       ],
       showTwo: true,
       showOne: false,
+      showThree:false,
       recordInfo: {
         tableList: [],
       },
@@ -724,6 +724,7 @@ export default {
               }
               this.showTwo = false;
               this.showOne = true;
+              this.showThree = true
             }
           });
         }
@@ -865,6 +866,8 @@ export default {
               var info = response.data.data.info;
               this.is_check = info.is_check
               this.showOne = false
+              this.showTwo = false
+              this.showThree = true
               this.disabled = true;
               this.$message.success("审核成功!");
               this.Reviewed = true
@@ -919,7 +922,7 @@ export default {
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
-            this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + ids});
+            this.$router.push({path: "/good/order/add?id=" + this.id + "&ids=" + ids});
           }
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -236,6 +236,18 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="拆零零售价" align="center" width="180px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.min_price"
+                style="width: 140px"
+                :disabled="disabled"
+                placeholder="请输入拆零零售价"
+              ></el-input>
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="采购单价" align="center" width="180px">
             <template slot-scope="scope">
               <el-input
@@ -248,6 +260,8 @@
             </template>
           </el-table-column>
 
+      
+
           <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
@@ -588,6 +602,7 @@ export default {
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
             drugList[i].name = drugList[i].drug_name;
+            drugList[i].min_price = drugList[i].min_price
             if (drugList[i].max_unit != drugList[i].min_unit) {
               drugList[i].unitList = [
                 { id: 1, name: "" },
@@ -642,6 +657,7 @@ export default {
             goodList[i].supply_unit = goodList[i].packing_unit;
             goodList[i].warehouse_info_id = 0;
             goodList[i].warehousing_id = 0;
+            goodList[i].min_price = goodList[i].retail_price
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
@@ -662,10 +678,9 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =
-            val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
-
+          this.recordInfo.tableList[i].min_price = val.min_price  
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
           } else {
@@ -725,6 +740,7 @@ export default {
       tempObj["warehousing_id"] = "";
       tempObj["number"] = "";
       tempObj["good_number"] = "";
+      tempObj["min_price"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -857,7 +873,7 @@ export default {
               var info = response.data.data.info;
               this.disabled = true;
               this.$message.success("审核成功!");
-              this.getPurchaseOrderDetail();
+              // this.getPurchaseOrderDetail();
             }
           });
         })
@@ -961,6 +977,7 @@ export default {
             tempObj["warehousing_id"] = "";
             tempObj["number"] = "";
             tempObj["good_number"] = "";
+            tempObj["min_price"] = ""
             this.recordInfo.tableList = [];
             this.recordInfo.tableList.push(tempObj);
           }else{
@@ -990,7 +1007,7 @@ export default {
         this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString();
         this.recordInfo.tableList[i].supply_total_price =  this.recordInfo.tableList[i].supply_total_price.toString();
         this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString();
-
+        this.recordInfo.tableList[i].min_price = this.recordInfo.tableList[i].min_price.toString();
         for (let j = 0; j < this.manufactuerList.length; j++) {
           if ( this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name) {
             this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id;
@@ -1034,6 +1051,8 @@ export default {
     checkGoodOrder() {
       var id = this.$route.query.id;
       var warehousing_id = this.$route.query.warehousing_id;
+      console.log("采购单ID",id)
+      console.log("采购订单ID",warehousing_id)
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
@@ -1407,6 +1426,7 @@ export default {
     tempObj["warehousing_id"] = "";
     tempObj["number"] = "";
     tempObj["good_number"] = "";
+    tempObj["min_price"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     if (parseInt(this.$route.query.id) > 0) {

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -317,6 +317,7 @@
             :rows="2"
             placeholder="备注信息"
             v-model="return_remark"
+            :disabled="disabled"
           >
           </el-input>
         </div>