Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

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

@@ -649,3 +649,27 @@ export function getOrderDetailById(params) {
     params: params
   })
 }
+
+export function getSingleOutOrderDetail(params) {
+  return request({
+    url: '/api/good/getsingleoutorderdetail',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getExportStockList(params) {
+  return request({
+    url: '/api/stock/getexportstocklist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getOutExportList(params) {
+  return request({
+    url: '/api/stock/getoutexprotlist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/dialysis.js

@@ -411,6 +411,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/forty',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_forty'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_forty',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirtyThree_one',
       component: () =>

src/xt_pages/data/components/addDrugs.vue

@@ -800,6 +800,7 @@
         this.form.max_unit = ""
         this.form.min_price = ""
         this.form.prescribing_number_unit = ""
+        this.dosageShow = false
         this.visible = false
       },
       getValue: function() {

src/xt_pages/data/components/consumables.vue

@@ -105,9 +105,9 @@
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
       </el-table-column> -->
-      <el-table-column label="零售价" width="100" align="center">
+      <el-table-column label="包装零售价" width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.retail_price }}
+          {{ scope.row.packing_price }}
         </template>
       </el-table-column>
        <el-table-column label="社保目录编码" width="110" align="center">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -259,6 +259,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 40">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -839,6 +849,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
       } else if (this.template_id == 39) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
+      } else if (this.template_id == 40) {
+        this.$router.push({ path: "/dialysis/print/batch/forty" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -513,7 +513,7 @@ export default {
             var config = resp.data.config
             console.log("config222222",config.is_open)
             let project_config = resp.data.project_config
-            console.log('project_config',resp.data.hisAdvices)
+            console.log('project_config',)
             if(project_config.is_open == 1){
               this.project = resp.data.project
               resp.data.hisAdvices.map((item,index) => {
@@ -618,7 +618,7 @@ export default {
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
-          
+            console.log("hhhhhhhh22323232323232",schedules)
             let arr = []
             let newArr = []
             let newSchedules = []

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -542,7 +542,7 @@
                 </td>
                 <td width="10">(</td>
                 <td width="35">首剂</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_shouji}}</span>
                     </div>
@@ -550,14 +550,14 @@
                 <td width="20">mg</td>
                 <td width="10"></td>
                 <td width="35">追加</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_weichi}}</span>
                     </div>
                 </td>
                 <td width="40">mg/h</td>
                 <td width="35">总量</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_zongliang}}</span>
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -1383,7 +1383,7 @@ export default {
             this.patientInfo.first_dialysis_date = "";
           }
           this.check = response.data.data.check;
-          console.log("核对信息", this.check);
+          // console.log("核对信息", this.check);
           this.predialysis = response.data.data.PredialysisEvaluation;
           console.log("透前评估", this.predialysis);
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -318,7 +318,7 @@
                         <td width="80">VP<br>mmHg</td>
                         <td width="80">TMP<br>mmHg</td>
                         <td width="80">Na<br>mmol/L</td>
-                        <td width="80">UF<br>ml</td>
+                        <td width="80">UF<br>L</td>
                         <td width="80">体温</td>
                         <td width="">备注</td>
                         <td width="80">签名</td>

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/outpatientDoctorStation/doctorDesk.vue

@@ -3573,8 +3573,10 @@
         }
       },
       currentChange(currentRow, oldCurrentRow) {
-        this.newPatientId = oldCurrentRow.id;
-        this.patientid = oldCurrentRow.id;
+        if(oldCurrentRow){
+          this.newPatientId = oldCurrentRow.id;
+          this.patientid = oldCurrentRow.id;
+        }
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++) {
           if ((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)) {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -9,7 +9,6 @@
     <el-tabs v-model="activeName">
       <el-tab-pane label="基础数据" name="first">
         <div>
-          <!--:rules="rules"-->
           <el-form :model="form" ref="form" :rules="rules" label-width="100px"
                    style="display: flex;flex-wrap: wrap;justify-content: space-between;">
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
@@ -46,28 +45,21 @@
               </el-select>
             </el-form-item>
 
-           <div style="width:100%;">
-              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：FX80 * 60盒</span></div>
-          </div>
-          <div style="width:100%;display:flex;align-items:center;">
-               <el-form-item label="规格型号 : " prop="specification_name" style="width:200px">
-                 <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
-               </el-form-item>
-                *
-                <el-form-item prop="min_number" class="noMargin">
-                  <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
-                </el-form-item>
-                <el-form-item prop="packing_unit" class="noMargin">
-                  <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
-                    <el-option
-                      v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                      :key="index"
-                      :label="item.name"
-                      :value="item.name">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-            </div>
+           
+        
+            <el-form-item label="规格型号 : " prop="specification_name">
+              <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item prop="packing_unit"  label="包装单位:">
+              <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
+                <el-option
+                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+            </el-form-item>
 
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
 
@@ -379,6 +371,9 @@
           good_name: [
             { required: true, message: '请输入耗材名称', trigger: 'blur' }
           ],
+          packing_unit:[
+            {required:true,message:"请输入包装单位",trigger:'blur'}
+          ],
           good_kind: [
             { required: true, message: '请选择耗材种类', trigger: 'change' }
           ],

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -5,9 +5,10 @@
     </div>
     <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;
+       规格:<span>{{this.$route.query.unit}}</span>&nbsp;
+       厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -60,7 +61,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
-              {{getTime(scope.row.expiry_date)}}
+              {{getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="批号" align="center">
@@ -104,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 {
@@ -113,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,
@@ -149,7 +151,12 @@
         ],
         drugTypeList:[],
         tableList:[],
-        manufacturerList:[]
+        manufacturerList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        minCount:[],
+        drugOutList:[],
       }
     },
     methods:{
@@ -166,6 +173,7 @@
               this.tableList = detail
               var total = response.data.data.total
               console.log("total",total)
+              this.total = total
            }
         })
       },
@@ -194,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

@@ -5,9 +5,11 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       药品名称:<span v-if="list.length>0">{{list[0].drug_name}}</span>
-       库存:
-       厂家:<span v-if="list.length>0">{{getManufacturer(list[0].manufacturer)}}</span>
+       药品名称:<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)}}
+       规格:<span>{{this.$route.query.unit}}</span>&nbsp;
+       厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -62,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>
@@ -80,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>
@@ -196,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:{
@@ -224,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
@@ -243,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) {
@@ -280,6 +294,7 @@
         this.end_time = "";
       } else {
         this.getlist();
+        this.getOutList()
       }
      },
      getManufacturer(id){
@@ -318,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
           }
         })
       },
@@ -353,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>
@@ -653,15 +637,16 @@ export default {
       const params = {
         id: order_id
       };
-   
+      console.log("parasm222222222",params)
+      this.WarehouseInfo.warehouseInfoDate = []
       getDrugWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          console.log("hhhhhhhhhh",response.data.data.info)
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.showOne = true
-            this.WarehouseInfo.warehouseInfoDate = []
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
             console.log("列表详情",this.WarehouseInfo.warehouseInfoDate)
           }
@@ -716,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() {
@@ -807,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/drugStockInOrderAdd.vue

@@ -87,7 +87,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -7,10 +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;">单据编号：{{it.warehousing_order}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -18,7 +19,7 @@
             <tr>
               <td width="80">药品名称</td>
               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
-              <td style="line-height:18px;" width="80">规格<br>型号</td>
+              <td style="line-height:18px;" width="100">规格<br>型号</td>
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
               <td style="line-height:18px;" width="80">单位</td>
               <td style="line-height:18px;" width="80">进货价</td>
@@ -31,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?item.drug.drug_spec:''}}</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>{{getUnit(item.drug_id)}}</span>
+                <span>{{item.max_unit}}</span>
               </td>
               <td style="line-height:18px">
                   {{item.price}}
@@ -62,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>
@@ -71,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>
 
@@ -94,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 {
@@ -139,7 +139,10 @@
         keywords:"",
         orgName:'',
         orgId:'',
-        adminUserOptions:[]
+        adminUserOptions:[],
+        tableList:[],
+        manufacturerList:[],
+        warehouseList:[]
       }
     },
     methods: {
@@ -260,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
@@ -326,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;
@@ -333,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/drugStockInOrderEdit.vue

@@ -128,7 +128,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -629,8 +629,14 @@ export default {
                this.recordInfo.recordData[i].manufacturer = 0
              }
 
-             this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].drug.last_price.toString()
-             this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
+             this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+            //  this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
+            
+            for(let j=0;j<this.manufacturerList.length;j++){
+              if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                 this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+               }
+            }
             
           }
           const params = {
@@ -764,6 +770,7 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("val2222",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id = val.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="{
@@ -279,163 +279,6 @@
     </div>
 
 
-
-
-
-    <el-dialog
-      title="出库详细"
-      :visible.sync="dialogVisible"
-      width="60%"
-     >
-      <span>
-        <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
-                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-                  :span-method="merge"
-        >
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>药品名称</span>
-            </template>
-
-            <template slot-scope="scope">
-              <span v-if="scope.row.drug_id != 0">{{
-                scope.row.drug.drug_name
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>规格名称</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.drug_id != 0">{{
-                scope.row.drug?scope.row.drug.drug_spec:''
-              }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="23" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>单价</span>
-            </template>
-            <template slot-scope="scope">
-              <!-- <span>{{scope.row.price}}</span> -->
-              <span>{{getRetailPrice(scope.row.drug_id)}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="23" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>出库数量</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open ==2 ">{{scope.row.count}}</span>
-              <span v-if="drugConfig.is_open ==1">{{getDrugCount(scope.row.drug_id)}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="总价" min-width="20" align="center">
-            <template slot-scope="scope">
-              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open == 2">{{(scope.row.count * getRetailPrice(scope.row.drug_id)).toFixed(2)}}</span>
-              <span v-if="drugConfig.is_open == 1">{{(getRetailPrice(scope.row.drug_id) * getDrugCount(scope.row.drug_id)).toFixed(2)}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="备注" min-width="20" align="center">
-            <template slot-scope="scope">
-              <el-popover placement="top-start" width="250" trigger="hover">
-                <div>{{scope.row.remark}}</div>
-                <span slot="reference"
-                      v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
-                <span slot="reference" v-else>{{ scope.row.remark}}</span>
-              </el-popover>
-
-            </template>
-          </el-table-column>
-
-          <el-table-column label="" align="center"  >
-            <template slot-scope="scope" v-if="scope.row.is_sys == 1">
-             <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
-
-
-    <el-dialog
-      title="出库明细"
-      :visible.sync="dialogVisibleTwo"
-      width="60%">
-      <span>
-         <div class="app-container">
-
-      <div class="filter-container">
-        <span style="font-size: 18px;color: #606266">商品使用明细</span>
-      </div>
-
-      <div class="cell clearfix">
-        <span style="width: 300px;color: #606266" v-if="userList.length>0">商品类型: {{userList[0].drug.drug_name}} </span>
-        <span style="width: 300px;color: #606266" v-if="userList.length>0">规格名称: {{userList[0].drug.drug_spec}}</span>
-      </div>
-
-      <el-row :gutter="12" style="margin-top: 10px">
-        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
-                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-        >
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>序号</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
-              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <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 == 1"></span>
-            </template>
-          </el-table-column>
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>使用数量</span>
-            </template>
-            <template slot-scope="scope">
-              <span >{{scope.row.count}}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>使用时间</span>
-            </template>
-            <template slot-scope="scope">
-              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </el-row>
-    </div>
-      </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleTwo = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisibleTwo = false">确 定</el-button>
-      </span>
-    </el-dialog>
-
-
-   
     <el-dialog
       title="提示"
       :visible.sync="drugDialogVisible"
@@ -534,7 +377,7 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetWarehouseOut();
     this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+    // this.fetchAllAdminUsers();
   },
   data() {
     return {
@@ -736,7 +579,7 @@ export default {
        this.getInitializtion()
        this.getSinleOrderDetail(val.id)
        this.list = []
-       this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
+      //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
 
     },
     GetOrderDetail(order_id) {
@@ -811,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/drugStockOutOrderAdd.vue

@@ -120,7 +120,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + " " + item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,10 +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;">单据编号：{{it.warehouse_out_order_number}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -27,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?item.drug.drug_spec:''}}</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>{{getUnit(item.drug_id)}}</span>
+                <span>{{item.max_unit}}</span>
               </td>
 
               <td style="line-height: 50px">
                   {{item.count}}
               </td>
               <td style="line-height:50px">
-                  {{item.price}}
+                  {{item.last_price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.price).toFixed(2)}}
+                {{(item.count * item.last_price).toFixed(2)}}
              </td>
              <td>{{getNumber(item.drug_id)}}</td>
              <td>{{getProductDate(item.drug_id)}}</td>
@@ -54,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>
@@ -90,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',
@@ -129,7 +130,11 @@
         keywords:"",
         orgId:'',
         orgName:"",
-        drugOrderList:[]
+        drugOrderList:[],
+        manufactureList:[],
+        tableList:[],
+        loading:false,
+        warehouseList:[]
       }
     },
     methods: {
@@ -303,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/drugStockOutOrderEdit.vue

@@ -98,7 +98,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -544,7 +544,13 @@
                 return;
               }
             }
-
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+               for(let j=0;j<this.manufacturerList.length;j++){
+                 if(this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].manufacturer_name){
+                    this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+                 }
+               }
+            }
             const params = {
               'stockOut': this.recordInfo.recordData
             }
@@ -613,7 +619,8 @@
             this.recordInfo.recordData.push(tempObj)
           }
         })
-      }, calculate: function(val) {
+      },
+       calculate: function(val) {
         if (val == 0) {
           return ''
         }

src/xt_pages/stock/drugs/query.vue

@@ -32,9 +32,9 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-         <el-select v-model="drug_category" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+         <el-select v-model="drug_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
-              v-for="(item,index) in drugCategory"
+              v-for="(item,index) in drugTypeList"
               :key="index"
               :label="item.name"
               :value="item.id">
@@ -113,31 +113,34 @@
         </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)}} -->
+              {{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)}}
+             <!-- {{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)}}
+            <!-- {{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">
+        <el-table-column prop="drug_name" label="操作" align="center" width="200px">
           <template slot-scope="scope">
             <el-button
               size="small"
               type="primary"
-              @click="handleDetail(scope.row.drug_id)"
+              @click="handleDetail(scope.row)"
             >库存流水
             </el-button>
             <el-button
               size="small"
               type="primary"
-              @click="handleBatch(scope.row.drug_id)"
+              @click="handleBatch(scope.row)"
             >批次
             </el-button>
           </template>
@@ -171,13 +174,14 @@
   import { getAllDrugStockQueryList,getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
+import { min } from 'moment'
   export default {
     name: 'stockIn',
     created() {
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
-      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-  
+      var drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      this.drugTypeList.push(...drugTypeList)
       this.getlist()
       this.getDrugCountList()
     },
@@ -212,13 +216,19 @@
         drugCategory:[
           {id:0,name:"全部"}
         ],
-        drugTypeList:[],
+        drugTypeList:[
+          {id:0,name:"全部"}
+        ],
         tableList:[],
         manufacturerList:[],
         countList:[],
         outCountList:[],
         autoCountList:[],
         keyword:"",
+        drug_type:0,
+        minCount:[],
+        drugOutList:[],
+        
       }
     },
     methods: {
@@ -333,12 +343,12 @@
       },
       handleSizeChange(val) {
         this.limit = val
-        // this.GetAllDrugStockQueryList()
+     
         this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        // this.GetAllDrugStockQueryList()
+       
         this.getlist()
       },
       calculate: function(val) {
@@ -352,7 +362,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        // this.GetAllDrugStockQueryList();
+     
         this.getlist()
       }
     },
@@ -412,14 +422,24 @@
         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,
@@ -438,13 +458,12 @@
         return (new Date(time)).getTime() / 1000
       },
       changeDrug(){
-     
-      this.getlist()
+        this.getlist()
       },
       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}
         });
       },
  
@@ -454,11 +473,11 @@
           page: this.page,
           limit: this.limit,
           keyword: this.keywords,
-          drug_category:this.drug_category,
+          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
@@ -493,11 +512,25 @@
         }
         return name
       },
-      handleDetail(id){
-        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+id})
+      handleDetail(val){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+         if(val.manufacturer == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+         }
+        }
+        var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+        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(id){
-        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+id})
+      handleBatch(val){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+         if(val.manufacturer == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+         }
+        }
+        var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+        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 = {
@@ -516,6 +549,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
           }
         })
       },
@@ -546,7 +590,60 @@
           }
         }
         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/stockBatchNumber.vue

@@ -5,9 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{this.$route.query.good_name}}
-       <!-- 库存:
-       厂家: -->
+        耗材名称:{{this.$route.query.good_name}} &nbsp;
+        库存:{{getInCount(this.$route.query.id)}} &nbsp;
+        规格:{{this.$route.query.specification_name}} &nbsp;
+        厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -62,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">
@@ -73,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>
@@ -115,11 +114,13 @@
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
       this.getlist()
-    //   this.getOutList()
+      this.getStockDrugCount()
+      this.packing_unit = this.$route.query.packing_unit
     },
     components: {
       BreadCrumb
@@ -162,7 +163,11 @@
           {id:2,name:"自动出库"},
           {id:3,name:"入库"},
         ],
-      
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keywords:"",
+        packing_unit:""
       }
     },
     methods:{
@@ -227,32 +232,52 @@
          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
            console.log("入库数据",this.tableList)
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
-
-          // var outlist =  response.data.data.outList
-          // console.log("outlist",outlist)
-          // for(let i=0;i<outlist.length;i++){
-          //     outlist[i].stock_way = 2
-          //     this.tableList.push(outlist[i])
-          // }
-          
-           
          }
       })
      },
+    getInCount(id){
+      var count= ""
+      for(let i=0;i<this.countList.length;i++){
+          if(id == this.countList[i].good_id){
+              count = this.countList[i].count
+          }
+        }
+        return count
+     },
      getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
      },
-     
+    getStockDrugCount(){
+        var params ={
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var count = response.data.data.count
+           console.log("详情入库统计",count)
+           this.countList = count
+           var outlist = response.data.data.outList
+           console.log("详情出库数量",outlist)
+          
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           console.log("详情自动出库",autoCount)
+           this.autoCountList = autoCount
+         }
+      })
+    },
 
     }
   }

src/xt_pages/stock/stockFlow.vue

@@ -5,10 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{this.$route.query.good_name}}
-       库存:{{getInCount(this.$route.query.id)}}
-       <!-- 厂家:{{this.$route.query.manufacturer}}
-       规格: -->
+       耗材名称:{{this.$route.query.good_name}} &nbsp;
+       库存:{{getInCount(this.$route.query.id)}} &nbsp;
+       规格:{{this.$route.query.specification_name}} &nbsp;
+       厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -39,15 +39,15 @@
               @change="endTimeChange"
           ></el-date-picker>
 
-        <!-- <span>出入库方式:</span> -->
-        <!-- <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+        <span>出入库方式:</span>
+         <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in stockType"
               :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select> -->
+        </el-select>
         
         
       </div>
@@ -63,13 +63,14 @@
         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4">入库</span>
-             <span v-if="scope.row.stock_way == 2">出库</span>
+             <span v-if="scope.row.stock_way == 4">采购入库</span>
+             <span v-if="scope.row.stock_way == 3">手动出库</span>
+             <span v-if="scope.row.stock_way == 2">自动出库</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 == 2"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3"> {{scope.row.warehouse_out_order_number}}</span>
              <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
             
            </template>
@@ -79,40 +80,40 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="入库数量"  align="center">
+         <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 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">
            <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 v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{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.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
-             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{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 == 2"> {{scope.row.number}}</span>
-             <span v-if="scope.row.stock_way == 4">{{scope.row.number}}</span>
+             <span v-if="scope.row.stock_way == 4 || scope.row.stock_way == 3">{{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"> {{getManufacturer(scope.row.manufacturer)}}</span>
-             <span v-if="scope.row.stock_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -135,7 +136,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
   import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
@@ -143,7 +144,8 @@
      
       this.getlist()
       this.getStockDrugCount()
-
+      this.getStockOutList()
+      this.packing_unit = this.$route.query.packing_unit
     },
     components: {
       BreadCrumb
@@ -182,15 +184,16 @@
         manufacturerList:[],
         stockType:[
           {id:0,name:"全部"},
-          {id:1,name:"手动出库"},
+          {id:3,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:3,name:"入库"},
+          {id:4,name:"采购入库"},
         ],
         countList:[],
         outCountList:[],
         autoCountList:[],
         keywords:"",
         obj:{},
+        packing_unit:""
       }
     },
     methods:{
@@ -199,10 +202,12 @@
        handleSizeChange(val) {
         this.limit = val
         this.getlist()
+        this.getStockOutList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
+        this.getStockOutList()
       },
         
     startTimeChange: function(val) {
@@ -213,6 +218,7 @@
         this.start_time = "";
       } else {
         this.getlist()
+        this.getStockOutList()
       }
     },
     endTimeChange: function(val) {
@@ -222,6 +228,7 @@
         this.end_time = "";
       } else {
        this.getlist()
+       this.getStockOutList()
       }
      },
      getManufacturer(id){
@@ -250,7 +257,8 @@
           page:this.page,
           id:this.$route.query.id,
           start_time:this.start_time,
-          end_time:this.end_time, 
+          end_time:this.end_time,
+          is_sys:this.stockType 
         } 
       getStockInList(params).then(response=>{
          if(response.data.state == 1){
@@ -267,6 +275,33 @@
          }
       })
      },
+    getStockOutList(){
+       var params= {
+          limit:this.limit,
+          page:this.page,
+          id:this.$route.query.id,
+          start_time:this.start_time,
+          end_time:this.end_time, 
+          is_sys:this.stock_type 
+        } 
+      getStockOutList(params).then(response=>{
+        if(response.data.state == 1){
+          var outList = response.data.data.outList
+          console.log("outList990-0000990",outList)
+           for(let i=0;i<outList.length;i++){
+             if(outList[i].is_sys == 0){
+                outList[i].stock_way = 3
+             }
+             if(outList[i].is_sys == 1){
+                outList[i].stock_way = 2
+             }
+             this.tableList.push(outList[i])
+           }
+          var total = response.data.data.total
+          this.total = total
+        }  
+      })
+    },
     getStockDrugCount(){
         var params ={
           keywords: this.keywords,
@@ -280,6 +315,7 @@
            this.countList = count
            var outlist = response.data.data.outList
            console.log("详情出库数量",outlist)
+          
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
            console.log("详情自动出库",autoCount)
@@ -319,6 +355,17 @@
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
      },
+     changeDrug(val){
+       this.tableList= []
+       if(val == 4 || val == 0){
+        this.getlist()
+       }
+       if(val == 2 || val == 3 || val == 0){
+        this.getStockOutList()
+       }
+      
+      
+     }
     }
   }
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -21,7 +21,7 @@
           style="width: 400px;"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/厂商"
+          placeholder="单据编码/制单人/耗材名称"
         />
         <el-button
           size="small"
@@ -67,23 +67,25 @@
       <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>
 
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+
+        <el-button size="small" type="primary" @click="toExport">导出</el-button>
       </div>
 
       <el-table
+        ref="multipleTable"
         :data="Warehouse.warehouseDate"
         :class="signAndWeighBoxPatients"
         style="width: 100%"
         border
         highlight-current-row
         v-loading="Warehouse.loading"
-        ref="multipleTable"
         @selection-change="select"
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -115,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"
@@ -181,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">
@@ -231,12 +219,12 @@
         </el-table-column>
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.product_date)}}
+            {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
           </template>
         </el-table-column>
         <el-table-column label="有效期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date)}}
+            {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
@@ -628,7 +616,8 @@ import {
   getWarehouseList,
   DeleteWarehouseInfoItem,
   GetAllGoodInfoByID,
-  EditWarehouse
+  EditWarehouse,
+  getExportStockList
 } from "@/api/stock";
 
 import { GetAllDrugInfoByID,postDrugWarehouse} from "@/api/drug/drug_stock";
@@ -638,7 +627,6 @@ export default {
   name: "stockIn",
   components: { BreadCrumb, stockInDialog },
   created() {
-
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -665,6 +653,8 @@ export default {
     this.fetchAllAdminUsers();
     this.GetAllGoodType()
     this.GetAllGoodInfo()
+
+    
   },
   data() {
 
@@ -752,20 +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:[],
+      checkAllStatus:false,
     };
     
   
   },
   methods: {
+     changeCheck() {
+      this.$refs.multipleTable.clearSelection();
+      if (this.checkAllStatus) {
+        this.$refs.multipleTable.toggleAllSelection();
+      }
+    },
     search: function() {
       const Params = {
         page: this.page,
@@ -983,6 +981,7 @@ export default {
       } else {
         this.startTime = this.getTimestamp(val);
         this.GetWarehouse();
+        this.getlist()
       }
     },
     endTimeChange(val) {
@@ -992,6 +991,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetWarehouse();
+        this.getlist()
       }
     },
     getTimestamp(time) {
@@ -1016,9 +1016,9 @@ export default {
         } else {
           this.manufacturer = response.data.data.manufacturer;
           this.dealer = response.data.data.dealer;
-          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
-         
+          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          this.getlist()
         }
       });
     },
@@ -1081,18 +1081,17 @@ export default {
         })
         .catch(() => {});
     },
-    changeAllSelected: function(val) {
-      if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
-      } else {
-        this.$refs.multipleTable.clearSelection();
-      }
-    },
+   
     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) {
@@ -1164,8 +1163,6 @@ export default {
           this.tableShow = true
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
-            // response.data.data.info[i].product_date = this.getTime(response.data.data.info[i].product_date,"{y}-{m}-{d}");
-            // response.data.data.info[i].expiry_date = this.getTime(response.data.data.info[i].expiry_date,"{y}-{m}-{d}");
             response.data.data.info[i].price = response.data.data.info[i].price.toString();
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
 
@@ -1439,12 +1436,72 @@ 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)
       }
-    }
+    },
+    getlist(){
+      var params = {
+        id:this.order_id,
+        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
+           console.log("l类型",this.manufacturer)
+           for(let i=0;i<this.goodType.length;i++){
+             for(let j=0;j<list.length;j++){
+               if(this.goodType[i].id == list[j].good_type_id){
+                 list[j].good_type_name = this.goodType[i].type_name
+               }
+             }
+           }
+          for(let i=0;i<list.length;i++){
+            list[i].unit = list[i].specification_name + list[i].packing_unit
+            list[i].total_price = (list[i].total_count * list[i].price).toFixed(2)
+            list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}")
+            list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}")
+            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
+               }
+            }
+          }
+         
+          this.exportList = list
+        }
+      })
+    },
+    toExport(){
+       console.log("列表22222222222",this.exportList)
+      import('@/vendor/Export2Excel').then(excel => {
+
+      const tHeader = ['耗材类型', '耗材名称', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','备注']
+      const filterVal = ['good_type_name', 'good_name', 'unit','number','total_count','price','total_price','manufacturer','product_date','expiry_date','dealer','remark']
+
+      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/stockInOrderAdd.vue

@@ -76,7 +76,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name +"  " +item.specification_name }}</div>
+                    <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
                   </template>
                  </el-autocomplete>
             </template>
@@ -752,7 +752,7 @@
               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.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/stockInOrderDetailPrint.vue

@@ -10,14 +10,20 @@
         </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="text-align:right;margin-bottom:1px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="display:flex;justify-content: space-between;">
+                      <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
+                        单据编号：{{it.warehousing_order}}
+                      </div>
+                      <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
+                        打印时间：{{time_now}}
+                      </div>
                     </div>
+                    
                     <div class="table_panel">
                         <table class="table">
                             <thead>
@@ -38,12 +44,12 @@
                                 </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>
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
-                                    <td style="line-height:18px;"><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                    <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
                                     <td style="line-height:18px;">{{item.price}}</td>
                                     <td style="line-height:18px;">{{item.warehousing_count}}</td> 
                                     <td style="line-height:18px;">{{(item.warehousing_count*item.price).toFixed(2)}}</td>
@@ -65,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>
@@ -125,7 +131,8 @@ export default {
             list:[],
             orgName:'',
             orgId:'',
-            adminUserOptions:[]
+            adminUserOptions:[],
+            warehousingInfo:[]
         }
     },
     methods:{
@@ -178,6 +185,7 @@ export default {
         },
        
      GetOrderDetail: function(order_id) {
+
         const params = {
             id: order_id
         };
@@ -186,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)
             }
         });
        },
@@ -331,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/stockInOrderEdit.vue

@@ -117,7 +117,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name +" " + item.specification_name}}</div>
+                    <div class="name">{{ item.good_name +" " + item.specification_name + "  "+ item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
             </template>
@@ -405,7 +405,8 @@ export default {
       manufacturer: [],
       dealerList: [],
       goodType: [],
-      manufacturerList:[]
+      manufacturerList:[],
+      numberList:[]
     };
   },
   methods: {
@@ -509,6 +510,7 @@ export default {
       tempObj["remark"] = "";
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
+      tempObj["number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -632,9 +634,17 @@ export default {
               return;
             }
           }
+          console.log("昌吉",this.manufacturerList)
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+
+          for(let j=0;j<this.manufacturerList.length;j++){
+              if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+                 }
+              }
           }
+         
           const params = {
             stockIn: this.recordInfo.recordData
           };
@@ -685,7 +695,7 @@ export default {
             response.data.data.info[i].price = response.data.data.info[i].price.toString();
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
             response.data.data.info[i].good_name = response.data.data.info[i].GoodInfo.good_name
-            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.packing_unit
+            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "/"+response.data.data.info[i].GoodInfo.packing_unit
             response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
             
            
@@ -731,16 +741,16 @@ export default {
           
             var list = response.data.data.list
             this.goodList = list
-            // var manufacturerList = response.data.data.manufacturerList
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
             // this.dealerList = response.data.data.dealerList
-            // this.manufacturerList = manufacturerList
-            // for(let i=0;i<this.goodList.length;i++){
-            //     for(let j=0;j<this.manufacturerList.length;j++){
-            //       if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-            //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-            //       }
-            //     }
-            // }
+            for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == manufacturerList[j].id){
+                    this.goodList[i].manufacturer = manufacturerList[j].manufacturer_name
+                  }
+                }
+            }
             // for(let i=0;i<this.goodList.length;i++){
             //    for(let j=0;j<this.dealerList.length;j++){
             //       if(this.goodList[i].dealer == this.dealerList[j].id){
@@ -774,7 +784,18 @@ export default {
             this.recordInfo.recordData[i].packing_unit = val.packing_unit
             this.recordInfo.recordData[i].dealer = val.dealer
           }
+         
+         if(val.xt_warehouse_info.length > 0){
+           
+          for(let j=0;j<val.xt_warehouse_info.length;j++){
+              this.numberList.push(val.xt_warehouse_info[j])
+            }
+            this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
+          }else{
+            this.recordInfo.recordData[i].number = ""
+          }
         }
+     
     }
   },
   created() {

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="{
@@ -201,11 +187,11 @@
               {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="批号" align="center">
+          <el-table-column label="批号" align="center">
             <template slot-scope="scope">
               {{ scope.row.number}}
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
@@ -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

@@ -123,7 +123,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name }}</div>
+                    <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -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>
@@ -150,7 +150,7 @@
           
           <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格&&单位<span style="color: red">*</span></span>
+              <span>规格&单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
@@ -159,14 +159,22 @@
             </template>
           </el-table-column>
           
-          <!-- <el-table-column  width="150" align="center">
+          <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
               <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
-               <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
+               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
+                <el-select v-model="scope.row.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
             </template>
-          </el-table-column> -->
+          </el-table-column>
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -227,7 +235,7 @@
             </template>   
           </el-table-column>
 
-         <!-- <el-table-column label="生产日期"  width="150" align="center">
+         <el-table-column label="生产日期"  width="150" align="center">
            <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -253,7 +261,22 @@
                 value-format="yyyy-MM-dd"
               ></el-date-picker>
             </template>
-          </el-table-column> -->
+          </el-table-column>
+         
+
+          <el-table-column label="经销商"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>   
+          </el-table-column>
+
 
 
           <el-table-column label="备注"  width="150" align="center">
@@ -262,7 +285,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="150">
+          <el-table-column label="操作" align="center" min-width="150" fixed="right">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -359,7 +382,8 @@ export default {
       goodType: [],
       goodInfo:[],
       goodList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      numberList:[],
     };
   },
   methods: {
@@ -463,6 +487,7 @@ export default {
       tempObj["good_unit"] = "";
       tempObj["number"] = ""
       tempObj["specification_name"] = ""
+      tempObj["number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -590,7 +615,7 @@ export default {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-        
+         
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -628,6 +653,7 @@ export default {
         if (response.data.state == 1) {
           
             var list = response.data.data.list
+            console.log("33334445555",list)
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -655,7 +681,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].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].price = val.buy_price
@@ -663,6 +689,15 @@ export default {
             this.recordInfo.recordData[i].good_id = val.id
          }
       }
+
+       if(val.xt_warehouse_info.length > 0){
+           var obj = {id:"",name:""}
+          for(let j=0;j<val.xt_warehouse_info.length;j++){
+            this.numberList.push(val.xt_warehouse_info[j])
+          }
+          
+        }
+        console.log("9999999",this.numberList)
     }
   },
   created() {
@@ -685,6 +720,7 @@ export default {
     tempObj["good_unit"] = ""
     tempObj["number"] = ""
     tempObj["specification_name"] = ""
+    tempObj["number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -10,13 +10,18 @@
         </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="text-align:right;margin-bottom:1px;font-size: 18px;">
-                      打印日期：{{time_now}}
+                    <div style="display:flex;justify-content: space-between;">
+                      <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
+                        单据编号: {{it.warehouse_out_order_number}}
+                      </div>
+                      <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
+                        打印日期：{{time_now}}
+                      </div>
                     </div>
                     <div class="table_panel">
                         <table class="table">
@@ -25,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>
@@ -34,16 +39,16 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in warehousingOutInfo.warehousingOutData' :key="index">
-                                    <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
-                                    <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                <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>
                                     <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td>
                                     <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>
@@ -77,7 +82,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList } from "@/api/stock";
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList,getOrderDetailByOrderId } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
@@ -90,7 +95,7 @@ export default {
           crumbs: [
             { path: false, name: '库存管理' },
             { path: false, name: '耗材管理' },
-            { path: false, name: '入库单打印' },
+            { path: false, name: '出库单打印' },
           ],
            isEdit: 0,
             checked: false,
@@ -118,7 +123,9 @@ export default {
             wareoutList:[],
             orgId:'',
             orgName:'',
-            orderInList:[]
+            orderInList:[],
+            tableList:[],
+            orderList:[]
         }
     },
     methods:{
@@ -146,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
@@ -241,10 +218,13 @@ export default {
             return false
           } else {
             this.list = [];
+        
             for (let i = 0; i < response.data.data.list.length; i++) {
+
+              
               this.list.push(response.data.data.list[i])
             }
-            console.log("list22222",this.list)
+          
           }
         })
       },
@@ -268,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(){
@@ -324,7 +304,36 @@ export default {
           return uParseTime(val, '{y}-{m}-{d}')
          }
       },
-
+     
+      GetOrderDetailOne(id){
+        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.allPrice =  total_price
+           }
+        })
+     },
 
     },
     created(){
@@ -333,11 +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/stockOutOrderEdit.vue

@@ -76,14 +76,14 @@
                       v-model="scope.row.good_name"
                       :fetch-suggestions="querySearchAsync"
                       :trigger-on-focus="false"
-                      placeholder="请输入病人名字"
+                      placeholder="请输入耗材名称"
                       @select="handleSelect"
                       @input="changeGoodName(scope.$index)"
                       style="width:150px;"
                     >
                       <i class="el-icon-search el-input__icon" slot="suffix"></i>
                     <template slot-scope="{ item }">
-                      <div class="name">{{ item.good_name }}</div>
+                      <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
                     </template>
                   </el-autocomplete>
                 </el-form-item>
@@ -108,7 +108,7 @@
              
           <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格&&单位<span style="color: red">*</span></span>
+              <span>规格&单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
@@ -116,22 +116,25 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column min-width="35" align="center">
+
+          <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
-
-              <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
-                          :value="specificationName(scope.row.good_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              <el-form-item style="padding-top: 20px">
+               <el-select v-model="scope.row.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
               </el-form-item>
-
             </template>
-          </el-table-column> -->
-
-
+          </el-table-column>
+         
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
@@ -181,7 +184,7 @@
               <el-input v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="操作" align="center" min-width="30"  fixed="right">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -215,7 +218,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -282,6 +285,7 @@
         dealer: [],
         goodType: [],
         goodInfo:[],
+        numberList:[],
       }
     },
     methods: {
@@ -340,8 +344,6 @@
             this.dealer = response.data.data.dealer;
             this.goodType = response.data.data.goodType;
             this.goodInfo = response.data.data.goodInfo;
-            // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-            // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
           loading.close();
         });
@@ -370,6 +372,7 @@
         tempObj['count'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
+        tempObj['number'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -486,13 +489,23 @@
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+              for(let j=0;j<this.manufacturerList.length;j++){
+                if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+                }
+              }
             }
             const params = {
               'stockOut': this.recordInfo.recordData
             }
            
+            for(let i=0;i<this.goodList.length;i++){
+             
+            }
+
+           
             console.log("stockout",params)
-            
+          
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -564,15 +577,15 @@
           
             var list = response.data.data.list
             this.goodList = list
-            // var manufacturerList = response.data.data.manufacturerList
-            // this.manufacturerList = manufacturerList
-            // for(let i=0;i<this.goodList.length;i++){
-            //   for(let j=0;j<this.manufacturerList.length;j++){
-            //     if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-            //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-            //     }
-            //   }
-            // }
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            for(let i=0;i<this.goodList.length;i++){
+              for(let j=0;j<this.manufacturerList.length;j++){
+                if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                }
+              }
+            }
           
             cb(this.goodList)
         } else {
@@ -584,29 +597,73 @@
       this.currentIndex = val
     },
     handleSelect(val){
-      console.log("val",val)
+       console.log("val22222",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             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].number =  val.number
+            this.recordInfo.recordData[i].name = val.specification_name  +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
-
          }
       }
+      console.log("hhhhh232323232",val.xt_warehouse_info)
+      if(val.xt_warehouse_info.length > 0){
+         console.log("hhhhhhhhhh")
+          for(let j=0;j<val.xt_warehouse_info.length;j++){
+            this.numberList.push(val.xt_warehouse_info[j])
+          }
+         this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
+      }else{
+        this.recordInfo.recordData[i].number = ""
+      }
+    },
+     getSingleOutOrderDetail(order_id){
+       const params = {
+          'id': order_id
+        }
+      getSingleOutOrderDetail(params).then(response=>{
+        if(response.data.state == 1){
+          console.log("详情",response.data.data.list)
+          var dealerList = response.data.data.dealerList
+          this.dealerList = dealerList
+          var manufacturerList = response.data.data.manufacturerList
+          console.log("hhhhhhhhh",manufacturerList)
+          this.manufacturerList = manufacturerList
+          this.goodType = response.data.data.goodType
+          for (let i = 0; i < response.data.data.list.length; i++) {
+           
+            response.data.data.list[i].price = response.data.data.list[i].price.toString()
+            response.data.data.list[i].count = response.data.data.list[i].count.toString()
+            response.data.data.list[i].good_name = response.data.data.list[i].good_name
+            response.data.data.list[i].name = response.data.data.list[i].specification_name + "/" + response.data.data.list[i].packing_unit
+            response.data.data.list[i].good_type_id = response.data.data.list[i].good_type_id
+            this.numberList.push(response.data.data.list[i])
+            this.recordInfo.recordData.push(response.data.data.list[i])
+          }
+         
+        }
+      })
     }
     },
     created() {
-      this.GetConfigInfo()
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.warehouse_out_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.propForm.goodUnit = this.$store.getters.good_unit
-      const order_id = this.$route.query.id
-      this.GetOrderDetail(order_id)
+      const order_id = this.$route.query.id  
+      this.getSingleOutOrderDetail(order_id)
     }
 
   }

src/xt_pages/stock/stockPrint.vue

@@ -21,34 +21,26 @@
                         <table class="table">
                             <thead>
                                 <tr>
-                                    <td width="60">商品编码</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>
                                     <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>
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
-                                    <td>{{item.good_code}}</td>
-                                    <td>{{item.good_name}}</td>
-                                    <td>{{item.type.type_name}}</td>
-                                    <td>{{item.specification_name}}</td>
-                                    <td>{{stockInCount(item)}}</td>
-                                    <td>{{item.price}}</td>
-                                    <td>{{salesReturnCount(item)}}</td>
-                                    <td> {{ stockInCount(item) - salesReturnCount(item) }}</td>
-                                    <td>{{ stockOutCount(item) }}</td>
-                                    <td>{{cancelStockCount(item) }}</td>
-                                    <td>{{ stockOutCount(item) - cancelStockCount(item)}}</td>
-                                    <td>{{stockInCount(item) -salesReturnCount(item) -stockOutCount(item) +cancelStockCount(item)}}</td>
+                                <tr v-for='(item,index) in tableList' :key="index">
+                                   <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>{{getManufacture(item.manufacturer)}}</td>
+                                   <td>{{getInCount(item.good_id)}}</td>
+                                   <td><span>{{getOutCount(item.good_id) + getAutoCount(item.good_id)}}</span></td> 
+                                   <td>{{getInCount(item.good_id)- getOutCount(item.good_id) - getAutoCount(item.good_id)}}</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -61,7 +53,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getAllStockQueryList } from "@/api/stock";
+import { getAllStockList,GetAllGoodType,getStockDrugCount } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment')
 export default {
@@ -72,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:"",
@@ -87,8 +79,14 @@ export default {
           page:"",
           WarehouseInfo: {
           loading: false,
-          warehouseInfoDate: []
+          warehouseInfoDate: [],
          },
+          tableList:[],
+          goodType:[],
+          manufacturerList:[],
+          countList:[],
+          outCountList:[],
+          autoCountList:[],
         }
     },
     methods:{
@@ -103,39 +101,40 @@ export default {
           })
       },
       getlist(){
-         const Params = {
-            page: this.page,
-            limit: this.limit,
-            keyword: this.keywords,
-            start_time:this.start_time,
-            end_time:this.end_time,
-            type_name:this.type_name,
-        };
-         this.WarehouseInfo.loading = true;
-         this.WarehouseInfo.warehouseInfoDate = [];
-         getAllStockQueryList(Params).then(response => {
-           if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false;
+        const params = {
+          page: this.page,
+          limit: this.limit,
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+          type:this.type_name,
+        }
+        getAllStockList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list22222",list)
+           this.tableList = list
+           var total = response.data.data.total
+           console.log("total",total)
+           this.total = total
+           var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = manufacturerList
+         }
+       })
+      },
+      GetAllGoodType() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.WarehouseInfo.loading = false;
-            this.total = response.data.data.total;
-          for (let i = 0; i < response.data.data.list.length; i++) {
-            this.WarehouseInfo.warehouseInfoDate.push( response.data.data.list[i]);
-          }
-          for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
-            if(this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info.length>0){
-              this.WarehouseInfo.warehouseInfoDate[i].price = this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price
-            }else{
-              this.WarehouseInfo.warehouseInfoDate[i].price = ""
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              this.goodType.push(response.data.data.goodType[i]);
             }
           }
-         }
-            console.log("打印数据源头",this.WarehouseInfo.warehouseInfoDate)
-          });
+        });
       },
-       stockInCount: function(row) {
+      stockInCount: function(row) {
       let total = 0;
       for (let i = 0; i < row.query_warehousing_info.length; i++) {
         total = total + row.query_warehousing_info[i].warehousing_count;
@@ -163,6 +162,71 @@ export default {
       }
       return total;
     },
+    getGoodType(id){
+      var name = ""
+      for(let i=0;i<this.goodType.length;i++){
+        if(id == this.goodType[i].id){
+           name = this.goodType[i].type_name
+        }
+      }
+      return name
+     },
+    getManufacture(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
+     },
+     getStockDrugCount(){
+        var params ={
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var count = response.data.data.count
+           console.log("入库统计",count)
+           this.countList = count
+           var outlist = response.data.data.outList
+           console.log("出库数量",outlist)
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           console.log("autoCount",autoCount)
+           this.autoCountList = autoCount
+         }
+      })
+    },
+      getInCount(id){
+        var count= ""
+      for(let i=0;i<this.countList.length;i++){
+        if(id == this.countList[i].good_id){
+            count = this.countList[i].count
+        }
+      }
+      return count
+      },
+      getOutCount(id){
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+          if(id == this.outCountList[i].good_id){
+            count = this.outCountList[i].count
+          }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].good_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
+      }
     },
     created(){
       var starttime =  this.$route.query.start_time
@@ -176,6 +240,8 @@ export default {
       this.page = this.$route.query.page
       this.limit = this.$route.query.limit
       this.getlist()
+      this.GetAllGoodType()
+      this.getStockDrugCount()
     }
 }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -88,7 +88,7 @@
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.specification_name }}*{{scope.row.min_number}}{{scope.row.min_unit}}</span>
+              <span>{{ scope.row.specification_name }} / {{scope.row.packing_unit}}</span>
             </template>
          </el-table-column>
         <el-table-column label="进货单价" align="center">
@@ -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">
@@ -165,7 +165,6 @@ import {
 export default {
   name: "stockIn",
   created() {
-    // this.GetAllStockQuery();
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
@@ -372,13 +371,22 @@ export default {
     },
 
     exportList(){
-
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','进货价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus']
-         const data = this.formatJson(filterVal, this.WarehouseInfo.warehouseInfoDate)
-         console.log("data",data)
 
+         const tHeader = ['耗材类型', '耗材名称', '规格&单位','规格型号','进货单价','生产商','入库数量','出库数量','库存剩余量']
+         const filterVal = ['type_name', 'good_name', 'unit','specification_name','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.getOutCount(this.tableList[i].good_id) + this.getAutoCount(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)
+         }
+         console.log("table",this.tableList)
+         const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -391,7 +399,7 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
       changeTypeName(){
-       this.GetAllStockQuery()
+       this.getlist()
       },
       toPrint(){
         this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name+"&page="+this.page+"&limit="+this.limit)
@@ -429,7 +437,7 @@ export default {
         keywords: this.keywords,
         start_time:this.start_time,
         end_time:this.end_time,
-        type_name:this.type_name,
+        type:this.type_name,
       };
      console.log("params",params)
       getAllStockList(params).then(response=>{
@@ -456,16 +464,25 @@ export default {
     },
     toClick(val){
        var manufacturer_name = ""
+       var specification_name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
           if(val.manufacturer == this.manufacturerList[i].id){
             manufacturer_name = this.manufacturerList[i].manufacturer_name  
           }
        }
-      console.log("厂家22222",manufacturer_name)
-      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name})
+      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})
     },
     toClickOne(val){
-      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
+       var manufacturer_name = ""
+       var specification_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+          }
+       }
+      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})
     },
     getStockDrugCount(){
         var params ={

src/xt_pages/user/inspection.vue

@@ -202,6 +202,7 @@
                   v-model="item.value"
                   style="width:95%"
                   type="number"
+                  @input='changeInput(item)'
                 >
                   <template slot="append">{{ item.unit }}</template>
                 </el-input>
@@ -299,6 +300,24 @@ export default {
     }
   },
   methods: {
+    changeInput(item){
+      
+      if(item.item_name == '血清铁蛋白' || item.item_name == '总铁结合力'){
+        let index1 = ''
+        let index2 = ''
+        this.form.formItem.map((it,index) => {
+          if(this.form.formItem[index].item_name == '血清铁蛋白'){
+            index1 = index
+          }
+          if(this.form.formItem[index].item_name == '总铁结合力'){
+            index2 = index
+          }
+          if(it.item_name == '转铁蛋白饱和度(计算)'){
+            it.value = (parseFloat(this.form.formItem[index1].value) / parseFloat(this.form.formItem[index2].value)) * 100
+          }
+        })
+      }
+    },
     deleteInspection() {
       if (this.project == null || this.itemDate == '') {
         this.$message.error('请先选择删除删除的记录')
@@ -411,7 +430,7 @@ export default {
           unit: this.project.inspection_reference[index].unit
         })
       }
-
+      console.log('form.formItem',this.form.formItem)
       this.dialogFormVisible = true
     },
     submitEdit(formName) {