数据

src/api/drug/drug_stock.js

@@ -493,3 +493,19 @@ export function getAutoDrugDetail(params) {
     params: params
   })
 }
+
+export function getDrugOrderInPrint(params) {
+  return request({
+    url: '/api/drug/getdrugorderinprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugOutOrderDetailPrint(params) {
+  return request({
+    url: '/api/drug/getdrugoutorderdetailprint',
+    method: 'get',
+    params: params
+  })
+}

src/api/stock.js

@@ -665,3 +665,11 @@ export function getExportStockList(params) {
     params: params
   })
 }
+
+export function getOutExportList(params) {
+  return request({
+    url: '/api/stock/getoutexprotlist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/management/components/QualityForm.vue

@@ -58,9 +58,7 @@
     </el-row>
     <el-row style="display: flex;align-items: center;">
       <el-col :span="2">
-        <el-checkbox v-model="checkAllStatus" @change="changeCheck"
-          >全选</el-checkbox
-        >
+        <el-checkbox v-model="checkAllStatus" @change="changeCheck">全选</el-checkbox>
       </el-col>
       <el-col :span="3">
         <el-button size="small" @click="BatchDelete" v-show="show"

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;
-       库存:&nbsp;
+       库存:{{getCountTwo(this.$route.query.drug_id,this.$route.query.min_number,this.$route.query.max_unit,this.$route.query.min_unit)}}&nbsp;
        规格:<span>{{this.$route.query.unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
       </div>
@@ -105,7 +105,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getBatchOrderDetail } from '@/api/drug/drug_stock'
+  import { getBatchOrderDetail,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -114,7 +114,8 @@
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-       this.getlist()
+      this.getlist()
+      this.getDrugCountList()
     },
     components: {
       SettingDialog,
@@ -150,7 +151,12 @@
         ],
         drugTypeList:[],
         tableList:[],
-        manufacturerList:[]
+        manufacturerList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        minCount:[],
+        drugOutList:[],
       }
     },
     methods:{
@@ -196,7 +202,119 @@
     endTimeChange(val){
       this.end_time = val
       this.getlist()
-    }
+    },
+     getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+      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 info = response.data.data.info
+            for(let i=0;i<info.length;i++){
+              if(info[i].count_unit == info[i].max_unit){
+                 info[i].count = info[i].count * info[i].min_number
+              }
+            }
+            console.log("info2222222",info)
+            this.drugOutList = info
+          }
+        })
+      },
+      getInCount(id){
+        var count = ""
+        for(let i=0;i<this.countList.length;i++){
+           if(id == this.countList[i].drug_id){
+             count = this.countList[i].count
+           }
+        }
+        return count
+      },
+
+      getOutCount(id){
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+           if(id == this.outCountList[i].drug_id){
+               count = this.outCountList[i].count
+           }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].drug_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
+      },
+         getMinCount(id){
+        var count=""
+        for(let i=0;i<this.minCount.length;i++){
+          if(id == this.minCount[i].drug_id){
+            count = this.minCount[i].count
+          }
+        }
+        return count
+      },
+      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
+      },
+
+      getCountOne(drug_id){
+        var count= 0
+        for(let i=0;i<this.drugOutList.length;i++){
+          if(drug_id == this.drugOutList[i].drug_id){
+             count += parseInt(this.drugOutList[i].count)
+          }
+        }
+        return count
+      },
+     getCountTwo(drug_id,min_number,max_unit,min_unit){
+       var total_count = 0
+       var out_count = 0
+       var count = 0
+       var str = ""
+       var str_min = ""
+       total_count = this.getInCount(drug_id) * min_number
+       out_count = this.getCountOne(drug_id)
+       count = total_count-out_count
+       if(parseInt(count/min_number)!=0){
+         str = parseInt(count/min_number) + max_unit
+       }
+       if((count%min_number)!=0){
+         str_min = count%min_number + min_unit
+       }
+       return str+str_min
+     }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -15,46 +15,41 @@
             <tbody>
             <tr>
               <td style="line-height: 50px" width="50">序号</td>
-              <td style="line-height: 50px" width="250">药品名称</td>
-              <td style="line-height: 50px" width="250">规格型号</td>
-              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="100">药品类型</td>
+              <td style="line-height: 50px" width="150">药品名称</td>
+              <td style="line-height: 50px" width="150">规格型号&单位</td>
+              <td style="line-height: 50px" width="50">进货单价</td>
+              <td  style="line-height: 50px" width="50">厂家</td>
               <td style="line-height: 50px" width="80">入库数量</td>
               <td style="line-height: 50px" width="80">出库数量</td>
-              <td style="line-height: 50px" width="80">入库退货</td>
-              <td style="line-height: 50px" width="80">出库退库</td>
-              <td style="line-height: 50px" width="80">剩余库存</td>
-              <td style="line-height:50px" width="80">单价</td>
-           
+              <td style="line-height:50px" width="80">剩余库存量</td>    
             </tr>
 
-            <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
+            <tr v-for="(item,index) in tableList" :key="item.id">
               <td style="line-height: 50px">&nbsp;
                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <span> {{ item.drug_name }}</span>
+                <span> {{getDrugType(item.drug_type)}}</span>
               </td>
               <td style="line-height: 50px">
-                   <span>{{ item.drug_spec }}</span>
+                <span> {{ item.drug_name }}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{getUnit(item.id)}}</span>
+                   <span> {{item.dose + item.dose_unit +"*"+item.min_number+item.min_unit+"/"+item.max_unit}}</span>
               </td>
-            
+             
               <td style="line-height: 50px">
-                  <span>{{ stockInCount(item) }}</span>
+                  <span>{{item.last_price }}</span>
               </td>
               <td style="line-height: 50px">
-                  <span>{{ stockOutCount(item) }}</span>
+                <span> {{getManufacturerList(item.manufacturer)}}</span>
               </td>
-              <td> <span>{{ salesReturnCount(item) }}</span ></td>
-              <td> <span>{{ cancelStockCount(item) }}</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>{{stockInCount(item) -salesReturnCount(item) -stockOutCount(item) +cancelStockCount(item)}}</span>
+                <span>{{getCountTwo(item.drug_id,item.min_number,item.max_unit,item.min_unit)}}</span>
              </td> 
-              <td style="line-height:50px">
-                  {{item.last_price}}
-              </td>
             </tr>
             </tbody>
           </table>
@@ -72,7 +67,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
+  import { getAllDrugStockQueryList,getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
   import { getDictionaryDataConfig } from "@/utils/data";
   import {getBaseDrugLibList} from '@/api/data'
   export default {
@@ -113,6 +108,15 @@
         is_use:"",
         is_charge:"",
         is_inject:"",
+        tableList:[],
+        manufacturerList:[],
+        loading:false,
+        drugType:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        minCount:[],
+        drugOutList:[],
       }
     },
     methods: {
@@ -230,35 +234,165 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      getList() {
-        let params = {
-          page: this.page,
-          limit: this.limit,
-          keyword: this.keywords,
-          is_use: this.is_use,
-          is_charge: this.is_charge,
-          is_inject: this.is_inject
+      getlist(){
+        const params = {
+          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,
         }
-        getBaseDrugLibList(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.total = response.data.data.total
-            this.list = []
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.list.push(response.data.data.list[i])
+        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
+             this.manufacturerList = response.data.data.manufacturerList
+             this.loading = false
+           }
+        })
+      },
+      getManufacturerList(id){
+        var name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+             name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return name
+      },
+      getDrugCountList(){
+         var params = {
+          keyword: this.$route.query.keywords,
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time,
+         }
+        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 info = response.data.data.info
+            for(let i=0;i<info.length;i++){
+              if(info[i].count_unit == info[i].max_unit){
+                 info[i].count = info[i].count * info[i].min_number
+              }
             }
-            console.log("list222222",this.list)
+            console.log("info2222222",info)
+            this.drugOutList = info
           }
         })
       },
+     getInCount(id){
+        var count = ""
+        for(let i=0;i<this.countList.length;i++){
+           if(id == this.countList[i].drug_id){
+             count = this.countList[i].count
+           }
+        }
+        return count
+      },
+
+      getOutCount(id){
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+           if(id == this.outCountList[i].drug_id){
+               count = this.outCountList[i].count
+           }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].drug_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
+      },
+      getMinCount(id){
+        var count=""
+        for(let i=0;i<this.minCount.length;i++){
+          if(id == this.minCount[i].drug_id){
+            count = this.minCount[i].count
+          }
+        }
+        return count
+      },
+      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
+      },
+
+      getCountOne(drug_id){
+        var count= 0
+        for(let i=0;i<this.drugOutList.length;i++){
+          if(drug_id == this.drugOutList[i].drug_id){
+             count += parseInt(this.drugOutList[i].count)
+          }
+        }
+        return count
+      },
+     getCountTwo(drug_id,min_number,max_unit,min_unit){
+       var total_count = 0
+       var out_count = 0
+       var count = 0
+       var str = ""
+       var str_min = ""
+       total_count = this.getInCount(drug_id) * min_number
+       out_count = this.getCountOne(drug_id)
+       count = total_count-out_count
+       if(parseInt(count/min_number)!=0){
+         str = parseInt(count/min_number) + max_unit
+       }
+       if((count%min_number)!=0){
+         str_min = count%min_number + min_unit
+       }
+       return str+str_min
+     },
+     getDrugType(id){
+       var name = ""
+       for(let i=0;i<this.drugType.length;i++){
+         if(id == this.drugType[i].id){
+            name = this.drugType[i].name
+         }
+       }
+       return name
+     }
     },
     created() {
-      this.GetAllDrugStockQueryList()
+      // this.GetAllDrugStockQueryList()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
-      this.drugCategory.push(...drugCategory)
-      this.getList()
+      var drugType = getDictionaryDataConfig('system','drug_type')
+      console.log("222343",drugType)
+      this.drugType.push(...drugType)
+      this.getlist()
+      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;
-       库存:&nbsp;
+       库存: {{getCountTwo(this.$route.query.drug_id,this.$route.query.min_number,this.$route.query.max_unit,this.$route.query.min_unit)}}
        规格:<span>{{this.$route.query.unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
 
@@ -64,13 +64,14 @@
         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4">手动入库</span>
-             <span v-if="scope.row.drug_way == 2">手动出库</span>
+             <span v-if="scope.row.drug_way == 4">采购入库</span>
+             <span v-if="scope.row.drug_way == 2">自动出库</span>
+             <span v-if="scope.row.drug_way == 1">手动出库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way ==1"> {{scope.row.warehouse_out_order_number}}</span>
              <span v-if="scope.row.drug_way == 4">{{scope.row.warehousing_order}}</span>
             
            </template>
@@ -82,40 +83,39 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="出入库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{scope.row.warehousing_count}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span>
+             <span v-if="scope.row.drug_way == 4"> {{scope.row.warehousing_count}}{{scope.row.max_unit}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{scope.row.count}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-             <!-- <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span> -->
-              {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
+               {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+              <!-- {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}} -->
              <span></span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进/出货单价" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4"> {{scope.row.price}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.price}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{scope.row.price}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
-             <span v-if="scope.row.drug_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.drug_way == 4"> {{getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 2"> {{scope.row.number}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way ==1"> {{scope.row.number}}</span>
              <span v-if="scope.row.drug_way == 4">{{scope.row.number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
-             <span v-if="scope.row.drug_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -198,13 +198,15 @@
           {id:0,name:"全部"},
           {id:1,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:3,name:"手动入库"},
+          {id:3,name:"采购入库"},
 
         ],
         outList:[],
         countList:[],
         outCountList:[],
         autoCountList:[],
+        drugOutList:[],
+        total:0,
       }
     },
     methods:{
@@ -226,7 +228,6 @@
                list[i].drug_way = 4
                this.tableList.push(list[i])
             }
-           
             var total = response.data.data.total
             this.total = total
             var manufacturerList = response.data.data.manufacturerList
@@ -245,24 +246,35 @@
              stock_type:this.stock_type,  
            }
           console.log("出库数据",params)
+
          getOutDrugStockFlow(params).then(response=>{
             if(response.data.state == 1){
                var outList = response.data.data.outList
-               for(let i=0;i<outList.length;i++){
+               console.log("outlist",outList)
+
+              for(let i=0;i<outList.length;i++){
+                if(outList[i].is_sys == 1){
                   outList[i].drug_way = 2
-                  this.tableList.push(outList[i])
-               }
-              console.log("列表数据",this.tableList)
+                }
+                if(outList.is_sys == 0){
+                  outList[i].drug_way = 1
+                }
+                this.tableList.push(outList[i])
+              }
+              this.total = response.data.data.total
+              console.log("出库列表数据",this.tableList)
             }
          })
        },
        handleSizeChange(val) {
         this.limit = val
         this.getlist()
+        this.getOutList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
+        this.getOutList()
       },
         
     startTimeChange: function(val) {
@@ -282,6 +294,7 @@
         this.end_time = "";
       } else {
         this.getlist();
+        this.getOutList()
       }
      },
      getManufacturer(id){
@@ -320,6 +333,17 @@
             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 info = response.data.data.info
+            for(let i=0;i<info.length;i++){
+              if(info[i].count_unit == info[i].max_unit){
+                 info[i].count = info[i].count * info[i].min_number
+              }
+            }
+            console.log("info2222222",info)
+            this.drugOutList = info
           }
         })
       },
@@ -355,26 +379,72 @@
         return (new Date(time)).getTime() / 1000
       },
       changeDrug(val){
-        
-        var arr = []
+       this.tableList = []
+        if(val == 0){
+         this.getlist()
+         this.getOutList()
+        }
         if(val == 3){
-          for(let i=0;i<this.tableList.length;i++){
-            if(this.tableList[i].drug_way == 4){
-
-              arr.push(this.tableList[i])
-            }
+          this.getlist()
+        }
+        if(val ==1 || val == 2){
+           this.getOutList()
+        }
+       
+      },
+      getMinCount(id){
+        var count=""
+        for(let i=0;i<this.minCount.length;i++){
+          if(id == this.minCount[i].drug_id){
+            count = this.minCount[i].count
           }
-          this.tableList = arr
         }
-        if(val == 1){
-          for(let i=0;i<this.tableList.length;i++){
-            if(this.tableList[i].drug_way == 2){
-              arr.push(this.tableList[i])
-            }
+        return count
+      },
+      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)
           }
-          this.tableList = arr
         }
-      }
+        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
+      },
+
+     getCountOne(drug_id){
+        var count= 0
+        for(let i=0;i<this.drugOutList.length;i++){
+          if(drug_id == this.drugOutList[i].drug_id){
+             count += parseInt(this.drugOutList[i].count)
+          }
+        }
+        return count
+      },
+     getCountTwo(drug_id,min_number,max_unit,min_unit){
+       var total_count = 0
+       var out_count = 0
+       var count = 0
+       var str = ""
+       var str_min = ""
+       total_count = this.getInCount(drug_id) * min_number
+       out_count = this.getCountOne(drug_id)
+       count = total_count-out_count
+       if(parseInt(count/min_number)!=0){
+         str = parseInt(count/min_number) + max_unit
+       }
+       if((count%min_number)!=0){
+         str_min = count%min_number + min_unit
+       }
+       return str+str_min
+     }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -192,7 +192,7 @@
         border
         highlight-current-row
         v-loading="Warehouse.loading"
-        ref="multipleTable"
+        ref="multipleTableOne"
         @selection-change="select"
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -359,22 +359,6 @@
       </span>
     </el-dialog>
 
-    
-
-
-      
-
-      <!-- <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination> -->
 
   </div>
 </template>
@@ -717,8 +701,13 @@ export default {
       }
     },
     select(selection) {
-      console.log("selection",selection)
-      this.order_id = selection[0].id
+      // console.log("selection",selection)
+      // this.order_id = selection[0].id
+      var ids=[]
+      for(let i=0;i<selection.length;i++){
+         ids.push(selection[i].id)
+      }
+      this.order_id = ids.join(",")
       this.selectedTableData = selection;
     },
     batchDelete() {
@@ -808,7 +797,7 @@ export default {
         return getDictionaryDataConfig(module, filed_name)
       },
     drugPrint(){
-      if(this.order_id == 0){
+      if(this.order_id == ""){
          this.$message.error("请选择入库单")
       }else{
         this.$router.push({path:"/stock/drugStockInOrderDetailPrint?id="+this.order_id})

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -7,11 +7,11 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div class="dialysis-print-order">
+        <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
           <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
 
-          <div style="float: left;margin-bottom: 1px;">单据编号：{{WarehouseInfo.warehouse.warehousing_order}}</div>
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehousing_order}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -32,18 +32,17 @@
               <td style="line-height:18px;" width="60">验收<br>结论</td>
             </tr>
 
-            <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
+            <tr v-for="(item,i) in it.child" :key="i">
               <td style="line-height: 18px">
-                 <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
+                 <span v-if="item.drug_id != 0">{{item.drug_name}}</span>
               </td>
               <td style="line-height: 18px">{{ item.remark }}</td>
               <td style="line-height: 18px">
-                 <span v-if="item.drug_id != 0">{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+                 <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
-              <!-- <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td> -->
-              <td style="line-height: 18px">{{ getManufacturer(item.drug.id) }}</td>
+              <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
               <td style="line-height: 18px">
-                <span>{{item.drug.max_unit}}</span>
+                <span>{{item.max_unit}}</span>
               </td>
               <td style="line-height:18px">
                   {{item.price}}
@@ -63,7 +62,7 @@
             </tr>
             <tr>
               <td>合计</td>
-              <td colspan="12" style="text-align:right;">{{allPrice.toFixed(2)}}</td>
+              <td colspan="12" style="text-align:right;">{{getAllPrince(it.id).toFixed(2)}}</td>
             </tr>
             </tbody>
           </table>
@@ -72,13 +71,13 @@
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
             <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
-            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
           </div>
           <div style="display:flex;margin-top:1px;float:right;" v-if="orgId !=10024">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"></div>
-            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
           </div>
         </div>
 
@@ -95,7 +94,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import {getDrugWarehouseInfoList} from "@/api/drug/drug_stock";
+  import {getDrugWarehouseInfoList,getDrugOrderInPrint} from "@/api/drug/drug_stock";
   import {getBaseDrugLibList} from '@/api/data'
   import { fetchAllAdminUsers } from "@/api/doctor";
   export default {
@@ -140,7 +139,10 @@
         keywords:"",
         orgName:'',
         orgId:'',
-        adminUserOptions:[]
+        adminUserOptions:[],
+        tableList:[],
+        manufacturerList:[],
+        warehouseList:[]
       }
     },
     methods: {
@@ -261,20 +263,12 @@
         }
         return name
       },
-      // getManufacturer(id){
-      //   let name = ''
-      //   this.manufacturer.map(item => {
-      //     if(item.id == id){
-      //       name = item.manufacturer_name
-      //     }
-      //   })
-      //   return name
-      // },
+      
       getManufacturer(id){
         let name = ""
-        for(let i=0;i<this.list.length;i++){
-           if(id == this.list[i].id){
-              name = this.list[i].manufacturer_name
+        for(let i=0;i<this.manufacturerList.length;i++){
+           if(id == this.manufacturerList[i].id){
+              name = this.manufacturerList[i].manufacturer_name
            }
         }
         return name
@@ -327,6 +321,42 @@
         }
         return name;
       },
+      getDrugOrderInPrint(order_id){
+          const params = {
+            id:order_id
+          };
+        getDrugOrderInPrint(params).then(response=>{
+          if(response.data.state == 1){
+           var info = response.data.data.info
+           console.log("info22233444444",info)
+           var warehousing =  response.data.data.warehousing
+           console.log("hhhhshdfh",warehousing)
+           this.warehouseList = warehousing
+           for(let i=0;i<info.length;i++){
+             info[i].child = []
+             for(let j=0;j<warehousing.length;j++){
+               if(info[i].id == warehousing[j].warehousing_id){
+                 info[i].child.push(warehousing[j])
+               }
+             }
+           }
+           console.log("infor2222",info)
+           this.tableList = info
+           var manufacturerList = response.data.data.manufacturerList
+           console.log("manufacturerList",manufacturerList)
+           this.manufacturerList = manufacturerList
+          }
+        })
+      },
+     getAllPrince(id){
+        var count = 0
+        for(let i=0;i<this.warehouseList.length;i++){
+          if(id == this.warehouseList[i].warehousing_id){
+             count +=this.warehouseList[i].warehousing_count * this.warehouseList[i].last_price
+          }
+        }
+        return count
+      }
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
@@ -334,8 +364,8 @@
       this.fetchAllAdminUsers()
       this.GetConfigInfo()
       const order_id = this.$route.query.id;
-      this.GetOrderDetail(order_id);
       this.getList()
+      this.getDrugOrderInPrint(order_id)
 
     }
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -200,7 +200,7 @@
           style="width: 100%"
           border
           highlight-current-row
-          ref="multipleTable"
+          ref="multipleTableOne"
           @selection-change="select"
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -654,7 +654,12 @@ export default {
       }
     },
     select(selection) {
-      this.order_id = selection[0].id
+     
+      var ids= []
+      for(let i=0;i<selection.length;i++){
+         ids.push(selection[i].id)
+      }
+      this.order_id =  ids.join(",")
       this.selectedTableData = selection;
     },
     batchDelete() {

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,11 +7,11 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div class="dialysis-print-order">
+        <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 style="float: left;margin-bottom: 1px;">单据编号：{{warehousingOutInfo.info.warehouse_out_order_number}}</div>
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -28,25 +28,25 @@
               <td style="line-height: 50px" width="">有效日期</td>
             </tr>
 
-            <tr v-for="(item,index) in warehousingOutInfo.warehousingOutData" :key="item.id">
+            <tr v-for="(item,i) in it.child" :key="i">
               <td style="line-height: 50px">
-                <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
+                <span v-if="item.drug_id != 0">{{item.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                  <span v-if="item.drug_id != 0">{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+                  <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.drug.max_unit}}</span>
+                <span>{{item.max_unit}}</span>
               </td>
 
               <td style="line-height: 50px">
                   {{item.count}}
               </td>
               <td style="line-height:50px">
-                  {{item.drug.last_price}}
+                  {{item.last_price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.drug.last_price).toFixed(2)}}
+                {{(item.count * item.last_price).toFixed(2)}}
              </td>
              <td>{{getNumber(item.drug_id)}}</td>
              <td>{{getProductDate(item.drug_id)}}</td>
@@ -55,7 +55,7 @@
              <tr>
                <td style="line-height:50px">合计</td>
                <td colspan="7"></td>
-               <td>{{allPrice.toFixed(2)}}</td>
+               <td>{{getAllPrince(it.id).toFixed(2)}}</td>
              </tr>
             </tbody>
           </table>
@@ -91,7 +91,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import {  getDrugWarehouseOutInfo,getDrugWarehouseOrderInfo } from '@/api/drug/drug_stock'
+  import {  getDrugWarehouseOutInfo,getDrugWarehouseOrderInfo,getDrugOutOrderDetailPrint } from '@/api/drug/drug_stock'
   import {getBaseDrugLibList} from '@/api/data'
   export default {
     name: 'dialysisPrintOrder',
@@ -130,7 +130,11 @@
         keywords:"",
         orgId:'',
         orgName:"",
-        drugOrderList:[]
+        drugOrderList:[],
+        manufactureList:[],
+        tableList:[],
+        loading:false,
+        warehouseList:[]
       }
     },
     methods: {
@@ -304,14 +308,51 @@
           return uParseTime(val, '{y}-{m}-{d}')
          }
       },
+
+      getDrugOutOrderDetailPrint(order_id){
+        var params = {
+          id:order_id
+        }
+        getDrugOutOrderDetailPrint(params).then(response=>{
+          if(response.data.state ==1){
+             var info = response.data.data.info
+             console.log("info",info)
+            var warehousing = response.data.data.warehousing
+            console.log("ware2232",warehousing)
+            this.warehouseList = warehousing
+            for(let i=0;i<info.length;i++){
+               info[i].child = []
+              for(let j=0;j<warehousing.length;j++){
+                if(info[i].id == warehousing[j].warehouse_out_id){
+                    info[i].child.push(warehousing[j])
+                }
+              }
+            }
+            
+            var manufacturerList = response.data.data.manufacturerList
+            console.log("manufacturelist",manufacturerList)
+            this.manufactureList = manufacturerList
+            console.log("列表",info)
+            this.tableList = info
+            this.loading = false
+          }
+        })
+      },
+      getAllPrince(id){
+        var count = 0
+        for(let i=0;i<this.warehouseList.length;i++){
+          if(id == this.warehouseList[i].warehouse_out_id){
+             count +=this.warehouseList[i].count * this.warehouseList[i].last_price
+          }
+        }
+        return count
+      }
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
       const order_id = this.$route.query.id;
-      this.orgId = this.$store.getters.xt_user.org.id;
-      this.GetOrderDetail(order_id);
-      this.getList()
-      this.getDrugWarehouseOrderInfo()
+      this.orgId = this.$store.getters.xt_user.org.id;  
+      this.getDrugOutOrderDetailPrint(order_id)
     }
 
   }

src/xt_pages/stock/drugs/query.vue

@@ -113,20 +113,20 @@
         </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}} -->
+             <!-- {{getInCount(scope.row.drug_id)}} -->
+              {{getInCount(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">
-             {{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)}} -->
+             <!-- {{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)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-            {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
-            <!-- {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}} -->
+            <!-- {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}} -->
+            {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
@@ -227,7 +227,8 @@ import { min } from 'moment'
         keyword:"",
         drug_type:0,
         minCount:[],
-        drugOutList:[]
+        drugOutList:[],
+        
       }
     },
     methods: {
@@ -342,12 +343,12 @@ import { min } from 'moment'
       },
       handleSizeChange(val) {
         this.limit = val
-        // this.GetAllDrugStockQueryList()
+     
         this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        // this.GetAllDrugStockQueryList()
+       
         this.getlist()
       },
       calculate: function(val) {
@@ -361,7 +362,7 @@ import { min } from 'moment'
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        // this.GetAllDrugStockQueryList();
+     
         this.getlist()
       }
     },
@@ -421,14 +422,24 @@ import { min } from 'moment'
         this.$refs.dialog.show()
       },
        exportStock(){
+
+         for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].index = i+1
+           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)
+         }
+       
+         console.log("2322323232",this.tableList)
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['药品名称', '规格名称', '入库数量','单价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','last_price','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
+         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
+         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
        
         
-         const data = this.formatJson(filterVal, this.tableData)
-        //  console.log("data",data)
-        
+         const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -452,7 +463,7 @@ import { min } from 'moment'
       printOrder(){
         this.$router.push({
           name: "drugQueryPrint",
-          query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
+          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}
         });
       },
  
@@ -509,7 +520,7 @@ 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})
+        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})
       },
       handleBatch(val){
         var manufacturer_name = ""
@@ -519,7 +530,7 @@ 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})
+        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})
       },
       getDrugCountList(){
          var params = {
@@ -549,13 +560,6 @@ import { min } from 'moment'
             }
             console.log("info2222222",info)
             this.drugOutList = info
-            var arr = []
-            for(let i=0;i<this.drugOutList.length;i++){
-              if(this.drugOutList[i].drug_id == 1197){
-                arr.push(this.drugOutList[i])
-              }
-            }
-            console.log("arrr",arr)
           }
         })
       },

src/xt_pages/stock/stockBatchNumber.vue

@@ -63,8 +63,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库单据编码" align="center">
            <template slot-scope="scope" >
-             <span v-if="scope.row.stock_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
-             <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
+             <span >{{scope.row.warehousing_order}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -74,25 +73,24 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
-             <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
+             <span> {{getTime(scope.row.expiry_date)}}</span>
+          
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope" >
-             <span v-if="scope.row.stock_way == 4">{{scope.row.number}} </span>
+             <span>{{scope.row.number}} </span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4"> {{scope.row.warehousing_count}}</span>
-             <span v-if="scope.row.stock_way == 2">{{scope.row.count}}</span>
+             <span> {{scope.row.warehousing_count}}{{packing_unit}}</span>
+           
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="进货价" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
-             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
+             <span> {{scope.row.price}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -122,6 +120,7 @@
     created() {
       this.getlist()
       this.getStockDrugCount()
+      this.packing_unit = this.$route.query.packing_unit
     },
     components: {
       BreadCrumb
@@ -168,6 +167,7 @@
         outCountList:[],
         autoCountList:[],
         keywords:"",
+        packing_unit:""
       }
     },
     methods:{
@@ -232,9 +232,9 @@
          if(response.data.state == 1){
            var list = response.data.data.list
            console.log("入库数据",list)
-           for(let i=0;i<list.length;i++){
-             list[i].stock_way = 4
-           }
+          //  for(let i=0;i<list.length;i++){
+          //    list[i].stock_way = 4
+          //  }
            this.tableList = list
            var total = response.data.data.total
            this.total = total

src/xt_pages/stock/stockFlow.vue

@@ -82,14 +82,14 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="出入库数量"  align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
-             <span v-if="(scope.row.stock_way == 2 || scope.row.stock_way == 3) && scope.row.count!=0">{{scope.row.count}}</span>
+             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}{{packing_unit}}</span>
+             <span v-if="(scope.row.stock_way == 2 || scope.row.stock_way == 3) && scope.row.count!=0">{{scope.row.count}}{{packing_unit}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="剩余库存量"  align="center">
            <template slot-scope="scope">
              <!-- <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span> -->
-              {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}
+              {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}{{packing_unit}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进/出货单价"  align="center">
@@ -145,6 +145,7 @@
       this.getlist()
       this.getStockDrugCount()
       this.getStockOutList()
+      this.packing_unit = this.$route.query.packing_unit
     },
     components: {
       BreadCrumb
@@ -192,6 +193,7 @@
         autoCountList:[],
         keywords:"",
         obj:{},
+        packing_unit:""
       }
     },
     methods:{
@@ -280,7 +282,7 @@
           id:this.$route.query.id,
           start_time:this.start_time,
           end_time:this.end_time, 
-          is_sys:this.stockType 
+          is_sys:this.stock_type 
         } 
       getStockOutList(params).then(response=>{
         if(response.data.state == 1){
@@ -288,10 +290,10 @@
           console.log("outList990-0000990",outList)
            for(let i=0;i<outList.length;i++){
              if(outList[i].is_sys == 0){
-                outList[i].stock_way = 2
+                outList[i].stock_way = 3
              }
              if(outList[i].is_sys == 1){
-                outList[i].stock_way = 3
+                outList[i].stock_way = 2
              }
              this.tableList.push(outList[i])
            }

src/xt_pages/stock/stockInOrder.vue

@@ -67,8 +67,8 @@
       <div class="cell clearfix">
         <el-checkbox
           style="width: 70px"
-          v-model="checked"
-          @change="changeAllSelected"
+          v-model="checkAllStatus"
+          @change="changeCheck"
           >全选</el-checkbox
         >
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
@@ -117,20 +117,6 @@
 
         <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
-            <!-- <el-tooltip
-              class="item"
-              effect="dark"
-              content="详情"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="warning"
-                icon="el-icon-document"
-                @click="handleSearch(scope.row.id)"
-              >
-              </el-button>
-            </el-tooltip> -->
             <el-tooltip
               class="item"
               effect="dark"
@@ -183,13 +169,13 @@
           border
           highlight-current-row
           v-loading="Warehouse.loading"
-          ref="multipleTable"
           @selection-change="select"
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266'
           }"
+          fit
         >
         <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
@@ -756,21 +742,28 @@ export default {
         dealer: '',
         manufacturer: ''
       },
-        isCreated: 1,
-        isVisibility: false,
-        drug_id:1,
+      isCreated: 1,
+      isVisibility: false,
+      drug_id:1,
       },
       drug_id:1,
       tableShow:false,
       tableList:[],
       isVisibility:false,
       order_id:0,
-      exportList:[]
+      exportList:[],
+      checkAllStatus:false,
     };
     
   
   },
   methods: {
+     changeCheck() {
+      this.$refs.multipleTable.clearSelection();
+      if (this.checkAllStatus) {
+        this.$refs.multipleTable.toggleAllSelection();
+      }
+    },
     search: function() {
       const Params = {
         page: this.page,
@@ -988,6 +981,7 @@ export default {
       } else {
         this.startTime = this.getTimestamp(val);
         this.GetWarehouse();
+        this.getlist()
       }
     },
     endTimeChange(val) {
@@ -997,6 +991,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetWarehouse();
+        this.getlist()
       }
     },
     getTimestamp(time) {
@@ -1086,18 +1081,17 @@ export default {
         })
         .catch(() => {});
     },
-    changeAllSelected: function() {
-      console.log("22222",this.checked)
-      this.$refs.multipleTable.clearSelection();
-      if (this.checked) {
-        this.$refs.multipleTable.toggleAllSelection();
-      }
-    },
+   
     select(selection) {
-      this.order_id = selection[0].id
       console.log("selection",selection)
+      var ids= []
+      for(let i=0;i<selection.length;i++){
+        ids.push(selection[i].id)
+      }
+      var str = ids.join(",")
+      this.order_id = str
       this.selectedTableData = selection;
-
+      this.getlist()
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -1442,7 +1436,7 @@ export default {
       this.propForm.goodType = [];
     },
     toPrint(){
-      if(this.order_id == 0){
+      if(this.order_id == ""){
         this.$message.error("请勾选入库单")
       }else{
         this.$router.push("/stock/in/detail/print?id="+this.order_id)
@@ -1454,6 +1448,7 @@ export default {
         start_time:this.start_time,
         end_time:this.end_time,
       }
+      console.log("params",params)
       getExportStockList(params).then(response=>{
         if(response.data.state == 1){
            var list = response.data.data.list

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -10,14 +10,14 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-                <div class="print_main_content">
+                <div class="print_main_content" v-for="(it,index) in warehousingInfo" :key="index">
                     <div class="order_title_panl">
                         <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
                         <span style="font-weight:500;font-size:18px;">耗材入库登记单</span>
                     </div>
                     <div style="display:flex;justify-content: space-between;">
                       <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
-                        单据编号：{{WarehouseInfo.warehouse.warehousing_order}}
+                        单据编号：{{it.warehousing_order}}
                       </div>
                       <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
                         打印时间：{{time_now}}
@@ -44,7 +44,7 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
+                                <tr v-for='(item,index) in it.child' :key="index">
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ item.remark }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
@@ -71,7 +71,7 @@
                             <div style="width:80px;" v-if='orgId != 10024'>药材主任：</div><div style="width:100px;"></div>
                             <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
                             <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
-                            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
+                            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
                        </div>
                     </div>
                 </div>
@@ -131,7 +131,8 @@ export default {
             list:[],
             orgName:'',
             orgId:'',
-            adminUserOptions:[]
+            adminUserOptions:[],
+            warehousingInfo:[]
         }
     },
     methods:{
@@ -184,6 +185,7 @@ export default {
         },
        
      GetOrderDetail: function(order_id) {
+
         const params = {
             id: order_id
         };
@@ -192,18 +194,24 @@ export default {
             this.$message.error(response.data.msg);
             return false;
             } else {
-             var obj = ""
-            for (let i = 0; i < response.data.data.info.length; i++) {
-                this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
-            }
-            this.WarehouseInfo.warehouse = response.data.data.warehousing;
+             var info = response.data.data.info
+             console.log("info2222",info)
+             var warehousing = response.data.data.warehousing
+             console.log("warehousing",warehousing)
+             for(let i=0;i<warehousing.length;i++){
+                warehousing[i].child = []
+              for(let j=0;j<info.length;j++){
+                if(warehousing[i].id == info[j].warehousing_id){
+                   warehousing[i].child.push(info[j])
+                }
+              }
+             }
+             this.warehousingInfo = warehousing
             var total_price = 0
-            for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
-               total_price += this.WarehouseInfo.warehouseInfoDate[i].warehousing_count * this.WarehouseInfo.warehouseInfoDate[i].price   
+            for(let i=0;i<info.length;i++){
+               total_price += info[i].warehousing_count * info[i].price   
             }
             this.allPrice = total_price
-            console.log("total_price",total_price)
-            console.log("数据222222222",this.WarehouseInfo.warehouseInfoDate)
             }
         });
        },
@@ -337,6 +345,7 @@ export default {
       this.orgName = this.$store.getters.xt_user.org.org_name;
       this.orgId = this.$store.getters.xt_user.org.id;
       const order_id = this.$route.query.id;
+
       this.fetchAllAdminUsers()
       this.GetConfigInfo();
       this.GetOrderDetail(order_id);

src/xt_pages/stock/stockOutOrder.vue

@@ -71,6 +71,7 @@
         >
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small" type="primary" @click="toExport">导出</el-button>
       </div>
 
       <el-table
@@ -112,21 +113,6 @@
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
            
-            <!-- <el-tooltip
-              class="item"
-              effect="dark"
-              content="详情"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="warning"
-                icon="el-icon-document"
-                @click="handleSearch(scope.row.id,scope.row)"
-              >
-              </el-button>
-            </el-tooltip> -->
-
             <el-tooltip
               class="item"
               effect="dark"
@@ -178,7 +164,7 @@
             style="width: 100%"
             border
             highlight-current-row
-            ref="multipleTable"
+            ref="multipleTableOne"
             @selection-change="select"
             :row-style="{ color: '#303133' }"
             :header-cell-style="{
@@ -380,11 +366,6 @@
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
       </div>
      
-      <!-- <div class="cell clearfix">
-        <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
-        <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
-      </div> -->
-
        <el-row :gutter="12" style="margin-top: 10px">
         <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
                   border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
@@ -669,7 +650,8 @@ import {
   GetAllGoodInfoByID,
   editWarehouseoutInfo,
   getOrderDetailByOrderId,
-  getOrderDetailById
+  getOrderDetailById,
+  getOutExportList
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -701,9 +683,9 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetConfigInfo();
     this.GetWarehouseOut();
-   
     this.fetchAllAdminUsers();
     
+    
   },
   data() {
      var checkGoodId = (rule, value, callback) => {
@@ -787,8 +769,9 @@ export default {
       userList:[],
       editdialogVisibleTwo:false,
       editdialogVisibleThree:false,
-      order_id:0,
+      order_id:"",
       warehouse_out_time:"",
+      exportList:[]
     };
   },
   methods: {
@@ -887,10 +870,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetWarehouseOut();
+      
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetWarehouseOut();
+     
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -899,6 +884,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetWarehouseOut();
+        this.getlist()
       }
      
     },
@@ -909,6 +895,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetWarehouseOut();
+        this.getlist()
       }
     },
     getTimestamp(time) {
@@ -930,6 +917,7 @@ export default {
           this.goodType = response.data.data.goodType
           this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
           this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          this.getlist()
         }
       });
     },
@@ -1001,10 +989,15 @@ export default {
       }
     },
     select(selection) {
-      console.log("selection",selection)
-      this.order_id = selection[0].id
+      var ids = []
+      for(let i=0;i<selection.length;i++){
+        ids.push(selection[i].id)
+      }
+      console.log("ids",ids)
+      this.order_id = ids.join(",")
       this.warehouse_out_time = selection[0].warehouse_out_time
       this.selectedTableData = selection;
+      this.getlist()
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -1053,15 +1046,7 @@ export default {
  
 
     
-    //新增
-    // handleSearch(id,row){ 
-      
-    //   this.warehousingOutInfo.info = []
-    //   this.warehousingOutInfo.warehousingOutData = []
-    //   this.GetOrderDetailOne(id)
-    //   this.GetTotalCount(row.warehouse_out_time)
-      
-    // },
+  
 
     handleSearch(val){
       this.tableList = []
@@ -1071,43 +1056,21 @@ export default {
       this.GetTotalCount(val.warehouse_out_time)
     },
   
-    //获取出库单详情数据
-    // GetOrderDetailOne(id) {
-    //     const params = {
-    //       'id': id
-    //     }
-    //     console.log("#3333333",id)
-    //   getWarehouseOutInfo(params).then(response => {
-    //       if (response.data.state == 0) {
-
-    //         this.$message.error(response.data.msg)
-    //         return false
-    //       } else {
-    //         this.tableShow = true
-    //         for (let i = 0; i < response.data.data.list.length; i++) {
-    //           this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-    //           console.log("表格00000000",this.tableList)
-    //           this.tableList.push(response.data.data.list[i])
-    //         }
-    //         this.warehousingOutInfo.info = response.data.data.info
-    //       }
-    //     })
-    //  }, 
-     GetOrderDetailOne(id){
+      GetOrderDetailOne(id){
         const params = {
           'id': id
         }
         getOrderDetailByOrderId(params).then(response=>{
-           if(response.data.state == 1){
-             this.tableShow = true
-             var list = response.data.data.list
-             console.log("list22222222",list)
-             for(let i=0;i<list.length;i++){
-               this.tableList.push(list[i])
-             }
-           }
+            if(response.data.state == 1){
+              this.tableShow = true
+              var list = response.data.data.list
+              console.log("list22222222",list)
+              for(let i=0;i<list.length;i++){
+                this.tableList.push(list[i])
+              }
+            }
         })
-     },
+      },
 
       getTypeName: function(id) {
         let name = ''
@@ -1527,13 +1490,67 @@ export default {
          })
       },
       toPrint(){
-        if(this.order_id == 0){
+        if(this.order_id == ""){
           this.$message.error("请选择出库单")
         }else{
             this.$router.push({path:"/stock/out/detail/print?id="+this.order_id+"&warehouse_out_time="+this.warehouse_out_time})
         }
-      
-      }
+      },
+      getlist(){
+         var params = {
+           'id': this.order_id,
+           "start_time":this.start_time,
+           "end_time":this.end_time,
+         }
+        console.log('parasm22',params)
+       getOutExportList(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            var outCount = response.data.data.outCount
+            console.log("outCount",outCount)
+            for(let i=0;i<list.length;i++){
+              for(let j=0;j<this.manufacturer.length;j++){
+                if(list[i].manufacturer == this.manufacturer[j].id){
+                  list[i].manufacturer = this.manufacturer[j].manufacturer_name
+                }
+              }
+              for(let z=0;z<this.dealer.length;z++){
+                 if(list[i].dealer == this.dealer[z].id){
+                   list[i].dealer = this.dealer[z].dealer_name
+                 }
+              }
+              for(let a=0;a<this.goodType.length;a++){
+                 if(list[i].good_type_id == this.goodType[a].id){
+                    list[i].good_type_id = this.goodType[a].type_name
+                 }
+              } 
+            }
+            console.log("导出list222222",list)
+            this.exportList = list
+          }
+        })
+      },
+      toExport(){
+       console.log("列表22222222222",this.exportList)
+        import('@/vendor/Export2Excel').then(excel => {
+        for(let i=0;i<this.exportList.length;i++){
+          this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
+        }
+        const tHeader = ['耗材名称', '规格型号', '单位','出库数量','出库价格','总价','批号','生产日期','有效日期']
+        const filterVal = ['good_name', 'specification_name', 'packing_unit','count','price','total_price','number','product_date','expiry_date']
+        console.log("table",this.exportList)
+        const data = this.formatJson(filterVal, this.exportList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '耗材出库单详情'
+        })
+        this.downloadLoading = false
+     })
+    },
+    formatJson(filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]));
+   },
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -139,7 +139,7 @@
 
               <el-form-item style="padding-top: 20px">
                 <el-input
-                  placeholder="请输入商品类型"
+                  placeholder="请输入耗材类型"
                   v-model="scope.row.good_type_id"
                   :value="typeName(scope.row.good_type_id)"
                 ></el-input>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -10,15 +10,14 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-                <div class="print_main_content">
+                <div class="print_main_content" v-for="(it,index) in tableList" :key="index">
                     <div class="order_title_panl">
                         <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
                         <span class="main_title">耗材出库登记单</span>
                     </div>
                     <div style="display:flex;justify-content: space-between;">
                       <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
-                        <!-- 单据编号：{{warehousingOutInfo.info.warehouse_out_order_number}} -->
-                        单据编号: {{tableList[0].warehouse_out_order_number}}
+                        单据编号: {{it.warehouse_out_order_number}}
                       </div>
                       <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
                         打印日期：{{time_now}}
@@ -31,7 +30,7 @@
                                     <td width="80">耗材名称</td>
                                     <td width="80">规格型号</td>
                                     <td width="80">单位</td>
-                                    <td width="80">出货数量</td>
+                                    <td width="80">出库数量</td>
                                     <td width="80">出库价格</td>
                                     <td width="80">总价</td>
                                     <td width="80">批号</td>
@@ -40,7 +39,7 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in tableList' :key="index">
+                                <tr v-for='(item,index) in it.child' :key="index">
                                     <td><span v-if="item.good_id != 0">{{item.good_name}}</span></td>
                                     <td><span v-if="item.good_id != 0">{{item.specification_name}}</span></td>
                                     <td><span v-if="item.good_id!=0">{{item.packing_unit}}</span></td>
@@ -48,8 +47,8 @@
                                     <td>{{item.price}}</td>
                                     <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
                                     <td>{{getNumber(item.good_id)}}</td>
-                                    <td>{{getProductDate(item.good_id)}}</td>
-                                    <td>{{getExpiryDate(item.good_id)}}</td>
+                                    <td>{{getTime(item.product_date)}}</td>
+                                    <td>{{getTime(item.expiry_date)}}</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
@@ -96,7 +95,7 @@ export default {
           crumbs: [
             { path: false, name: '库存管理' },
             { path: false, name: '耗材管理' },
-            { path: false, name: '入库单打印' },
+            { path: false, name: '出库单打印' },
           ],
            isEdit: 0,
             checked: false,
@@ -125,7 +124,8 @@ export default {
             orgId:'',
             orgName:'',
             orderInList:[],
-            tableList:[]
+            tableList:[],
+            orderList:[]
         }
     },
     methods:{
@@ -153,36 +153,6 @@ export default {
             }
             })
         },
-       GetOrderDetail: function(order_id) {
-        const params = {
-          'id': order_id
-        };
-        getWarehouseOutInfo(params).then(response => {
-          if (response.data.state == 0) {
-
-            this.$message.error(response.data.msg);
-            return false
-          } else {
-
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-            }
-            this.warehousingOutInfo.info = response.data.data.info;
-            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData);
-            var total_price = 0;
-            for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
-              total_price += this.warehousingOutInfo.warehousingOutData[i].total_price   
-            }
-            console.log('this.allPrice',this.allPrice)
-           this.allPrice = total_price;
-
-           var wareoutList =  response.data.data.wareoutList;
-           console.log("出库数据",wareoutList);
-           this.wareoutList = wareoutList
-          }
-        })
-      },
-
        GetTotalCount(time){
           var params = {
            warehouse_out_time:time
@@ -278,13 +248,13 @@ export default {
       },
 
       getWarehouseOutInfoCount(warehouse_out_id,good_id){
-        var count = 0;
-         for(let i=0;i<this.wareoutList.length;i++){
-            if(warehouse_out_id == this.wareoutList[i].warehouse_out_id && good_id == this.wareoutList[i].good_id){
-                count = this.wareoutList[i].count
-            }
+         var count = 0
+         for(let i=0;i<this.orderList.length;i++){
+          if(this.orderList[i].warehouse_out_id == warehouse_out_id && this.orderList[i].good_id == good_id){
+             count += this.orderList[i].count
+          } 
          }
-        return count
+         return count
       },
 
       getWarehouseOrderInfoList(){
@@ -339,14 +309,26 @@ export default {
         const params = {
           'id': id
         }
+        console.log("paramsssss",params)
         getOrderDetailByOrderId(params).then(response=>{
            if(response.data.state == 1){
+             var order = response.data.data.order
+             console.log("order22222",order)
              var list = response.data.data.list
+             this.orderList = list
+             for(let i=0;i<order.length;i++){
+               order[i].child =[]
+               for(let j=0;j<list.length;j++){
+                  if(order[i].id == list[j].warehouse_out_id){
+                     order[i].child.push(list[j])
+                  }
+               }
+             }
              console.log("详情打印222222",list)
+             this.tableList = order
              var total_price = 0
              for(let i=0;i<list.length;i++){
                total_price += response.data.data.list[i].price * response.data.data.list[i].count
-               this.tableList.push(list[i])
              }
              this.allPrice =  total_price
            }
@@ -360,12 +342,9 @@ export default {
       const order_id = this.$route.query.id;
       const warehouse_out_time = this.$route.query.warehouse_out_time;
       this.GetConfigInfo();
-      // this.GetOrderDetail(order_id);
       this.GetTotalCount(warehouse_out_time);
       this.GetOrderDetailOne(order_id)
       this.getList()
-      //获取所有入库单
-      this.getWarehouseOrderInfoList()
     }
 }
 </script>

src/xt_pages/stock/stockPrint.vue

@@ -64,8 +64,8 @@ export default {
         return{
           crumbs: [
             { path: false, name: '库存管理' },
-            { path: false, name: '自备药查询' },
-            { path: false, name: '自备药打印' },
+            { path: false, name: '库存查询' },
+            { path: false, name: '库存查询打印' },
           ],
           start_time:"",
           end_time:"",

src/xt_pages/stock/stockQuery.vue

@@ -103,19 +103,19 @@
         </el-table-column>
        <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-          <span>{{getInCount(scope.row.good_id)}}</span>
+          <span>{{getInCount(scope.row.good_id)}}{{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)}}</span>
+           <span>{{getOutCount(scope.row.good_id) + getAutoCount(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)}}
+           {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}{{scope.row.packing_unit}}
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -471,7 +471,7 @@ 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})
+      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})
     },
     toClickOne(val){
        var manufacturer_name = ""
@@ -482,7 +482,7 @@ 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})
+      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})
     },
     getStockDrugCount(){
         var params ={