新分支

src/api/drug/drug.js

@@ -925,4 +925,13 @@ export function getDrugInventoryRecordList(params){
     method:"get",
     params:params
   })
+}
+
+export function getInventoryRecordPrintList(params){
+
+  return request({
+    url:"/api/drug/getdruginventoryrecordprintlist",
+    method:"Get",
+    params:params,
+  })
 }

src/api/stock.js

@@ -1151,4 +1151,13 @@ export function getStockInventroyModePrintList(params){
     method:"get",
     params:params
   })
+}
+
+export function getDrugInventroyModePrintList(params){
+
+  return request({
+    url:"/api/drug/getdruginventorymodeprintlist",
+    method:"Get",
+    params:params,
+  })
 }

src/router/modules/drugs.js

@@ -82,6 +82,22 @@ export default {
       is_menu: false,
       meta: { title: 'inventoryPrint', noCache: true }
     },
+    {
+      path: '/stock/drugs/druginventoryPrint',
+      component: () => import('@/xt_pages/stock/drugs/inventoryRecordPrint'),
+      name: 'druginventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'druginventoryPrint', noCache: true }
+    },
+    {
+      path: '/stock/drugs/drugInventoryModePrint',
+      component: () => import('@/xt_pages/stock/drugs/drugInventoryModePrint'),
+      name: 'drugInventoryModePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugInventoryModePrint', noCache: true }
+    },
     {
       path: '/stock/drugs/print',
       component: () => import('@/xt_pages/stock/drugs/print'),

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2741,13 +2741,13 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        <span v-if="org_id!=10598 && org_id!=10551">{{
+                        <!-- <span v-if="org_id!=10598 && org_id!=10551">{{
                           afterdialysis.weight_loss
                             ? afterdialysis.weight_loss
                             : "/"
                            }}
-                         </span>
-                         <span v-if="org_id ==10598 || org_id == 10551">
+                         </span> -->
+                         <span>
                           {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
                          </span>
 

src/xt_pages/stock/drugs/drugInventory.vue

@@ -26,9 +26,9 @@
           <drug-damaged ref="childOne"></drug-damaged>
         </el-tab-pane>
 
-        <!-- <el-tab-pane label="盘点日志表" name="seven">
+        <el-tab-pane label="盘点日志表" name="seven">
             <inventory-record ref="childSeven"></inventory-record>
-         </el-tab-pane> -->
+         </el-tab-pane>
       </el-tabs>
     </div>
   </div>

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -0,0 +1,417 @@
+<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">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">药品盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td align="center">药品名称</td>
+                        <td align="center">规格</td>
+                     
+                        <td align="center">本月入库数量</td>
+                        <td align="center">本月出库数量</td>
+                        <td align="center">本月剩余库存</td>
+                        <td align="center">批号</td>
+                        <td align="center">生产日期</td> 
+                        <td align="center">有效日期</td>
+                        <td align="center">生产厂商</td>
+                        <td align="center">盘点数量</td>
+                       
+                    </tr>
+
+                    <tr v-for="(item,index) in tableList" :key="index">
+                        <td align="center">{{ item.good_name }}</td>
+                        <td align="center">{{ item.specification_name }}</td>
+                        <td align="center">{{ getInCount(item.good_id) }}</td>
+                        <td align="center">{{ getOutCount(item.good_id) }}</td> 
+                        <td align="center">{{ getSumCount(item.good_id) }}</td>
+                        <td align="center">
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ it.number }}
+                                    </td>
+                              </tr>
+                            </table>
+                        </td>
+                       
+                        <td align="center">
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ getTime(it.product_date) }}
+                                    </td>
+                              </tr>
+                            </table>
+                        </td>
+                        <td align="center">
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ getTime(it.expiry_date) }}
+                                    </td>
+                              </tr>
+                            </table>
+                        </td>
+                        <td align="center">
+
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ getManufacturerName(it.manufacturer) }}
+                                    </td>
+                              </tr>
+                            </table>
+
+                        </td>
+                        <td align="center">
+
+                            
+                        </td>
+                       
+                    </tr>
+                   
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import print from "print-js"; 
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getDrugInventroyModePrintList } from  "@/api/stock"
+  export default {
+    components:{
+        BreadCrumb
+    },
+     data(){
+       return{
+        crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材模版打印' },
+          ],
+          tableList:[],
+          org_name: this.$store.getters.xt_user.org.org_name,
+          start_time:"",
+          end_time:"",
+          manufacturerList:[],
+          infoList:[],
+          outinfo:[],
+          flowProList:[],
+          flowNoProList:[],
+          goodInfo:[]
+       }
+     },
+     methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+          
+          var params = {
+            start_time:this.$route.query.start_time,
+            end_time:this.$route.query.end_time,
+          }
+          console.log("params-------",params)
+          getDrugInventroyModePrintList(params).then(response=>{
+              if(response.data.state == 1){
+                 var list  =  response.data.data.list
+
+                 console.log("list===============",list)
+
+                if(list!=null && list.length > 0){
+                  let dataInfo = {}
+                  list.forEach((item, index) => {
+                  let { good_id } = item
+                  if (!dataInfo[good_id]) {
+                    dataInfo[good_id] = {
+                      good_id:item.good_id,
+                      child: [],
+                      count:0,
+                      specification_name:item.specification_name,
+                      good_name:item.good_name,
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+                
+                for(let i=0;i<arr.length;i++){
+                   for(let j=0;j<list.length;j++){
+                       if(arr[i].good_id == list[j].good_id){
+                          arr[i].child.push(list[j])
+                       }
+                   }
+                }
+                
+                this.tableList = arr
+                console.log("arr--------------",arr)
+                }
+                 var manufacturerList = response.data.data.manufacturerList
+                 this.manufacturerList = manufacturerList
+
+                 this.infoList = response.data.data.infoList
+
+                 this.outinfo = response.data.data.outinfo
+
+                 this.flowNoProList = response.data.data.flowNoProList
+
+                 this.flowProList = response.data.data.flowProList
+
+                 this.goodInfo = response.data.data.goodInfo
+              }
+          })
+        },
+        getManufacturerName(id){
+           var manufacturer_name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+             if(id == this.manufacturerList[i].id){
+                 manufacturer_name = this.manufacturerList[i].manufacturer_name
+             }
+           }
+           return manufacturer_name
+        },
+        
+        getInCount(good_id){
+          
+          var newArr =[]
+          var total_count =0
+          var newArrOne = []
+          var total_count_one  = 0
+          var total =0
+          for(let i=0;i<this.infoList.length;i++){
+            if(good_id == this.infoList[i].good_id){
+               newArr.push(this.infoList[i])
+            }
+          }
+          if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+                total_count += parseInt(newArr[i].warehousing_count)
+            }
+          }
+
+          for(let i=0;i<this.flowProList.length;i++){
+            if(good_id == this.flowProList[i].good_id){
+               newArrOne.push(this.flowProList[i])
+            }
+          }
+          if(newArrOne!=null){
+            for(let i=0;i<newArrOne.length;i++){
+               total_count_one += newArrOne[i].count
+            }
+          }
+          total = total_count + total_count_one
+          return total
+        },
+        getOutCount(good_id){
+
+          var newArr =[]
+          var newArrOne = []
+          var total_count =0
+          var total_count_one  = 0
+          var total = 0
+          for(let i=0;i<this.outinfo.length;i++){
+            if(good_id == this.outinfo[i].good_id){
+               newArr.push(this.outinfo[i])
+            }
+          }
+          if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+              total_count += parseInt(newArr[i].count)
+            }
+          }
+
+          for(let i=0;i<this.flowNoProList.length;i++){
+            if(good_id == this.flowNoProList[i].good_id){
+               newArrOne.push(this.flowNoProList[i])
+            }
+          }
+          if(newArrOne!=null){
+            for(let i=0;i<newArrOne.length;i++){
+               total_count_one += newArrOne[i].count
+            }
+          }
+
+
+          total = total_count + total_count_one
+          return total
+        },
+        getSumCount(good_id){
+          var sum_count = 0
+          for(let i=0;i<this.goodInfo.length;i++){
+             if(good_id == this.goodInfo[i].id){
+                sum_count = this.goodInfo[i].sum_count
+             }
+          }
+          return sum_count
+        }
+
+        
+     },
+     created(){
+        
+        this.getlist()
+     }
+
+  } 
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/drugs/inventoryRecordPrint.vue

@@ -0,0 +1,284 @@
+<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">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">药品盘点</td></tr>
+                    </thead>  
+                    <tbody class="print_body">
+                    <tr>
+                        <td align="center">盘点时间</td>
+                        <td align="center">药品名称</td>
+                        <td align="center">规格</td>
+                        <td align="center">进价</td>
+                        <td align="center">批号</td>
+                        <td align="center">生产厂商</td>
+                        <td align="center">有效日期</td>
+                        <td align="center">仓库名称</td>
+                        <td align="center">盘点前数量</td> 
+                        <td align="center">盘点后数量</td>
+                        <td align="center">盘点类型</td>
+                        <td align="center">盘点人</td>
+                       
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td align="center">{{ getTime(item.record_date) }}</td>
+                        <td align="center">{{item.drug_name}}</td>
+                        <td align="center">{{item.specification_name}}</td>
+                        <td align="center">{{ item.price }}</td>
+                        <td align="center">{{item.batch_number }}</td>
+                        <td align="center">{{ item.manufacturer_name }}</td>
+                        <td align="center">{{ getTime(item.expiry_date) }}</td>
+                        <td align="center">{{ getHouseName(item.storehouse_id) }}</td>
+                        <td align="center">
+                             {{ item.stock_max_number }}
+                           <span v-if="item.stock_max_number>0">{{ item.max_unit }}</span> 
+                             {{ item.stock_min_number }}
+                           <span v-if="item.stock_min_number>0">{{ item.min_unit }}</span> 
+                        </td> 
+                        <td align="center">
+                            {{ item.last_stock_max_number }}
+                           <span v-if="item.last_stock_max_number>0">{{ item.max_unit }}</span> 
+                             {{ item.last_stock_min_number }}
+                           <span v-if="item.last_stock_min_number>0">{{ item.min_unit }}</span> 
+                        </td>
+                        <td align="center">
+                            <span v-if="item.reason == 10">盘盈</span>
+                            <span v-if="item.reason == 11">盘亏</span>
+                        </td>
+                        <td align="center">
+                            {{getName(item.creater)}}
+                        </td>
+                       
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getInventoryRecordPrintList } from "@/api/drug/drug"
+import print from "print-js";
+import { min } from 'moment';
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name: this.$store.getters.xt_user.org.org_name,
+          ids:"",
+          tableData:[],
+          manufacturerList:[],
+          houseList:[],
+          inventoryList:[],
+          doctorList:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+       getlist(){
+            var params = {
+              limit:this.$route.query.limit,
+              page:this.$route.query.page,
+              keyword:this.$route.query.drug_name,
+              storehouse_id:this.$route.query.storehouse_id,
+              ids:this.$route.query.ids,
+              start_time:this.$route.query.start_time,
+              end_time:this.$route.query.end_time,
+            }
+          getInventoryRecordPrintList(params).then(response=>{
+             if(response.data.state == 1){
+              this.total =  response.data.data.total
+              this.tableData = response.data.data.list
+              this.houseList = response.data.data.houseList
+              this.doctorList = response.data.data.doclist
+              
+             }
+          })   
+        },
+        getManufacturerName(id){
+
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        },
+        getNumber(id){
+          var number = ""
+          for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+                number = this.inventoryList[i].drug_warehouse_info.batch_number
+            }
+          }
+          return number
+         },
+         getPrice(id){
+           var price = 0
+           for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+               price = this.inventoryList[i].drug_warehouse_info.price
+            }
+          }
+          if(price > 0){
+          return price
+          }
+          
+         },
+         getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       },
+       getCount(stock_max_number,stock_min_number,last_stock_max_number,last_stock_min_number,min_number,id){
+         
+         var cha_count = 0
+         var befor_total_count = 0
+         var after_total_count = 0
+         var befor_total_count = stock_max_number * min_number + stock_min_number
+         var after_total_count = last_stock_max_number * min_number + last_stock_min_number
+         var retail_price = 0
+         var price = 0
+         var max_count = 0
+         var min_count = 0
+         var total_price = 0
+        for(let i=0;i<this.inventoryList.length;i++){
+          if(id == this.inventoryList[i].id){
+            retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            price = this.inventoryList[i].drug_warehouse_info.price
+          }
+        }
+
+         //如果透前数量大于透后数量 盘亏
+         if(befor_total_count  > after_total_count){
+           cha_count = befor_total_count - after_total_count
+         }
+         max_count = cha_count/min_number
+         min_count = cha_count%min_number
+         console.log("price",price/min_number)
+         console.log("max_count23323232",max_count)
+         console.log("min_count33333",min_count)
+         console.log("min_number2332233232",min_number)
+         
+         total_price = Math.floor(max_count) * price + min_count * (price/min_number)
+         
+         if(total_price > 0){
+            return total_price.toFixed(2)
+         }else{
+          return ""
+         }
+        return cha_count
+       },
+       getCountOne(stock_max_number,stock_min_number,last_stock_max_number,last_stock_min_number,min_number,id){
+         var cha_count = 0
+         var befor_total_count = 0
+         var after_total_count = 0
+         var befor_total_count = stock_max_number * min_number + stock_min_number
+         var after_total_count = last_stock_max_number * min_number + last_stock_min_number
+         var retail_price = 0
+         var price = 0
+         var max_count = 0
+         var min_count = 0
+         var total_price = 0
+          for(let i=0;i<this.inventoryList.length;i++){
+          if(id == this.inventoryList[i].id){
+            retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            price = this.inventoryList[i].drug_warehouse_info.price
+          }
+        }
+         //如果透前数量大于透后数量 盘盈
+         if(befor_total_count  < after_total_count){
+           cha_count = after_total_count - befor_total_count
+         }
+         max_count = cha_count/min_number
+         min_count = cha_count%min_number
+         total_price =  Math.floor(max_count) *price + min_count * (price/min_number)
+         if(total_price > 0){
+            return total_price.toFixed(2)
+         }else{
+          return ""
+         }
+        
+       },
+       getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.doctorList.length;i++){
+           if(admin_user_id == this.doctorList[i].admin_user_id){
+               user_name = this.doctorList[i].user_name
+           }
+         }
+         return user_name
+      }
+    },
+    created(){
+
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/drugs/inventory_record.vue

@@ -57,13 +57,19 @@
             </div>
             <div>
                <el-button size="small" type="primary" @click="print_1">打印</el-button>
-             
+               <el-button size="small" type="primary" @click="print_2">盘点模版打印2</el-button>
             </div>
           
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%"  @selection-change="changePrice" >
            <el-table-column type="selection" width="50" align="center"> </el-table-column>
-            <el-table-column prop="date" label="药品名称" align="center">
+           
+           <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
+           <el-table-column prop="date" label="药品名称" align="center">
                <template slot-scope="scope">
                  {{scope.row.drug_name}}
                </template>
@@ -107,7 +113,7 @@
            
            <el-table-column prop="name" label="盘点前数量" width="100"  align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.stock_max_number>0">{{scope.row.stock_max_number}}{{scope.row.warehousing_unit}} </span>  
+                  <span v-if="scope.row.stock_max_number>0">{{scope.row.stock_max_number}}{{scope.row.max_unit}} </span>  
                   <span v-if="scope.row.stock_min_number>0">{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
                   <span v-if="scope.row.stock_max_number == 0 && scope.row.stock_min_number == 0">0</span>
                 </template> 
@@ -115,7 +121,7 @@
 
             <el-table-column prop="name" label="盘点后数量" width="100"  align="center">
                 <template slot-scope="scope">
-                   <span v-if="scope.row.last_stock_max_number > 0">{{scope.row.last_stock_max_number}}{{scope.row.warehousing_unit}}</span>  
+                   <span v-if="scope.row.last_stock_max_number > 0">{{scope.row.last_stock_max_number}}{{scope.row.max_unit}}</span>  
                    <span v-if="scope.row.last_stock_min_number>0">{{scope.row.last_stock_min_number}}{{scope.row.min_unit}}</span>
                    <span v-if="scope.row.last_stock_max_number == 0 && scope.row.last_stock_min_number == 0">0</span>
                 </template> 
@@ -133,11 +139,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
-                <template slot-scope="scope">
-                   {{ getTime(scope.row.ctime) }}
-                </template>
-            </el-table-column>
+          
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
@@ -157,6 +159,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getDrugInventoryRecordList } from "@/api/drug/drug"
+const moment = require('moment')
 export default {
     name: "inventory",
     data() {
@@ -194,7 +197,22 @@ export default {
              this.$message.error("请勾选需要打印的内容")
              return false
            }
-           this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids}) 
+           this.$router.push({path:'/stock/drugs/druginventoryPrint?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids+"&start_time="+this.start_time+"&end_time="+this.end_time}) 
+        },
+        print_2(){
+          var start_time_one = ""
+          var end_time_one = ""
+          if(this.start_time!="" && this.end_time !=""){
+            start_time_one = this.start_time
+            end_time_one = this.end_time
+          }
+          if(this.start_time=="" && this.end_time ==""){
+
+            start_time_one = moment().startOf('month').format("YYYY-MM-DD")
+            end_time_one= moment().endOf('month').format("YYYY-MM-DD")
+
+          }
+          this.$router.push({path:'/stock/drugs/drugInventoryModePrint?start_time='+"&start_time="+start_time_one+"&end_time="+end_time_one}) 
         },
         handleSizeChange(val){
          this.limit = val