导出

src/router/index_路由未分离前.js

@@ -886,7 +886,8 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/index'),
         name: 'config',
         meta: { title: 'config' }
-      }
+      },
+     
     ]
   },
   {

src/router/modules/selfPreparedMedicine.js

@@ -61,6 +61,32 @@ export default {
        hidden:true,
        is_menu:false,
        meta:{title:'selfStockPrint',noCache:true}
-     }
+     },
+
+     {
+      path: '/stock/stockprint',
+      component: () => import('@/xt_pages/stock/stockPrint'),
+      name: 'stockqueryprint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockprint', noCache: true }
+     },
+
+     {
+      path: '/stock/in/detail/print',
+      component: () => import('@/xt_pages/stock/stockInOrderDetailPrint'),
+      name: 'stockInDetailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInDetailPrint',noCache: true }
+    },
+    {
+      path: '/stock/out/detail',
+      component: () => import('@/xt_pages/stock/stockOutOrderDetailPrint'),
+      name: 'stockOutDetailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutDetailPrint',noCache: true }
+    },
   ]
 }

src/router/modules/stock.js

@@ -233,6 +233,41 @@ export default {
         title: '出库打印',
         noCache: true
       }
-    }
+    },
+
+    {
+      path: '/stock/drugStockInOrderDetailPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugInOrderDetailPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/stock/drugStockOutOrderDetailPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugOutOrderDetailPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/stock/drugQueryPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugQueryPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugQueryPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
   ]
 }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -728,7 +728,7 @@
                     <td width='50'>
                         <div class="under-line">
                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('肝素')>-1">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^\d.]/g,"") : '' }}
                             </span>
                         </div>
                     </td>
@@ -741,7 +741,7 @@
                     <td width='50'>
                         <div class="under-line">
                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('+NS')>-1">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^\d.]/g,"") : '' }}
                             </span>
                         </div>
                     </td>
@@ -1547,6 +1547,27 @@ export default {
         if(arr[i] == "肝素10ml"){
           strname = "肝素10ml"
         }
+        if(arr[i] == "肝素1.1ml"){
+          strname = "肝素1.1ml"
+        }
+        if(arr[i] == "肝素1.2ml"){
+          strname = "肝素1.2ml"
+        }
+       if(arr[i] == "肝素1.3ml"){
+          strname = "肝素1.3ml"
+        }
+        if(arr[i] == "肝素1.4ml"){
+          strname = "肝素1.4ml"
+        }
+       if(arr[i] == "肝素1.5ml"){
+          strname = "肝素1.5ml"
+        }
+       if(arr[i] == "肝素1.6ml"){
+          strname = "肝素1.6ml"
+        }
+       if(arr[i] == "肝素1.7ml"){
+          strname = "肝素1.7ml"
+        }
       }
       return strname
     },
@@ -1564,6 +1585,27 @@ export default {
         if(arr[i] == "+NS10ml"){
           strname = "+NS10ml"
         }
+        if(arr[i] == "+NS1.1ml"){
+          strname = "+NS1.1ml"
+        }
+        if(arr[i] == "+NS1.2ml"){
+          strname = "+NS1.2ml"
+        }
+       if(arr[i] == "+NS1.3ml"){
+          strname = "+NS1.3ml"
+        }
+       if(arr[i] == "+NS1.4ml"){
+          strname = "+NS1.4ml"
+        }
+       if(arr[i] == "+NS1.5ml"){
+          strname = "+NS1.5ml"
+        }
+       if(arr[i] == "+NS1.6ml"){
+          strname = "+NS1.6ml"
+        }
+      if(arr[i] == "+NS1.7ml"){
+          strname = "+NS1.7ml"
+        }
       }
       return strname
     },

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -8,14 +8,14 @@
       type="primary"
       >打印
     </el-button>
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -575,7 +575,7 @@ export default {
         excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '耗材出库明细'
+           filename: '耗材退库明细'
          })
           this.downloadLoading = false
         })

src/xt_pages/stock/detail/print.vue

@@ -171,6 +171,7 @@
             var stockTotal = response.data.data.stockTotal
             console.log("stocktOTl",stockTotal)
             this.stockTotal = stockTotal
+            console.log("导出数据",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (this.type == 1) {
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -9,14 +9,14 @@
       >打印
     </el-button>
 
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -576,7 +576,7 @@ export default {
         excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '耗材出库明细'
+           filename: '耗材退货明细'
          })
           this.downloadLoading = false
         })

src/xt_pages/stock/detail/stockInDetail.vue

@@ -9,14 +9,14 @@
       >打印
     </el-button>
 
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
 
     <div class="cell clearfix">
       <el-input
@@ -201,7 +201,8 @@ import {
   deleteCancelStock,
   GetAllConfig,
   getStockDetail,
-  getPrintStockGood
+  getPrintStockGood,
+  
 } from "@/api/stock";
 
 export default {
@@ -232,6 +233,8 @@ export default {
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
+
+    this.getPrintStockGood()
   },
   data() {
     return {
@@ -264,21 +267,25 @@ export default {
       selectedTableData: [],
       dealer: [],
       tableList:[],
-      goodUnit:[]
+      goodUnit:[],
+      stockTotal:[]
     };
   },
   methods: {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     changeDealer: function(val) {
       this.dealer_id = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -388,7 +395,7 @@ export default {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            this.tableList.push(obj)
+            // this.tableList.push(obj)
           }
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -444,10 +451,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -456,6 +465,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     endTimeChange(val) {
@@ -465,6 +475,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -625,57 +636,115 @@ export default {
         }
       });
     },
-    exportList(){
+   getPrintStockGood(){
+     const params = {
+       start_time:this.start_time,
+       end_time:this.end_time,
+       type:1,
+     }
+   
+     getPrintStockGood(params).then(response=>{
+        if(response.data.state == 1){
+          var stockTotal =  response.data.data.stockTotal
+        
+          this.stockTotal = stockTotal
+          var list =  response.data.data.list
+         
+          for(let i=0;i<list.length;i++){
+            if (list[i].query_warehousing_info.length > 0) {
+               this.tableList.push(list[i])
+             }
+          }
+         
        
-     let dataInfo = {}
-     this.tableList.forEach((item, index) => {
-     let { good_id } = item
-     if (!dataInfo[good_id]) {
-        dataInfo[good_id] = {
-        child: [],
-        good_id: item.good_id,
-        count:0,
-        total:0,
-        price:0.0,
-        remark:""
-      }
-      }
+       
+        }
      })
-     let list = Object.values(dataInfo)
-    
-     list.map(item=>{
-     for(let i=0;i<this.tableList.length;i++){
-       if(item.good_id == this.tableList[i].good_id){
-           item.child.push(this.tableList[i])
-         }
+   },
+
+    calCount(stock) {
+        let total = 0
+        var array = []
+        array = stock.query_warehousing_info
+        for (let i = 0; i < array.length; i++) {
+         total = total + array[i].warehousing_count
         }
-      })
+        return total
+      },
 
-     for(let k=0;k<list.length;k++){
-       for(let z=0;z<list[k].child.length;z++){
-          if(list[k].good_id == list[k].child[z].good_id){
-             list[k].count += list[k].child[z].warehousing_count
-             list[k].price = list[k].child[0].price
-             list[k].remark = list[k].child[0].remark
+     calTotal(stock) {
+       var array = []
+       array = stock.query_warehousing_info
+        let total_price = 0.0
+        for (let i = 0; i < array.length; i++) {
+         total_price = total_price + array[i].warehousing_count * array[i].price  
+        }
+        return  Math.floor(total_price * 100) / 100
+      }, 
+      calTotalPrice() {
+        var amountPrice = 0
+        for (let i = 0; i < this.tableList.length; i++) {
+          var obj = this.tableList[i]
+          var len = 0
+          len = obj.query_warehousing_info.length
+          let total_price = 0.0
+          for (let a = 0; a < len; a++) {
+           total_price = total_price + obj.query_warehousing_info[a].total_price   
           }
+
+          amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
+        }
+        return Math.floor(amountPrice* 100) / 100
+      }, 
+      getStockCount(id){
+        
+        var count = ""
+        for(let i=0;i<this.stockTotal.length;i++){
+            if(id == this.stockTotal[i].good_id){
+              count = this.stockTotal[i].count
+            }
+        }
+        return count
+      },
+      getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+
+        }
+        try {
+        } catch (e) {
+          m += s2.split('.')[1].length
+        }
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
+      },
+    
+    exportList(){
+       var obj = {index:"合计",total:0}
+       obj.total = this.calTotalPrice()
+      for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+        this.tableList[i].count = this.calCount(this.tableList[i])
+        this.tableList[i].total = this.calTotal(this.tableList[i])
+        this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
+        this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
+
        }
-     }
+       this.tableList.push(obj)
+       console.log("数据222222",this.tableList)
     
-      
-      for(let i=0;i<list.length;i++){
-          list[i].index = i+1
-          list[i].drug_name =  this.typeNameOne(list[i].good_id) 
-          list[i].drug_spec =  this.specificationName(list[i].good_id)
-          list[i].min_unit = this.getUnit(list[i].child[0].GoodInfo.good_unit)
-          list[i].total = list[i].price * list[i].count
-        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+       
+       const data = this.formatJson(filterVal, this.tableList)
        
-       const data = this.formatJson(filterVal, list)
-       console.log("data",data)
-      
         excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -8,14 +8,14 @@
       type="primary"
       >打印
     </el-button>
-     <!-- <el-button
+     <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -195,7 +195,7 @@
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
@@ -225,6 +225,7 @@ export default {
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
+    this.getPrintStockGood()
   },
   data() {
     return {
@@ -256,17 +257,20 @@ export default {
       selectedTableData: [],
       dealer: [],
       goodUnit:[],
-      tableList:[]
+      tableList:[],
+      stockTotal:[]
     };
   },
   methods: {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -328,7 +332,7 @@ export default {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            this.tableList.push(obj)
+            
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -372,7 +376,7 @@ export default {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            this.tableList.push(obj)
+           
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -429,10 +433,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -441,6 +447,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     endTimeChange(val) {
@@ -450,6 +457,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -617,26 +625,115 @@ export default {
         }
       });
     },
+    getPrintStockGood(){
+      const params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        type:3,
+      }
+      console.log("params",params)
+      getPrintStockGood(params).then(response=>{
+          if(response.data.state == 1){
+            var stockTotal =  response.data.data.stockTotal
+            console.log("stockTotal",stockTotal)
+            this.stockTotal = stockTotal
+            var list =  response.data.data.list
+            console.log("导出数据",list)
+            for(let i=0;i<list.length;i++){
+              if (list[i].query_warehouseout_info.length > 0) {
+                this.tableList.push(list[i])
+              }
+            }
+          console.log("表哥",this.tableList)
+          }
+      })
+    },
+     calCount(stock) {
+        let total = 0
+        var array = []
+        array = stock.query_warehousing_info
+        for (let i = 0; i < array.length; i++) {
+         total = total + array[i].warehousing_count
+        }
+        return total
+      },
+
+     calTotal(stock) {
+       var array = []
+       array = stock.query_warehousing_info
+        let total_price = 0.0
+        for (let i = 0; i < array.length; i++) {
+         total_price = total_price + array[i].warehousing_count * array[i].price  
+        }
+        return  Math.floor(total_price * 100) / 100
+      }, 
+      calTotalPrice() {
+        var amountPrice = 0
+        for (let i = 0; i < this.tableList.length; i++) {
+          var obj = this.tableList[i]
+          var len = 0
+          len = obj.query_warehouseout_info.length
+          let total_price = 0.0
+          for (let a = 0; a < len; a++) {
+           total_price = total_price + obj.query_warehouseout_info[a].total_price   
+          }
+
+          amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
+        }
+        return Math.floor(amountPrice* 100) / 100
+      }, 
+      getStockCount(id){
+        
+        var count = ""
+        for(let i=0;i<this.stockTotal.length;i++){
+            if(id == this.stockTotal[i].good_id){
+              count = this.stockTotal[i].count
+            }
+        }
+        return count
+      },
+      getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+
+        }
+        try {
+        } catch (e) {
+          m += s2.split('.')[1].length
+        }
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
+      },
+   
+
      exportList(){
      
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1
-          this.tableList[i].drug_name =  this.typeNameOne(this.tableList[i].good_id) 
-          this.tableList[i].drug_spec =  this.specificationName(this.tableList[i].good_id)
-          this.tableList[i].min_unit = this.getUnit(this.tableList[i].GoodInfo.good_unit)
-          this.tableList[i].total_price = this.getTotal(this.tableList[i].price,this.tableList[i].count)
-         
-        }
+      var obj = {index:"合计",total:0}
+       obj.total = this.calTotalPrice()
+       for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+        this.tableList[i].count = this.getStockCount(this.tableList[i].id)
+        this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].price
+        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].query_warehouseout_info[0].price).toFixed(2)
+        this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
+       }
+       this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
        
 
       
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
-       
+     
         excel.export_json_to_excel({
            header: tHeader,
            data,

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

@@ -366,7 +366,46 @@ export default {
           var drugInOrder = response.data.data.detail
           console.log("drug3434444",drugInOrder)
           this.cancelStockDate = drugInOrder
-          this.tableList = drugInOrder
+           let objInfo = {}
+          drugInOrder.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 warehousing_count:0,
+                 price:item.price,
+                 remark:item.remark,
+                 total_price:0
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list22333333",list)
+         for(let i=0;i<drugInOrder.length;i++){
+            list.map(item=>{
+              if(drugInOrder[i].drug_id == item.drug_id){
+                 item.child.push(drugInOrder[i])
+              }
+            })
+          }
+          console.log("list2334444",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].warehousing_count!=null || list[i].child[j].warehousing_count != "" || list[i].child[j].warehousing_count!=0){
+                list[i].warehousing_count += list[i].child[j].warehousing_count
+                
+              }
+            }
+          }
+          for(let i=0;i<list.length;i++){
+            list[i].total_price = list[i].warehousing_count * list[i].price  
+          }
+          console.log("list666666666",list)
+          this.tableList = list
           var total = response.data.data.total
           this.total = total
         }
@@ -392,9 +431,18 @@ export default {
           this.tableList[i].index = i+1
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','warehousing_count','price','remark']
-       
+       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','warehousing_count','price','total_price','remark']
+       console.log("表格22222222",this.tableList)
+       let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tableList.length;i++){
+         obj.total_price += this.tableList[i].price * this.tableList[i].warehousing_count
+       }
+       for(let j=0;j<this.tableList.length;j++){
+         this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
+       }
+       obj.total_price = obj.total_price.toFixed(2)
+       this.tableList.push(obj)
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
        

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

@@ -388,7 +388,46 @@ export default {
           var order = response.data.data.order
           console.log("出库数据",order)
           this.tableData = order
-          this.tableList = order
+           let objInfo = {}
+          order.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 count:0,
+                 price:item.price,
+                 remark:item.remark,
+                 total_price:0,
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list2334444",list)
+          for(let i=0;i<order.length;i++){
+            list.map(item=>{
+              if(order[i].drug_id == item.drug_id){
+                 item.child.push(order[i])
+              }
+            })
+          }
+          
+          console.log("list22333333",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
+                list[i].count += list[i].child[j].count
+              }
+            }
+          }
+          for(let i=0;i<list.length;i++){
+             list[i].total_price = list[i].count * list[i].price
+          }
+          console.log("list666666666",list)
+          this.tableList = list
           var total = response.data.data.total
           this.total = total
         } 
@@ -414,9 +453,17 @@ export default {
           this.tableList[i].index = i+1
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','remark']
-       
+       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total_price','remark']
+       let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tableList.length;i++){
+         obj.total_price += this.tableList[i].price * this.tableList[i].count
+       }
+       for(let j=0;j<this.tableList.length;j++){
+          this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
+       }
+       obj.total_price = obj.total_price.toFixed(2)
+       this.tableList.push(obj)
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
        

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -22,7 +22,6 @@
               <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="">备 注</td>
             </tr>
@@ -48,10 +47,7 @@
                   {{item.price}}
               </td>
               <td style="line-height:50px">
-                  {{item.price}}
-              </td>
-              <td style="line-height:50px">
-                  {{item.total_price}}
+                  {{(item.count * item.price).toFixed(2)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -63,7 +59,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -171,15 +167,52 @@
       getDrugOutDetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.order
-          console.log("drug3434444",drugInOrder)
-          this.cancelStockDate = drugInOrder
+          console.log("出库数据22",drugInOrder)
+          let objInfo = {}
+          drugInOrder.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 count:0,
+                 price:item.price,
+                 remark:item.remark,
+                 total_price:"",
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list2334444",list)
+          for(let i=0;i<drugInOrder.length;i++){
+            list.map(item=>{
+              if(drugInOrder[i].drug_id == item.drug_id){
+                 item.child.push(drugInOrder[i])
+              }
+            })
+          }
+          
+          console.log("list22333333",list)
+            for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
+                list[i].count += list[i].child[j].count
+              }
+            }
+          }
+          console.log("list666666666",list)
+          this.cancelStockDate = list
+        
         }
       })  
       },
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].total_price
+            total += this.cancelStockDate[i].price * this.cancelStockDate[i].count
          }
          return total
       }

src/xt_pages/stock/drugs/drugPrint.vue

@@ -22,6 +22,7 @@
               <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="">备 注</td>
             </tr>
 
@@ -45,6 +46,9 @@
               <td style="line-height:50px">
                   {{item.price}}
               </td>
+              <td style="line-height:50px">
+                 {{(item.warehousing_count*item.price).toFixed(2)}}
+              </td>
               <td style="line-height: 50px">
                  {{item.remark}}
               </td>
@@ -55,7 +59,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -164,7 +168,42 @@
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
           console.log("drug3434444",drugInOrder)
-          this.cancelStockDate = drugInOrder
+
+          let objInfo = {}
+          drugInOrder.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 warehousing_count:0,
+                 price:item.price,
+                 remark:item.remark,
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list22333333",list)
+         for(let i=0;i<drugInOrder.length;i++){
+            list.map(item=>{
+              if(drugInOrder[i].drug_id == item.drug_id){
+                 item.child.push(drugInOrder[i])
+              }
+            })
+          }
+          console.log("list2334444",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].warehousing_count!=null || list[i].child[j].warehousing_count != "" || list[i].child[j].warehousing_count!=0){
+                list[i].warehousing_count += list[i].child[j].warehousing_count
+              }
+            }
+          }
+          console.log("list666666666",list)
+          this.cancelStockDate = list
           var total = response.data.data.total
           this.total = total
         }
@@ -174,7 +213,7 @@
       getTotal(){
         var total = 0
         for(let i=0;i<this.cancelStockDate.length;i++){
-           total += this.cancelStockDate[i].price
+           total += this.cancelStockDate[i].price*this.cancelStockDate[i].warehousing_count
         }
         return total
       }

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -0,0 +1,419 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-title">药品管理查询表</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <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="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">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span> {{ item.drug_name }}</span>
+              </td>
+              <td style="line-height: 50px">
+                   <span>{{ item.drug_spec }}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{getUnit(item.id)}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  <span>{{ stockInCount(item) }}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span>{{ stockOutCount(item) }}</span>
+              </td>
+              <td> <span>{{ salesReturnCount(item) }}</span ></td>
+              <td> <span>{{ cancelStockCount(item) }}</span></td>
+              <td>
+                <span>{{stockInCount(item) -salesReturnCount(item) -stockOutCount(item) +cancelStockCount(item)}}</span>
+             </td> 
+              <td style="line-height:50px">
+                  {{item.last_price}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  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 { getDictionaryDataConfig } from "@/utils/data";
+  import {getBaseDrugLibList} from '@/api/data'
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10000,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        drugCategory:[],
+        drug_category:"",
+        start_time:"",
+        end_time:"",
+        list:[],
+        is_use:"",
+        is_charge:"",
+        is_inject:"",
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(this.list[i].id == id){
+            name = this.list[i].min_unit
+          }
+        }
+        return name
+      },
+   
+       GetAllDrugStockQueryList() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.$route.query.keyword,
+          drug_category:this.$route.query.drug_category,
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time,
+        }
+        console.log("parasm22222",Params)
+        this.WarehouseInfo.warehouseInfoDate = []
+        getAllDrugStockQueryList(Params).then(response => {
+          if (response.data.state == 0) {
+            
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            
+            this.total = response.data.data.total
+            var arr = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
+              
+            }
+            console.log("数据源头",this.WarehouseInfo.warehouseInfoDate)
+          }
+        })
+      },
+     getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      },
+      stockInCount: function(row) {
+        let total = 0
+        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
+          total = total + row.query_drug_warehousing_info[i].warehousing_count
+        }
+        return total
+      },
+      salesReturnCount: function(row) {
+        let total = 0
+
+        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
+          total = total + row.query_drug_sales_return_info[i].count
+        }
+        return total
+      },
+      stockOutCount: function(row) {
+        let total = 0
+
+        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
+          total = total + row.query_drug_warehouseout_info[i].count
+        }
+        return total
+      },
+      cancelStockCount: function(row) {
+        let total = 0
+        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
+          total = total + row.query_drug_cancel_stock_info[i].count
+        }
+        return total
+      },
+      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
+        }
+        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("list222222",this.list)
+          }
+        })
+      },
+    },
+    created() {
+      this.GetAllDrugStockQueryList()
+      var drugCategory = getDictionaryDataConfig('system','drug_category')
+      this.drugCategory.push(...drugCategory)
+      this.getList()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

@@ -14,9 +14,8 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">入库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266"
-            >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
-          >
+          <span style="color: #606266">入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span>&nbsp;&nbsp;
+          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
         </el-row>
       </div>
 
@@ -243,6 +242,12 @@ export default {
     },
     editRecord: function() {
       this.$emit("edit-record");
+    },
+    printOrder(){
+      this.$router.push({
+        name: "drugInOrderDetailPrint",
+        query: { id: this.$route.query.id }
+      });
     }
   }
 };

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -0,0 +1,382 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-title">药品入库登记表</div>
+         
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <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="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">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                 <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                 <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{getUnit(item.drug_id)}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                   <span>{{ item.warehousing_count }}</span>
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td style="line-height:50px">
+                <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
+             </td>
+            </tr>
+            <tr>
+              <td>合计</td>
+              <td colspan="5"></td>
+              <td>{{allPrice.toFixed(2)}}</td>
+            </tr>
+            </tbody>
+          </table>
+        
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <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:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  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 {getBaseDrugLibList} from '@/api/data'
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+        Warehouse: {
+          loading: false,
+          warehouseDate: [],
+          tableCurrentIndex: ""
+        },
+
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: [],
+          warehouse: {}
+        },
+        allPrice:0,
+        start_time:"",
+        end_time:"",
+        list:[],
+        is_use:"",
+        is_charge:"",
+        is_inject:"",
+        page:1,
+        limit:10000,
+        keywords:""
+      }
+    },
+    methods: {
+      getDateOne(){
+        return "入库日期: "+this.start_time +"~"+this.end_time
+      },
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+     
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+      GetOrderDetail: function(order_id) {
+        const params = {
+          id: order_id
+        };
+      getDrugWarehouseInfoList(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.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
+          }
+          console.log("数据源",this.WarehouseInfo.warehouseInfoDate)
+          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
+          }
+          console.log("total_price",total_price)
+          this.allPrice = total_price
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+        }
+      });
+    },
+     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
+        }
+        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("list222222",this.list)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(this.list[i].id == id){
+            name = this.list[i].min_unit
+          }
+        }
+        return name
+      },
+    },
+    created() {
+      const order_id = this.$route.query.id;
+      this.GetOrderDetail(order_id);
+      this.getList()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -11,7 +11,8 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>&nbsp;&nbsp;
+          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
         </el-row>
       </div>
 
@@ -253,9 +254,12 @@
           }
         })
         this.sameRowArr = sameRowArr
-
-
-
+      },
+      printOrder(){
+        this.$router.push({
+          name: "drugOutOrderDetailPrint",
+          query: { id: this.$route.query.id }
+        });
       }
     }
   }

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -0,0 +1,374 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+         <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title">药品出库登记表</div>
+         
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <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="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height: 50px" width="">总价</td>
+            </tr>
+
+            <tr v-for="(item,index) in warehousingOutInfo.warehousingOutData" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{getUnit(item.drug_id)}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td  style="line-height:50px">
+                {{(item.count * item.price).toFixed(2)}}
+             </td>
+            </tr>
+             <tr>
+               <td style="line-height:50px">合计</td>
+               <td colspan="5"></td>
+               <td>{{allPrice.toFixed(2)}}</td>
+             </tr>
+            </tbody>
+          </table>
+        
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <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:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import {  getDrugWarehouseOutInfo } from '@/api/drug/drug_stock'
+  import {getBaseDrugLibList} from '@/api/data'
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        warehousingOutInfo: {
+          loading: false,
+          warehousingOutData: [],
+          info: {}
+        },
+        allPrice:0,
+        start_time:"",
+        end_time:"",
+        list:[],
+        is_use:"",
+        is_charge:"",
+        is_inject:"",
+        page:1,
+        limit:10000,
+        keywords:""
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+    GetOrderDetail: function(order_id) {
+            const params = {
+            'id': order_id
+            }
+            getDrugWarehouseOutInfo(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])
+               }
+               var total_price = 0
+               for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
+                 total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
+               }
+               this.allPrice = total_price
+               this.warehousingOutInfo.info = response.data.data.info
+               this.handleSpanTempArr()
+            }
+            })
+        },
+        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
+        }
+        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("list222222",this.list)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(this.list[i].id == id){
+            name = this.list[i].min_unit
+          }
+        }
+        return name
+      },
+    },
+    created() {
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+      this.getList()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/query.vue

@@ -12,6 +12,14 @@
         >设置
         </el-button
         >
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="printOrder"
+        >打印
+      </el-button>
       <el-button
           size="small"
           class="filter-item"
@@ -106,6 +114,12 @@
             >{{ stockInCount(scope.row) }}</span
             >
           </template>
+        </el-table-column>
+         <el-table-column label="单价" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.last_price}}</span
+            >
+          </template>
         </el-table-column>
         <el-table-column label="入库退货" align="center">
           <template slot-scope="scope">
@@ -292,9 +306,7 @@
             this.total = response.data.data.total
             var arr = []
             for (let i = 0; i < response.data.data.list.length; i++) {
-              this.WarehouseInfo.warehouseInfoDate.push(
-                response.data.data.list[i]
-              )
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
               arr.push(response.data.data.list[i])
             }
             console.log("数据源头",arr)
@@ -413,8 +425,8 @@
       },
        exportStock(){
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['药品名称', '规格名称', '入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
+         const tHeader = ['药品名称', '规格名称', '入库数量','单价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
+         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','last_price','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
        
         
          const data = this.formatJson(filterVal, this.tableData)
@@ -423,7 +435,7 @@
          excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '自备药查询'
+           filename: '药品查询'
          })
           this.downloadLoading = false
         })
@@ -439,6 +451,12 @@
       },
       changeDrug(){
        this.GetAllDrugStockQueryList()
+      },
+      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}
+        });
       }
     }
   }

src/xt_pages/stock/stockInOrderDetail.vue

@@ -14,9 +14,8 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">入库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266"
-            >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
-          >
+          <span style="color: #606266">入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span>&nbsp;&nbsp;
+          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
         </el-row>
       </div>
 
@@ -309,6 +308,12 @@ export default {
     },
     editRecord: function() {
       this.$emit("edit-record");
+    },
+    printOrder(){
+       this.$router.push({
+        name: "stockInDetailPrint",
+        query: { id: this.$route.query.id }
+      });
     }
   }
 };

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -0,0 +1,311 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <span class="main_title">耗材入库登记单</span>
+                    </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{time_now}}
+                    </div>
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <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><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>
+                                    <td>{{item.price}}</td>
+                                    <td>{{item.warehousing_count}}</td> 
+                                    <td>{{(item.warehousing_count*item.price).toFixed(2)}}</td>
+                                </tr>
+                                <tr>
+                                  <td>合计</td>
+                                  <td colspan="4"></td>
+                                  <td>{{allPrice.toFixed(2)}}</td>
+                               </tr>
+                            </tbody>
+                        </table>
+
+                        <div style="display:flex;margin-top:20px;float:right;">
+                            <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:50px;">审核：</div><div style="width:100px;"></div>
+                            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                       </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import {
+  GetAllConfig,
+  getWarehouseInfoList,
+  getGoodInfoList
+} from "@/api/stock";
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '入库单打印' },
+          ],
+            isEdit: 0,
+            checked: false,
+            signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+            goodType: [],
+            goodInfo: [],
+            manufacturer: [],
+            dealer: [],
+            Warehouse: {
+                loading: false,
+                warehouseDate: [],
+                tableCurrentIndex: ""
+            },
+
+            WarehouseInfo: {
+                loading: false,
+                warehouseInfoDate: [],
+                warehouse: {}
+            },
+            time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            allPrice:0,
+            page: 1,
+            limit: 10000,
+            keyword: "",
+            is_use:"",
+            good_kind:"",
+            is_charge:"",
+            list:[]
+        }
+    },
+    methods:{
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+      
+        GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+            if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+            } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            this.goodInfo = response.data.data.goodInfo;
+            this.goodType = response.data.data.goodType;
+            }
+        });
+        },
+       
+     GetOrderDetail: function(order_id) {
+        const params = {
+            id: order_id
+        };
+        getWarehouseInfoList(params).then(response => {
+            if (response.data.state == 0) {
+            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 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   
+            }
+            this.allPrice = total_price
+            console.log("total_price",total_price)
+            console.log("数据222222222",this.WarehouseInfo.warehouseInfoDate)
+            }
+        });
+       },
+      
+    getSpecificationName: function(id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == id) {
+          name = this.goodInfo[i].specification_name;
+        }
+      }
+      return name;
+    },
+    getTypeName: function(id) {
+      let name = "";
+      for (let i = 0; i < this.goodType.length; i++) {
+        if (this.goodType[i].id == id) {
+          name = this.goodType[i].type_name;
+        }
+      }
+      return name;
+    },
+    getTypeNameOne:function(id){
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name;
+     },
+     getList() {
+        this.goodInfo.loading = true
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use:this.is_use,
+          good_kind:this.good_kind,
+          is_charge: this.is_charge,
+        }
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+           
+            this.$message.error(response.data.msg)
+            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)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(id == this.list[i].id){
+             name = this.list[i].good_unit
+          }
+        }
+        return this.getGoodUnit(name)
+      },
+      getGoodUnit(id){
+        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
+          if(id == this.$store.getters.good_unit[i].id){
+
+            return this.$store.getters.good_unit[i].name
+          }
+        }
+        return ""
+      },
+    },
+    created(){
+
+      const order_id = this.$route.query.id;
+      this.GetConfigInfo();
+      this.GetOrderDetail(order_id);
+      this.getList()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+      
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+            white-space: pre-line;
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -11,7 +11,8 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>&nbsp;&nbsp;
+          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
         </el-row>
       </div>
 
@@ -230,6 +231,7 @@
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
+          
             console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
             this.handleSpanTempArr()
           }
@@ -340,7 +342,14 @@
             }
          }
          return count
-      }
+      },
+
+     printOrder(){
+       this.$router.push({
+        name: "stockOutDetailPrint",
+        query: { id: this.$route.query.id,warehouse_out_time:this.$route.query.warehouse_out_time }
+      });
+    }
     }
   }
 </script>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -0,0 +1,326 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <span class="main_title">耗材出库登记单</span>
+                    </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{time_now}}
+                    </div>
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <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 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>
+                                    <td>{{item.price}}</td>
+                                    <td>{{getOutStockCount(item.good_id)}}</td> 
+                                    <td>{{(getOutStockCount(item.good_id)*item.price).toFixed(2)}}</td>
+                                </tr>
+                                <tr>
+                                  <td>合计</td>
+                                  <td colspan="4"></td>
+                                  <td>{{allPrice.toFixed(2)}}</td>
+                               </tr>
+                            </tbody>
+                        </table>
+
+                        <div style="display:flex;margin-top:20px;float:right;">
+                            <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:50px;">审核：</div><div style="width:100px;"></div>
+                            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                       </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList } from "@/api/stock";
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '入库单打印' },
+          ],
+           isEdit: 0,
+            checked: false,
+            signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+            goodType: [],
+            goodInfo: [],
+            manufacturer: [],
+            dealer: [],
+
+            warehousingOutInfo: {
+            loading: false,
+            warehousingOutData: [],
+            info: {}
+            },
+            stockCount:[],
+            time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            allPrice:0,
+            page: 1,
+            limit: 10000,
+            keyword: "",
+            is_use:"",
+            good_kind:"",
+            is_charge:"",
+            list:[]
+        }
+    },
+    methods:{
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+
+        GetConfigInfo() {
+            GetAllConfig().then(response => {
+            if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+            } else {
+                this.manufacturer = response.data.data.manufacturer
+                this.dealer = response.data.data.dealer
+                this.goodInfo = response.data.data.goodInfo
+                this.goodType = response.data.data.goodType
+            }
+            })
+        },
+       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.getOutStockCount(this.warehousingOutInfo.warehousingOutData[i].good_id)*this.warehousingOutInfo.warehousingOutData[i].price
+            }
+           this.allPrice = total_price
+          }
+        })
+      },
+
+       GetTotalCount(time){
+          var params = {
+           warehouse_out_time:time
+          }
+        GetOutStockTotalCount(params).then(response=>{
+           if(response.data.state == 1){
+              var stockCount = response.data.data.stockCount
+              console.log("stockCount",stockCount)
+              this.stockCount = stockCount
+           }
+        })
+      },
+      
+       getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+       getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      },
+       getTypeNameOne: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].good_name
+          }
+        }
+        return name
+      },
+      getOutStockCount(id){
+         var count = 0 
+         for(let i=0;i<this.stockCount.length;i++){
+            if(id == this.stockCount[i].good_id){
+              count = this.stockCount[i].count
+            }
+         }
+         return count
+      },
+       getList() {
+        this.goodInfo.loading = true
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use:this.is_use,
+          good_kind:this.good_kind,
+          is_charge: this.is_charge,
+        }
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            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)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(id == this.list[i].id){
+             name = this.list[i].good_unit
+          }
+        }
+        return this.getGoodUnit(name)
+      },
+      getGoodUnit(id){
+        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
+          if(id == this.$store.getters.good_unit[i].id){
+
+            return this.$store.getters.good_unit[i].name
+          }
+        }
+        return ""
+      },
+      
+    },
+    created(){
+
+      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.getList()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+      
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+            white-space: pre-line;
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/stock/stockPrint.vue

@@ -26,6 +26,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>
@@ -41,6 +42,7 @@
                                     <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>
@@ -122,6 +124,13 @@ export default {
           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 = ""
+            }
+          }
          }
             console.log("打印数据源头",this.WarehouseInfo.warehouseInfoDate)
           });

src/xt_pages/stock/stockQuery.vue

@@ -100,6 +100,11 @@
             <span>{{getUnit(scope.row.good_unit)}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="进货价" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.query_warehousing_info.length>0">{{scope.row.query_warehousing_info[0].price?scope.row.query_warehousing_info[0].price:""}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             <span
@@ -259,6 +264,16 @@ export default {
             this.WarehouseInfo.warehouseInfoDate[i].realOutCount =  this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) -  this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
 
             this.WarehouseInfo.warehouseInfoDate[i].overplus = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) -this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i]) - this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) + this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[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
+              this.WarehouseInfo.warehouseInfoDate[i].all_price = (this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) * this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price).toFixed(2)
+            }else{
+             this.WarehouseInfo.warehouseInfoDate[i].price = ""
+             this.WarehouseInfo.warehouseInfoDate[i].all_price = ""
+            }
+
+
          }
         
         console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
@@ -368,11 +383,13 @@ export default {
     },
 
     exportList(){
+         console.log("2222222",this.WarehouseInfo.warehouseInfoDate)
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus'] 
+         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)
+         
          excel.export_json_to_excel({
            header: tHeader,
            data,