数据

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2621,7 +2621,9 @@
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-
+            console.log("hhhhhhhhhhhhhh",temp)
+            console.log("hhhh23",temp2)
+            console.log("hhhh23",temp3)
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {
@@ -2658,7 +2660,7 @@
                   single_dose: temp[b].single_dose,
                   delivery_way: temp[b].delivery_way,
                   execution_frequency: temp[b].execution_frequency,
-                  retail_price: temp[b].retail_price.toString(),
+                  retail_price: temp[b].min_price.toString(),
                   remark: '',
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -584,7 +584,7 @@ export default {
                 return
              }
              if(msg == 2){
-               this.$message.error("退库数量大于出库数量")
+               this.$message.error("该批次退库数量大于出库数量")
              }
               if(msg == 4){
                this.$message.error("该批次退库数量大于入库数量")

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -392,13 +392,13 @@
         tempObj['id'] = 0
         tempObj['good_type_id'] = 0
         tempObj['good_id'] = 0
-        tempObj['count'] = ''
+        tempObj['count'] = 0
         tempObj["number"] = ""
         tempObj["dealer"] = ""
         tempObj["manufacturer"]= ""
         tempObj["register_account"] = ""
         tempObj["remark"] = ""
-        tempObj["price"] = ""
+        tempObj["price"] = 0
         tempObj["warehouse_info_id"] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
@@ -546,7 +546,7 @@
                   this.$message.error("退库数量大于出库数量")
                 }
                 if(msg == 4){
-                  this.$message.error("该批次退库数量大于入库数量")
+                  this.$message.error("该批次退库数量大于出库数量")
                 }
                  if(msg == 5){
                   this.$message.error("该批次退库数量大于入库数量")

src/xt_pages/stock/drugs/cancelDrugOrderPrint.vue

@@ -9,7 +9,7 @@
       <div id="dialysis-print-box">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
-          <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
+          <div class="order-title" style="font-weight:500;font-size:18px;">药品退库登记表</div>
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.order_number}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
@@ -18,7 +18,7 @@
             <tbody>
             <tr>
               <td style="line-height: 50px" width="230">药品名称</td>
-              <td style="line-height: 50px" width="260">品名/注册证号(备案凭证号)</td>
+              <td style="line-height: 50px" width="260">批准文号</td>
               <td style="line-height: 50px" width="230">规格型号</td>
               <td style="line-height: 50px" width="200">生产厂商</td>
               <td style="line-height: 50px" width="180">批号(序列号)</td>

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -162,7 +162,7 @@
             border
             highlight-current-row
             ref="multipleTableOne"
-            @current-change="handleCurrentChangeOne"
+           
             @selection-change="select"
             :row-style="{ color: '#303133' }"
             :header-cell-style="{
@@ -489,7 +489,7 @@ export default {
         ids: idStr
       };
 
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -371,7 +371,7 @@ export default {
       },
       tableRules: {
         return_count: [
-          { required: true, message: "数量不能为空", trigge: "blur" }
+          { required: true, message: "数量不能为空", trigger: "blur" }
         ]
       },
       ruleForm: {

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -306,7 +306,7 @@
         },
         tableRules: {
           count: [
-            { required: true, message: '数量不能为空', trigge: 'blur' }
+            { required: true, message: '数量不能为空', trigger: 'blur' }
           ]
 
         },
@@ -547,7 +547,7 @@
                    this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
                  }
               }
-             
+              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
             }
 
             const params = {
@@ -567,6 +567,9 @@
                 if(response.data.data.msg == 2){
                    this.$message.error("退库数量大于入库数量")
                 }
+                if(response.data.data.msg == 4){
+                  this.$message.error("退库数量大于出库数量")
+                }
               
               }
             })

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -6,7 +6,7 @@
     <div class="app-container ">
       <div class="cell clearfix">
        药品名称:<span>{{this.$route.query.drug_name}}</span>&nbsp;
-       库存:{{getCountTwo(this.$route.query.drug_id,this.$route.query.min_number,this.$route.query.max_unit,this.$route.query.min_unit)}}&nbsp;
+       库存:{{this.$route.query.overPlus}}&nbsp;
        规格:<span>{{this.$route.query.unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
       </div>
@@ -136,7 +136,7 @@
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.getlist()
-      this.getDrugCountList()
+      // this.getDrugCountList()
     },
     components: {
       SettingDialog,

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -45,10 +45,10 @@
               <td style="line-height: 50px">
                 <span> {{getManufacturerList(item.manufacturer)}}</span>
               </td>
-              <td><span>{{getInCount(item.drug_id)}}{{item.max_unit}}</span ></td>
-              <td><span>{{getCount(item.drug_id,item.min_number,item.max_unit,item.min_unit)}}</span></td>
+              <td><span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span ></td>
+              <td><span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">{{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}</span></td>
               <td>
-                <span>{{getCountTwo(item.drug_id,item.min_number,item.max_unit,item.min_unit)}}</span>
+                <span v-if="getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)!=0">{{getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}</span>
              </td> 
             </tr>
             </tbody>
@@ -117,6 +117,7 @@
         autoCountList:[],
         minCount:[],
         drugOutList:[],
+        allCountList:[],
       }
     },
     methods: {
@@ -164,7 +165,7 @@
           start_time:this.$route.query.start_time,
           end_time:this.$route.query.end_time,
         }
-        console.log("parasm22222",Params)
+        console.log("数据23232",Params)
         this.WarehouseInfo.warehouseInfoDate = []
         getAllDrugStockQueryList(Params).then(response => {
           if (response.data.state == 0) {
@@ -239,15 +240,26 @@
           page: this.$route.query.page,
           limit:this.$route.query.limit,
           keyword: this.$route.query.keyword,
-          drug_type:this.$route.drug_type,
-          start_time:this.$route.start_time,
-          end_time:this.$route.end_time,
+          drug_type:this.$route.query.drug_type,
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time,
         }
-        console.log("parasm222222",params)
+       console.log("数据23232",params)
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
              console.log("list99999",list)
+             for(let i=0;i<list.length;i++){
+               for(let j=0;j<list[i].drug_warehouse_info.length;j++){
+                 list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
+               }
+               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
+                  }
+               }
+             }
+             
              this.tableList = list
              this.manufacturerList = response.data.data.manufacturerList
              this.loading = false
@@ -277,9 +289,12 @@
             var outcountlist = response.data.data.outCountList
             console.log("出库数据",outcountlist)
             this.outCountList = outcountlist
+             this.allCountList.push(...outcountlist)
             var aucountlist = response.data.data.auCountList
             console.log("自动数据",aucountlist)
+          
             this.autoCountList = aucountlist
+            this.allCountList.push(...aucountlist)
             var minCount = response.data.data.minCount
             console.log("minCount",minCount)
             this.minCount = minCount
@@ -331,24 +346,61 @@
         }
         return count
       },
-      getCount(drug_id,min_number,max_unit,min_unit){
-        var count= 0
+      // getCount(drug_id,min_number,max_unit,min_unit){
+      //   var count= 0
+      //   var str = ""
+      //   var min_str = ""
+      //   for(let i=0;i<this.drugOutList.length;i++){
+      //     if(drug_id == this.drugOutList[i].drug_id){
+      //        count += parseInt(this.drugOutList[i].count)
+      //     }
+      //   }
+      //   if(parseInt(count/min_number)!=0){
+      //     str = parseInt(count/min_number)+ max_unit
+      //   }
+      //   if((count%min_number)!=0){
+      //     min_str =  count%min_number + min_unit
+      //   }
+      //   return str + min_str
+      // },
+        getCount(drug_id,min_number,max_unit,min_unit){
+        var total= 0
         var str = ""
         var min_str = ""
-        for(let i=0;i<this.drugOutList.length;i++){
-          if(drug_id == this.drugOutList[i].drug_id){
-             count += parseInt(this.drugOutList[i].count)
+        var arr = []
+        for(let i=0;i<this.allCountList.length;i++){
+          if(drug_id == this.allCountList[i].drug_id){
+             arr.push(this.allCountList[i])
           }
         }
-        if(parseInt(count/min_number)!=0){
-          str = parseInt(count/min_number)+ max_unit
+        var arrTwo = []
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].drug_id == 1236){
+             arrTwo.push(arr[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
         }
-        if((count%min_number)!=0){
-          min_str =  count%min_number + min_unit
+        if(total<min_number){
+           str = ""
+           min_str = total + min_unit
         }
+        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
+          }
+        }
+    
         return str + min_str
       },
-
       getCountOne(drug_id){
         var count= 0
         for(let i=0;i<this.drugOutList.length;i++){
@@ -383,7 +435,78 @@
          }
        }
        return name
-     }
+     },
+     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
+      },
+      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)
+           }
+         }
+         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
+      },
+      getWarehouseOutInfo(arr,max_unit,min_unit,min_number){
+         var min_str = ""
+         var max_str = ""
+        var total = 0
+        if (arr.length > 0) {
+          for(let i=0;i<arr.length;i++){
+            total += parseInt(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
+
+      }
     },
     created() {
       // this.GetAllDrugStockQueryList()
@@ -392,7 +515,7 @@
       console.log("222343",drugType)
       this.drugType.push(...drugType)
       this.getlist()
-      this.getDrugCountList()
+      // this.getDrugCountList()
     }
 
   }

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -6,7 +6,7 @@
     <div class="app-container ">
       <div class="cell clearfix">
        药品名称:<span>{{this.$route.query.drug_name}}</span>&nbsp;
-       库存: {{getCountTwo(this.$route.query.drug_id,this.$route.query.min_number,this.$route.query.max_unit,this.$route.query.min_unit)}}
+       库存: {{this.$route.query.overPlus}}
        规格:<span>{{this.$route.query.unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
 
@@ -170,7 +170,7 @@
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       // this.getlist()
       // this.getOutList()
-      this.getDrugCountList()
+      // this.getDrugCountList()
 
       this.getDrugFlow()
     },

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -476,7 +476,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
-          console.log("列表999988888",this.warehouse.warehouseDate)
+          // console.log("列表999988888",this.warehouse.warehouseDate)
         }
       });
     },

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -233,8 +233,8 @@
           </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              <!-- {{getTotalCount(scope.row.drug_id)}} -->
-              {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+              <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
+              <span v-if="scope.row.is_sys == 1"> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="出货单价" align="center">
@@ -349,7 +349,7 @@
               <span>批次号</span>
             </template>
             <template slot-scope="scope">
-              <span>{{getDrugBatchNumber(scope.row.drug_id)}}</span>
+              <span>{{getDrugBatchNumber(scope.row.drug_id,scope.row.count)}}</span>
             </template>
           </el-table-column>
           
@@ -393,7 +393,7 @@
               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-               {{scope.row.count}}
+               {{scope.row.count}}{{scope.row.count_unit}}
             </template>
           </el-table-column>
 
@@ -671,9 +671,9 @@ export default {
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
     },
     handleSearch(val){
-      
+       console.log("val23233232",val)
        this.getInitializtion()
-       this.getSinleOrderDetail(val.id)
+       this.getSinleOrderDetail(val.id,val.warehouse_out_time)
        this.list = []
       //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
 
@@ -944,9 +944,10 @@ export default {
      }
      return name
    },
-   getSinleOrderDetail(id){
+   getSinleOrderDetail(id,start_time){
        var params = {
          id:id,
+         start_time:start_time,
        }
      getSinleOrderDetail(params).then(response=>{
         if(response.data.state == 1){
@@ -955,8 +956,15 @@ export default {
           var list =  response.data.data.list
           console.log("list2323232",list)
           var outList = response.data.data.outList
+          for(let i=0;i<outList.length;i++){
+            console.log("55555",outList[i].count_unit)
+            console.log("666",outList[i].max_unit)
+          if(outList[i].count_unit == outList[i].max_unit){
+              outList[i].count =outList[i].count * outList[i].min_number
+            }
+          }
           this.outList = outList
-         console.log("outList222",outList)
+         console.log("出库数据44444",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
@@ -1019,7 +1027,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
          }
-         console.log("paramsw2ww",params)
+       
         getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
@@ -1063,45 +1071,69 @@ export default {
         }
         return str + min_str
       },
-      getTotalCount(drug_id){
+      getTotalCount(drug_id,min_number,max_unit,min_unit){
+        console.log("hhhhhhhhh",this.outList)
          var str = ""
          var min_str = ""
+         var arr = []
+         var total = 0
          for(let i=0;i<this.outList.length;i++){
            if(this.outList[i].drug_id == drug_id){
-            if(parseInt(this.outList[i].count/this.outList[i].min_number)!=0){
-              str = parseInt(this.outList[i].count/this.outList[i].min_number)+ this.outList[i].max_unit
+             total += this.outList[i].count
+           }
+         }
+
+         if (total >=min_number){
+            if(parseInt(total/min_number)!=0){
+              str = parseInt(total/min_number)+ max_unit
             }
-            if((this.outList[i].count%this.outList[i].min_number)!=0){
-              min_str =  this.outList[i].count%this.outList[i].min_number + this.outList[i].min_unit
+            if((total%min_number)!=0){
+              min_str =  total%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){
+        console.log("列表",this.drugFlowList)
         var arr = []
         for(let i=0;i<this.drugFlowList.length;i++){
           if(id == this.drugFlowList[i].drug_id){
              arr.push(this.drugFlowList[i])
           }
         }
+      
         var total = 0
         for(let i=0;i<arr.length;i++){
-          if(arr[i].max_unit == max_unit){
-             arr[i].count = arr[i].count * arr[i].min_number
+          if(arr[i].count_unit == max_unit){
+             arr[i].count = arr[i].count * min_number
           }
-          if(arr[i].max_unit == min_unit){
+          if(arr[i].count_unit == min_unit){
             arr[i].count = arr[i].count
           }
           total += arr[i].count
         }
-
+      console.log("arr00000000000",arr)
         var str = ""
         var min_str = ""
-        
-        str = parseInt(total/min_number)+ max_unit
-        min_str =  total%min_number + min_unit
-
+        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 (total < min_number){
+          str = ""
+          min_str = total + min_unit
+        }
+       
         return str + min_str 
 
       },
@@ -1179,25 +1211,10 @@ export default {
          total_price = strprice + minstrprice
          return  total_price
       },
-
-      // getDrugBatchNumber(id){
-        
-      //   var arr= []
-      //   var batchNumber =[]
-        
-      //   for(let i=0;i<this.userList.length;i++){
-      //      if(id == this.userList[i].id){
-      //        for(let j=0;j<this.userList[i].drugwarehouseoutinfo.length;j++){
-      //           batchNumber.push(this.userList[i].drugwarehouseoutinfo[j].batch_number)
-      //        }
-      //      }
-      //   }
-      //   return batchNumber.join(",")
-      // },
-      getDrugBatchNumber(drugid){
+      getDrugBatchNumber(drugid,count){
         var arr = []
         for(let i=0;i<this.batchNumberList.length;i++){
-          if(drugid == this.batchNumberList[i].drug_id){
+          if(drugid == this.batchNumberList[i].drug_id && count == this.batchNumberList[i].count){
             arr.push(this.batchNumberList[i].batch_number)
           }
         }
@@ -1243,8 +1260,6 @@ export default {
           }
          
         }
-        console.log("23232323",this.exportList)
-         console.log("了下23",this.drugTypeList)
       
        import('@/vendor/Export2Excel').then(excel => {
         for(let i=0;i<this.exportList.length;i++){

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -149,7 +149,7 @@
               >
                 <div style="display:flex;">
                   <el-input
-                     oninput="value=value.replace(/\D|^0/g,'')"
+                    oninput="value=value.replace(/\D|^0/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
                     type="number"
@@ -337,8 +337,8 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
-        count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
-        min_unit:[{required:true,message:"单位不能为空",trigge:"blur"}]
+        count: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+        min_unit:[{required:true,message:"单位不能为空",trigger:"blur"}]
       },
       ruleForm: {
         manufacturer: [
@@ -607,7 +607,7 @@ export default {
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
               console.log("str22222222",str)
               if(msg == 1){
-                this.$message.error(str + "库存不足,请入库")
+                this.$message.error(str + "该批次库存不足")
               }else{
                 this.$message.success("出库成功");
                 this.recordInfo.recordData = [];
@@ -686,7 +686,7 @@ export default {
             this.recordInfo.recordData[i].max_unit = val.max_unit
             this.recordInfo.recordData[i].min_number = val.min_number
             this.recordInfo.recordData[i].min_unit = val.min_unit
-         
+          
             this.recordInfo.recordData[i].number = val.number
             if(val.retail_price == 0){
               this.recordInfo.recordData[i].price = ""
@@ -749,6 +749,7 @@ export default {
     tempObj["dealer"] = ""
     tempObj["number"] = ""
     tempObj["warehouse_info_id"] = 0
+    tempObj["count"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -300,7 +300,7 @@
         },
         tableRules: {
           count: [
-            { required: true, message: '数量不能为空', trigge: 'blur' }
+            { required: true, message: '数量不能为空', trigger: 'blur' }
           ],
           price: [
             { required: true, message: '单价不能为空', trigger: 'blur' }
@@ -449,8 +449,8 @@
         tempObj['batch_number'] = ''
         tempObj['number'] = ''
         tempObj['count_unit'] = ""
-        tempObj['dealer'] = 0
-        tempObj['manufacturer'] = 0
+        tempObj['dealer'] = ""
+        tempObj['manufacturer'] = ""
         tempObj['warehouse_info_id'] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
@@ -755,11 +755,16 @@
              this.recordInfo.recordData[i].drug_name = val.drug_name
              this.recordInfo.recordData[i].drug_type = val.drug_type
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
-             this.recordInfo.recordData[i].last_price = val.retail_price
+             this.recordInfo.recordData[i].price = val.retail_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
              this.recordInfo.recordData[i].min_unit = val.min_unit
+             if(val.dealer == 0){
+               this.recordInfo.recordData[i].dealer = ""
+             }else{
+               this.recordInfo.recordData[i].dealer = val.dealer
+             }
            }
         }
         console.log("333333",this.recordInfo.recordData)

src/xt_pages/stock/drugs/query.vue

@@ -111,25 +111,17 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-             <!-- {{getInCount(scope.row.drug_id)}} -->
-              {{getInCount(scope.row.drug_id)}}{{scope.row.max_unit}}
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span> 
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <!-- {{getOutCount(scope.row.drug_id) + getAutoCount(scope.row.drug_id)}} -->
-             {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+            {{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
            </template>
         </el-table-column>
-        <!-- <el-table-column prop="drug_name" label="退库数量" align="center">
-           <template slot-scope="scope">
-             {{getCancelCount(scope.row.drug_id)}}{{scope.row.max_unit}}
-           </template>
-        </el-table-column> -->
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-             <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)!=''">{{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
-              <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit) ==''">0{{scope.row.max_unit}}0{{scope.row.min_unit}}</span>
+             <span>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
@@ -150,10 +142,10 @@
         </el-table-column>
        </el-table>
        
-      <el-pagination
+    <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,500,1000]"
+        :page-sizes="[10, 50, 100,200,500,1000]"
         :page-size="10"
         background
         align="right"
@@ -181,32 +173,26 @@ import { min } from 'moment'
   export default {
     name: 'stockIn',
     created() {
+      
       var nowDate = new Date();
       var nowYear = nowDate.getFullYear();
       var nowMonth = nowDate.getMonth() + 1;
       var nowDay = nowDate.getDate();
-      this.end_time =
-        nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+      this.end_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
       nowDate.setMonth(nowDate.getMonth() - 1);
       nowYear = nowDate.getFullYear();
       nowMonth = nowDate.getMonth() + 1;
       nowDay = nowDate.getDate();
-      this.start_time =
-        nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+      this.start_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+      this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       var drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.drugTypeList.push(...drugTypeList)
-      this.getlist()
-      this.getDrugCountList()
+     
+      // this.getDrugCountList()
+     
+      
     },
     components: {
       SettingDialog,
@@ -219,13 +205,14 @@ import { min } from 'moment'
           { path: '/stock/drugs/stock/query', name: '药品库存查询' }
         ],
         keywords: '',
-        total: 0,
+       
         multipleSelection: [],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
         end_time: '',
         page: 1,
         limit: 10,
+        total: 0,
         goodType: [],
         goodInfo: [],
         tempArr: [],
@@ -252,9 +239,45 @@ import { min } from 'moment'
         minCount:[],
         drugOutList:[],
         cancelCountList:[],
+        allCountList:[],
       }
     },
     methods: {
+     //获取库存
+      getlist(){
+      
+        const params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          drug_type:this.drug_type,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+        console.log("parasm222222",params)
+        getDrugStockList(params).then(response=>{
+          if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list99999",list)
+             for(let i=0;i<list.length;i++){
+               for(let j=0;j<list[i].drug_warehouse_info.length;j++){
+                 list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
+               }
+               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
+                  }
+               }
+             }
+             console.log("列表list232323323232323223",list)
+             this.tableList = list
+             var total = response.data.data.total
+             this.total = total
+             this.manufacturerList = response.data.data.manufacturerList
+           
+           }
+        })
+      },
       handleSpanTempArr() {
         this.tempArr = []
 
@@ -301,47 +324,7 @@ import { min } from 'moment'
           }
         }
       },
-      GetAllDrugStockQueryList: function() {
-       
-        const Params = {
-          page: this.page,
-          limit: this.limit,
-          keyword: this.keywords,
-          drug_category:this.drug_category,
-          start_time:this.start_time,
-          end_time:this.end_time,
-        }
-        this.WarehouseInfo.loading = true
-        this.WarehouseInfo.warehouseInfoDate = []
-        getAllDrugStockQueryList(Params).then(response => {
-          if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.WarehouseInfo.loading = false
-            this.total = response.data.data.total
-            var arr = []
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
-              arr.push(response.data.data.list[i])
-            }
-           
-            for(let i=0;i<arr.length;i++){
-               arr[i].stockInCount =  this.stockInCount(arr[i])
-               arr[i].salesReturnCount = this.salesReturnCount(arr[i])
-               arr[i].reactCount = (this.stockInCount(arr[i]) - this.salesReturnCount(arr[i]))?this.stockInCount(arr[i]) - this.salesReturnCount(arr[i]):0
-               arr[i].stockOutCount = this.stockOutCount(arr[i])
-               arr[i].cancelStockCount = this.cancelStockCount(arr[i])?this.cancelStockCount(arr[i]):0
-               arr[i].reactOutCount = (this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i]))?(this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i])):0
-               arr[i].overplusCount = (this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]))?this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]):0
-            }
-          
-             this.tableData = arr
-            this.handleSpanTempArr()
-          }
-        })
-      },
+    
       getSpecificationName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
@@ -366,12 +349,10 @@ import { min } from 'moment'
       },
       handleSizeChange(val) {
         this.limit = val
-     
         this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-       
         this.getlist()
       },
       calculate: function(val) {
@@ -395,7 +376,7 @@ import { min } from 'moment'
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        // this.GetAllDrugStockQueryList();
+       
         this.getlist()
       }
      
@@ -430,14 +411,6 @@ import { min } from 'moment'
         }
         return total
       },
-      showStockInDetailDialog: function(val) {
-      },
-      showSaleReturnDetailDialog: function() {
-      },
-      showStockOutDetailDialog: function() {
-      },
-      showCancelStockDetailDialog: function() {
-      },
       search: function() {
         this.getlist()
       }, 
@@ -451,9 +424,10 @@ import { min } from 'moment'
            this.tableList[i].drug_type_name = this.getDrugType(this.tableList[i].drug_type)
            this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
            this.tableList[i].manufacturer_name = this.getManufacturerList(this.tableList[i].manufacturer)
-           this.tableList[i].inCount =  this.getInCount(this.tableList[i].drug_id) + this.tableList[i].max_unit
-           this.tableList[i].outCount = this.getCount(this.tableList[i].drug_id,this.tableList[i].min_number,this.tableList[i].max_unit,this.tableList[i].min_unit)
-           this.tableList[i].overplusCount = this.getCountTwo(this.tableList[i].drug_id,this.tableList[i].min_number,this.tableList[i].max_unit,this.tableList[i].min_unit)
+
+          this.tableList[i].inCount =  this.getWarehoseInfo(this.tableList[i].drug_warehouse_info)
+          this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
          }
        
          console.log("hhhhhhhadhfadf 列表",this.tableList)
@@ -489,31 +463,6 @@ import { min } from 'moment'
           query: {drug_type:this.drug_type,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
         });
       },
- 
-  //获取库存
-      getlist(){
-        const params = {
-          page: this.page,
-          limit: this.limit,
-          keyword: this.keywords,
-          drug_type:this.drug_type,
-          start_time:this.start_time,
-          end_time:this.end_time,
-        }
-        console.log("parasm222222",params)
-        getDrugStockList(params).then(response=>{
-          if(response.data.state == 1){
-             var list = response.data.data.list
-             console.log("list99999",list)
-             this.tableList = list
-             var total = response.data.data.total
-             console.log("total",total)
-             this.total = total
-             this.manufacturerList = response.data.data.manufacturerList
-           
-           }
-        })
-      },
       getDrugType(id){
        
         var name = ""
@@ -543,7 +492,8 @@ import { min } from 'moment'
          }
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
-        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.drug_id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit})
+        var overPlus = 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+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
       },
       handleBatch(val){
         var manufacturer_name = ""
@@ -553,7 +503,8 @@ import { min } from 'moment'
          }
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
-        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.drug_id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit})
+        var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
       },
       getDrugCountList(){
          var params = {
@@ -565,19 +516,11 @@ import { min } from 'moment'
         getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
-            console.log("入库数据",countlist)
             this.countList = countlist
-            var outcountlist = response.data.data.outCountList
-            console.log("出库数据",outcountlist)
-            this.outCountList = outcountlist
-            var aucountlist = response.data.data.auCountList
-            console.log("自动数据",aucountlist)
-            this.autoCountList = aucountlist
             var minCount = response.data.data.minCount
             console.log("minCount",minCount)
             this.minCount = minCount
             var cancelCountList =  response.data.data.cancelCountList
-            console.log("退库数据",cancelCountList)
             this.cancelCountList = cancelCountList
             var info = response.data.data.info
             for(let i=0;i<info.length;i++){
@@ -585,6 +528,7 @@ import { min } from 'moment'
                  info[i].count = info[i].count * info[i].min_number
               }
             }
+            console.log("搜有列表",this.autoCountList)
             console.log("info2222222",info)
             this.drugOutList = info
           }
@@ -627,24 +571,45 @@ import { min } from 'moment'
         }
         return count
       },
-      getCount(drug_id,min_number,max_unit,min_unit){
-        var count= 0
+     getCount(drug_id,min_number,max_unit,min_unit){
+        var total= 0
         var str = ""
         var min_str = ""
-        for(let i=0;i<this.drugOutList.length;i++){
-          if(drug_id == this.drugOutList[i].drug_id){
-             count += parseInt(this.drugOutList[i].count)
+        var arr = []
+        for(let i=0;i<this.allCountList.length;i++){
+          if(drug_id == this.allCountList[i].drug_id){
+             arr.push(this.allCountList[i])
           }
         }
-        if(parseInt(count/min_number)!=0){
-          str = parseInt(count/min_number)+ max_unit
+        var arrTwo = []
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].drug_id == 1236){
+             arrTwo.push(arr[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
+        }
+        if(total<min_number){
+           str = ""
+           min_str = total + min_unit
         }
-        if((count%min_number)!=0){
-          min_str =  count%min_number + min_unit
+        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
+          }
         }
+    
         return str + min_str
       },
-
+  
       getCountOne(drug_id){
         var count= 0
         for(let i=0;i<this.drugOutList.length;i++){
@@ -669,12 +634,10 @@ import { min } from 'moment'
        if(parseInt(count/min_number)!=0){
          str = parseInt(count/min_number) + max_unit
        }
-       console.log("str2222",str)
+     
        if((count%min_number)!=0){
          str_min = count%min_number + min_unit
        }
-
-       console.log("str0000000",str,str_min)
        return str+str_min
      },
       getCancelCount(id){
@@ -686,6 +649,77 @@ import { min } from 'moment'
         }
         return count
       },
+      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
+      },
+      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)
+           }
+         }
+         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
+      },
+      getWarehouseOutInfo(arr,max_unit,min_unit,min_number){
+         var min_str = ""
+         var max_str = ""
+        var total = 0
+        if (arr.length > 0) {
+          for(let i=0;i<arr.length;i++){
+            total += parseInt(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
+
+      }
     }
   }
 </script>

src/xt_pages/stock/stockBatchNumber.vue

@@ -6,8 +6,7 @@
     <div class="app-container ">
       <div class="cell clearfix">
         耗材名称:{{this.$route.query.good_name}} &nbsp;
-        <!-- 库存: {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit}}&nbsp; -->
-        库存: {{getStockCount(this.$route.query.id)}}
+        库存:{{this.$route.query.overCount}}{{packing_unit}} &nbsp;
         规格:{{this.$route.query.specification_name}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>
@@ -140,7 +139,7 @@
         "-" +
         (nowDay < 10 ? "0" + nowDay : nowDay);
       this.getlist()
-      this.getStockDrugCount()
+      // this.getStockDrugCount()
       this.packing_unit = this.$route.query.packing_unit
     },
     components: {

src/xt_pages/stock/stockFlow.vue

@@ -6,8 +6,7 @@
     <div class="app-container ">
       <div class="cell clearfix">
        耗材名称:{{this.$route.query.good_name}} &nbsp;
-       <!-- 库存:  {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit }} &nbsp; -->
-       库存: {{getStockCount(this.$route.query.id)}}{{this.$route.query.packing_unit }}
+       库存: {{this.$route.query.overCount}}{{packing_unit}} &nbsp;
        规格:{{this.$route.query.specification_name}} &nbsp;
        厂家:{{this.$route.query.manufacturer}} 
       </div>
@@ -167,7 +166,7 @@
         (nowDay < 10 ? "0" + nowDay : nowDay);
       // this.getlist()
       // this.getStockOutList()
-      this.getStockDrugCount()
+      // this.getStockDrugCount()
     
       this.getStockFlow()
       this.packing_unit = this.$route.query.packing_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -671,7 +671,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params2222",params)
-        
+          
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -803,7 +803,7 @@ export default {
             this.recordInfo.recordData[i].good_type_id = val.id
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
-            this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
+            this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
             this.recordInfo.recordData[i].number =  val.number
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark

src/xt_pages/stock/stockOutOrder.vue

@@ -606,7 +606,7 @@
               <span>使用人</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
+              <span v-if="scope.row.is_total == 0">{{scope.row.name}}</span>
               <span v-if="scope.row.is_total == 1"></span>
             </template>
           </el-table-column>
@@ -615,7 +615,7 @@
               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.count}}{{scope.row.info.packing_unit}}</span>
+              <span v-if="scope.row.is_total == 0">{{scope.row.count}}{{scope.row.packing_unit}}</span>
               <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
 
             </template>
@@ -634,8 +634,7 @@
               <span>批次号</span>
             </template>
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_total == 0">{{getNumber(scope.row.id)}}</span> -->
-               <span v-if="scope.row.is_total ==0">{{getBatchNumber(scope.row.patient_id,scope.row.good_id)}}</span>
+               <span v-if="scope.row.is_total ==0">{{scope.row.number}}</span>
             </template>
           </el-table-column>
 <!-- 
@@ -1539,11 +1538,22 @@ export default {
               var stockflowlist = response.data.data.stockFlowList
               console.log("stockflowlist",stockflowlist)
               this.stockFlowList = stockflowlist
-              for (let i = 0; i < arrList.length; i++) {
-                var obj = arrList[i]
+              // for (let i = 0; i < arrList.length; i++) {
+              //   var obj = arrList[i]
+              //   obj['is_total'] = 0
+              //   this.userList.push(obj)
+              //   total = total + arrList[i].count
+              // }
+              // this.userList.push({
+              //   is_total: 1,
+              //   total: total,
+              // })
+
+              for (let i = 0; i <  this.stockFlowList.length; i++) {
+                var obj =  this.stockFlowList[i]
                 obj['is_total'] = 0
                 this.userList.push(obj)
-                total = total + arrList[i].count
+                total = total +  this.stockFlowList[i].count
               }
               this.userList.push({
                 is_total: 1,

src/xt_pages/stock/stockPrint.vue

@@ -36,14 +36,18 @@
                                    <td>{{getGoodType(item.good_type_id)}}</td>
                                    <td>{{item.good_name }}</td>
                                    <td><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
-                                   <td>{{item.price}}</td>
+                                   <td>{{item.buy_price}}</td>
                                    <td>{{getManufacture(item.manufacturer)}}</td>
-                                   <td>{{getInCount(item.good_id)}}</td>
-                                   <!-- <td><span>{{getOutCount(item.good_id) + getAutoCount(item.good_id)}}</span></td>  -->
-                                   <td><span>{{getInCount(item.good_id) - getStockCount(item.good_id)}}{{item.packing_unit}}</span></td>
-                                   <!-- <td>{{getInCount(item.good_id)- getOutCount(item.good_id) - getAutoCount(item.good_id)}}</td> -->
-                                   <!-- <td>{{getCancelCount(item.good_id)}}{{item .packing_unit}}</td> -->
-                                   <td> {{getStockCount(item.good_id)}} {{item.packing_unit}} </td>
+                                   <td>
+                                      <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>
+                                   </td>
+                                  
+                                   <td>
+                                     <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>  
+                                   </td>
                                 </tr>
                             </tbody>
                         </table>
@@ -251,7 +255,40 @@ export default {
        }
      }
      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
+   }
     },
     created(){
       var starttime =  this.$route.query.start_time
@@ -266,7 +303,7 @@ export default {
       this.limit = this.$route.query.limit
       this.getlist()
       this.GetAllGoodType()
-      this.getStockDrugCount()
+      // this.getStockDrugCount()
     }
 }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -93,7 +93,7 @@
          </el-table-column>
         <el-table-column label="进货单价" align="center">
           <template slot-scope="scope">
-            {{scope.row.price}}
+             {{scope.row.buy_price}}
           </template>
         </el-table-column>
         <el-table-column label="生产商" align="center">
@@ -103,30 +103,19 @@
         </el-table-column>
        <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-          <span>{{getInCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span>
+          
+          <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span>
          </template>
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-           <!-- <span>{{getOutCount(scope.row.good_id) + getAutoCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span> -->
-
-           {{getInCount(scope.row.good_id) - getStockCount(scope.row.good_id)}}{{scope.row.packing_unit}}
+            <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>{{getCancelCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span>
-
-         </template>
-       </el-table-column>
-       -->
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-           <!-- {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id) + getCancelCount(scope.row.good_id)}} {{scope.row.packing_unit}} -->
-           
-           {{getStockCount(scope.row.good_id)}} {{scope.row.packing_unit}} 
-
+           <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">
@@ -199,7 +188,7 @@ export default {
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
-    this.getStockDrugCount()
+    // this.getStockDrugCount()
   },
   components: {
     BreadCrumb
@@ -406,18 +395,17 @@ export default {
          import('@/vendor/Export2Excel').then(excel => {
 
          const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
-         const filterVal = ['type_name', 'good_name', 'unit','price','prodect_name','inCount','outCount','overplus']
+         const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
 
        
          for(let i=0;i<this.tableList.length;i++){
            this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
-           this.tableList[i].inCount =  this.getInCount(this.tableList[i].good_id)
-          //  this.tableList[i].outCount = this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
-          //  this.tableList[i].overplus =this.getInCount(this.tableList[i].good_id)- this.getOutCount(this.tableList[i].good_id) - this.getAutoCount(this.tableList[i].good_id)
-          this.tableList[i].outCount =  this.getInCount(this.tableList[i].good_id) - this.getStockCount(this.tableList[i].good_id)
-          this.tableList[i].overplus = this.getStockCount(this.tableList[i].good_id)
+           this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
+        
+          this.tableList[i].outCount = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverplus(this.tableList[i].xt_warehouse_info) - this.getCancelInfo(this.tableList[i].cancel_stock_info)
+          this.tableList[i].overplus = this.getOverplus(this.tableList[i].xt_warehouse_info)
          }
          console.log("table",this.tableList)
          const data = this.formatJson(filterVal, this.tableList)
@@ -505,7 +493,8 @@ export default {
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
-      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit})
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     toClickOne(val){
        var manufacturer_name = ""
@@ -516,7 +505,8 @@ export default {
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
-      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit})
+       var overCount  = this.getOverplus(val.xt_warehouse_info)
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     getStockDrugCount(){
         var params ={
@@ -585,6 +575,39 @@ export default {
        }
      }
      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
    }
   }
 };