1

src/lang/zh.js

@@ -188,6 +188,11 @@ export default {
     stockModifyPrice: '耗材调价',
     stockDamaged: '耗材报损',
     stockWarning: '耗材预警',
+    stockInventory: '耗材盘点',
+    drugModifyPrice: '药品调价',
+    drugDamaged: '药品报损',
+    drugWarning: '药品预警',
+    drugInventory: '药品盘点',
 
     showconfig: '显示配置',
     user_detail: '使用明细',

src/router/modules/dialysis.js

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

src/router/modules/drugs.js

@@ -56,6 +56,20 @@ export default {
       name: 'drugWarning',
       meta: { title: 'drugWarning', noCache: true }
     },
+    {
+      path: '/stock/drugs/drugInventory',
+      component: () => import('@/xt_pages/stock/drugs/drugInventory'),
+      name: 'drugInventory',
+      meta: { title: 'drugInventory', noCache: true }
+    },
+    {
+      path: '/stock/drugs/inventoryPrint',
+      component: () => import('@/xt_pages/stock/drugs/inventoryPrint'),
+      name: 'inventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'inventoryPrint', noCache: true }
+    },
     // {
     //   path: '/stock/drugs/stock/return',
     //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),

src/router/modules/stock.js

@@ -68,6 +68,20 @@ export default {
       name: 'stockWarning',
       meta: { title: 'stockWarning', noCache: true }
     },
+    {
+      path: '/stock/stockInventory',
+      component: () => import('@/xt_pages/stock/stockInventory'),
+      name: 'stockInventory',
+      meta: { title: 'stockInventory', noCache: true }
+    },
+    {
+      path: '/stock/inventoryPrint',
+      component: () => import('@/xt_pages/stock/inventoryPrint'),
+      name: 'inventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'inventoryPrint', noCache: true }
+    },
 
     // {
     //   path: "/stock/",

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -249,6 +249,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 37">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 39">
         <el-button
           size="small"
@@ -847,6 +857,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyTwo" });
       } else if (this.template_id == 33) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
+      } else if (this.template_id == 37) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtySeven" });
       } else if (this.template_id == 39) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
       } else if (this.template_id == 40) {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -258,7 +258,7 @@
                   <div class="inline_block" style="margin-left:10px;">
                     机器运行：
                     <div class="under_line" style="width: 140px;text-align: center">
-                      
+                      {{ afterdialysis.machine_run ? afterdialysis.machine_run : '/' }}
                     </div>
                   </div>
                 </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -47,13 +47,15 @@
         <div class="inline_block">
           病区：
           <div class="under_line" style="width: 50px;text-align: center;">
-            {{ "/" }}
+            <span v-if="org_id == 10121">{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
+            <span v-else>{{ "/" }}</span>
           </div>
         </div>
         <div class="inline_block">
           床号：
           <div class="under_line" style="width: 50px;text-align: center;">
-            {{ "/" }}
+            <span v-if="org_id == 10121">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
+            <span v-else>{{ "/" }}</span>
           </div>
         </div>
         <div class="inline_block">

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -92,7 +92,7 @@
 
                           </div>
                           <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                              <div style="width:33%;">个人支付金额：{{info.psn_cash_pay?info.psn_cash_pay:0}}元</div>
+                              <div style="width:33%;">个人支付金额：{{info.psn_pay?info.psn_pay:0}}元</div>
                               <div style="width:33%;">个人账户金额：{{info.balc}}元</div>
                           </div>
                       </td>

src/xt_pages/stock/drugs/drugInventory.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+        <el-tabs v-model="activeName">
+            <el-tab-pane label="药品盘点" name="first">
+                <drug-inventory></drug-inventory>
+            </el-tab-pane>
+            <el-tab-pane label="盘点明细" name="second">
+                <inventory-details></inventory-details>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+    
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/bread-crumb";
+import drugInventory from './inventory'
+import inventoryDetails from './inventoryDetails'
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb,
+        drugInventory,
+        inventoryDetails
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "药品管理" },
+                { path: false, name: "药品盘点" }
+            ],
+            activeName:'first'
+        }
+    },
+    methods:{
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.modifyDialog{
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 10px;
+    .el-form-item{
+        width: 33%;
+    }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -192,8 +192,8 @@ export default {
         return{
             crumbs: [
                 { path: false, name: "库存管理" },
-                { path: false, name: "耗材管理" },
-                { path: false, name: "耗材调价" }
+                { path: false, name: "药品管理" },
+                { path: false, name: "药品调价" }
             ],
             tableHeight: '',
             fullHeight: document.documentElement.clientHeight,

src/xt_pages/stock/drugs/inventory.vue

@@ -0,0 +1,269 @@
+<template>
+    <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input
+                size="small"
+                style="width: 200px;margin-left:10px;"
+                class="filter-item"
+                v-model.trim="searchKey"
+                placeholder=""
+                />
+                <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search"
+                >搜索</el-button
+                >
+                <el-date-picker
+                size="small"
+                v-model="value1"
+                type="date"
+                style="margin-left:5px;width:140px;"
+                placeholder="选择日期">
+                </el-date-picker>
+                <el-date-picker
+                size="small"
+                v-model="value2"
+                type="date"
+                style="margin-left:5px;width:140px;"
+                placeholder="选择日期">
+                </el-date-picker>
+            </div>
+            <div>
+                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
+                <el-button size="small" type="primary">核对</el-button>
+                <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button>
+            </div>
+        </div>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="盘点编号">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="盘点日期">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="盘点人">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="审核日期">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="审核人">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="状态">
+            </el-table-column>
+            <el-table-column
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+        <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+                <el-form-item label="耗材ID">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="药品名称">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="报损数量">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.name"></el-input>
+                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <el-table-column
+                prop="date"
+                label="耗材ID"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="date"
+                label="耗材名称"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="规格"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="单位"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="调价数量"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原进货价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="新零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="生产厂商"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="产地"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="批准文号"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="备注"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                fixed="right"
+                width="100"
+                label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "drugInventory",
+    data() {
+        return{
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+            total: 0,
+            
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/stockModifyPricePrint'})
+            
+        },
+        handleSizeChange(){},
+        handleCurrentChange(){}
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -0,0 +1,311 @@
+<template>
+    <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                耗材类别：
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                停用状态：
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input
+                size="small"
+                style="width: 200px;margin-left:10px;"
+                class="filter-item"
+                v-model.trim="searchKey"
+                placeholder=""
+                />
+                <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search"
+                >搜索</el-button
+                >
+            </div>
+            <div>
+                <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button>
+            </div>
+        </div>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="耗材名称"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="类别"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="规格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="单位"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="库存数量"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="进价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="零售总价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="产地"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产厂商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="实盘点"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="亏损价格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产日期"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="有效日期"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            fixed="right"
+            width="100"
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+        <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+                <el-form-item label="耗材ID">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="药品名称">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="报损数量">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.name"></el-input>
+                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <el-table-column
+                prop="date"
+                label="耗材ID"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="date"
+                label="耗材名称"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="规格"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="单位"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="调价数量"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原进货价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="新零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="生产厂商"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="产地"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="批准文号"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="备注"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                fixed="right"
+                width="100"
+                label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "inventory",
+    data() {
+        return{
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+            total: 0,
+            
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/drugs/inventoryPrint'})
+            
+        },
+        handleSizeChange(){},
+        handleCurrentChange(){}
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -0,0 +1,98 @@
+<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="printTitle">库存盘点核单数</div>
+                <div style="float:right;">调价日期：</div>
+                <table class="printTable" border="1">
+                    <tr>
+                        <td>序号</td>
+                        <td>药品名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>零售价</td>
+                        <td>当前库存</td>
+                        <td>盘点数</td>
+                        <td>亏损金额</td>
+                    </tr>
+                    <tr v-for="item in 3">
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                </table>
+                <div style="margin-top:10px;">
+                    <span>合计：库存金额</span>
+                    <span>    库存盘点金额：亏损总计</span>
+                </div>
+                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
+                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></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>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '药品管理' },
+            { path: false, name: '药品盘点打印' },
+          ],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .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 td{padding:5px;} }';
+            printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+
+
+    },
+    created(){
+    }
+}
+</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;}
+</style>

src/xt_pages/stock/inventory.vue

@@ -0,0 +1,269 @@
+<template>
+    <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input
+                size="small"
+                style="width: 200px;margin-left:10px;"
+                class="filter-item"
+                v-model.trim="searchKey"
+                placeholder=""
+                />
+                <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search"
+                >搜索</el-button
+                >
+                <el-date-picker
+                size="small"
+                v-model="value1"
+                type="date"
+                style="margin-left:5px;width:140px;"
+                placeholder="选择日期">
+                </el-date-picker>
+                <el-date-picker
+                size="small"
+                v-model="value2"
+                type="date"
+                style="margin-left:5px;width:140px;"
+                placeholder="选择日期">
+                </el-date-picker>
+            </div>
+            <div>
+                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
+                <el-button size="small" type="primary">核对</el-button>
+                <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button>
+            </div>
+        </div>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="盘点编号">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="盘点日期">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="盘点人">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="审核日期">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="审核人">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="状态">
+            </el-table-column>
+            <el-table-column
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+        <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+                <el-form-item label="耗材ID">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="药品名称">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="报损数量">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.name"></el-input>
+                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <el-table-column
+                prop="date"
+                label="耗材ID"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="date"
+                label="耗材名称"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="规格"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="单位"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="调价数量"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原进货价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="新零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="生产厂商"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="产地"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="批准文号"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="备注"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                fixed="right"
+                width="100"
+                label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "inventory",
+    data() {
+        return{
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+            total: 0,
+            
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/stockModifyPricePrint'})
+            
+        },
+        handleSizeChange(){},
+        handleCurrentChange(){}
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>

src/xt_pages/stock/inventoryDetails.vue

@@ -0,0 +1,311 @@
+<template>
+    <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                耗材类别：
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                停用状态：
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input
+                size="small"
+                style="width: 200px;margin-left:10px;"
+                class="filter-item"
+                v-model.trim="searchKey"
+                placeholder=""
+                />
+                <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search"
+                >搜索</el-button
+                >
+            </div>
+            <div>
+                <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button>
+            </div>
+        </div>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="耗材名称"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="类别"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="规格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="单位"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="库存数量"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="进价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="零售总价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="产地"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产厂商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="实盘点"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="亏损价格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产日期"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="有效日期"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            fixed="right"
+            width="100"
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+        <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+                <el-form-item label="耗材ID">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="药品名称">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="报损数量">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.name"></el-input>
+                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <el-table-column
+                prop="date"
+                label="耗材ID"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="date"
+                label="耗材名称"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="规格"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="单位"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="调价数量"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原进货价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="原零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="新零售价"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="生产厂商"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="产地"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="批准文号"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="备注"
+                width="100">
+                </el-table-column>
+                <el-table-column
+                fixed="right"
+                width="100"
+                label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "inventory",
+    data() {
+        return{
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+            total: 0,
+            
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/inventoryPrint'})
+            
+        },
+        handleSizeChange(){},
+        handleCurrentChange(){}
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>

src/xt_pages/stock/inventoryPrint.vue

@@ -0,0 +1,98 @@
+<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="printTitle">库存盘点核单数</div>
+                <div style="float:right;">调价日期：</div>
+                <table class="printTable" border="1">
+                    <tr>
+                        <td>序号</td>
+                        <td>耗材名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>零售价</td>
+                        <td>当前库存</td>
+                        <td>盘点数</td>
+                        <td>亏损金额</td>
+                    </tr>
+                    <tr v-for="item in 3">
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                </table>
+                <div style="margin-top:10px;">
+                    <span>合计：库存金额</span>
+                    <span>    库存盘点金额：亏损总计</span>
+                </div>
+                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
+                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></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>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .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 td{padding:5px;} }';
+            printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+
+
+    },
+    created(){
+    }
+}
+</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;}
+</style>

src/xt_pages/stock/stockInventory.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+        <el-tabs v-model="activeName">
+            <el-tab-pane label="耗材盘点" name="first">
+                <inventory></inventory>
+            </el-tab-pane>
+            <el-tab-pane label="盘点明细" name="second">
+                <inventory-details></inventory-details>
+            </el-tab-pane>
+        </el-tabs>
+        
+    </div>
+    
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../components/bread-crumb";
+import inventory from './inventory.vue'
+import inventoryDetails from './inventoryDetails.vue'
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb,
+        inventory,
+        inventoryDetails
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "耗材管理" },
+                { path: false, name: "耗材报损" }
+            ],
+            activeName:'first'
+        }
+    },
+    methods:{
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.modifyDialog{
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 10px;
+    .el-form-item{
+        width: 33%;
+    }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>

src/xt_pages/user/templateSummary.vue

@@ -308,7 +308,7 @@
                       </div>
                      </div>
                   </el-row>
-                  <el-row>
+                  <el-row style="margin:10px 0 0;">
                     <el-col :span="8">
                       <el-form-item label="记录医生">
                         <el-select v-model="form.admin_user_id" placeholder="请选择">