药房

src/lang/en.js

@@ -98,6 +98,11 @@ export default {
     stockManage: 'Stock Manage',
     wareHouseManage:'Ware House Manage',
     inventoryTransfer:'inventoryTransfer',
+    DrugDispensing:'DrugDispensing',
+    DispensingDetails:'DispensingDetails',
+    // ConsumablesManagement:'ConsumablesManagement',
+    MedicianManagement:'MedicianManagement',
+    patiantDispensing:'patiantDispensing',
     supplyManage: 'Supply Manage',
     supplyQuery: 'supply query',
     baseInfo: 'base Info',

src/lang/zh.js

@@ -120,7 +120,7 @@ export default {
     completeOrder: '购买结果',
     orderRecord: '订单详情',
     recordList: '订单记录',
-    stockManage: '耗材管理',
+    // stockManage: '耗材管理',
     supplyManage: '采购管理',
     supplyList: '供应商管理',
     goodType: '商品类型',
@@ -158,6 +158,13 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
+    // 药房管理
+    PatientDispensing:'患者发药',
+    DrugDispensing:'药品发药',
+    DispensingDetails:'发药明细',
+    // ConsumablesManagement:'耗材管理',
+    MedicianManagement:'药品管理',
+
     otherManagement: '其他管理',
     drugsExpiryDate: '药品有效期预警',
     drugsSurplus: '药品剩余预警',
@@ -180,7 +187,7 @@ export default {
 
     inventoryTransfer: '库存调拨',
 
-    consumablesManagement: '耗材管理',
+    // consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',
     stockInOrder: '入库单',

src/router/index.js

@@ -36,6 +36,12 @@ import DepositManagement from './modules/DepositManagement'
 import hisTool from './modules/hisTool'
 import supply from './modules/supply'
 
+import PatientDispensing from './modules/PatientDispensing'
+import DrugDispensing from './modules/DrugDispensing'
+import DispensingDetails from './modules/DispensingDetails'
+// import ConsumablesManagement from './modules/ConsumablesManagement'
+import MedicianManagement from './modules/MedicianManagement'
+
 // import outpatientRecord from './modules/outpatientRecord'
 import kuyiShopping from './modules/kuyiShopping'
 import createPatient from './modules/createPatient'
@@ -156,6 +162,12 @@ var _asy_router_map = [
   wareHouseManage,  //仓库管理模块
   DepositManagement, //押金管理模块
   inventoryTransfer,    //库存调拨模块
+  PatientDispensing, // 患者发药模块
+  DrugDispensing, // 药房管理模块
+  DispensingDetails, // 药房管理模块
+  // ConsumablesManagement, // 药房管理模块
+  MedicianManagement, // 药房管理模块
+
   otherManagement,
   qcd,
   device,

src/router/modules/ConsumablesManagement.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/ConsumablesManagement',
+  component: Layout,
+  name:'ConsumablesManagement',
+  redirct: 'noredirect',
+  children: [{
+    path: '/Pharmacy/ConsumablesManagement',
+    component: () => import('@/xt_pages/Pharmacy/ConsumablesManagement.vue'),
+    name: '耗材管理',
+    meta: {
+      title: '耗材管理',
+      noCache: true
+    }
+  },]
+}

src/router/modules/DispensingDetails.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/DispensingDetails',
+  component: Layout,
+  name:'DispensingDetails',
+  redirct: 'noredirect',
+  children: [{
+    path: '/Pharmacy/DispensingDetails',
+    component: () => import('@/xt_pages/Pharmacy/DispensingDetails.vue'),
+    name: '发药明细',
+    meta: {
+      title: '发药明细',
+      noCache: true
+    }
+  },]
+}

src/router/modules/DrugDispensing.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/DrugDispensing',
+  component: Layout,
+  name:'DrugDispensing',
+  redirct: 'noredirect',
+  children: [{
+    path: '/Pharmacy/DrugDispensing',
+    component: () => import('@/xt_pages/Pharmacy/DrugDispensing.vue'),
+    name: '药品发药',
+    meta: {
+      title: '药品发药',
+      noCache: true
+    }
+  },]
+}

src/router/modules/MedicianManagement.js

@@ -0,0 +1,223 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/MedicianManagement',
+  component: Layout,
+  name: 'MedicianManagement',
+  alwaysShow: true,
+  redirct: 'noredirect',
+  meta: {
+    title: 'MedicianManagement',
+    icon: 'MedicianManagement',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/Pharmacy/MedicianManagement',
+      component: () => import('@/xt_pages/stock/drugs/query'),
+      name: '库存查询',
+      meta: { title: '库存查询', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/stock/in',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
+      name: 'drugsStockIn',
+      meta: { title: 'drugsStockIn', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/stock/out',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
+      name: 'drugsStockOut',
+      meta: { title: 'drugsStockOut', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/drugModifyPricePrint',
+      component: () => import('@/xt_pages/stock/drugs/drugModifyPricePrint'),
+      name: 'drugModifyPricePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugModifyPricePrint', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/drugInventory',
+      component: () => import('@/xt_pages/stock/drugs/drugInventory'),
+      name: 'drugInventory',
+      meta: { title: 'drugInventory', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/inventoryPrint',
+      component: () => import('@/xt_pages/stock/drugs/inventoryPrint'),
+      name: 'inventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'inventoryPrint', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/stock/cancel',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
+      name: 'drugsStockCancel',
+      meta: { title: 'drugsStockCancel', noCache: true }
+    },
+    {
+      path: '/Pharmacy/drugs/stock/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugIndex'),
+      name: 'drugDetail',
+      meta: { title: '明细查询', noCache: true }
+    },
+    {
+      path: '/Pharmacy/in/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderAdd'),
+      name: 'drugStockInOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInOrderAdd', noCache: true }
+    },
+    
+    {
+      path: '/Pharmacy/in/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
+      name: 'drugStockInDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInDetail', noCache: true }
+    }, {
+      path: '/Pharmacy/return/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
+      name: 'drugSalesReturnDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnDetail', noCache: true }
+    }, {
+      path: '/Pharmacy/return/add',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrderAdd'),
+      name: 'drugSalesReturnOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnOrderAdd', noCache: true }
+    }, {
+      path: '/Pharmacy/out/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderAdd'),
+      name: 'drugStockOutOrderAdd_Pharmacy',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderAdd_Pharmacy', noCache: true }
+    }, {
+      path: '/Pharmacy/out/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutDetail'),
+      name: 'drugStockOutDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutDetail', noCache: true }
+    }, {
+      path: '/Pharmacy/cancel/add',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderAdd'),
+      name: 'cancelDrugStockOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
+    }, {
+      path: '/Pharmacy/cancel/detail',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
+      name: 'cancelDrugStockDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockDetail', noCache: true }
+    },
+    {
+      path: '/Pharmacy/cancel/edit',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderEdit'),
+      name: 'cancelDrugStockOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderEdit', noCache: true }
+    },
+    {
+      path: '/Pharmacy/user/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockUserDetail'),
+      name: 'drugStockUserDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockUserDetail', noCache: true }
+    },
+
+    // 编辑药品入库单
+    {
+      path: '/Pharmacy/in/order/edit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderEdit'),
+      name: 'drugStockInOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInOrderEdit', noCache: true }
+    },
+
+    {
+      path: '/Pharmacy/in/drugstockflow',
+      component: () => import('@/xt_pages/stock/drugs/drugStockFlow'),
+      name: 'drugStockFlow',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockFlow', noCache: true }
+    },
+
+    {
+      path: '/Pharmacy/in/drugbatchnumber',
+      component: () => import('@/xt_pages/stock/drugs/drugBatchNumber'),
+      name: 'drugBatchNumber',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugBatchNumber', noCache: true }
+    },
+    {
+      path: '/Pharmacy/stockoutorderedit',
+      component: () => import('@/xt_pages/stock/stockOutOrderEdit'),
+      name: 'stockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutOrderEdit', noCache: true }
+    },
+    {
+      path: '/Pharmacy/in/order/edit',
+      component: () => import('@/xt_pages/stock/stockInOrderEdit'),
+      name: 'stockInOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInOrderEdit' }
+    },
+
+    {
+      path: '/Pharmacy/in/stockflow',
+      component: () => import('@/xt_pages/stock/stockFlow'),
+      name: 'stockFlow',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockFlow' }
+    },
+
+    {
+      path: '/Pharmacy/in/stockbatchnumber',
+      component: () => import('@/xt_pages/stock/stockBatchNumber'),
+      name: 'stockBatchNumber',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockBatchNumber' }
+    },
+    {
+      path: '/Pharmacy/out/drugstockoutorderedit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderEdit'),
+      name: 'drugStockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderEdit' }
+
+    },
+    {
+      path: '/Pharmacy/cancel/print',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugOrderPrint'),
+      name: 'cancelDrugOrderPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugOrderPrint' }
+
+    }
+  ]
+}

src/router/modules/PatientDispensing.js

@@ -0,0 +1,26 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/PatientDispensing',
+  component: Layout,
+  name:'PatientDispensing',
+  redirct: 'noredirect',
+  children: [{
+    path: '/Pharmacy/PatientDispensing',
+    component: () => import('@/xt_pages/Pharmacy/PatientDispensing.vue'),
+    name: '患者发药',
+    meta: {
+      title: '患者发药',
+      noCache: true
+    }
+  },
+  // {
+  //   path: '/Pharmacy/print/patientPrint',
+  //   component: () => import('@/xt_pages/Pharmacy/print/patientPrint.vue'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'outpatientChargesPrint',
+  //   meta: { title: 'outpatientChargesPrint', noCache: true }
+  // }
+]
+}

src/router/modules/outpatientCharges.js

@@ -33,14 +33,15 @@ export default {
     {
         path: '/outpatientCharges/labelPrinting',
         component: () => import('@/xt_pages/outpatientCharges/labelPrinting'),
-        name: 'labelPrinting',
+        name: 'OutpatientChargesLabelPrinting',
         meta: { title: 'labelPrinting', noCache: true }
     },
+    // 此页面需要被缓存
     {
         path: '/outpatientCharges/summary',
         component: () => import('@/xt_pages/outpatientCharges/summary'),
-        name: 'summary',
-        meta: { title: 'summary', noCache: true }
+        name: 'OutpatientChargesSummary',
+        meta: { title: 'summary', noCache: true}
     },
     {
         path: '/outpatientCharges/incomeStatistics',
@@ -60,7 +61,7 @@ export default {
         hidden: true,
         is_menu: false,
         name: 'summaryDetail',
-        meta: { title: 'summaryDetail', noCache: true }
+        meta: { title: 'summaryDetail', noCache: true}
     },
     {
         path: '/outpatientCharges/treatPrint',

src/views/layout/Layout.vue

@@ -11,6 +11,10 @@
         <div v-if="bingliShow" :class="index == 1 ? 'navOne navActive' : 'navOne'" @click="clickActive(1,'电子病历')">
           <i class="iconfont icon-s_bingli navIcon"></i>
           <p>电子病历</p>
+        </div>
+         <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
+          <i class="iconfont icon-shangcheng-1 navIcon"></i>
+          <p>药房管理</p>
         </div>
         <div v-if="touxiShow" :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
           <i class="iconfont icon-computer_fill navIcon"></i>
@@ -121,6 +125,7 @@ export default {
       bingliShow:true,
       touxiShow:true,
       kucunShow:true,
+      medicianshow:true,
       peizhiShow:true,
       kuyishoppingShow:true,
       caigouShow:true,
@@ -134,6 +139,7 @@ export default {
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];
+    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','MedicianManagement']
     let menzhenArr = [];
     let bingliArr = [];
     let touxiArr = [];
@@ -141,7 +147,8 @@ export default {
     let peizhiArr = [];
     let kuyishoppingArr = [];
     let caigouArr =[]
-    this.permission_routers.map(item => {
+    let medicianArr = []
+     this.permission_routers.map(item => {
       if(menzhen.indexOf(item.name) > -1){
         menzhenArr.push(item)
       }else if(bingli.indexOf(item.name) > -1){
@@ -156,6 +163,8 @@ export default {
         kuyishoppingArr.push(item)
       }else if(caigou.indexOf(item.name)>-1){
          caigouArr.push(item)
+      }else if(medician.indexOf(item.name) > -1){
+        medicianArr.push(item)
       }
     });
     // console.log('menzhenArr.length',menzhenArr.length)
@@ -164,7 +173,7 @@ export default {
     // console.log('kucunArr.length',kucunArr.length)
     // console.log('peizhiArr.length',peizhiArr.length)
     // console.log('kuyishoppingArr.length',kuyishoppingArr.length)
-    console.log("cagouArr23323322323",caigouArr.length)
+    // console.log("cagouArr23323322323",caigouArr.length)
     if(menzhenArr.length == 0){
       this.menzhenShow = false
     }else if(bingliArr.length == 0){

src/views/layout/components/Sidebar/index.vue

@@ -102,6 +102,23 @@ export default {
             let a = false;
             this.$emit('func',a)
           }
+        }else if(newVal == '药房管理'){
+          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','MedicianManagement']
+          // console.log('permission_routers',this.permission_routers)
+          let routerArr = [];
+          this.permission_routers.map(item => {
+            if(nameArr.indexOf(item.name) > -1){
+              routerArr.push(item)
+            }
+          });
+          this.arr = routerArr;
+          if(this.arr.length > 0){
+            let a = true;
+            this.$emit('func',a)
+          }else{
+            let a = false;
+            this.$emit('func',a)
+          }
         }else if(newVal == '透析管理'){
           let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
           // console.log('permission_routers',this.permission_routers)

src/xt_pages/Pharmacy/ConsumablesManagement.vue

@@ -0,0 +1,26 @@
+<template>
+  <div class="main-contain">耗材管理</div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+        crumbs: [
+        { path: false, name: "耗材管理" },
+        { path: "/Pharmacy/ConsumablesManagement", name: "耗材管理" },
+      ],
+    };
+  },
+
+  methods: {},
+  created() {},
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/Pharmacy/DispensingDetails.vue

@@ -0,0 +1,133 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model="name"
+            placeholder="请输入患者姓名"
+          ></el-input>
+
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker
+          >-
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >查询</el-button
+          >
+        </div>
+      </div>
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        style="width: 1651px"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column type="index" label="序号" align="center" width="250">
+        </el-table-column>
+        <el-table-column label="患者名称" align="center" width="300">
+          <template slot-scope="scope"> </template>
+        </el-table-column>
+
+        <el-table-column label="开立医生" align="center" width="300">
+          <template slot-scope="scope"> </template>
+        </el-table-column>
+        <el-table-column label="发药时间" align="center" width="400">
+          <template slot-scope="scope"> </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="400">
+          <template slot-scope="scope">
+            <el-button type="primary" @click="views">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <details-print
+      ref="detailsprint"
+      :visibility="isVisibility"
+      :propsTable="propsTable"
+    >
+    </details-print>
+  </div>
+</template>
+
+<script>
+import detailsPrint from "./print/details.vue";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    detailsPrint,
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "发药明细" },
+        { path: "/Pharmacy/DispensingDetails", name: "发药明细" },
+      ],
+      name: "",
+      tableList: [{}],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+    };
+  },
+
+  methods: {
+    // 查看
+    views() {
+      this.$refs.detailsprint.show();
+    },
+  },
+  created() {},
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -0,0 +1,215 @@
+<template>
+  <div class="main-contain new-main-contain">
+    <div class="position">
+      <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div
+      class="app-container"
+      style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+    >
+      <div class="mainLeft">
+        <div>
+          <div class="list">
+            <el-date-picker
+              style="width: 300px"
+              v-model="datepick"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </div>
+
+          <div class="list">
+            <el-radio-group v-model="state">
+              <el-radio :label="1">待发药</el-radio>
+              <el-radio :label="2">已发药</el-radio>
+            </el-radio-group>
+          </div>
+          <div class="list">
+            <el-input
+              size="small"
+              style="width: 239px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入药品名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :height="tableHeight"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column prop="name" label="名称" width="100">
+            </el-table-column>
+            <el-table-column prop="specifications" label="规格" width="100">
+            </el-table-column>
+            <el-table-column prop="stock" label="库存" width="100">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="mainRight">
+        <div class="titlelist">
+          <el-button type="primary" @click="dispense" v-if="state == 1"
+            >发药</el-button
+          >
+          <el-button type="primary" @click="toPrint">打印</el-button>
+          <el-button type="primary" v-if="state == 1">设置</el-button>
+        </div>
+        <el-divider></el-divider>
+        <div>
+          <el-table
+            :height="tableHeight"
+            :data="tableData_list"
+            border
+            style="width: 1328px"
+            @selection-change="handleSelectionChange"
+          >
+            >
+            <el-table-column type="selection" width="55"> </el-table-column>
+            <el-table-column type="index" label="序号" width="120" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="患者名称" width="180" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="单次用量" width="170" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="用法" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="频率" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="天数" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="总量" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="数据来源" width="162" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="margin-top">诊断时间：2022-05-07 19:22:16</div>
+      </div>
+    </div>
+
+    <drug-print
+      ref="drugprint"
+      :visibility="isVisibility"
+      :propsTable="propsTable"
+      :state="state"
+    >
+    </drug-print>
+  </div>
+</template>
+
+<script>
+import drugPrint from "./print/drugPrint.vue";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+    drugPrint,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "药品发药" },
+        { path: "/Pharmacy/DrugDispensing", name: "药品发药" },
+      ],
+      tableHeight: 400,
+      datepick: "",
+      state: 1,
+      waitmount: 0,
+      alreadmount: 0,
+      tableData: [],
+      tableData_list: [],
+      multipleSelection: [],
+    };
+  },
+
+  methods: {
+    // 跳转打印页面
+    toPrint() {
+      // this.$router.push({ path: "/Pharmacy/print/patientPrint" });
+      this.$refs.drugprint.show();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    // 药品发药
+    dispense() {
+      var params = {};
+      this.$confirm("确定是否对该药品进行发药?", "患者发药", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {})
+        .catch(() => {});
+    },
+
+    // 药品退药
+    endispense() {
+      var params = {};
+      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {})
+        .catch(() => {});
+    },
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+  },
+  created() {},
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.new-main-contain {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.app-container {
+  height: 100%;
+}
+.mainLeft {
+  width: 300px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .el-radio {
+    margin-right: 75px;
+  }
+
+  .list {
+    margin: 10px 0;
+  }
+}
+.mainRight {
+  margin-left: 10px;
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+  .titlelist {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+</style>

src/xt_pages/Pharmacy/MedicianManagement.vue

@@ -0,0 +1,26 @@
+<template>
+  <div class="main-contain">药品管理</div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+        crumbs: [
+        { path: false, name: "药品管理" },
+        { path: "/Pharmacy/MedicianManagement", name: "药品管理" },
+      ],
+    };
+  },
+
+  methods: {},
+  created() {},
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="main-contain new-main-contain">
+    <div class="position">
+      <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div
+      class="app-container"
+      style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+    >
+      <div class="mainLeft">
+        <div>
+          <div class="list">
+            <el-date-picker
+              style="width: 200px"
+              v-model="datepick"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </div>
+
+          <div class="list">
+            <el-radio-group v-model="state">
+              <el-radio :label="1">待发药{{ waitmount }}人</el-radio>
+              <el-radio :label="2">已发药{{ alreadmount }}人</el-radio>
+            </el-radio-group>
+          </div>
+          <div class="list">
+            <el-input
+              size="small"
+              style="width: 130px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入患者名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :height="tableHeight"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column prop="date" label="患者姓名" width="100">
+            </el-table-column>
+            <el-table-column prop="name" label="单据编号" width="100">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="mainRight">
+        <div class="titlelist">
+          <el-button type="primary" @click="dispense" v-if="state == 1"
+            >发药</el-button
+          >
+          <el-button type="primary" @click="endispense" v-if="state == 2"
+            >退药</el-button
+          >
+          <el-button type="primary" @click="toPrint">打印</el-button>
+          <el-button type="primary" v-if="state == 1">设置</el-button>
+        </div>
+        <el-divider></el-divider>
+        <div>
+          <el-table
+            :height="tableHeight"
+            :data="tableData_list"
+            border
+            style="width: 100%"
+          >
+            <el-table-column type="index" label="序号" width="120" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="名称" width="220" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="单次用量" width="170" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="用法" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="频率" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="天数" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="总量" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="开立医生" width="160" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="数据来源" width="162" align="center">
+            </el-table-column>
+            <el-table-column prop="name" label="备注" width="170" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="margin-top: 25px">诊断时间：2022-05-07 19:22:16</div>
+      </div>
+    </div>
+
+    <patient-print
+      ref="patientprint"
+      :visibility="isVisibility"
+      :propsTable="propsTable"
+    >
+    </patient-print>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import patientPrint from "./print/patientPrint.vue";
+export default {
+  components: {
+    BreadCrumb,
+    patientPrint,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "患者发药" },
+        { path: "/Pharmacy/patiantDispensing", name: "患者发药" },
+      ],
+      tableHeight: 400,
+      datepick: "",
+      state: 1,
+      waitmount: 0,
+      alreadmount: 0,
+      keywords: "",
+      tableData: [],
+      propsTable: [],
+      tableData_list: [],
+      isVisibility: false,
+    };
+  },
+  watch: {
+  },
+
+  methods: {
+    // 跳转打印页面
+    toPrint() {
+      // this.$router.push({ path: "/Pharmacy/print/patientPrint" });
+      this.$refs.patientprint.show();
+    },
+
+    // 搜索患者
+    searchAction() {},
+
+    // 药品发药
+    dispense() {
+      var params = {};
+      this.$confirm("确定是否对该药品进行发药?", "患者发药", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {})
+        .catch(() => {});
+    },
+
+    // 药品退药
+    endispense() {
+      var params = {};
+      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {})
+        .catch(() => {});
+    },
+  },
+  created() {},
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.new-main-contain {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.app-container {
+  height: 100%;
+}
+.mainLeft {
+  width: 200px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .el-radio {
+    margin-right: 5px;
+  }
+
+  .list {
+    margin: 10px 0;
+  }
+}
+.mainRight {
+  margin-left: 10px;
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+  .titlelist {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+</style>

src/xt_pages/Pharmacy/print/details.vue

@@ -0,0 +1,207 @@
+<template>
+  <el-dialog
+    title="打印"
+    :visible.sync="visibility"
+    :close-on-click-modal="isClose"
+    :close-on-press-escape="isClose"
+  >
+    <el-button type="primary" @click="print" class="print_style"
+      >打印</el-button
+    >
+    <div id="dialysis-print-box-1" class="dialysis-print-box-1">
+      <!-- <div class="list_title">
+        <div>药品名称：</div>
+        <div>规格：</div>
+        <div>发药状态：</div>
+        <div v-if="state==2">领药人：</div>
+      </div> -->
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="处方详情" name="first">
+          <el-tabs v-model="editableTabsValue" type="card">
+            <el-tab-pane
+              :key="item.name"
+              v-for="(item, index) in editableTabs"
+              :label="item.title"
+            >
+              Rp
+              <el-table
+                style="width: 1020px; margin: 0 auto"
+                :data="tableData"
+                border
+                max-height="450"
+                :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+              >
+                <el-table-column prop="name" label="名称" width="160" align="center">
+                </el-table-column>
+                 <el-table-column prop="group" label="组" width="100" align="center">
+                </el-table-column>
+                <el-table-column prop="SingleDosage" label="单次用量" width="100" align="center">
+               </el-table-column>
+                <el-table-column prop="use" label="用法" width="120" align="center">
+                </el-table-column>
+                <el-table-column prop="frequency" label="频率" width="120" align="center">
+                </el-table-column>
+                <el-table-column prop="day" label="天数" width="120" align="center">
+                </el-table-column>
+                <el-table-column prop="amount" label="总量" width="90" align="center">
+                </el-table-column>
+                <el-table-column prop="price" label="单价" width="100" align="center">
+                </el-table-column>
+                <el-table-column prop="tips" label="备注" width="120" align="center">
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </el-tab-pane>
+        <el-tab-pane label="病历详情" name="second">病历详情</el-tab-pane>
+      </el-tabs>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Vue from "vue";
+import print from "print-js";
+import printutils from "./print.js";
+
+export default {
+  data() {
+    return {
+      visibility: false,
+      tableData: [{}],
+      isClose: false,
+      activeName: "first",
+      editableTabsValue: "2",
+      editableTabs: [
+        {
+          title: "处方1",
+        },
+        {
+          title: "处方2",
+        },
+      ],
+      tabIndex: 2,
+    };
+  },
+  props: {
+    propForm: {
+      type: Object,
+    },
+
+    state: {
+      type: Number,
+    },
+  },
+
+  methods: {
+    hide: function () {
+      this.visibility = false;
+      for (let i = 0; i < this.propForm.goods.length; i++) {
+        for (let key in this.propForm.goods[i]) {
+          if (key != "index") {
+            this.propForm.goods[i][key].isSelected = false;
+          }
+        }
+      }
+    },
+    show: function () {
+      this.visibility = true;
+    },
+
+    comfirm: function (formName) {
+      this.goodInfo = [];
+      this.goodInfoTableData = [];
+      this.$emit("dialog-comfirm", this.getValue());
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.table.setCurrentRow(null);
+    },
+    getValue() {},
+
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    // 打印
+    print() {
+      Vue.prototype.printJson = printutils.printJson;
+      this.printJson({
+        // title: ``, // 打印出来的标题
+        data: this.tableData, // 需要打印的数据
+        serial: false, // 是否需要打印序列号
+        fields: [
+          // 需要打印的字段
+
+          "name",
+          "group",
+          "SingleDosage",
+          "use",
+          "frequency",
+          "day",
+          "amount",
+          "price",
+          "tips",
+        ],
+        properties: [
+          // 需要打印的字段对应的表头名
+
+          {
+            field: "name",
+            displayName: "名称",
+          },
+            {
+            field: "group",
+            displayName: "组",
+          },
+          {
+            field: "SingleDosage",
+            displayName: "单词用量",
+          },
+          {
+            field: "use",
+            displayName: "用法",
+          },
+          {
+            field: "frequency",
+            displayName: "频率",
+          },
+          {
+            field: "day",
+            displayName: "天数",
+          },
+          {
+            field: "amount",
+            displayName: "总量",
+          },
+          {
+            field: "price",
+            displayName: "单价",
+          },
+          
+          {
+            field: "tips",
+            displayName: "备注",
+          },
+        ],
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.print_style {
+  position: absolute;
+  right: 10px;
+  top: 42px;
+}
+
+.list_title {
+  width: 940px;
+  border-bottom: 1px solid;
+  display: flex;
+  margin: 30px auto;
+
+  div {
+    width: 230px;
+    padding: 10px 0;
+  }
+}
+</style>

src/xt_pages/Pharmacy/print/drugPrint.vue

@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    title="打印"
+    :visible.sync="visibility"
+    :close-on-click-modal="isClose"
+    :close-on-press-escape="isClose"
+  >
+    <el-button type="primary" @click="print" class="print_style"
+      >打印</el-button
+    >
+    <div id="dialysis-print-box-1" class="dialysis-print-box-1">
+      <div class="list_title">
+        <div>药品名称：</div>
+        <div>规格：</div>
+        <div>发药状态：</div>
+        <div v-if="state==2">领药人：</div>
+      </div>
+
+      <el-table
+        style="width: 940px; margin: 0 auto"
+        :data="tableData"
+        border
+        max-height="450"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+      >
+        <el-table-column type="index" prop="index" label="序号" width="60">
+        </el-table-column>
+        <el-table-column prop="name" label="患者姓名" width="160">
+        </el-table-column>
+        <el-table-column prop="SingleDosage" label="单次用量" width="120">
+        </el-table-column>
+        <el-table-column prop="use" label="用法" width="120"> </el-table-column>
+        <el-table-column prop="frequency" label="频率" width="120">
+        </el-table-column>
+        <el-table-column prop="day" label="天数" width="120"> </el-table-column>
+        <el-table-column prop="amount" label="总量" width="120">
+        </el-table-column>
+        <el-table-column prop="tips" label="数据来源" width="120">
+        </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Vue from "vue";
+import print from "print-js";
+import printutils from "./print.js";
+
+export default {
+  data() {
+    return {
+      visibility: false,
+      tableData: [{}],
+      isClose:false
+    };
+  },
+  props: {
+    propForm: {
+      type: Object,
+    },
+
+    state:{
+        type:Number
+    }
+  },
+
+  methods: {
+    // isClose() {
+    //   this.visibility = false;
+    // },
+
+    hide: function () {
+      this.visibility = false;
+      for (let i = 0; i < this.propForm.goods.length; i++) {
+        for (let key in this.propForm.goods[i]) {
+          if (key != "index") {
+            this.propForm.goods[i][key].isSelected = false;
+          }
+        }
+      }
+    },
+    show: function () {
+      this.visibility = true;
+    },
+
+    comfirm: function (formName) {
+      this.goodInfo = [];
+      this.goodInfoTableData = [];
+      this.$emit("dialog-comfirm", this.getValue());
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.table.setCurrentRow(null);
+    },
+    getValue() {},
+
+    // 打印
+    print() {
+      Vue.prototype.printJson = printutils.printJson;
+      //   const style =
+      //     '@media print {.list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto}}';
+      //   printJS({
+      //     printable: "dialysis-print-box-1",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false,
+      //   });
+      this.printJson({
+        title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
+        <div style="width: 230px;padding: 10px 0;">药品名称：${1}</div>
+        <div style="width: 230px;padding: 10px 0;">规格：${1}</div>
+        <div style="width: 230px;padding: 10px 0;">发药状态：${1}</div>
+        </div>`, // 打印出来的标题
+        data: this.tableData, // 需要打印的数据
+        serial: true, // 是否需要打印序列号
+        fields: [
+          // 需要打印的字段
+
+          "name",
+          "SingleDosage",
+          "use",
+          "frequency",
+          "day",
+          "amount",
+          "tips",
+        ],
+        properties: [
+          // 需要打印的字段对应的表头名
+
+          {
+            field: "name",
+            displayName: "姓名",
+          },
+          {
+            field: "SingleDosage",
+            displayName: "单词用量",
+          },
+          {
+            field: "use",
+            displayName: "用法",
+          },
+          {
+            field: "frequency",
+            displayName: "频率",
+          },
+          {
+            field: "day",
+            displayName: "天数",
+          },
+          {
+            field: "amount",
+            displayName: "总量",
+          },
+          {
+            field: "tips",
+            displayName: "备注",
+          },
+        ],
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.print_style {
+  position: absolute;
+  right: 10px;
+  top: 42px;
+}
+
+.list_title {
+  width: 940px;
+  border-bottom: 1px solid;
+  display: flex;
+  margin: 30px auto;
+
+  div {
+    width: 230px;
+    padding: 10px 0;
+  }
+}
+</style>

src/xt_pages/Pharmacy/print/patientPrint.vue

@@ -0,0 +1,178 @@
+<template>
+  <el-dialog
+    title="打印"
+    :visible.sync="visibility"
+    :close-on-click-modal="isClose"
+    :close-on-press-escape="isClose"
+  >
+    <el-button type="primary" @click="print" class="print_style"
+      >打印</el-button
+    >
+    <div id="dialysis-print-box-1" class="dialysis-print-box-1">
+      <div class="list_title">
+        <div>患者名称：</div>
+        <div>数据来源：</div>
+        <div>发药状态：</div>
+        <div>领药时间：</div>
+      </div>
+
+      <el-table
+        style="width: 940px; margin: 0 auto"
+        :data="tableData"
+        border
+        max-height="450"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+      >
+        <el-table-column type="index" prop="index" label="序号" width="60">
+        </el-table-column>
+        <el-table-column prop="name" label="名称" width="160">
+        </el-table-column>
+        <el-table-column prop="SingleDosage" label="单次用量" width="120">
+        </el-table-column>
+        <el-table-column prop="use" label="用法" width="120"> </el-table-column>
+        <el-table-column prop="frequency" label="频率" width="120">
+        </el-table-column>
+        <el-table-column prop="day" label="天数" width="120"> </el-table-column>
+        <el-table-column prop="amount" label="总量" width="120">
+        </el-table-column>
+        <el-table-column prop="tips" label="备注" width="120">
+        </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Vue from "vue";
+import print from "print-js";
+import printutils from "./print.js";
+
+export default {
+  data() {
+    return {
+      visibility: false,
+      tableData: [{}],
+      isClose:false
+    };
+  },
+  props: {
+    propForm: {
+      type: Object,
+    },
+  },
+
+  methods: {
+    // isClose() {
+    //   this.visibility = false;
+    // },
+
+    hide: function () {
+      this.visibility = false;
+      for (let i = 0; i < this.propForm.goods.length; i++) {
+        for (let key in this.propForm.goods[i]) {
+          if (key != "index") {
+            this.propForm.goods[i][key].isSelected = false;
+          }
+        }
+      }
+    },
+    show: function () {
+      this.visibility = true;
+    },
+
+    comfirm: function (formName) {
+      this.goodInfo = [];
+      this.goodInfoTableData = [];
+      this.$emit("dialog-comfirm", this.getValue());
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.table.setCurrentRow(null);
+    },
+    getValue() {},
+
+    // 打印
+    print() {
+      Vue.prototype.printJson = printutils.printJson;
+      //   const style =
+      //     '@media print {.list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto}}';
+      //   printJS({
+      //     printable: "dialysis-print-box-1",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false,
+      //   });
+      this.printJson({
+        title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
+        <div style="width: 230px;padding: 10px 0;">患者名称：${1}</div>
+        <div style="width: 230px;padding: 10px 0;">数据来源：${1}</div>
+        <div style="width: 230px;padding: 10px 0;">预约状态：${1}</div>
+        <div style="width: 230px;padding: 10px 0;">领药时间：${1}</div>
+        </div>`, // 打印出来的标题
+        data: this.tableData, // 需要打印的数据
+        serial: true, // 是否需要打印序列号
+        fields: [
+          // 需要打印的字段
+
+          "name",
+          "SingleDosage",
+          "use",
+          "frequency",
+          "day",
+          "amount",
+          "tips",
+        ],
+        properties: [
+          // 需要打印的字段对应的表头名
+
+          {
+            field: "name",
+            displayName: "姓名",
+          },
+          {
+            field: "SingleDosage",
+            displayName: "单词用量",
+          },
+          {
+            field: "use",
+            displayName: "用法",
+          },
+          {
+            field: "frequency",
+            displayName: "频率",
+          },
+          {
+            field: "day",
+            displayName: "天数",
+          },
+          {
+            field: "amount",
+            displayName: "总量",
+          },
+          {
+            field: "tips",
+            displayName: "备注",
+          },
+        ],
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.print_style {
+  position: absolute;
+  right: 10px;
+  top: 42px;
+}
+
+.list_title {
+  width: 940px;
+  border-bottom: 1px solid;
+  display: flex;
+  margin: 30px auto;
+
+  div {
+    width: 230px;
+    padding: 10px 0;
+  }
+}
+</style>

src/xt_pages/Pharmacy/print/print.js

@@ -0,0 +1,53 @@
+import printJS from "print-js";
+/**
+ * 
+ * @param {
+ *      title:"", // 表名
+ *      serial：false, // 是否需要序号
+ *      data:[], // 要打印的数据
+ *      fields:[], // 需要打印的字段
+ *      properties:[
+ *          {
+ *              field:"字段名（对应fields）",
+ *              displayName:"打印时展⽰的中⽂表头名字",
+ *              columnSize:"定义列宽，⽤百分⽐来表⽰⼤⼩，可不传"
+ *          }
+ *      ],
+ * } args
+ *  
+ */
+function printJson(args = {}) {
+    let data = [];
+    for (let di = 0; di < args.data.length; di++) {
+        var obj = {}
+        // 如果需要序列号则是列表index+1
+        if (args.serial) {
+            obj.serial = di + 1
+        }
+        // 遍历需要打印的字段与列表字段⼀⼀对应，形成键值对
+        for (let fi = 0; fi < args.fields.length; fi++) {
+            obj[args.fields[fi]] = args.data[di][args.fields[fi]]
+        }
+        data.push(obj)
+    }
+    let properties = args.properties;
+    if (args.serial) {
+        properties.unshift({
+            field: "serial",
+            displayName: "序号",
+        })
+    }
+    printJS({
+        printable: data,
+        properties: properties || [],
+        header: args.title || "",
+        // 样式设置
+        type: 'json',  // 打印的格式
+        headerStyle:'display:flex;  .list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;}',
+        gridStyle: 'border: 1px solid #000;text-align:center;padding:5px 0;', // 表格样式
+        gridHeaderStyle: 'border: 1px solid #000;text-align:center;padding:5px 0;',//表头样式
+    });
+}
+export default {
+    printJson
+}

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -1,103 +1,140 @@
  <template>
   <div id="list-print" class="list-print">
     <div v-for="(i, index) in pageArr.length" :key="index">
-      <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
-      <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
-      <div class="listInfo">
-        <div>个人编号:{{order.psn_no}}</div>
-        <div>住院号：{{ order.mdtrt_id }}</div>
-<!--        <div>次数：</div>-->
-        <div>姓名：{{ order.psn_name }}</div>
-        <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
-      </div>
-
-      <div class="listInfo">
-        <div>入院科室：血液透析室</div>
-        <div>出院科室：血液透析室</div>
-        <!-- <div>入院日期：{{hospital_record.in_hosptial_time.split(' ')[0]}}</div> -->
-        <!-- <div>出院日期：{{hospital_record.out_hosptial_time.split(' ')[0]}}</div> -->
-        <!-- <div>住院天数:{{getDay(hospital_record.in_hosptial_time.split(' ')[0] ,hospital_record.out_hosptial_time.split(' ')[0])}}</div> -->
-      </div>
-
-      <div
-        class="listInfo"
-        style="padding-bottom: 10px; border-bottom: 1px solid"
-      >
-        <div>出院诊断：尿毒症</div>
-        <div>床位号：</div>
-        <div v-if="order&&order.insutype == '390'">费别：城乡居民基本医疗保险</div>
-        <div v-if="order&&order.insutype == '310'">费别：职工基本医疗保险</div>
-
-      </div>
-
-      <table
+      <TABLE
         class="listTable"
-        border="1"
-        frame="hsides"
-        rules="none"
-        v-for="item in list"
+        border="0"
         cellspacing="0"
+        style="font-size: 14px"
+        align="center"
       >
-        <tr style="border: 1px solid" >
-          <td style="width: 19%">账单名称：{{item.med_chrgitm_name}}</td>
-          <td style="width: 21%">费用名称</td>
-          <td style="width: 14%">规格</td>
-          <td style="width: 10%">类别</td>
-          <td style="width: 10%">单价(元)</td>
-          <td style="width: 6%">数量</td>
-          <td style="width: 20%">金额(元)</td>
-        </tr>
-        <tr v-for="subItem in item.details">
-          <td style="width: 19%;white-space: nowrap;">{{subItem.name}}</td>
-          <td style="width: 21%;white-space: nowrap;"></td>
-          <td style="width: 14%">{{ subItem.spec }}</td>
-          <td style="width: 10%;white-space: nowrap;">{{ subItem.medicine_insurance_kind }}</td>
-          <td style="width: 10%">{{ subItem.price.toFixed(2) }}</td>
-          <td style="width: 6%;white-space: nowrap;">{{ subItem.count }}{{ subItem.unit }}</td>
-          <td style="width: 20%">{{ (subItem.price * subItem.count).toFixed(2) }}</td>
-        </tr>
-
-        <tr>
-          <td style="width: 20%;white-space: nowrap;">甲类：{{item.jiaTotal?item.jiaTotal:"0.00"}}</td>
-          <td style="width: 20%;white-space: nowrap;" >乙类：{{item.yiTotal?item.yiTotal:"0.00"}}</td>
-          <td style="width: 5%;white-space: nowrap;">丙类：{{item.bingTotal?item.bingTotal:"0.00"}}</td>
-          <td style="width: 5%;white-space: nowrap;">其他：{{0.00}}</td>
-          <td></td>
-          <td style="width: 20%;white-space: nowrap;">小计：{{item.total}}</td>
-
-        </tr>
-      </table>
-      <table
-          class="listTable"
-          border="1"
-          frame="below"
-          rules="none"
-          cellspacing="0"
-      >
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td>总费用：{{order.medfee_sumamt}}</td>
-        </tr>
-
-        <tr>
-          <td>报销类别费用合计</td>
-          <td>甲类：{{getJaiTotal()?getJaiTotal():"0.00"}}</td>
-          <td>乙类：{{getYiTotal()?getYiTotal():"0.00"}}</td>
-          <td>丙类：{{getBingTotal()?getBingTotal():"0.00"}}</td>
-          <td></td>
-          <td>其他：0.00</td>
-        </tr>
-      </table>
-      <div class="tableBottom">
-        <!-- <div class="tableBottomOne">制表人：{{ admin.user_name }}</div> -->
-        <div class="tableBottomOne">制表日期：{{ getNowTime() }}</div>
-        <!-- <div class="tableBottomOne">总费用：{{ order.medfee_sumamt }}元</div> -->
-      </div>
+        <THEAD style="display: table-header-group; font-weight: bold;border-bottom: 1px solid;">
+          <TR
+            ><TD colspan="4" align="center" style="font-size: 20px"
+              >{{ $store.getters.xt_user.org.org_name }}费用清单</TD
+            ></TR
+          >
+          <TR>
+            <TD colspan="1">个人编码:{{ order.psn_no }}</TD>
+            <TD>住院号：{{ order.mdtrt_id }}</TD>
+            <TD>姓名：{{ order.psn_name }}</TD>
+            <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
+          </TR>
+          <TR>
+            <TD> 入院科室：血液透析室 </TD>
+            <TD> 出院科室：血液透析室 </TD>
+          </TR>
+          <TR>
+            <TD> 出院诊断：尿毒症 </TD>
+            <TD> 床位号： </TD>
+            <TD v-if="order && order.insutype == '390'">
+              费别：城乡居民基本医疗保险
+            </TD>
+            <TD v-if="order && order.insutype == '310'">
+              费别：职工基本医疗保险
+            </TD>
+            <TD></TD>
+          </TR>
+        </THEAD>
+        <TBODY style="text-align: center">
+          <TR>
+            <TD colspan="4">
+              <Table
+                class="listTable"
+                border="1"
+                frame="hsides"
+                rules="none"
+                v-for="item in list"
+                :key="item"
+                cellspacing="0"
+              >
+                <TR style="border: 1px solid">
+                  <TD width="80"
+                    >账单名称：{{ item.med_chrgitm_name }}</TD
+                  >
+                  <TD width="80">费用名称</TD>
+                  <TD width="150">规格</TD>
+                  <TD width="80">类别</TD>
+                  <TD width="80">单价(元)</TD>
+                  <TD width="80">数量</TD>
+                  <TD width="80">金额(元)</TD>
+                </TR>
+                <TR v-for="subItem in item.details" :key="subItem">
+                  <TD style="white-space: nowrap">{{
+                    subItem.name
+                  }}</TD>
+                  <TD style="white-space: nowrap"></TD>
+                  <TD >{{ subItem.spec }}</TD>
+                  <TD style="white-space: nowrap">{{
+                    subItem.medicine_insurance_kind
+                  }}</TD>
+                  <TD>{{ subItem.price.toFixed(2) }}</TD>
+                  <TD style="white-space: nowrap"
+                    >{{ subItem.count }}{{ subItem.unit }}</TD
+                  >
+                  <TD>{{
+                    (subItem.price * subItem.count).toFixed(2)
+                  }}</TD>
+                </TR>
+                <TR>
+                  <TD style="white-space: nowrap"
+                    >甲类：{{ item.jiaTotal ? item.jiaTotal : "0.00" }}</TD
+                  >
+                  <TD style="width: 20%; white-space: nowrap"
+                    >乙类：{{ item.yiTotal ? item.yiTotal : "0.00" }}</TD
+                  >
+                  <TD style="width: 5%; white-space: nowrap"
+                    >丙类：{{ item.bingTotal ? item.bingTotal : "0.00" }}</TD
+                  >
+                  <TD style="width: 5%; white-space: nowrap"
+                    >其他：{{ 0.0 }}</TD
+                  >
+                  <TD></TD>
+                  <TD style="width: 20%; white-space: nowrap"
+                    >小计：{{ item.total }}</TD
+                  >
+                  <TD></TD>
+                </TR>
+              </Table>
+            </TD>
+          </TR>
+          <TR>
+            <TD colspan="4">
+              <Table
+                class="listTable"
+                border="1"
+                frame="below"
+                rules="none"
+                cellspacing="0"
+              >
+                <TR>
+                  <TD></TD>
+                  <TD></TD>
+                  <TD></TD>
+                  <TD></TD>
+                  <TD></TD>
+                  <TD></TD>
+                  <TD>总费用：{{ order.medfee_sumamt }}</TD>
+                </TR>
+                <TR>
+                  <TD>报销类别费用合计</TD>
+                  <TD>甲类：{{ getJaiTotal() ? getJaiTotal() : "0.00" }}</TD>
+                  <TD>乙类药品：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
+                  <TD>丙类：{{ getBingTotal() ? getBingTotal() : "0.00" }}</TD>
+                  <TD>非药品：0.00</TD>
+                  <TD></TD>
+                  <TD>其他：0.00</TD>
+                </TR>
+              </Table>
+            </TD>
+          </TR>
+        </TBODY>
+        <TFOOT style="display: table-header-group; font-weight: bold">
+          <TR>
+            <TD colspan="4">制表日期：{{ getNowTime() }}</TD>
+          </TR>
+        </TFOOT>
+      </TABLE>
     </div>
   </div>
 </template>
@@ -118,7 +155,8 @@ export default {
       default: function () {
         return {};
       },
-    },hospital_record:{
+    },
+    hospital_record: {
       type: Object,
       default: function () {
         return {};
@@ -147,40 +185,38 @@ export default {
   //     this.getPage()
   // },
   methods: {
-    getDay(dateString1,dateString2){
-      var  startDate = Date.parse(dateString1);
-      var  endDate = Date.parse(dateString2);
-      if (startDate>endDate){
+    getDay(dateString1, dateString2) {
+      var startDate = Date.parse(dateString1);
+      var endDate = Date.parse(dateString2);
+      if (startDate > endDate) {
         return 0;
       }
-      if (startDate==endDate){
+      if (startDate == endDate) {
         return 1;
       }
-      var days=(endDate - startDate)/(1*24*60*60*1000);
-      return  days;
-
+      var days = (endDate - startDate) / (1 * 24 * 60 * 60 * 1000);
+      return days;
     },
-    getJaiTotal(){
-      var total = 0
-      for(let i =0; i < this.list.length; i++){
-        total = parseFloat(total) + parseFloat(this.list[i].jiaTotal)
-
+    getJaiTotal() {
+      var total = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        total = parseFloat(total) + parseFloat(this.list[i].jiaTotal);
       }
-      return total.toFixed(2)
-    }, getYiTotal(){
-      var total = 0
-      for(let i =0; i<  this.list.length; i++){
-        total = parseFloat(total) + parseFloat(this.list[i].yiTotal)
-
+      return total.toFixed(2);
+    },
+    getYiTotal() {
+      var total = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        total = parseFloat(total) + parseFloat(this.list[i].yiTotal);
       }
-      return total.toFixed(2)
-    }, getBingTotal(){
-      var total = 0
-      for(let i =0; i < this.list.length; i++){
-        total = parseFloat(total) + parseFloat(this.list[i].bingTotal)
-
+      return total.toFixed(2);
+    },
+    getBingTotal() {
+      var total = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        total = parseFloat(total) + parseFloat(this.list[i].bingTotal);
       }
-      return total.toFixed(2)
+      return total.toFixed(2);
     },
 
     getNowTime: function () {
@@ -217,8 +253,8 @@ export default {
           this.pageArr.push(num);
         }
       }
-
-      console.log(this.pageArr,'this.pageArr')
+      console.log(this.list, "lisy");
+      console.log(this.pageArr, "this.pageAr");
     },
   },
   watch: {
@@ -263,7 +299,16 @@ export default {
   border-color: #000;
   text-align: left;
 }
-.listTable tr td {
+.listTable thead {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable thead tr td {
   padding: 0 5px;
 }
 .tableBottom {

src/xt_pages/stock/drugs/cancelDrugStockDetail.vue

@@ -1,23 +1,26 @@
 <template>
-  <cancel-stock-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></cancel-stock-order-detail>
+  <cancel-stock-order-detail
+    v-if="isEdit == 0"
+    v-on:edit-record="isEdit = 1"
+  ></cancel-stock-order-detail>
   <cancel-stock-order-edit v-else></cancel-stock-order-edit>
 </template>
 
 <script>
-  import CancelStockOrderDetail from './cancelDrugStockOrderDetail'
-  import CancelStockOrderEdit from './cancelDrugStockOrderEdit'
-  export default {
-    name: 'cancelStockDetail',
-    components: { CancelStockOrderEdit, CancelStockOrderDetail },
-    data() {
-      return {
-        isEdit: 0
-      }
-    },
-  }
+import CancelStockOrderDetail from "./cancelDrugStockOrderDetail";
+import CancelStockOrderEdit from "./cancelDrugStockOrderEdit";
+export default {
+  name: "cancelStockDetail",
+  components: { CancelStockOrderEdit, CancelStockOrderDetail },
+  data() {
+    return {
+      isEdit: 0,
+    };
+  },
 
+
+};
 </script>
 
 <style scoped>
-
 </style>

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -6,7 +6,7 @@
         size="small"
         @click="AddNewOrder"
         class="filter-item"
-        style="float:right;"
+        style="float: right"
         type="primary"
         icon="el-icon-circle-plus-outline"
         >新增
@@ -14,20 +14,27 @@
     </div>
 
     <div class="app-container">
-
       <div class="cell clearfix">
         <label class="title"><span class="name">仓库</span> :</label>
-        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
-            <el-option
-              v-for="(option, index) in houseList"
-              :key="index"
-              :label="option.storehouse_name"
-              :value="option.id">
-            </el-option>
+        <el-select
+          size="small"
+          v-model="storehouse_id"
+          filterable
+          placeholder="请选择仓库"
+          style="width: 200px"
+          @change="changeStoreHouse"
+        >
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id"
+          >
+          </el-option>
         </el-select>
         <el-input
           size="small"
-          style="width: 200px;"
+          style="width: 200px"
           class="filter-item"
           v-model.trim="searchKey"
           placeholder="单据编码/制单人"
@@ -40,14 +47,14 @@
           @click="search"
           >搜索</el-button
         >
-        <div style="margin-left:10px;">
+        <div style="margin-left: 10px">
           <label class="title"><span class="name">退库时间</span> : </label>
           <el-date-picker
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            style="width: 196px"
             type="date"
             placeholder="选择日期时间"
             align="right"
@@ -61,7 +68,7 @@
             v-model="end_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            style="width: 196px"
             type="date"
             placeholder="选择日期时间"
             align="right"
@@ -72,8 +79,6 @@
         </div>
       </div>
 
-
-
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox
           style="width: 70px"
@@ -81,9 +86,13 @@
           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
-        <el-button size="small"  type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small"  type="primary" @click="toExport">导出</el-button>
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small" type="primary" @click="toExport"
+          >导出</el-button
+        >
       </div>
 
       <el-table
@@ -97,7 +106,7 @@
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
+          color: '#606266',
         }"
       >
         <el-table-column type="selection" width="55"> </el-table-column>
@@ -116,11 +125,10 @@
 
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            {{getHouseName(scope.row.storehouse_id)}}
+            {{ getHouseName(scope.row.storehouse_id) }}
           </template>
         </el-table-column>
 
-
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
             {{ getXuserName(scope.row.creater) }}
@@ -164,120 +172,118 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[5,10, 15, 100]"
+        :page-sizes="[5, 10, 15, 100]"
         :page-size="5"
         background
-        style="margin-top:20px;float: right;margin-bottom:10px;"
+        style="margin-top: 20px; float: right; margin-bottom: 10px"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-      <div v-show ="showTable">
+      <div v-show="showTable">
         <el-table
-            :data="tableList"
-            :class="signAndWeighBoxPatients"
-            border
-            highlight-current-row
-            ref="multipleTableOne"
-
-            @selection-change="select"
-            :row-style="{ color: '#303133' }"
-            :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-            }"
-          >
-
-            <el-table-column label="药品名称" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.BaseDrugLib.drug_name}}
-              </template>
-            </el-table-column>
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTableOne"
+          @selection-change="select"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
+          }"
+        >
+          <el-table-column label="药品名称" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.BaseDrugLib.drug_name }}
+            </template>
+          </el-table-column>
 
           <el-table-column label="规格&单位" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
-              </template>
-            </el-table-column>
-            <el-table-column label="国家编码" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.BaseDrugLib.medical_insurance_number}}
-              </template>
-            </el-table-column>
-
-
-            <el-table-column label="仓库名称" align="center">
-              <template slot-scope="scope">
-                {{getHouseName(scope.row.storehouse_id)}}
-              </template>
-            </el-table-column>
-
-            <el-table-column label="退库数量" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.count}}
-              </template>
-            </el-table-column>
-
-            <el-table-column label="退库单位" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.max_unit}}
-              </template>
-            </el-table-column>
-
-            <el-table-column label="退库单价" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.price}}
-              </template>
-            </el-table-column>
-
-            <!-- <el-table-column label="批次" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.BaseDrugLib.dose
+              }}{{ scope.row.BaseDrugLib.dose_unit }} *
+              {{ scope.row.BaseDrugLib.min_number
+              }}{{ scope.row.BaseDrugLib.min_unit }} /{{
+                scope.row.BaseDrugLib.max_unit
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.BaseDrugLib.medical_insurance_number }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="仓库名称" align="center">
+            <template slot-scope="scope">
+              {{ getHouseName(scope.row.storehouse_id) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库数量" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.count }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库单位" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.max_unit }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库单价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price }}
+            </template>
+          </el-table-column>
+
+          <!-- <el-table-column label="批次" align="center">
               <template slot-scope="scope">
                 {{ scope.row.batch_number}}
               </template>
             </el-table-column> -->
 
-            <el-table-column label="品名/注册证号(备案凭证号)" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.register_account}}
-              </template>
-            </el-table-column>
+          <el-table-column label="品名/注册证号(备案凭证号)" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.register_account }}
+            </template>
+          </el-table-column>
 
-            <el-table-column label="生产厂家" align="center">
-              <template slot-scope="scope">
-                {{scope.row.manufacturer}}
-              </template>
-            </el-table-column>
+          <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.manufacturer }}
+            </template>
+          </el-table-column>
 
-            <el-table-column label="生产日期" align="center">
-              <template slot-scope="scope">
-                {{scope.row.product_date}}
-              </template>
-            </el-table-column>
+          <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.product_date }}
+            </template>
+          </el-table-column>
 
           <el-table-column label="有效日期" align="center">
-              <template slot-scope="scope">
-                {{scope.row.expiry_date}}
-              </template>
-            </el-table-column>
-
-            <el-table-column label="经销商" align="center">
-              <template slot-scope="scope">
-                {{scope.row.dealer}}
-              </template>
-            </el-table-column>
-
-            <el-table-column label="退库原因" align="center">
-              <template slot-scope="scope">
-                {{scope.row.remark}}
-              </template>
-            </el-table-column>
-
-
-          </el-table>
+            <template slot-scope="scope">
+              {{ scope.row.expiry_date }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="经销商" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.dealer }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库原因" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.remark }}
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
     </div>
-
-
   </div>
 </template>
 
@@ -289,15 +295,21 @@ import {
   GetAllConfig,
   getDrugCancelStockList,
   getCancelStockDetail,
-  getDrugCancelExportList
+  getDrugCancelExportList,
 } from "@/api/drug/drug_stock";
-import BreadCrumb from '../../components/bread-crumb'
+import BreadCrumb from "../../components/bread-crumb";
 // import BreadCrumb from "../components/bread-crumb";
 
 export default {
   name: "salesReturnOrder",
-  components: { BreadCrumb  },
+  components: { BreadCrumb },
   created() {
+    if (this.$route.path == "/Pharmacy/drugs/stock/cancel") {
+      this.crumbs = [
+        { path: false, name: "药品管理" },
+        { path: false, name: "出库退库单" },
+      ];
+    }
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -327,7 +339,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: false, name: "出库退库单" }
+        { path: false, name: "出库退库单" },
       ],
       searchKey: "",
       type: 1,
@@ -348,16 +360,16 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      tableList:[],
-      showTable:false,
-      order_id:"",
-      exportList:[],
-      houseList:[],
-      storehouse_id:0,
+      tableList: [],
+      showTable: false,
+      order_id: "",
+      exportList: [],
+      houseList: [],
+      storehouse_id: 0,
     };
   },
   methods: {
-    search: function() {
+    search: function () {
       const Params = {
         page: this.page,
         limit: this.limit,
@@ -365,10 +377,10 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey,
-        storehouse_id:this.storehouse_id,
+        storehouse_id: this.storehouse_id,
       };
       this.cancelStockDate = [];
-      getDrugCancelStockList(Params).then(response => {
+      getDrugCancelStockList(Params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
@@ -380,38 +392,36 @@ export default {
         }
       });
     },
-    AddNewOrder: function() {
+    AddNewOrder: function () {
       this.$router.push({
         name: "cancelDrugStockOrderAdd",
-        query: { type: this.type }
+        query: { type: this.type },
       });
     },
-    GetCancelStock: function() {
+    GetCancelStock: function () {
       const Params = {
         page: this.page,
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        storehouse_id:this.storehouse_id,
+        storehouse_id: this.storehouse_id,
       };
       this.cancelStockDate = [];
-      getDrugCancelStockList(Params).then(response => {
+      getDrugCancelStockList(Params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
-
-
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
           }
-          var obj= {id:0,storehouse_name:"全部"}
-          this.houseList = []
-          this.houseList.push(obj)
-          for(let i=0;i<response.data.data.houseList.length;i++){
-            this.houseList.push(response.data.data.houseList[i])
+          var obj = { id: 0, storehouse_name: "全部" };
+          this.houseList = [];
+          this.houseList.push(obj);
+          for (let i = 0; i < response.data.data.houseList.length; i++) {
+            this.houseList.push(response.data.data.houseList[i]);
           }
         }
       });
@@ -440,8 +450,7 @@ export default {
       return name;
     },
     fetchAllAdminUsers() {
-      fetchAllAdminUsers().then(response => {
-
+      fetchAllAdminUsers().then((response) => {
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -453,7 +462,7 @@ export default {
         }
       });
     },
-    handleSelectionChange: function(val) {
+    handleSelectionChange: function (val) {
       this.multipleSelection = val;
     },
     handleSizeChange(val) {
@@ -487,11 +496,11 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    calculate: function(val) {
+    calculate: function (val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
-    GetConfigInfo: function() {
-      GetAllConfig().then(response => {
+    GetConfigInfo: function () {
+      GetAllConfig().then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
@@ -501,40 +510,41 @@ export default {
         }
       });
     },
-    getManufactuerName: function(manufacturer_id) {
+    getManufactuerName: function (manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
           return this.manufacturer[i].manufacturer_name;
         }
       }
     },
-    getDealerName: function(dealer_id) {
+    getDealerName: function (dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
           return this.dealer[i].dealer_name;
         }
       }
     },
-    handleEdit: function(index, row) {
-
-      this.$router.push({path:"/drugstock/cancel/edit?id="+row.id+"&type="+this.type})
+    handleEdit: function (index, row) {
+      this.$router.push({
+        path: "/drugstock/cancel/edit?id=" + row.id + "&type=" + this.type,
+      });
     },
-    handleDelete: function(index, row) {
+    handleDelete: function (index, row) {
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
 
       const params = {
-        ids: idStr
+        ids: idStr,
       };
 
       this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          deleteDrugCancelStock(params).then(response => {
+          deleteDrugCancelStock(params).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               return false;
@@ -543,7 +553,7 @@ export default {
                 title: "成功",
                 message: "删除成功",
                 type: "success",
-                duration: 2000
+                duration: 2000,
               });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.cancelStockDate.length; y++) {
@@ -557,7 +567,7 @@ export default {
         })
         .catch(() => {});
     },
-    changeAllSelected: function(val) {
+    changeAllSelected: function (val) {
       if (val) {
         this.$refs.multipleTable.toggleAllSelection();
       } else {
@@ -565,13 +575,13 @@ export default {
       }
     },
     select(selection) {
-      var ids= []
-      for(let i=0;i<selection.length;i++){
-         ids.push(selection[i].id)
+      var ids = [];
+      for (let i = 0; i < selection.length; i++) {
+        ids.push(selection[i].id);
       }
-      this.order_id =  ids.join(",")
+      this.order_id = ids.join(",");
       this.selectedTableData = selection;
-      this.getDrugCancelExportList()
+      this.getDrugCancelExportList();
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -584,14 +594,15 @@ export default {
       }
       const idStr = ids.join(",");
       const params = {
-        ids: idStr
+        ids: idStr,
       };
       this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-          deleteDrugCancelStock(params).then(response => {
+        type: "warning",
+      })
+        .then(() => {
+          deleteDrugCancelStock(params).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               return false;
@@ -600,7 +611,7 @@ export default {
                 title: "成功",
                 message: "删除成功",
                 type: "success",
-                duration: 2000
+                duration: 2000,
               });
 
               for (let i = 0; i < ids.length; i++) {
@@ -616,105 +627,155 @@ export default {
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
-     if(val!=null){
-      this.getCancelStockDetail(val.id)
-     }
+      if (val != null) {
+        this.getCancelStockDetail(val.id);
+      }
     },
-    getCancelStockDetail(id){
-        var params = {
-          id:id
+    getCancelStockDetail(id) {
+      var params = {
+        id: id,
+      };
+      getCancelStockDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          for (let i = 0; i < list.length; i++) {
+            list[i].product_date = this.getTime(
+              list[i].product_date,
+              "{y}-{h}-{d}"
+            );
+            list[i].expiry_date = this.getTime(
+              list[i].expiry_date,
+              "{y}-{h}-{d}"
+            );
+          }
+          this.tableList = list;
+          this.showTable = true;
         }
-      getCancelStockDetail(params).then(response=>{
-       if(response.data.state == 1){
-         var list =  response.data.data.list
-         for(let i=0;i<list.length;i++){
-           list[i].product_date = this.getTime(list[i].product_date,"{y}-{h}-{d}")
-           list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{h}-{d}")
-         }
-         this.tableList = list
-         this.showTable = true
-       }
-      })
+      });
     },
-   getTime(val) {
-      if(val < 0){
-        return ""
+    getTime(val) {
+      if (val < 0) {
+        return "";
       }
-      if(val == ""){
-      return ""
-      }else {
-      return uParseTime(val, '{y}-{m}-{d}')
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
       }
     },
-    toPrint(){
-      if(this.order_id == ""){
-        this.$message.error("请勾选退库单")
-        return
+    toPrint() {
+      if (this.order_id == "") {
+        this.$message.error("请勾选退库单");
+        return;
       }
-     this.$router.push({path:"/drug/cancel/print?order_id="+this.order_id+"&start_time="+this.start_time+"&end_time="+this.end_time})
+      this.$router.push({
+        path:
+          "/drug/cancel/print?order_id=" +
+          this.order_id +
+          "&start_time=" +
+          this.start_time +
+          "&end_time=" +
+          this.end_time,
+      });
     },
-    getDrugCancelExportList(){
+    getDrugCancelExportList() {
       const params = {
-        order_id:this.order_id
-      }
-     getDrugCancelExportList(params).then(response=>{
-        if(response.data.state == 1){
-         var list = response.data.data.list
-        //  console.log("导出数据222",list)
-         this.exportList = list
+        order_id: this.order_id,
+      };
+      getDrugCancelExportList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          //  console.log("导出数据222",list)
+          this.exportList = list;
         }
-     })
+      });
     },
-    toExport(){
-      if(this.order_id == ""){
-        this.$message.error("请勾选退库单")
-        return
+    toExport() {
+      if (this.order_id == "") {
+        this.$message.error("请勾选退库单");
+        return;
       }
-     import('@/vendor/Export2Excel').then(excel => {
-
-      for(let i=0;i<this.exportList.length;i++){
-        this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
-        this.exportList[i].drug_name = this.exportList[i].BaseDrugLib.drug_name
-        this.exportList[i].unit = this.exportList[i].BaseDrugLib.dose + this.exportList[i].BaseDrugLib.dose_unit + "*" + this.exportList[i].BaseDrugLib.min_number +this.exportList[i].BaseDrugLib.min_unit + "/" +this.exportList[i].BaseDrugLib.max_unit
-        if(this.exportList[i].dealer == 0){
-          this.exportList[i].dealer = ""
-        }
-        if(this.exportList[i].manufacturer == 0){
-          this.exportList[i].manufacturer = ""
-        }
+      import("@/vendor/Export2Excel").then((excel) => {
+        for (let i = 0; i < this.exportList.length; i++) {
+          this.exportList[i].total_price =
+            this.exportList[i].count * this.exportList[i].price;
+          this.exportList[i].drug_name =
+            this.exportList[i].BaseDrugLib.drug_name;
+          this.exportList[i].unit =
+            this.exportList[i].BaseDrugLib.dose +
+            this.exportList[i].BaseDrugLib.dose_unit +
+            "*" +
+            this.exportList[i].BaseDrugLib.min_number +
+            this.exportList[i].BaseDrugLib.min_unit +
+            "/" +
+            this.exportList[i].BaseDrugLib.max_unit;
+          if (this.exportList[i].dealer == 0) {
+            this.exportList[i].dealer = "";
+          }
+          if (this.exportList[i].manufacturer == 0) {
+            this.exportList[i].manufacturer = "";
+          }
 
-        this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
-        this.exportList[i].expiry_date = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
-      }
-      const tHeader = ['药品名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
-      const filterVal = ['drug_name', 'unit','count','price','batch_number','register_account','manufacturer','product_date','expiry_date','remark']
-      // console.log("table",this.exportList)
-
-      const data = this.formatJson(filterVal, this.exportList)
-      excel.export_json_to_excel({
-        header: tHeader,
-        data,
-        filename: '药品退库单详情'
-      })
-      this.downloadLoading = false
-     })
+          this.exportList[i].product_date = this.getTime(
+            this.exportList[i].product_date,
+            "{y}-{h}-{d}"
+          );
+          this.exportList[i].expiry_date = this.getTime(
+            this.exportList[i].expiry_date,
+            "{y}-{h}-{d}"
+          );
+        }
+        const tHeader = [
+          "药品名称",
+          "规格&单位",
+          "退库数量",
+          "退库单价",
+          "批次",
+          "品名/注册证号(备案凭证号)",
+          "生产厂家",
+          "生产日期",
+          "有效期",
+          "退库原因",
+        ];
+        const filterVal = [
+          "drug_name",
+          "unit",
+          "count",
+          "price",
+          "batch_number",
+          "register_account",
+          "manufacturer",
+          "product_date",
+          "expiry_date",
+          "remark",
+        ];
+        // console.log("table",this.exportList)
+
+        const data = this.formatJson(filterVal, this.exportList);
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: "药品退库单详情",
+        });
+        this.downloadLoading = false;
+      });
     },
     formatJson(filterVal, jsonData) {
-    return jsonData.map(v => filterVal.map(j => v[j]));
-   },
-   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
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    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;
         }
-    }
-    return storehouse_name
+      }
+      return storehouse_name;
+    },
+    changeStoreHouse() {
+      this.GetCancelStock();
+    },
   },
-  changeStoreHouse(){
-    this.GetCancelStock()
-  }
-  }
 };
 </script>
 

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -3,230 +3,240 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container ">
+    <div class="app-container">
       <div class="cell clearfix">
-       药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
-       库存:{{this.$route.query.over_plus}}&nbsp;
-       规格:<span>{{this.$route.query.unit}}</span>&nbsp;
-       厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+        药品名称:<span>{{ getName(this.$route.query.drug_id) }}</span
+        >&nbsp; 库存:{{ this.$route.query.over_plus }}&nbsp; 规格:<span>{{
+          this.$route.query.unit
+        }}</span
+        >&nbsp; 厂家:<span>{{ this.$route.query.manufacturer }}</span
+        >&nbsp;
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
         <el-date-picker
-            size="small"
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="startTimeChange"
-           ></el-date-picker>-
-            <el-date-picker
-              size="small"
-              v-model="end_time"
-              prefix-icon="el-icon-date"
-              :editable="false"
-              style="width: 196px;margin-right:10px;"
-              type="date"
-              placeholder="选择日期时间"
-              align="right"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              @change="endTimeChange"
-          ></el-date-picker>
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker
+        >-
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px; margin-right: 10px"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
       </div>
-      
-       <el-table
-        :data="tableList"
-        border
-        style="width: 100%">
+
+      <el-table :data="tableList" border style="width: 100%">
         <el-table-column prop="date" label="序号" width="100" align="center">
-           <template  slot-scope="scope">
-              {{scope.$index + 1}}
-           </template>
+          <template slot-scope="scope">
+            {{ scope.$index + 1 }}
+          </template>
         </el-table-column>
         <el-table-column prop="date" label="供应商" width="180" align="center">
-           <template  slot-scope="scope">
-              {{getManufactur(scope.row.manufacturer)}}
-           </template>
+          <template slot-scope="scope">
+            {{ getManufactur(scope.row.manufacturer) }}
+          </template>
         </el-table-column>
-        <el-table-column prop="drug_type" label="入库单据编码" width="180" align="center">
-           <template slot-scope="scope">
-              {{scope.row.warehousing_order}}
-           </template>
+        <el-table-column
+          prop="drug_type"
+          label="入库单据编码"
+          width="180"
+          align="center"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.warehousing_order }}
+          </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
-           <template slot-scope="scope">
-              {{getTime(scope.row.ctime)}}
-           </template>
+          <template slot-scope="scope">
+            {{ getTime(scope.row.ctime) }}
+          </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="有效期" align="center">
-           <template slot-scope="scope">
-              {{getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
-           </template>
+          <template slot-scope="scope">
+            {{ getTime(scope.row.expiry_date, "{y}-{m}-{d}") }}
+          </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="批号" align="center">
-           <template slot-scope="scope">
-              {{scope.row.batch_number}}
-           </template>
+        <el-table-column prop="drug_name" label="批号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.batch_number }}
+          </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="仓库名称" width="200" align="center">
-           <template slot-scope="scope">
-              <span>{{getHouseName(scope.row.storehouse_id)}}</span>
-           </template>
+        <el-table-column
+          prop="drug_name"
+          label="仓库名称"
+          width="200"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ getHouseName(scope.row.storehouse_id) }}</span>
+          </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="数量" align="center">
-           <template slot-scope="scope">
-             {{scope.row.warehousing_count}}{{scope.row.max_unit}}
-           </template>
+        <el-table-column prop="drug_name" label="数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehousing_count }}{{ scope.row.max_unit }}
+          </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="零售价" align="center">
-           <template slot-scope="scope">
-              {{scope.row.retail_price}}
-           </template>
+          <template slot-scope="scope">
+            {{ scope.row.retail_price }}
+          </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进货单价" align="center">
-           <template slot-scope="scope">
-              {{scope.row.price}}
-           </template>
+          <template slot-scope="scope">
+            {{ scope.row.price }}
+          </template>
         </el-table-column>
-       </el-table>
-       
+      </el-table>
+
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,500,1000]"
+        :page-sizes="[10, 50, 100, 500, 1000]"
         :page-size="10"
         background
         align="right"
-        style="margin-top:20px;"
+        style="margin-top: 20px"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
     </div>
 
-    <setting-dialog
-      ref="dialog"
-    ></setting-dialog>
-
+    <setting-dialog ref="dialog"></setting-dialog>
   </div>
 </template>
 
 <script>
-  import { uParseTime } from '@/utils/tools'
-  import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getBatchOrderDetail,getDrugCountList } from '@/api/drug/drug_stock'
-  import SettingDialog from './settingDialog/index'
-  import { getDictionaryDataConfig } from "@/utils/data";
-  export default {
-    name: 'stockIn',
-    created() {
-       var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
-      this.end_time =
-        nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
-      this.start_time =
-        nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      var drugCategory = getDictionaryDataConfig('system','drug_category')
-      this.drugCategory.push(...drugCategory)
-      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-      this.getlist()
-    },
-    components: {
-      SettingDialog,
-      BreadCrumb
+import { uParseTime } from "@/utils/tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getBatchOrderDetail, getDrugCountList } from "@/api/drug/drug_stock";
+import SettingDialog from "./settingDialog/index";
+import { getDictionaryDataConfig } from "@/utils/data";
+export default {
+  name: "stockIn",
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    var drugCategory = getDictionaryDataConfig("system", "drug_category");
+    this.drugCategory.push(...drugCategory);
+    this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
+    this.getlist();
+  },
+  components: {
+    SettingDialog,
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/drugs/stock/query", name: "药品库存查询" },
+        { path: "/drugstock/in/drugstockflow", name: "库存流水" },
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      page: 1,
+      limit: 10,
+      goodType: [],
+      goodInfo: [],
+      tempArr: [],
+      sameRowArr: [],
+      WarehouseInfo: {
+        loading: false,
+        warehouseInfoDate: [],
+      },
+      tableData: [],
+      drug_category: 0,
+      drugCategory: [{ id: 0, name: "全部" }],
+      drugTypeList: [],
+      tableList: [],
+      manufacturerList: [],
+      countList: [],
+      outCountList: [],
+      autoCountList: [],
+      minCount: [],
+      drugOutList: [],
+      drug: {},
+      houseList: [],
+    };
+  },
+  watch: {
+
+  },
+
+
+  methods: {
+    getlist() {
+      var params = {
+        drug_id: this.$route.query.drug_id,
+        page: this.page,
+        limit: this.limit,
+      };
+      getBatchOrderDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var detail = response.data.data.detail;
+
+          this.tableList = detail;
+          this.manufacturerList = response.data.data.manufacturerList;
+          var total = response.data.data.total;
+
+          this.total = total;
+          this.drug = response.data.data.drug;
+          this.houseList = response.data.data.houseList;
+        }
+      });
     },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '库存管理' },
-          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
-          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
-        ],
-        keywords: '',
-        total: 0,
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        page: 1,
-        limit: 10,
-        goodType: [],
-        goodInfo: [],
-        tempArr: [],
-        sameRowArr: [],
-        WarehouseInfo: {
-          loading: false,
-          warehouseInfoDate: []
-        },
-        tableData:[],
-        drug_category:0,
-        drugCategory:[
-          {id:0,name:"全部"}
-        ],
-        drugTypeList:[],
-        tableList:[],
-        manufacturerList:[],
-        countList:[],
-        outCountList:[],
-        autoCountList:[],
-        minCount:[],
-        drugOutList:[],
-        drug:{},
-        houseList:[],
+    getTime(val) {
+      if (val < 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
       }
     },
-    methods:{
-      getlist(){
-         var params = {
-           drug_id:this.$route.query.drug_id,
-           page:this.page,
-           limit:this.limit,
-         }
-        getBatchOrderDetail(params).then(response=>{
-           if(response.data.state == 1){
-              var detail =  response.data.data.detail
-             
-              this.tableList = detail
-              this.manufacturerList = response.data.data.manufacturerList
-              var total = response.data.data.total
-              
-              this.total = total
-              this.drug =  response.data.data.drug
-              this.houseList = response.data.data.houseList
-           }
-        })
-      },
-      getTime(val) {
-       if(val < 0){
-           return ""
-       }
-       if(val == ""){
-          return ""
-        }else {
-          return uParseTime(val, '{y}-{m}-{d}')
-        }
-     },
-   handleSizeChange(val) {
+    handleSizeChange(val) {
       this.limit = val;
       this.getlist();
     },
@@ -234,206 +244,205 @@
       this.page = val;
       this.getlist();
     },
-    startTimeChange(val){
-      this.start_time = val
-      this.getlist()
+    startTimeChange(val) {
+      this.start_time = val;
+      this.getlist();
     },
-    endTimeChange(val){
-      this.end_time = val
-      this.getlist()
+    endTimeChange(val) {
+      this.end_time = val;
+      this.getlist();
     },
-     getDrugCountList(){
-         var params = {
-          keyword: this.keywords,
-          start_time:this.start_time,
-          end_time:this.end_time,
-         }
-      getDrugCountList(params).then(response=>{
-          if(response.data.state == 1){
-            var countlist =  response.data.data.countList
-          
-            this.countList = countlist
-            var outcountlist = response.data.data.outCountList
-           
-            this.outCountList = outcountlist
-            var aucountlist = response.data.data.auCountList
-           
-            this.autoCountList = aucountlist
-             var minCount = response.data.data.minCount
-            
-            this.minCount = minCount
-            var info = response.data.data.info
-            for(let i=0;i<info.length;i++){
-              if(info[i].count_unit == info[i].max_unit){
-                 info[i].count = info[i].count * info[i].min_number
-              }
+    getDrugCountList() {
+      var params = {
+        keyword: this.keywords,
+        start_time: this.start_time,
+        end_time: this.end_time,
+      };
+      getDrugCountList(params).then((response) => {
+        if (response.data.state == 1) {
+          var countlist = response.data.data.countList;
+
+          this.countList = countlist;
+          var outcountlist = response.data.data.outCountList;
+
+          this.outCountList = outcountlist;
+          var aucountlist = response.data.data.auCountList;
+
+          this.autoCountList = aucountlist;
+          var minCount = response.data.data.minCount;
+
+          this.minCount = minCount;
+          var info = response.data.data.info;
+          for (let i = 0; i < info.length; i++) {
+            if (info[i].count_unit == info[i].max_unit) {
+              info[i].count = info[i].count * info[i].min_number;
             }
-          
-            this.drugOutList = info
           }
-        })
-      },
-      getInCount(id){
-        var count = ""
-        for(let i=0;i<this.countList.length;i++){
-           if(id == this.countList[i].drug_id){
-             count = this.countList[i].count
-           }
-        }
-        return count
-      },
 
-      getOutCount(id){
-        var count = ""
-        for(let i=0;i<this.outCountList.length;i++){
-           if(id == this.outCountList[i].drug_id){
-               count = this.outCountList[i].count
-           }
+          this.drugOutList = info;
         }
-        return count
-      },
-      getAutoCount(id){
-        var count= ""
-        for(let i=0;i<this.autoCountList.length;i++){
-          if(id == this.autoCountList[i].drug_id){
-            count = this.autoCountList[i].count
-          }
+      });
+    },
+    getInCount(id) {
+      var count = "";
+      for (let i = 0; i < this.countList.length; i++) {
+        if (id == this.countList[i].drug_id) {
+          count = this.countList[i].count;
         }
-        return count
-      },
-         getMinCount(id){
-        var count=""
-        for(let i=0;i<this.minCount.length;i++){
-          if(id == this.minCount[i].drug_id){
-            count = this.minCount[i].count
-          }
+      }
+      return count;
+    },
+
+    getOutCount(id) {
+      var count = "";
+      for (let i = 0; i < this.outCountList.length; i++) {
+        if (id == this.outCountList[i].drug_id) {
+          count = this.outCountList[i].count;
         }
-        return count
-      },
-      getCount(drug_id,min_number,max_unit,min_unit){
-        var count= 0
-        var str = ""
-        var min_str = ""
-        for(let i=0;i<this.drugOutList.length;i++){
-          if(drug_id == this.drugOutList[i].drug_id){
-             count += parseInt(this.drugOutList[i].count)
-          }
+      }
+      return count;
+    },
+    getAutoCount(id) {
+      var count = "";
+      for (let i = 0; i < this.autoCountList.length; i++) {
+        if (id == this.autoCountList[i].drug_id) {
+          count = this.autoCountList[i].count;
         }
-        if(parseInt(count/min_number)!=0){
-          str = parseInt(count/min_number)+ max_unit
+      }
+      return count;
+    },
+    getMinCount(id) {
+      var count = "";
+      for (let i = 0; i < this.minCount.length; i++) {
+        if (id == this.minCount[i].drug_id) {
+          count = this.minCount[i].count;
         }
-        if((count%min_number)!=0){
-          min_str =  count%min_number + min_unit
+      }
+      return count;
+    },
+    getCount(drug_id, min_number, max_unit, min_unit) {
+      var count = 0;
+      var str = "";
+      var min_str = "";
+      for (let i = 0; i < this.drugOutList.length; i++) {
+        if (drug_id == this.drugOutList[i].drug_id) {
+          count += parseInt(this.drugOutList[i].count);
         }
-        return str + min_str
-      },
+      }
+      if (parseInt(count / min_number) != 0) {
+        str = parseInt(count / min_number) + max_unit;
+      }
+      if (count % min_number != 0) {
+        min_str = (count % min_number) + min_unit;
+      }
+      return str + min_str;
+    },
 
-      getCountOne(drug_id){
-        var count= 0
-        for(let i=0;i<this.drugOutList.length;i++){
-          if(drug_id == this.drugOutList[i].drug_id){
-             count += parseInt(this.drugOutList[i].count)
-          }
+    getCountOne(drug_id) {
+      var count = 0;
+      for (let i = 0; i < this.drugOutList.length; i++) {
+        if (drug_id == this.drugOutList[i].drug_id) {
+          count += parseInt(this.drugOutList[i].count);
         }
-        return count
-      },
-     getCountTwo(drug_id,min_number,max_unit,min_unit){
-       var total_count = 0
-       var out_count = 0
-       var count = 0
-       var str = ""
-       var str_min = ""
-       total_count = this.getInCount(drug_id) * min_number
-       out_count = this.getCountOne(drug_id)
-       count = total_count-out_count
-       if(parseInt(count/min_number)!=0){
-         str = parseInt(count/min_number) + max_unit
-       }
-       if((count%min_number)!=0){
-         str_min = count%min_number + min_unit
-       }
-       return str+str_min
-     },
-     getManufactur(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
-     },
-    getName(drug_id){
-        var name = ""
-        if(drug_id == this.drug.id){
-           name = this.drug.drug_name
+      }
+      return count;
+    },
+    getCountTwo(drug_id, min_number, max_unit, min_unit) {
+      var total_count = 0;
+      var out_count = 0;
+      var count = 0;
+      var str = "";
+      var str_min = "";
+      total_count = this.getInCount(drug_id) * min_number;
+      out_count = this.getCountOne(drug_id);
+      count = total_count - out_count;
+      if (parseInt(count / min_number) != 0) {
+        str = parseInt(count / min_number) + max_unit;
+      }
+      if (count % min_number != 0) {
+        str_min = (count % min_number) + min_unit;
+      }
+      return str + str_min;
+    },
+    getManufactur(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
-     },
-     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
+      }
+      return name;
+    },
+    getName(drug_id) {
+      var name = "";
+      if (drug_id == this.drug.id) {
+        name = this.drug.drug_name;
+      }
+      return name;
+    },
+    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;
         }
       }
-      return storehouse_name
-     },
-    }
-  }
+      return storehouse_name;
+    },
+  },
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
 
   .border {
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+}
 
-  }
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
 
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-  }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
 </style>
 
 <style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
 
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
 
-  .count {
-    color: #bd2c00;
-  }
+.count {
+  color: #bd2c00;
+}
 
-  .el-table td,
-  .el-table th.is-leaf,
-  .el-table--border,
-  .el-table--group {
-    border-color: #d0d3da;
-  }
+.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;
-  }
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
 </style>

src/xt_pages/stock/drugs/drugIndex.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
       <div class="service-box">
-        <el-tabs v-model="activeName" @tab-click="handleClick"> 
+        <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="入库明细" name="first">
             <drug-in-order></drug-in-order>
           </el-tab-pane>
@@ -18,46 +18,50 @@
           <el-tab-pane label="退库明细">
             <drug-cancel-detail></drug-cancel-detail>
           </el-tab-pane>
-
         </el-tabs>
       </div>
     </div>
   </div>
 </template>
 <script>
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import DrugInOrder from '@/xt_pages/stock/drugs/components/drugInOrder'
-import DrugCancelOrder from '@/xt_pages/stock/drugs/components/drugCancelOrder'
-import DrugOutDetail from '@/xt_pages/stock/drugs/components/drugOutDetail'
-import DrugCancelDetail from '@/xt_pages/stock/drugs/components/drugCancelDetail'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import DrugInOrder from "@/xt_pages/stock/drugs/components/drugInOrder";
+import DrugCancelOrder from "@/xt_pages/stock/drugs/components/drugCancelOrder";
+import DrugOutDetail from "@/xt_pages/stock/drugs/components/drugOutDetail";
+import DrugCancelDetail from "@/xt_pages/stock/drugs/components/drugCancelDetail";
 export default {
   components: {
     BreadCrumb,
     DrugInOrder,
     DrugCancelOrder,
     DrugOutDetail,
-    DrugCancelDetail
+    DrugCancelDetail,
   },
-   data() {
-      return {
-        crumbs: [
-          { path: false, name: '库存管理' },
-          { path: '/stock/drugs/stock/detail', name: '出入库明细查询' }
-        ],
-        activeName: 'first'
-
-      }
-    },
-    methods: {
-      handleClick(tab, event) {
-        window.sessionStorage.setItem('drug_active',this.activeName)
-      }
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/drugs/stock/detail", name: "出入库明细查询" },
+      ],
+      activeName: "first",
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      window.sessionStorage.setItem("drug_active", this.activeName);
     },
-    created(){
-      var active_name =  window.sessionStorage.getItem('drug_active')
-      if(active_name!=null){
-        this.activeName = active_name
-      }
+  },
+  created() {
+    if (this.$route.path == "/Pharmacy/drugs/stock/detail") {
+      this.crumbs = [
+        { path: false, name: "药品管理" },
+        { path: false, name: "出入库明细查询" },
+      ];
     }
-}
+    var active_name = window.sessionStorage.getItem("drug_active");
+    if (active_name != null) {
+      this.activeName = active_name;
+    }
+  },
+};
 </script>

src/xt_pages/stock/drugs/drugInventory.vue

@@ -1,68 +1,78 @@
 <template>
-  <div class="main-contain" style="height:100%;">
+  <div class="main-contain" style="height: 100%">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container" style="height: calc(100vh - 118px);overflow: hidden;">
-        <el-tabs v-model="activeName" style="height: 100%;display: flex;flex-direction: column;" @tab-click="handleClick">
-            <el-tab-pane label="药品盘点" name="first" v-if="first" >
-                <drug-inventory></drug-inventory>
-            </el-tab-pane>
-            <el-tab-pane label="盘点列表" name="second" v-if="second">
-                <inventory-details ref="child"></inventory-details>
-            </el-tab-pane>
+    <div
+      class="app-container"
+      style="height: calc(100vh - 118px); overflow: hidden"
+    >
+      <el-tabs
+        v-model="activeName"
+        style="height: 100%; display: flex; flex-direction: column"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane label="药品盘点" name="first" v-if="first">
+          <drug-inventory></drug-inventory>
+        </el-tab-pane>
+        <el-tab-pane label="盘点列表" name="second" v-if="second">
+          <inventory-details ref="child"></inventory-details>
+        </el-tab-pane>
 
-            <el-tab-pane label="报损列表" name="three" v-if="three">
-                <drug-damaged ref="childOne"></drug-damaged>
-            </el-tab-pane>
-        </el-tabs>
+        <el-tab-pane label="报损列表" name="three" v-if="three">
+          <drug-damaged ref="childOne"></drug-damaged>
+        </el-tab-pane>
+      </el-tabs>
     </div>
-    
-  
   </div>
 </template>
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
-import drugInventory from './inventory'
-import inventoryDetails from './inventoryDetails'
-import drugDamaged from './drugDamaged.vue'
+import drugInventory from "./inventory";
+import inventoryDetails from "./inventoryDetails";
+import drugDamaged from "./drugDamaged.vue";
 export default {
-    name: "stockModifyPrice",
-    components:{
-        BreadCrumb,
-        drugInventory,
-        inventoryDetails,
-        drugDamaged
-    },
-    data() {
-        return{
-            crumbs: [
-                { path: false, name: "库存管理" },
-                { path: false, name: "药品管理" },
-                { path: false, name: "药品盘点" }
-            ],
-            activeName:'first',
-            first:true,
-            second:true,
-            three:true,
-        }
-    },
-    methods:{
-      handleClick(){
-        if(this.activeName == "second"){
-         this.$refs.child.getlist()
-        }
-        if(this.activeName =="three"){
-          this.$refs.childOne.getlist()
-        }
+  name: "stockModifyPrice",
+  components: {
+    BreadCrumb,
+    drugInventory,
+    inventoryDetails,
+    drugDamaged,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "药品管理" },
+        { path: false, name: "药品盘点" },
+      ],
+      activeName: "first",
+      first: true,
+      second: true,
+      three: true,
+    };
+  },
+  methods: {
+    handleClick() {
+      if (this.activeName == "second") {
+        this.$refs.child.getlist();
+      }
+      if (this.activeName == "three") {
+        this.$refs.childOne.getlist();
       }
     },
-    created(){
-      
-    },
-    mounted() {
-    },
+  },
+  created() {
+    if (this.$route.path == "/Pharmacy/drugs/drugInventory") {
+      this.crumbs = [
+        { path: false, name: "药品管理" },
+        { path: false, name: "药品管理" },
+        { path: false, name: "药品盘点" },
+      ];
+    }
+  },
+  mounted() {},
 };
 </script>
 
@@ -71,13 +81,13 @@ export default {
   // margin: 20px;
   font-size: 15px;
 }
-.modifyDialog{
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 10px;
-    .el-form-item{
-        width: 33%;
-    }
+.modifyDialog {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+  .el-form-item {
+    width: 33%;
+  }
 }
 .el-table td,
 .el-table th.is-leaf,
@@ -90,10 +100,10 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-::-webkit-scrollbar{
-    height: 20px !important;
+::-webkit-scrollbar {
+  height: 20px !important;
 }
-.el-tabs__content{
+.el-tabs__content {
   overflow-y: auto;
 }
 </style>

src/xt_pages/stock/drugs/drugStockDetail.vue

@@ -6,7 +6,7 @@
         size="small"
         @click="AddNewOrder"
         class="filter-item"
-        style="float:right;"
+        style="float: right"
         type="primary"
         icon="el-icon-circle-plus-outline"
         >新增
@@ -17,7 +17,7 @@
       <div class="cell clearfix">
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 400px"
           class="filter-item"
           v-model.trim="searchKey"
           placeholder="单据编码/制单人/厂商"
@@ -38,7 +38,7 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 196px"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -51,7 +51,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 196px"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -134,7 +134,7 @@
           :page-sizes="[7]"
           :page-size="7"
           background
-          style="margin-top:20px;float: right"
+          style="margin-top: 20px; float: right"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
         >
@@ -154,6 +154,7 @@ export default {
   name: "salesReturnOrder",
   components: { BreadCrumb },
   created() {
+
     var year = new Date().getFullYear();
     var month = new Date().getMonth() + 1;
     var day = new Date().getDate();
@@ -185,7 +186,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: "/stock/detail", name: "出入库明细查询" }
+        { path: "/stock/detail", name: "出入库明细查询" },
       ],
       searchKey: "",
       type: 1,
@@ -205,11 +206,11 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
     };
   },
   methods: {
-    getTypeName: function(row) {
+    getTypeName: function (row) {
       let name = "";
       let name2 = "";
       if (row.type == 1) {
@@ -228,7 +229,7 @@ export default {
       }
       return name + name2;
     },
-    specificationName: function(good_info_id) {
+    specificationName: function (good_info_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == good_info_id) {
@@ -237,17 +238,17 @@ export default {
       }
       return name;
     },
-    search: function() {
+    search: function () {
       const Params = {
         page: this.page,
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
       };
       this.cancelStockDate = [];
-      getStockDetail(Params).then(response => {
+      getStockDetail(Params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
@@ -259,22 +260,22 @@ export default {
         }
       });
     },
-    AddNewOrder: function() {
+    AddNewOrder: function () {
       this.$router.push({
         name: "cancelStockOrderAdd",
-        query: { type: this.type }
+        query: { type: this.type },
       });
     },
-    GetCancelStock: function() {
+    GetCancelStock: function () {
       const Params = {
         page: this.page,
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
       };
       this.cancelStockDate = [];
-      getStockDetail(Params).then(response => {
+      getStockDetail(Params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
@@ -310,7 +311,7 @@ export default {
       return name;
     },
     fetchAllAdminUsers() {
-      fetchAllAdminUsers().then(response => {
+      fetchAllAdminUsers().then((response) => {
         console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
@@ -323,7 +324,7 @@ export default {
         }
       });
     },
-    handleSelectionChange: function(val) {
+    handleSelectionChange: function (val) {
       this.multipleSelection = val;
     },
     handleSizeChange(val) {
@@ -357,11 +358,11 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    calculate: function(val) {
+    calculate: function (val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
-    GetConfigInfo: function() {
-      GetAllConfig().then(response => {
+    GetConfigInfo: function () {
+      GetAllConfig().then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
@@ -372,42 +373,42 @@ export default {
         }
       });
     },
-    getManufactuerName: function(manufacturer_id) {
+    getManufactuerName: function (manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
           return this.manufacturer[i].manufacturer_name;
         }
       }
     },
-    getDealerName: function(dealer_id) {
+    getDealerName: function (dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
           return this.dealer[i].dealer_name;
         }
       }
     },
-    handleEdit: function(index, row) {
+    handleEdit: function (index, row) {
       this.$router.push({
         name: "cancelStockDetail",
-        query: { id: row.id, type: this.type }
+        query: { id: row.id, type: this.type },
       });
     },
-    handleDelete: function(index, row) {
+    handleDelete: function (index, row) {
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
 
       const params = {
-        ids: idStr
+        ids: idStr,
       };
 
       this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          deleteCancelStock(params).then(response => {
+          deleteCancelStock(params).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               return false;
@@ -416,7 +417,7 @@ export default {
                 title: "成功",
                 message: "删除成功",
                 type: "success",
-                duration: 2000
+                duration: 2000,
               });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.cancelStockDate.length; y++) {
@@ -430,7 +431,7 @@ export default {
         })
         .catch(() => {});
     },
-    changeAllSelected: function(val) {
+    changeAllSelected: function (val) {
       if (val) {
         this.$refs.multipleTable.toggleAllSelection();
       } else {
@@ -451,15 +452,15 @@ export default {
       }
       const idStr = ids.join(",");
       const params = {
-        ids: idStr
+        ids: idStr,
       };
       this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          deleteCancelStock(params).then(response => {
+          deleteCancelStock(params).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               return false;
@@ -468,7 +469,7 @@ export default {
                 title: "成功",
                 message: "删除成功",
                 type: "success",
-                duration: 2000
+                duration: 2000,
               });
 
               for (let i = 0; i < ids.length; i++) {
@@ -482,8 +483,8 @@ export default {
           });
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>