8月15日

src/api/drug/drug.js

@@ -579,3 +579,11 @@ export function getDrugNewQuery(params) {
     params: params
   })
 }
+
+export function getDrugWarehouseOutInfoById(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseoutinfobyid',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/addDrugs.vue

@@ -168,8 +168,8 @@
                                   maxlength="30"></el-input>
                     </el-form-item>
                        <el-form-item label="库存警戒:">
-                            <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
+                            <el-input v-model="form.drug_stock_limit" style="width:140px;" placeholder=""
+                                      maxlength="30"></el-input>{{form.max_unit}}
                         </el-form-item>
                         <el-form-item label="产地:" prop="drug_origin_place">
                             <el-input v-model="form.drug_origin_place" style="width:160px;" placeholder=""

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -25,7 +25,7 @@
               :value="item.id">
             </el-option>
           </el-select>
-          <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
         </div>
@@ -42,93 +42,118 @@
           >
             <el-table-column label="药品类型" align="center">
               <template slot-scope="scope">
-               
+                {{getDrugTypeName(scope.row.drug_type)}}
               </template>
             </el-table-column>
             <el-table-column label="药品名称" align="center">
               <template slot-scope="scope">
-                
+                 {{scope.row.drug_name}}
               </template>
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                 
+                  {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
-                
+                {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
             <el-table-column label="国家编码" align="center">
               <template slot-scope="scope">
-               
+                {{scope.row.social_security_directory_code}}
               </template>
             </el-table-column>
             <el-table-column label="仓库名称" align="center">
               <template slot-scope="scope">
-                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
-                  <td style="border-right: none; border-inline-end: none;text-align: center" >
-                    
-                  </td>
-                </tr>
+                <tr style="background: none" v-for="(item, index) in scope.row.drug_warehouse" :key="index">
+                 <td  style="border-right: none;border-inline-end: none;text-align: center;">
+                    {{ getHouseName(item.storehouse_id) }}
+                 </td>
+               </tr>
               </template>
             </el-table-column>
         
             <el-table-column label="入库量" align="center">
               <template slot-scope="scope">
-                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
-                  <td style="border-right: none; border-inline-end: none;text-align: center">
-                
-                  </td>
-                </tr>
+               <tr style="background: none" v-for="(item, index) in scope.row.drug_warehouse" :key="index">
+              <td style="border-right: none;border-inline-end: none;text-align: center; ">
+                {{getWarehoseInfoSeven(scope.row.drug_warehouse_info, scope.row.max_unit, scope.row.min_unit,scope.row.min_number,item.storehouse_id)}}&nbsp;
+              </td>
+            </tr>
                </template>
             </el-table-column>
           
             <el-table-column label="出库量" align="center">
               <template slot-scope="scope">
-              
+                <tr style="background: none" v-for="(item, index) in scope.row.drug_warehouse" :key="index">
+                <td style="border-right: none;border-inline-end: none;text-align: center;">
+                   <span style="color:#0099FF" @click="toDialogClick(scope.row.id,scope.row.drug_name,scope.row.dose,scope.row.dose_unit,scope.row.min_number,scope.row.min_unit,scope.row.max_unit)"> {{getOutFlushNight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info,item.storehouse_id)}}&nbsp;</span>
+                </td>
+              </tr>
              </template>
             </el-table-column>
 
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
-               
-
+                <tr style="background: none" v-for="(item, index) in scope.row.drug_warehouse" :key="index">
+                    <td style="border-right: none;border-inline-end: none;text-align: center;">
+                        {{getOutFlushTen(scope.row.drug_cancel_stock_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id)}}&nbsp;
+                    </td>
+                </tr>
               </template>
             </el-table-column>
 
              <el-table-column label="实际出库" align="center">
               <template slot-scope="scope">
-             
+                <tr style="background: none" v-for="(item, index) in scope.row.drug_warehouse" :key="index">
+                    <td style="border-right: none;border-inline-end: none;text-align: center;">
+                    {{getDrugOut(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id)}}&nbsp;
+                    </td>
+                </tr>
              </template>
             </el-table-column>
 
             <el-table-column label="剩余库存" align="center">
-             
+              <template slot-scope="scope">
+                <tr style="background: none" v-for="(item, index) in scope.row.drug_warehouse" :key="index">
+                <td style="border-right: none;border-inline-end: none;text-align: center;">
+                  {{getOverFlushInfoEight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id,scope.row.storehouse_id)}}&nbsp;
+                </td>
+                </tr>
+             </template>
             </el-table-column>
 
             <el-table-column label="总库存量" align="center">
-            
+             <template slot-scope="scope">
+                <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) > 0">
+                 {{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)? getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number): 0}}
+                </div>
+              </template>
             </el-table-column>
            
-            <el-table-column label="操作" align="center" width="200px">
-             
-              <template slot-scope="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  @click="toClick(scope.row)"
-                >库存流水
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  @click="toClickOne(scope.row)"
-                >批次
-                </el-button>
-               </template>
-            </el-table-column>
+            <el-table-column
+                prop="drug_name"
+                label="操作"
+                align="center"
+                width="200px"
+                >
+                <template slot-scope="scope">
+                    <el-button
+                    size="small"
+                    type="primary"
+                    @click="handleDetail(scope.row)"
+                    >库存流水
+                    </el-button>
+                    <el-button
+                    size="small"
+                    type="primary"
+                    @click="handleBatch(scope.row)"
+                    >批次
+                    </el-button>
+                </template>
+              </el-table-column>
           </el-table>
            <el-pagination
             @size-change="handleSizeChange"
@@ -151,7 +176,7 @@
       :visible.sync="dialogVisible"
       width="70%">
       <span>
-        耗材名称:{{good_name}}
+        药品名称:{{drug_name}}
         规格&单位:{{specification_name}}
         查询日期:
           <el-date-picker
@@ -213,6 +238,7 @@
                
             </template>
           </el-table-column>
+          
           <el-table-column label="使用人" align="center">
             <template slot-scope="scope">
               {{getName(scope.row.patient_id)}}
@@ -245,11 +271,9 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getDrugNewQuery,getGoodWarehouseOutInfoById } from "@/api/drug/drug"
-import {
-  getStockDrugCount
-} from "@/api/stock";
+import { getStorehouseList,getDrugNewQuery,getDrugWarehouseOutInfoById } from "@/api/drug/drug"
 import { uParseTime } from '@/utils/tools'
+import { max } from 'moment'
 export default {
 
   data(){
@@ -284,10 +308,11 @@ export default {
      start_first_time:"",
      end_first_time:"",
      tableData:[],
-     good_id:0,
+     drug_id:0,
      patientList:[],
-     good_name:"",
-     specification_name:""
+     drug_name:"",
+     specification_name:"",
+     drugTypeList:[],
     }
   
   },
@@ -356,19 +381,33 @@ export default {
       getDrugNewQuery(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list2332233232323232w",list)
-            
-            if(list.length > 0){
-              var arr = []
-              for(let i=0;i<list.length;i++){
-                if(list[i].xt_warehouse_info.length > 0){
-                  arr.push(list[i])
+            for (let i = 0; i < list.length; i++) {
+              for (let j = 0; j < list[i].drug_warehouse_info.length; j++) {
+                if (list[i].max_unit == list[i].drug_warehouse_info[j].max_unit) {
+                   list[i].drug_warehouse_info[j].stock_max_number =list[i].min_number *list[i].drug_warehouse_info[j].stock_max_number
+                   list[i].drug_warehouse_info[j].warehousing_count =list[i].min_number *list[i].drug_warehouse_info[j].warehousing_count
+                 }
                 }
+                for (let y = 0; y < list[i].drug_warehouse_out.length; y++) {
+                  if (list[i].drug_warehouse_out[y].count_unit == list[i].max_unit) {
+                    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
+                   }
+                }
+            }
+            var arr = [];
+            for (let i = 0; i < list.length; i++) {
+             if (list[i].drug_warehouse_info.length > 0) {
+               arr.push(list[i]);
               }
-              this.tableList = arr
             }
+            this.tableList = arr;
             this.total = response.data.data.total
-           
+            this.drugTypeList = response.data.data.drugTypeList
          }
       })
     },
@@ -391,11 +430,11 @@ export default {
     },
     handleSizeChangeOne(val) {
       this.limitone = val;
-      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+      this.toDialogClick(this.drug_id,this.drug_name,this.specification_name)
     },
     handleCurrentChangeOne(val) {
       this.pageone = val;
-      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+      this.toDialogClick(this.drug_id,this.drug_name,this.specification_name)
     },
    seach(){
     this.getlist()
@@ -433,178 +472,37 @@ export default {
        return ""
      }
    },
-   getStockDrugCount(){
-        var params ={
-           keywords: this.keywords,
-           start_time:this.start_time,
-           end_time:this.end_time,
+  getOverFlushInfo(arr, max_unit, min_unit, min_number) {
+      var max_str = "";
+      var min_str = "";
+      var total = 0;
+      var newarr = arr;
+      if (newarr.length > 0) {
+        for (let i = 0; i < newarr.length; i++) {
+          total += newarr[i].stock_max_number + newarr[i].stock_min_number;
         }
-      getStockDrugCount(params).then(response=>{
-         if(response.data.state == 1){
-           var outlist = response.data.data.outList
-           this.outCountList = outlist
-           var autoCount = response.data.data.autoCount
-           this.autoCountList = autoCount
-           var totalCount = response.data.data.totalCount
-           this.cancelCountList = totalCount
-         }
-      })
-    },
-    getWareInfoCountOne(val,storehouse_id){
-     var count = 0
-     if(val.length > 0){
-       for(let i=0;i<val.length;i++){
-         if(val[i].storehouse_id == storehouse_id){
-             count +=val[i].stock_count
-         }
-       }
-     }
-     if(count > 0){
-       return count
-     }else{
-       return ""
-     }
-   },
-   getOutCount(id){
-      var count = 0
-      for(let i=0;i<this.outCountList.length;i++){
-         if(id == this.outCountList[i].good_id){
-           count = this.outCountList[i].count
-         }
       }
-     return count
-   },
-   getAutoCount(id){
-     var count= 0
-     for(let i=0;i<this.autoCountList.length;i++){
-       if(id == this.autoCountList[i].good_id){
-         count = this.autoCountList[i].count
-       }
-     }
-     return count
-   },
-   getCancelCount(id){
-     var count = 0
-     for(let i=0;i<this.cancelCountList.length;i++){
-       if(id == this.cancelCountList[i].good_id){
-          count = this.cancelCountList[i].count
-       }
-     }
-     return count
-   },
-   getCancelCountInfo(cancel_stock_info,storehouse_id){
-     var count = 0 
-     if(cancel_stock_info.length >0){
-        for(let i=0;i<cancel_stock_info.length;i++){
-          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
-              count += cancel_stock_info[i].count
-          }
-        }
-     }
-     return count
-   },
-   getWareOutInfoCount(warehouse_out_info,storehouse_id){
-     var count = 0
-     if(warehouse_out_info.length > 0){
-       for(let i=0;i<warehouse_out_info.length;i++){
-         if(storehouse_id == warehouse_out_info[i].storehouse_id){
-            count +=warehouse_out_info[i].count
-         }
-       }
-     }
-     return count
-   },
-   getInCount(id){
-      var count= 0
-     for(let i=0;i<this.countList.length;i++){
-      if(id == this.countList[i].good_id){
-          count = this.countList[i].count
+      if (total < min_number) {
+        min_str = total + min_unit;
       }
-     }
-     return count
-    },
-    getOutCount(id){
-      var count = 0
-      for(let i=0;i<this.outCountList.length;i++){
-         if(id == this.outCountList[i].good_id){
-           count = this.outCountList[i].count
-         }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
       }
-     return count
-   },
-   getAutoCount(id){
-     var count= 0
-     for(let i=0;i<this.autoCountList.length;i++){
-       if(id == this.autoCountList[i].good_id){
-         count = this.autoCountList[i].count
-       }
-     }
-     return count
-   },
-   getCancelCount(id){
-     var count = 0
-     for(let i=0;i<this.cancelCountList.length;i++){
-       if(id == this.cancelCountList[i].good_id){
-          count = this.cancelCountList[i].count
-       }
-     }
-     return count
-   },
-   getStockCount(id){
-     var stock_count = 0
-     for(let i=0;i<this.countList.length;i++){
-       if(id == this.countList[i].good_id){
-         stock_count = this.countList[i].stock_count
-       }
-     }
-     return stock_count
-   },
-   getWareInfo(arr){
-     var total = 0
-     if(arr.length > 0){
-       for(let i=0;i<arr.length;i++){
-         total += parseInt(arr[i].warehousing_count)
-       }
-     }else{
-       total = ""
-     }
-     return total
-   },
-   getOverplus(arr){
-     var total = 0
-     if(arr.length > 0){
-      for(let i=0;i<arr.length;i++){
-        total += arr[i].stock_count
-      }
-     }else{
-       total = ""
-     }
-     return total
-   },
-   getCancelInfo(arr){
-     var total = 0
-     if(arr.length > 0){
-      for(let i=0;i<arr.length;i++){
-        total += arr[i].count
-      }
-     }else{
-       total = ""
-     }
-     return total
-   },
-   getOverFlushInfo(arr){
-     var total = 0
-     if(arr.length >0){
-      for(let i=0;i<arr.length;i++){
-        total += arr[i].stock_count
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
       }
-     }
-     return total
-   },
-   toDialogClick(id,good_name,specification_name){
-    this.good_id = id
-    this.good_name = good_name
-    this.specification_name = specification_name
+      return max_str + min_str;
+    },
+   toDialogClick(id,drug_name,dose,dose_unit,min_number,min_unit,max_unit){
+    this.drug_id = id
+    this.drug_name = drug_name
+    this.specification_name = dose + dose_unit + "*"+min_number+min_unit +"/"+ max_unit
      var params = {
        good_id:id,
        limit:this.limitone,
@@ -612,7 +510,7 @@ export default {
        start_first_time:this.start_first_time,
        end_first_time:this.end_first_time,
      }
-     getGoodWarehouseOutInfoById(params).then(response=>{
+     getDrugWarehouseOutInfoById(params).then(response=>{
        if(response.data.state == 1){
          var list = response.data.data.list
          console.log("list23233233232w",list)
@@ -647,12 +545,243 @@ export default {
       }
     }
     return name
-  }
+  },
+  getDrugTypeName(id){
+    var type_name = ""
+    for(let i=0;i<this.drugTypeList.length;i++){
+      if(id == this.drugTypeList[i].value){
+        type_name = this.drugTypeList[i].name
+      }
+    }
+    return type_name
+  },
+  getWarehoseInfoSeven(arr, max_unit, min_unit, min_number, storehouse_id) {
+    var total = 0;
+    var max_str = "";
+    var min_str = "";
+    if (arr.length > 0) {
+    for (let i = 0; i < arr.length; i++) {
+        if (arr[i].storehouse_id == storehouse_id) {
+        total += parseInt(arr[i].warehousing_count);
+        }
+    }
+    }
+    if (total < min_number) {
+    min_str = total + min_unit;
+    }
+    if (total == 0) {
+    min_str = "";
+    max_str = "";
+    }
+    if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+        max_str = parseInt(total / min_number) + max_unit;
+    }
+    if (total % min_number != 0) {
+        min_str = (total % min_number) + min_unit;
+    }
+    }
+    return max_str + min_str;
+   },
+   getOutFlushNight(info, max_unit, min_unit,min_number, cancel_info,storehouse_id){
+      var str = "";
+      var str_min = "";
+      //总库存
+      var total = 0;
+      var out_count = 0;
+      var over_count = 0;
+      var cancel_count = 0;
+      for (let i = 0; i < info.length; i++) {
+        if (info[i].storehouse_id == storehouse_id) {
+          total += info[i].warehousing_count;
+        }
+      }
+
+      for (let j = 0; j < info.length; j++) {
+        if (info[j].storehouse_id == storehouse_id) {
+          out_count += info[j].stock_max_number + info[j].stock_min_number;
+        }
+      }
+      over_count = total - out_count;
+      if (parseInt(over_count / min_number) != 0) {
+        str = parseInt(over_count / min_number) + max_unit;
+      }
+      if (over_count % min_number != 0) {
+        str_min = (over_count % min_number) + min_unit;
+      }
+      return str + str_min;
+    },
+    getOverFlushInfoEight(arr, max_unit, min_unit, min_number, storehouse_id) {
+      var max_str = "";
+      var min_str = "";
+      var total = 0;
+      var newarr = arr;
+      
+      if (newarr.length > 0) {
+        for (let i = 0; i < newarr.length; i++) {
+          if (newarr[i].storehouse_id == storehouse_id) {
+            total += newarr[i].stock_max_number + newarr[i].stock_min_number;
+          }
+        }
+      }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      
+      return max_str + min_str;
+    },
+ 
+   getWarehoseInfo(arr) {
+      var total = 0;
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].warehousing_count);
+        }
+      }
+      if (total == 0) {
+        total = "";
+      }
+
+      return total;
+    },
+   getOutFlushTen(info, max_unit, min_unit,min_number,storehouse_id){
+      var str = "";
+      var str_min = "";
+      //总库存
+      var total = 0;
+      for (let i = 0; i < info.length; i++) {
+        if (info[i].storehouse_id == storehouse_id) {
+           total += info[i].count;
+        }
+      }
+      if (parseInt(total / min_number) != 0) {
+        str = parseInt(total / min_number) + max_unit;
+      }
+      if (total % min_number != 0) {
+        str_min = (total % min_number) + min_unit;
+      }
+      return str + str_min;
+    },
+   getDrugOut(info, max_unit, min_unit,min_number,storehouse_id){
+   
+      var str = "";
+      var str_min = "";
+      //总库存
+      var total = 0;
+      for (let i = 0; i < info.length; i++) {
+        if (info[i].storehouse_id == storehouse_id) {
+          total += info[i].count;
+        }
+      }
+      if (parseInt(total / min_number) != 0) {
+        str = parseInt(total / min_number) + max_unit;
+      }
+      if (total % min_number != 0) {
+        str_min = (total % min_number) + min_unit;
+      }
+      return str + str_min;
+   },
+  handleDetail(val) {
+      var manufacturer_name = "";
+      for (let i = 0; i < this.manufacturerList.length; i++) {
+        if (val.manufacturer == this.manufacturerList[i].id) {
+          manufacturer_name = this.manufacturerList[i].manufacturer_name;
+        }
+      }
+      var unit =
+        val.dose +
+        val.dose_unit +
+        "*" +
+        val.min_number +
+        val.min_unit +
+        "/" +
+        val.max_unit;
+      var over_plus = this.getOverFlushInfo(
+        val.drug_warehouse_info,
+        val.max_unit,
+        val.min_unit,
+        val.min_number
+      );
+      this.$router.push({
+        path:
+          "/drugstock/in/drugstockflow?drug_id=" +
+          val.id +
+          "&manufacturer=" +
+          manufacturer_name +
+          "&unit=" +
+          unit +
+          "&min_number=" +
+          val.min_number +
+          "&max_unit=" +
+          val.max_unit +
+          "&min_unit=" +
+          val.min_unit +
+          "&over_plus=" +
+          over_plus,
+      });
+      window.sessionStorage.setItem("start_time", this.start_time);
+      window.sessionStorage.setItem("end_time", this.end_time);
+    },
+    handleBatch(val) {
+      console.log("val322332323232", val);
+      var manufacturer_name = "";
+      for (let i = 0; i < this.manufacturerList.length; i++) {
+        if (val.manufacturer == this.manufacturerList[i].id) {
+          manufacturer_name = this.manufacturerList[i].manufacturer_name;
+        }
+      }
+      var unit =
+        val.dose +
+        val.dose_unit +
+        "*" +
+        val.min_number +
+        val.min_unit +
+        "/" +
+        val.max_unit;
+      var over_plus = this.getOverFlushInfo(
+        val.drug_warehouse_info,
+        val.max_unit,
+        val.min_unit,
+        val.min_number
+      );
+
+      window.sessionStorage.setItem("start_time", this.start_time);
+      window.sessionStorage.setItem("end_time", this.end_time);
+      this.$router.push({
+        path:
+          "/drugstock/in/drugbatchnumber?drug_id=" +
+          val.id +
+          "&manufacturer=" +
+          manufacturer_name +
+          "&unit=" +
+          unit +
+          "&min_number=" +
+          val.min_number +
+          "&max_unit=" +
+          val.max_unit +
+          "&min_unit=" +
+          val.min_unit +
+          "&over_plus=" +
+          over_plus,
+      });
+    },
   },
   created(){
     this.getStorehouseList()
     this.getlist()
-    this.getStockDrugCount()
+  
   }
 }
 </script>

src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue

@@ -36,9 +36,9 @@
           filterable
            @change="changeGoodTypeName">
             <el-option
-              v-for="item in goodTypeList"
+              v-for="item in drugTypeList"
               :key="item.id"
-              :label="item.type_name"
+              :label="item.name"
               :value="item.id">
             </el-option>
           </el-select>
@@ -59,67 +59,67 @@
           >
             <el-table-column label="药品类型" align="center">
               <template slot-scope="scope">
-                
+                 {{getDrugTypeName(scope.row.drug_type)}}
               </template>
             </el-table-column>
             <el-table-column label="药品名称" align="center">
               <template slot-scope="scope">
-                
+                 {{scope.row.drug_name}}
               </template>
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                
+                  {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
-               
+                 {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
             <el-table-column label="期初结余" align="center">
                
-                 <el-table-column prop="stockIn" label="数量" width="100">
+                 <el-table-column prop="stockIn" label="数量" width="100" align="center">
                    
                  </el-table-column>
               
-                <el-table-column prop="buy_price" label="进货金额" width="100">
+                <el-table-column prop="last_price" label="进货金额" width="100" align="center">
                    
                 </el-table-column>
-                <el-table-column prop="stockMoney" label="销售金额" width="100">
+                <el-table-column prop="stockMoney" label="销售金额" width="100" align="center">
                  
                 </el-table-column>
              
             </el-table-column>
             <el-table-column label="本期增加" align="center">
              
-                <el-table-column prop="stockAdd" label="数量" width="100">
+                <el-table-column prop="stockAdd" label="数量" width="100" align="center">
                 
                 </el-table-column>
              
-                <el-table-column prop="buy_price" label="进货金额" width="100">
+                <el-table-column prop="last_price" label="进货金额" width="100" align="center">
                   
                 </el-table-column>
-                <el-table-column  prop="addStockMoney" label="销售金额"  width="100">
+                <el-table-column  prop="addStockMoney" label="销售金额"  width="100" align="center">
                 </el-table-column>
               
             </el-table-column>
          
             <el-table-column label="本期减少" align="center">
-               <el-table-column prop="outStock" label="数量" width="100">
+               <el-table-column prop="outStock" label="数量" width="100" align="center">
                 </el-table-column>
-                <el-table-column  prop="buy_price"  label="进货金额" width="100">
+                <el-table-column  prop="last_price"  label="进货金额" width="100" align="center">
                 </el-table-column>
-                <el-table-column prop="stockOutMoney" label="销售金额" width="100">
+                <el-table-column prop="stockOutMoney" label="销售金额" width="100" align="center">
                 </el-table-column>
             </el-table-column>
           
             <el-table-column label="期末结余" align="center">
-              <el-table-column prop="overStock" label="数量" width="100">
+              <el-table-column prop="overStock" label="数量" width="100" align="center">
               </el-table-column>
-              <el-table-column prop="buy_price" label="进货金额" width="100">
+              <el-table-column prop="last_price" label="进货金额" width="100" align="center">
               </el-table-column>
-              <el-table-column prop="oveMoney" label="销售金额" width="100">
+              <el-table-column prop="oveMoney" label="销售金额" width="100" align="center">
               </el-table-column>
             </el-table-column>
 
@@ -147,9 +147,7 @@
 </template>
 <script>
 import { getStorehouseList,getPurchaseDrugQuery } from "@/api/drug/drug"
-import {
-  getStockDrugCount
-} from "@/api/stock";
+
 import { uParseTime } from '@/utils/tools'
 export default {
 
@@ -170,7 +168,7 @@ export default {
      page:1,
      total:0,
      keyword:"",
-     goodTypeList:[],
+     drugTypeList:[],
      start_time:"",
      end_time:"",
      countList:[],
@@ -185,7 +183,8 @@ export default {
      good_id:0,
      patientList:[],
      good_name:"",
-     specification_name:""
+     specification_name:"",
+     
     }
   
   },
@@ -206,12 +205,7 @@ export default {
              this.houseList.push(houseList[i])
            }
            this.manufacturerList = response.data.data.manufacturerList
-           var obj = {id:0,type_name:"全部"}
-           this.goodTypeList.push(obj)
-           var goodTypeList = response.data.data.goodTypeList
-           for(let i=0;i<goodTypeList.length;i++){
-             this.goodTypeList.push(goodTypeList[i])
-            }
+        
            this.patientList = response.data.data.patientList
          }
       })
@@ -228,22 +222,49 @@ export default {
       getPurchaseDrugQuery(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
-            for(let i=0;i<list.length;i++){
-               list[i].stockIn = this.getWarehouseInfo(list[i].warehouse_info)
-               list[i].stockMoney = (this.getWarehouseInfo(list[i].warehouse_info) * list[i].buy_price).toFixed(2)
-               list[i].stockAdd = this.getWarehouseInfoOne(list[i].warehouse_info)
-               list[i].addStockMoney = (this.getWarehouseInfoOne(list[i].warehouse_info) *list[i].buy_price).toFixed(2)
-
-               list[i].outStock = this.getWarehouseOut(list[i].warehouse_out_info)
-               list[i].stockOutMoney = (this.getWarehouseOut(list[i].warehouse_out_info)*list[i].buy_price).toFixed(2)
-
-               list[i].overStock = this.getWarehouseInfo(list[i].warehouse_info)
-               list[i].oveMoney = (this.getWarehouseInfo(list[i].warehouse_info)*list[i].buy_price).toFixed(2)
+            for (let i = 0; i < list.length; i++) {
+              for (let j = 0; j < list[i].drug_warehouse_info.length; j++) {
+                if (list[i].max_unit == list[i].drug_warehouse_info[j].max_unit) {
+                   list[i].drug_warehouse_info[j].stock_max_number =list[i].min_number *list[i].drug_warehouse_info[j].stock_max_number
+                   list[i].drug_warehouse_info[j].warehousing_count =list[i].min_number *list[i].drug_warehouse_info[j].warehousing_count
+                 }
+                }
+                for (let y = 0; y < list[i].drug_warehouse_out.length; y++) {
+                  if (list[i].drug_warehouse_out[y].count_unit == list[i].max_unit) {
+                    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
+                   }
+                }
+            }
+            var arr = [];
+            for (let i = 0; i < list.length; i++) {
+             if (list[i].drug_warehouse_info.length > 0) {
+               arr.push(list[i]);
+              }
             }
-            this.tableList = list
+            for(let i=0;i<arr.length;i++){
+              arr[i].stockIn = this.getDrugWarehouseInfoStart(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].drug_warehouse_out)
+              arr[i].stockMoney = this.getDrugWarehouseInfoMoneyStart(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price,arr[i].drug_warehouse_out)
+              arr[i].stockAdd = this.getDrugWarehouseInfoStockAdd(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
+              arr[i].addStockMoney = this.getDrugWarehouseInfoaddMoney(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price)
+              arr[i].outStock = this.getDrugWarehouseOutInfo(arr[i].drug_warehouse_out,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
+              arr[i].stockOutMoney = this.getDrugWarehouseOutMoney(arr[i].drug_warehouse_out,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price)
+              arr[i].overStock = this.getDrugWarehouseInfo(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
+              arr[i].oveMoney =  this.getDrugWarehouseInfoMoney(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price)
+            }
+            this.tableList = arr;
             this.total = response.data.data.total
-
-           this.manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = response.data.data.manufacturerList
+            var drugTypeList = response.data.data.drugTypeList
+            var obj = {id:0,name:"全部"}
+            this.drugTypeList.push(obj)
+            for(let i=0;i<drugTypeList.length;i++){
+               this.drugTypeList.push(drugTypeList[i])
+            }
            
          }
       })
@@ -265,22 +286,14 @@ export default {
       this.page = val;
       this.getlist()
     },
-    handleSizeChangeOne(val) {
-      this.limitone = val;
-      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
-    },
-    handleCurrentChangeOne(val) {
-      this.pageone = val;
-      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
-    },
    seach(){
     this.getlist()
    },
-   getGoodTypeName(id){
+   getDrugTypeName(id){
      var type_name = ""
-     for(let i=0;i<this.goodTypeList.length;i++){
-       if(id == this.goodTypeList[i].id){
-         type_name = this.goodTypeList[i].type_name
+     for(let i=0;i<this.drugTypeList.length;i++){
+       if(id == this.drugTypeList[i].value){
+         type_name = this.drugTypeList[i].name
        }
      }
      return type_name
@@ -294,189 +307,7 @@ export default {
      }
      return storehouse_name
    },
-   getWareInfoCount(val,storehouse_id){
-     var count = 0
-     if(val.length > 0){
-       for(let i=0;i<val.length;i++){
-         if(val[i].storehouse_id == storehouse_id){
-             count +=val[i].warehousing_count
-         }
-       }
-     }
-     if(count > 0){
-       return count
-     }else{
-       return ""
-     }
-   },
-   getStockDrugCount(){
-        var params ={
-           keywords: this.keywords,
-           start_time:this.start_time,
-           end_time:this.end_time,
-        }
-      getStockDrugCount(params).then(response=>{
-         if(response.data.state == 1){
-           var outlist = response.data.data.outList
-           this.outCountList = outlist
-           var autoCount = response.data.data.autoCount
-           this.autoCountList = autoCount
-           var totalCount = response.data.data.totalCount
-           this.cancelCountList = totalCount
-         }
-      })
-    },
-    getWareInfoCountOne(val,storehouse_id){
-     var count = 0
-     if(val.length > 0){
-       for(let i=0;i<val.length;i++){
-         if(val[i].storehouse_id == storehouse_id){
-             count +=val[i].stock_count
-         }
-       }
-     }
-     if(count > 0){
-       return count
-     }else{
-       return ""
-     }
-   },
-   getOutCount(id){
-      var count = 0
-      for(let i=0;i<this.outCountList.length;i++){
-         if(id == this.outCountList[i].good_id){
-           count = this.outCountList[i].count
-         }
-      }
-     return count
-   },
-   getAutoCount(id){
-     var count= 0
-     for(let i=0;i<this.autoCountList.length;i++){
-       if(id == this.autoCountList[i].good_id){
-         count = this.autoCountList[i].count
-       }
-     }
-     return count
-   },
-   getCancelCount(id){
-     var count = 0
-     for(let i=0;i<this.cancelCountList.length;i++){
-       if(id == this.cancelCountList[i].good_id){
-          count = this.cancelCountList[i].count
-       }
-     }
-     return count
-   },
-   getCancelCountInfo(cancel_stock_info,storehouse_id){
-     var count = 0 
-     if(cancel_stock_info.length >0){
-        for(let i=0;i<cancel_stock_info.length;i++){
-          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
-              count += cancel_stock_info[i].count
-          }
-        }
-     }
-     return count
-   },
-   getWareOutInfoCount(warehouse_out_info,storehouse_id){
-     var count = 0
-     if(warehouse_out_info.length > 0){
-       for(let i=0;i<warehouse_out_info.length;i++){
-         if(storehouse_id == warehouse_out_info[i].storehouse_id){
-            count +=warehouse_out_info[i].count
-         }
-       }
-     }
-     return count
-   },
-   getInCount(id){
-      var count= 0
-     for(let i=0;i<this.countList.length;i++){
-      if(id == this.countList[i].good_id){
-          count = this.countList[i].count
-      }
-     }
-     return count
-    },
-    getOutCount(id){
-      var count = 0
-      for(let i=0;i<this.outCountList.length;i++){
-         if(id == this.outCountList[i].good_id){
-           count = this.outCountList[i].count
-         }
-      }
-     return count
-   },
-   getAutoCount(id){
-     var count= 0
-     for(let i=0;i<this.autoCountList.length;i++){
-       if(id == this.autoCountList[i].good_id){
-         count = this.autoCountList[i].count
-       }
-     }
-     return count
-   },
-   getCancelCount(id){
-     var count = 0
-     for(let i=0;i<this.cancelCountList.length;i++){
-       if(id == this.cancelCountList[i].good_id){
-          count = this.cancelCountList[i].count
-       }
-     }
-     return count
-   },
-   getStockCount(id){
-     var stock_count = 0
-     for(let i=0;i<this.countList.length;i++){
-       if(id == this.countList[i].good_id){
-         stock_count = this.countList[i].stock_count
-       }
-     }
-     return stock_count
-   },
-   getWareInfo(arr){
-     var total = 0
-     if(arr.length > 0){
-       for(let i=0;i<arr.length;i++){
-         total += parseInt(arr[i].warehousing_count)
-       }
-     }else{
-       total = ""
-     }
-     return total
-   },
-   getOverplus(arr){
-     var total = 0
-     if(arr.length > 0){
-      for(let i=0;i<arr.length;i++){
-        total += arr[i].stock_count
-      }
-     }else{
-       total = ""
-     }
-     return total
-   },
-   getCancelInfo(arr){
-     var total = 0
-     if(arr.length > 0){
-      for(let i=0;i<arr.length;i++){
-        total += arr[i].count
-      }
-     }else{
-       total = ""
-     }
-     return total
-   },
-   getOverFlushInfo(arr){
-     var total = 0
-     if(arr.length >0){
-      for(let i=0;i<arr.length;i++){
-        total += arr[i].stock_count
-      }
-     }
-     return total
-   },
+
   
    startFirstTimeChange(){
      this.getlist()
@@ -509,44 +340,238 @@ export default {
   startTimeChange(){
 
   },
-  getWarehouseInfo(val){
-    var count =0 
-    for(let i=0;i<val.length;i++){
-      count +=val[i].stock_count
+  getDrugWarehouseInfo(arr,min_number,min_unit,max_unit){
+   var total = 0
+   var max_str = "";
+   var min_str = "";
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total += arr[i].stock_max_number + arr[i].stock_min_number
+     }
+   }
+  if (total < min_number) {
+     min_str = total + min_unit;
+   }
+  if (total == 0) {
+     min_str = "";
+     max_str = "";
+  }
+  if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number) + max_unit;
+    }
+    if (total % min_number != 0) {
+      min_str = (total % min_number) + min_unit;
+    }
+   }
+  return max_str + min_str;  
+
+  },
+  getDrugWarehouseInfoStart(arr,min_number,min_unit,max_unit,outArr){
+   var total = 0
+   var add_total = 0
+   var out_total = 0
+   var max_str = "";
+   var min_str = "";
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      add_total += arr[i].warehousing_count
+     }
+   }
+   if(outArr.length > 0){
+     for(let i=0;i<outArr.length;i++){
+      out_total+= outArr[i].count
+     }  
+   }
+   total = add_total - out_total
+  if (total < min_number) {
+    min_str = total + min_unit;
+   }
+  if (total == 0) {
+     min_str = "";
+     max_str = "";
+  }
+  if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number) + max_unit;
+    }
+    if (total % min_number != 0) {
+      min_str = (total % min_number) + min_unit;
+    }
+   }
+  return max_str + min_str;  
+
+  },
+ getDrugWarehouseInfoMoneyStart(arr,min_number,min_unit,max_unit,last_price,outArr){
+   var total = 0
+   var min_str = 0
+   var max_str = 0
+   var addTotal = 0
+   var outTotal = 0
+   var total_price = 0
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      addTotal += arr[i].warehousing_count
+     }
+   }
+   if(outArr.length > 0){
+     for(let i=0;i<outArr.length;i++){
+      outTotal += outArr[i].count
+     }
+   }
+   console.log("adw23223wode",addTotal)
+   console.log("233232232tade",outTotal)
+   total = addTotal - outTotal
+   if (total < min_number) {
+      min_str = total 
+   }
+   if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number);
+    }
+    if (total % min_number != 0) {
+      min_str = (total % min_number);
+    }
+   }
+ 
+   total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
+    console.log("total_price",total_price)
+   return total_price
+  },
+  getDrugWarehouseInfoMoney(arr,min_number,min_unit,max_unit,last_price){
+   var total = 0
+   var min_str = 0
+   var max_str = 0
+   var total_price = 0
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total += arr[i].stock_max_number + arr[i].stock_min_number
+     }
+   }
+   if (total < min_number) {
+      min_str = total 
+   }
+   if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number);
     }
-    if(count > 0 ){
-      return count
-    }else{
-      return count
+    if (total % min_number != 0) {
+      min_str = (total % min_number);
     }
+   }
+ 
+   total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
+    console.log("total_price",total_price)
+   return total_price
   },
-  getWarehouseInfoOne(val){
-    var count =0 
-    for(let i=0;i<val.length;i++){
-      count +=val[i].warehousing_count
+  getDrugWarehouseInfoStockAdd(arr,min_number,min_unit,max_unit){
+  
+   var total = 0
+   var max_str = "";
+   var min_str = "";
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total += arr[i].warehousing_count
+     }
+   }
+  if (total < min_number) {
+    min_str = total + min_unit;
+   }
+  if (total == 0) {
+     min_str = "";
+     max_str = "";
+  }
+  if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number) + max_unit;
     }
-    if(count > 0 ){
-      return count
-    }else{
-      return count
+    if (total % min_number != 0) {
+      min_str = (total % min_number) + min_unit;
     }
+   }
+  return max_str + min_str;  
   },
-  getWarehouseOut(val){
-    var count = 0
-    for(let i=0;i<val.length;i++){
-      count +=val[i].count
+  getDrugWarehouseInfoaddMoney(arr,min_number,min_unit,max_unit,last_price){
+   var total = 0
+   var min_str = 0
+   var max_str = 0
+   var total_price = 0
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total += arr[i].warehousing_count
+     }
+   }
+   if (total < min_number) {
+      min_str = total 
+   }
+   if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number);
     }
-    if(count >0){
-     return count
-    }else{
-      return count
+    if (total % min_number != 0) {
+      min_str = (total % min_number);
     }
+   }
+ 
+   total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
+   return total_price
+  },
+  getDrugWarehouseOutInfo(arr,min_number,min_unit,max_unit){
+   var total = 0
+   var max_str = "";
+   var min_str = "";
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total += arr[i].count
+     }
+   }
+  if (total < min_number) {
+    min_str = total + min_unit;
+   }
+  if (total == 0) {
+     min_str = "";
+     max_str = "";
+  }
+  if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number) + max_unit;
+    }
+    if (total % min_number != 0) {
+      min_str = (total % min_number) + min_unit;
+    }
+   }
+  return max_str + min_str;  
+  },
+  getDrugWarehouseOutMoney(arr,min_number,min_unit,max_unit,last_price){
+   var total = 0
+   var min_str = 0
+   var max_str = 0
+   var total_price = 0
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total += arr[i].count
+     }
+   }
+   if (total < min_number) {
+      min_str = total 
+   }
+   if (total >= min_number) {
+    if (parseInt(total / min_number) != 0) {
+      max_str = parseInt(total / min_number);
+    }
+    if (total % min_number != 0) {
+      min_str = (total % min_number);
+    }
+    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
+    return total_price
+   }
   }
+  
   },
   created(){
     this.getStorehouseList()
     this.getlist()
-    this.getStockDrugCount()
+  
   }
 }
 </script>

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -104,6 +104,12 @@
             {{ scope.row.price }}
           </template>
         </el-table-column>
+        <!-- <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
+          <template slot-scope="scope">
+           <span v-if="scope.row.stock_max_number >0">{{ scope.row.stock_max_number }}{{drug.max_unit}}</span> 
+           <span v-if="scope.row.stock_min_number >0">{{scope.row.stock_min_number}}{{drug.min_unit}}</span>
+          </template>
+        </el-table-column> -->
          <el-table-column prop="remake" label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}

src/xt_pages/stock/drugs/query.vue

@@ -219,7 +219,8 @@
                   border-inline-end: none;
                   text-align: center;
                 "
-              >
+              > 
+              <span>
                 {{
                   getOutFlushNight(
                     scope.row.drug_warehouse_info,
@@ -230,6 +231,7 @@
                     item.storehouse_id
                   )
                 }}&nbsp;
+               </span> 
               </td>
             </tr>
           </template>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="main-contain">
-     <div class="app-container ">
+     <div class="app-container "  
+        v-loading="loading"
+        element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
           <span>仓库:</span>
@@ -145,15 +147,11 @@
             <el-table-column label="总库存量" align="center">
               <template slot-scope="scope">
                 <span v-if="org_id == 3907 || org_id == 9583">
-                    {{
-                    getWareInfo(scope.row.xt_warehouse_info) -
-                    getAutoCount(scope.row.id) -
-                    getOutCount(scope.row.id) +
-                    getCancelCount(scope.row.id)
-                    }}
+                    {{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) -getOutCount(scope.row.id) +getCancelCount(scope.row.id)}}
                 </span>
                 <span v-if="org_id != 3907 && org_id != 9583">
-                    {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+                   <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) <= scope.row.stock_warn_count" style="color:red"> {{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+                   <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) > scope.row.stock_warn_count"> {{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
                 </span>
                </template>
             </el-table-column>
@@ -333,7 +331,8 @@ export default {
      good_id:0,
      patientList:[],
      good_name:"",
-     specification_name:""
+     specification_name:"",
+     loading:false,
     }
   
   },
@@ -342,7 +341,7 @@ export default {
 
     },
     changeGoodName(){
-
+      this.getlist()
     },
     toClick(val){
        var manufacturer_name = ""
@@ -390,6 +389,7 @@ export default {
       })
     },
     getlist(){
+       this.loading = true
         var params = {
           storehouse_id:this.storehouse_id,
           good_type:this.good_type,
@@ -402,8 +402,7 @@ export default {
       getGoodNewQuery(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list2332233232323232w",list)
-            
+            this.loading = false
             if(list.length > 0){
               var arr = []
               for(let i=0;i<list.length;i++){

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -229,8 +229,8 @@ export default {
          if(response.data.state == 1){
             var list = response.data.data.list
             for(let i=0;i<list.length;i++){
-               list[i].stockIn = this.getWarehouseInfo(list[i].warehouse_info)
-               list[i].stockMoney = (this.getWarehouseInfo(list[i].warehouse_info) * list[i].buy_price).toFixed(2)
+               list[i].stockIn = this.getWarehouseInfoStart(list[i].warehouse_info,list[i].warehouse_out_info)
+               list[i].stockMoney = (this.getWarehouseInfoStart(list[i].warehouse_info,list[i].warehouse_out_info) * list[i].buy_price).toFixed(2)
                list[i].stockAdd = this.getWarehouseInfoOne(list[i].warehouse_info)
                list[i].addStockMoney = (this.getWarehouseInfoOne(list[i].warehouse_info) *list[i].buy_price).toFixed(2)
 
@@ -508,6 +508,23 @@ export default {
   },
   startTimeChange(){
 
+  },
+  getWarehouseInfoStart(arr1,arr2){
+    var count =0
+    var addCount = 0 
+    var outCount = 0
+    for(let i=0;i<arr1.length;i++){
+      addCount +=arr1[i].warehousing_count
+    }
+    for(let i=0;i<arr2.length;i++){
+      outCount +=arr2[i].count
+    }
+    count = addCount - outCount
+    if(count > 0 ){
+      return count
+    }else{
+      return count
+    }
   },
   getWarehouseInfo(val){
     var count =0