数据

src/xt_pages/data/components/addDrugs.vue

@@ -115,26 +115,42 @@
                     <el-form-item label="默认单次用量 : " prop="drug_dose">
                          <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
                                       maxlength="30"></el-input>
-                          <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
+                          <!-- <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
                                 <el-option
                                         v-for="(item,index) in unitList"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
                                 </el-option>
-                           </el-select>
+                           </el-select> -->
+                         <el-select v-model="form.drug_dose_unit" style="width:80px;" filterable placeholder="单次用量单位">
+                               <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                              </el-option>
+                        </el-select>
                      </el-form-item>
                     <el-form-item label="默认开药数量:" prop="prescribing_number">
                         <el-input v-model="form.prescribing_number" style="width:70px;margin-right:5px;" placeholder=""
                                   maxlength="30"></el-input>
-                        <el-select v-model="form.prescribing_number_unit" style="width:80px;" placeholder="开药数量单位">
+                        <!-- <el-select v-model="form.prescribing_number_unit" style="width:80px;" placeholder="开药数量单位">
                               <el-option
                                 v-for="(item,index) in packingUnit"
                                 :key="index"
                                 :label="item.name"
                                 :value="item.name">
                               </el-option>
-                          </el-select>
+                          </el-select> -->
+                         <el-select v-model="form.prescribing_number_unit" style="width:80px;" filterable placeholder="开药数量单位">
+                               <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                        </el-select>
                     </el-form-item>
                      <!-- <el-form-item label="开药数量单位:" prop="prescribing_number">
                           <el-select v-model="form.prescribing_number_unit" style="width:160px;" placeholder="开药数量单位">
@@ -574,7 +590,7 @@
           packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
           drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
-          drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
+          // drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
           drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
 
@@ -925,156 +941,156 @@
            }
         })
       },
-      changeDoseUnit(val){
-        if(val == this.form.min_unit){
-          // this.form.dose = 1
-          this.form.min_number = 1
-          this.dosageShow = true
-        }
-        if(val !=this.form.min_unit){
-          this.dosageShow = false
-        }
-        var arr =  getDataConfig('hemodialysis','units')
-        this.unitList = []
-        for(let i=0;i<arr.length;i++){
-
-          if(this.form.min_unit == arr[i].name){
-            this.unitList.push(arr[i])
-          }
-          if(val == arr[i].name){
-            this.unitList.push(arr[i])
-          }
-          let idArr = []
-          this.unitList.map(item => {
-            idArr.push(item.id)
-          })
-          if(idArr.indexOf(this.form.drug_dose_unit) == -1){
-            if(this.form.drug_dose_unit == arr[i].id){
-              this.unitList.push(arr[i])
-            }
-          }
-
-        }
-        let ojb = {};
-        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
-            //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-            ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
-            return prevArr
-        }, [])
-
-      },
-      changeMinUnit(val){
-        if(val == this.form.dose_unit){
-          // this.form.dose = 1
-          this.form.min_number = 1
-          this.dosageShow = true
-        }else{
-          this.dosageShow = false
-        }
-        // if(val != this.form.max_unit){
-        //   this.dosageShow = false
-        // }
-        if(val == this.form.max_unit){
-          this.form.min_number = 1
-          this.minNumberShow = true
-        }else{
-          this.minNumberShow = false
-        }
-
-        // if(this.form.dosage == "" || this.form.max_unit == ""){
-        //    this.form.min_number = 1
-        // }
-        var arr = getDataConfig('hemodialysis','units')
-        this.unitList = []
-        this.packingUnit = []
-        for(let i=0;i<arr.length;i++){
-            if(val == arr[i].name){
-              this.unitList.push(arr[i])
-              this.packingUnit.push(arr[i])
-            }
-            if(this.form.max_unit == arr[i].name){
-              this.unitList.push(arr[i])
-              this.packingUnit.push(arr[i])
-            }
-            if(this.form.drug_dose_unit == arr[i].id){
-              this.unitList.push(arr[i])
-            }
-            if(this.form.prescribing_number_unit == arr[i].id){
-              this.packingUnit.push(arr[i])
-            }
+      // changeDoseUnit(val){
+      //   if(val == this.form.min_unit){
+      //     // this.form.dose = 1
+      //     this.form.min_number = 1
+      //     this.dosageShow = true
+      //   }
+      //   if(val !=this.form.min_unit){
+      //     this.dosageShow = false
+      //   }
+      //   var arr =  getDataConfig('hemodialysis','units')
+      //   this.unitList = []
+      //   for(let i=0;i<arr.length;i++){
+
+      //     if(this.form.min_unit == arr[i].name){
+      //       this.unitList.push(arr[i])
+      //     }
+      //     if(val == arr[i].name){
+      //       this.unitList.push(arr[i])
+      //     }
+      //     let idArr = []
+      //     this.unitList.map(item => {
+      //       idArr.push(item.id)
+      //     })
+      //     if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+      //       if(this.form.drug_dose_unit == arr[i].id){
+      //         this.unitList.push(arr[i])
+      //       }
+      //     }
+
+      //   }
+      //   let ojb = {};
+      //   this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+      //       //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //       ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+      //       return prevArr
+      //   }, [])
+
+      // },
+      // changeMinUnit(val){
+      //   if(val == this.form.dose_unit){
+      //     // this.form.dose = 1
+      //     this.form.min_number = 1
+      //     this.dosageShow = true
+      //   }else{
+      //     this.dosageShow = false
+      //   }
+      //   // if(val != this.form.max_unit){
+      //   //   this.dosageShow = false
+      //   // }
+      //   if(val == this.form.max_unit){
+      //     this.form.min_number = 1
+      //     this.minNumberShow = true
+      //   }else{
+      //     this.minNumberShow = false
+      //   }
+
+      //   // if(this.form.dosage == "" || this.form.max_unit == ""){
+      //   //    this.form.min_number = 1
+      //   // }
+      //   var arr = getDataConfig('hemodialysis','units')
+      //   this.unitList = []
+      //   this.packingUnit = []
+      //   for(let i=0;i<arr.length;i++){
+      //       if(val == arr[i].name){
+      //         this.unitList.push(arr[i])
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       if(this.form.max_unit == arr[i].name){
+      //         this.unitList.push(arr[i])
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       if(this.form.drug_dose_unit == arr[i].id){
+      //         this.unitList.push(arr[i])
+      //       }
+      //       if(this.form.prescribing_number_unit == arr[i].id){
+      //         this.packingUnit.push(arr[i])
+      //       }
             
 
 
 
-            let idArr = []
-            this.unitList.map(item => {
-              idArr.push(item.id)
-            })
-            if(idArr.indexOf(this.form.drug_dose_unit) == -1){
-              if(this.form.drug_dose_unit == arr[i].id){
-                this.unitList.push(arr[i])
-              }
-            }
-            let packingIdArr = []
-            this.packingUnit.map(item => {
-              packingIdArr.push(item.id)
-            })
-            if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
-              if(this.form.prescribing_number_unit == arr[i].id){
-                this.packingUnit.push(arr[i])
-              }
-            }
-        }
-        let ojb = {};
-        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
-          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
-          return prevArr
-        }, [])
-
-        let newojb = {};
-        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
-          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
-          return prevArr
-        }, [])
-
-      },
-      changeMaxUnit(val){
-        if(val == this.form.min_unit){
-          this.form.min_number = 1
-          this.minNumberShow = true
-        }else{
-          this.minNumberShow = false
-        }
-        var arr = getDataConfig('hemodialysis','units')
-        this.packingUnit = []
-        for(let i=0;i<arr.length;i++){
-            if(val == arr[i].name){
-              this.packingUnit.push(arr[i])
-            }
-            if(this.form.min_unit == arr[i].name){
-              this.packingUnit.push(arr[i])
-            }
-            let packingIdArr = []
-            this.packingUnit.map(item => {
-              packingIdArr.push(item.id)
-            })
-            if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
-              if(this.form.prescribing_number_unit == arr[i].id){
-                this.packingUnit.push(arr[i])
-              }
-            }
-        }
-
-
-        let newojb = {};
-        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
-          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
-          return prevArr
-        }, [])
-      }
+      //       let idArr = []
+      //       this.unitList.map(item => {
+      //         idArr.push(item.id)
+      //       })
+      //       if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+      //         if(this.form.drug_dose_unit == arr[i].id){
+      //           this.unitList.push(arr[i])
+      //         }
+      //       }
+      //       let packingIdArr = []
+      //       this.packingUnit.map(item => {
+      //         packingIdArr.push(item.id)
+      //       })
+      //       if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
+      //         if(this.form.prescribing_number_unit == arr[i].id){
+      //           this.packingUnit.push(arr[i])
+      //         }
+      //       }
+      //   }
+      //   let ojb = {};
+      //   this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+      //     //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //     ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+      //     return prevArr
+      //   }, [])
+
+      //   let newojb = {};
+      //   this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+      //     //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //     newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+      //     return prevArr
+      //   }, [])
+
+      // },
+      // changeMaxUnit(val){
+      //   if(val == this.form.min_unit){
+      //     this.form.min_number = 1
+      //     this.minNumberShow = true
+      //   }else{
+      //     this.minNumberShow = false
+      //   }
+      //   var arr = getDataConfig('hemodialysis','units')
+      //   this.packingUnit = []
+      //   for(let i=0;i<arr.length;i++){
+      //       if(val == arr[i].name){
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       if(this.form.min_unit == arr[i].name){
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       let packingIdArr = []
+      //       this.packingUnit.map(item => {
+      //         packingIdArr.push(item.id)
+      //       })
+      //       if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
+      //         if(this.form.prescribing_number_unit == arr[i].id){
+      //           this.packingUnit.push(arr[i])
+      //         }
+      //       }
+      //   }
+
+
+      //   let newojb = {};
+      //   this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+      //     //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //     newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+      //     return prevArr
+      //   }, [])
+      // }
     }, watch: {
       visible(val) {
         // this.form = this.formValue

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -307,10 +307,7 @@
               <span>序号</span>
             </template>
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
-              <span v-if="scope.row.is_total == 1">{{'合计'}}</span> -->
               {{scope.$index+1}}
-            
             </template>
           </el-table-column>
 
@@ -951,16 +948,19 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          var outList = response.data.data.outList
-          for(let i=0;i<outList.length;i++){
-          if(outList[i].count_unit == outList[i].max_unit){
-              outList[i].count =outList[i].count * outList[i].min_number
-            }
-          }
-          this.outList = outList
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
+         for(let i=0;i<drugFlowList.length;i++){
+           if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.max_unit){
+               drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
+           }
+           if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
+              drugFlowList[i].count = drugFlowList[i].count 
+           }
+         }
+         console.log("库存柳树",drugFlowList)
+ 
          this.drugFlowList = drugFlowList
          for(let i=0;i<list.length;i++){
            if(list[i].batch_number == "0" || list[i].batch_number == 0){
@@ -983,11 +983,12 @@ export default {
        drug_id:val.drug_id,
        record_time:val.sys_record_time,
      }
+     console.log("使用明细",params)
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
         
         this.userList = response.data.data.list
-        
+        console.log("自动出库数据",this.userList)
         if(val.is_sys == 1){
         
           this.drugDialogVisible = true
@@ -1097,84 +1098,21 @@ export default {
              arr.push(this.drugFlowList[i])
           }
         }
-        var total = 0
-        for(let i=0;i<arr.length;i++){
-          if(arr[i].count_unit == max_unit){
-             arr[i].count = arr[i].count * min_number
-          }
-          if(arr[i].count_unit == min_unit){
-            arr[i].count = arr[i].count
-          }
-          total += arr[i].count
-        }
         var str = ""
         var min_str = ""
-        if(total >= min_number){
-          if(parseInt(total/min_number)!=0){
-            str = parseInt(total/min_number)+ max_unit
-          }
-          if(total%min_number !=0){
-            min_str =  total%min_number + min_unit
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            if(parseInt(arr[i].count/min_number)!=0){
+              str = parseInt(arr[i].count/min_number)+ max_unit
+            }
+            if(arr[i].count%min_number !=0){
+              min_str =  arr[i].count%min_number + min_unit
+            }
           }
         }
-        if (total < min_number){
-          str = ""
-          min_str = total + min_unit
-        }
         return str + min_str 
       },
-    //   getTotalCountOne(id,min_number,max_unit,min_unit){
-       
-    //     for(let i=0;i<this.outList.length;i++){
-    //       if(this.outList[i].count_unit == this.outList[i].max_unit){
-    //         this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
-    //       }
 
-    //      if(this.outList[i].count_unit == this.outList[i].min_unit){
-    //         this.outList[i].total_count = this.outList[i].count
-    //       }
-       
-    //     }
-    //     console.log("我的",this.outList)
-    //       let dataInfo = {};
-    //       this.outList.forEach((item, index) => {
-    //         let { drug_id } = item;
-    //         if (!dataInfo[drug_id]) {
-    //           dataInfo[drug_id] = {
-    //             drug_id,
-    //             child: [],
-    //             total:0,
-    //           };
-    //         }
-    //       });
-    //     let list = Object.values(dataInfo);
-    //     console.log("drug_id22222",list)
-    //     for(let i=0;i<list.length;i++){
-    //       for(let j=0;j<this.outList.length;j++){
-    //         if(list[i].drug_id == this.outList[j].drug_id){
-    //           list[i].child.push(this.outList[j])
-    //         }
-    //       }
-    //     }
-    //    var total = 0
-    //    for(let i=0;i<list.length;i++){
-    //     for(let j=0;j<list[i].child.length;j++){
-    //        if(id == list[i].child[j].drug_id){
-    //          total+= list[i].child[j].total_count
-    //        }
-    //     }
-    //    }
-      
-    //   var str = ""
-    //   var min_str = ""
-      
-    //   str = parseInt(total/min_number)+ max_unit
-    //   min_str =  total%min_number + min_unit
-
-    //  return str + min_str
-      
-       
-    //  },
       getAllPrice(drug_id,price,min_price){
          var strprice = 0
          var minstrprice = 0
@@ -1198,7 +1136,7 @@ export default {
          return  total_price
       },
       getDrugBatchNumber(drugid,count){
-        console.log("drug_id2323",drug_id)
+        console.log("drug_id2323",drugid)
         console.log("count",count)
         console.log("hhhhhhhhhhh",this.batchNumberList)
         var arr = []

src/xt_pages/stock/drugs/query.vue

@@ -112,15 +112,20 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-              <span>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
-              <!-- <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4">
+                <span v-if="scope.row.drug_warehouse_out.length > 0"></span> {{getDrugOutList(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+             </span>
+             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
-               <!-- <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4">
+                 {{getDrugChaCount(scope.row.drug_warehouse_info,scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
+               </span>
+               
+               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
             </div>
            </template>
         </el-table-column>
@@ -237,7 +242,6 @@ import { min } from 'moment'
     methods: {
      //获取库存
       getlist(){
-      
         const params = {
           page: this.page,
           limit: this.limit,
@@ -260,6 +264,11 @@ import { min } from 'moment'
                     list[i].drug_warehouse_out[y].count = list[i].drug_warehouse_out[y].count * list[i].min_number
                   }
                }
+               for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
+                 if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
+                   list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
+                 } 
+               }
              }
              console.log("列表list232323323232323223",list)
              this.tableList = list
@@ -715,6 +724,54 @@ import { min } from 'moment'
          }
         return max_str + min_str
 
+      },
+
+      getDrugOutList(arr,max_unit,min_unit,min_number){
+        var str = ""
+        var str_min = ""
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+           if(parseInt(arr[i].count/min_number)!=0){
+              str = parseInt(arr[i].count/min_number)+ max_unit
+            }
+            if(arr[i].count%min_number !=0){
+              str_min =  arr[i].count%min_number + min_unit
+            }
+          }
+        }
+        return str + str_min
+      },
+
+      getDrugChaCount(info,out_info,max_unit,min_unit,min_number,cancel_info){
+        var total_info = 0
+        var total_out = 0
+        var cha_count = 0
+        var cancel_count = 0
+        if(info.length > 0 ){
+          for(let i=0;i<info.length;i++){
+            total_info += info[i].warehousing_count * min_number
+          }
+        }
+        if(out_info.length>0){
+          for(let j=0;j<out_info.length;j++){
+            total_out += out_info[j].count
+          }
+        }
+        if(cancel_info.length >0){
+         for(let z=0;z<cancel_info.length;z++){
+            cancel_count +=cancel_info[z].count
+         }
+        }
+        cha_count = total_info - total_out + cancel_count
+        var str = ""
+        var str_min = ""
+        if(parseInt(cha_count/min_number)!=0){
+            str = parseInt(cha_count/min_number)+ max_unit
+         }
+         if(cha_count%min_number !=0){
+           str_min =  cha_count%min_number + min_unit
+         }
+         return str + str_min
       }
     }
   }

src/xt_pages/stock/stockPrint.vue

@@ -42,11 +42,13 @@
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td>
-                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info) - getOverplus(item.xt_warehouse_info) - getCancelInfo(item.cancel_stock_info)}}{{item.packing_unit}}</span>
+                                        {{getAutoCount(item.id) + getOutCount(item.id)}}
+                                       <!-- <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info) - getOverplus(item.xt_warehouse_info) - getCancelInfo(item.cancel_stock_info)}}{{item.packing_unit}}</span> -->
                                    </td>
                                   
                                    <td>
-                                     <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>  
+                                     <span v-if="getWareInfo(item.xt_warehouse_info) > 0">{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span> 
+                                     <!-- <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>   -->
                                    </td>
                                 </tr>
                             </tbody>
@@ -303,7 +305,7 @@ export default {
       this.limit = this.$route.query.limit
       this.getlist()
       this.GetAllGoodType()
-      // this.getStockDrugCount()
+      this.getStockDrugCount()
     }
 }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -110,14 +110,12 @@
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
             {{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}}
-            <!-- <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info) - getOverplus(scope.row.xt_warehouse_info) - getCancelInfo(scope.row.cancel_stock_info)}}{{scope.row.packing_unit}}</span> -->
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
           <span v-if="getWareInfo(scope.row.xt_warehouse_info) > 0">{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
-           <!-- <span v-if="getOverplus(scope.row.xt_warehouse_info)>0">{{getOverplus(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span> -->
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">