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

src/api/drug/drug_stock.js

@@ -356,7 +356,7 @@ export function getPrintStockGood(params) {
 
 
 
-export function getWarehouseOutUser(params) {
+export function getDrugWarehouseOutUser(params) {
   return request({
     url: '/api/drugwarehouseout/user',
     method: 'get',
@@ -388,3 +388,5 @@ export function getDrugStockAutomaticReduceConfig() {
 
 
 
+
+

src/lang/zh.js

@@ -62,32 +62,32 @@ export default {
     clipboardDemo: 'Clipboard',
     i18n: '国际化',
     medicalScheduling:'医护排班',
-    medicalSchedulingIndex:'医护排班',
+    medicalSchedulingIndex:'排班管理',
     class:'班种列表',
     schedulingStatistics:'排班统计',
     permissionManage: '权限管理',
     adminManage: '员工管理',
     roleManage: '权限管理',
-    dialysis: '透析管理',
+    dialysis: '透析监控',
     paper: '透析管理',
     advice: '今日医嘱',
     prepare: '透析准备',
     dialysisPrintOrder: '打印透析单',
     details: '透析',
     data_dictionary: '数据字典',
-    specialDictionary: '专项字典',
+    specialDictionary: '专用字典',
     field_config: '字段配置',
-    template: '模版配置',
+    template: '数据模版',
     druguse: '医嘱模版',
     watch: '透析监测',
     addAdmin: '新增用户',
     editAdmin: '编辑用户信息',
     setupPerview: '设置权限',
-    user: '病人管理',
-    createPatient: '新增病人',
+    user: '患者中心',
+    createPatient: '新增患者',
     patientPage: '病人信息',
     editPatient: '修改病人信息',
-    patient: '病人管理',
+    patient: '患者中心',
     dialysisSolution: '透析处方',
     inspection: '检验检查',
     home: '首页',
@@ -98,8 +98,8 @@ export default {
     doctorAdvice: '医嘱信息',
     dryWeight: '干体重',
     device: '设备',
-    deviceManage: '设备管理',
-    modemanagement: '型号管理',
+    deviceManage: '院感管理',
+    modemanagement: '型号配置',
     dialysisMachineManage: '设备管理',
     workforce: '患者排班',
     appointment: '排班管理',
@@ -119,7 +119,7 @@ export default {
     completeOrder: '购买结果',
     orderRecord: '订单详情',
     recordList: '订单记录',
-    stockManage: '库存管理',
+    stockManage: '耗材管理',
     goodType: '商品类型',
     stockIn: '入库管理',
     stockOut: '出库管理',
@@ -150,9 +150,10 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
+    otherManagement:'其他管理',
     drugsExpiryDate:'药品有效期预警',
     drugsSurplus:'药品剩余预警',
-    drugsQuery:'明细查询',
+    drugsQuery:'库存查询',
     drugsReportLoss:'药品报损',
     drugsAdjustPrice:'药品调价',
     drugsStockCancel:'退库单',
@@ -165,16 +166,16 @@ export default {
     selfPreparedMedicineIndex:'自备药管理',
     selfPreparedMedicine:'自备药管理',
     consumablesManagement:'耗材管理',
-    warehouseReceipt: '耗材出入库',
-    warehouseReceiptOther: '其他出入库',
-    stockInOrder: '耗材入库单',
-    salesReturnOrder: '耗材退货单',
-    stockOutOrder: '耗材出库单',
-    cancelStockOrder: '耗材退库单',
-    otherStockInOrder: '其他入库单',
-    otherSalesReturnOrder: '其他退货单',
-    otherStockOutOrder: '其他出库单',
-    otherCancelStockOrder: '其他退库单',
+    warehouseReceipt: '出入库',
+    warehouseReceiptOther: '出入库',
+    stockInOrder: '入库单',
+    salesReturnOrder: '退货单',
+    stockOutOrder: '出库单',
+    cancelStockOrder: '退库单',
+    otherStockInOrder: '入库单',
+    otherSalesReturnOrder: '退货单',
+    otherStockOutOrder: '出库单',
+    otherCancelStockOrder: '退库单',
     stockInOrderAdd: '新增入库单',
     salesReturnOrderAdd: '新增退货单',
     stockOutOrderAdd: '新增出库单',
@@ -195,7 +196,7 @@ export default {
     upload_config: '质控上报配置',
     quality_control: '质控上报',
     remind_print: '排版提醒打印',
-    system_prescription: '透析方案',
+    system_prescription: '处方模版',
     integration_config: '集成配置',
     his_config: 'HIS集成配置',
 
@@ -226,6 +227,10 @@ export default {
     lineUp:'排队窗口',
     otherManagement:'其他管理',
     calling:'排队叫号',
+    bedManagement:'床位管理',
+    dictionaryManagement:'字典管理',
+    templateManagement:'模板管理',
+    drugStockUserDetail:"出库人明细",
 
   },
   navbar: {
@@ -318,7 +323,7 @@ export default {
   data_config: {
     patient: '病人管理',
     scheduling: '排班管理',
-    device: '设备管理',
+    device: '院感管理',
     hemodialysis: '血透管理',
     system: '系统配置',
     education: '透后宣教',

src/router/index.js

@@ -39,6 +39,9 @@ import dataPrescription from './modules/dataPrescription'
 import dataDruguse from './modules/dataDruguse'
 import dataShowconfig from './modules/dataShowconfig'
 import dataPrint from './modules/dataPrint'
+import bedManagement from './modules/bedManagement'
+import dictionaryManagement from './modules/dictionaryManagement'
+import templateManagement from './modules/templateManagement'
 
 Vue.use(Router)
 
@@ -119,8 +122,8 @@ var _asy_router_map = [
   dialysisRecord,
   dialysis,
   stock,
-  selfPreparedMedicine,
   drugs,
+  selfPreparedMedicine,
   otherManagement,
   qcd,
   device,
@@ -129,11 +132,14 @@ var _asy_router_map = [
   slow,
   scrm,
   shop,
-  integration,
+  
   systems,
   roleManage,
-  dataDictionary,
-  specialDictionary,
+  bedManagement,
+  dictionaryManagement,
+  templateManagement,
+  // dataDictionary,
+  // specialDictionary,
   dataTemplate,
   dataPrescription,
   dataDruguse,
@@ -143,7 +149,8 @@ var _asy_router_map = [
   outpatientDoctorStation,
   outpatientCharges,
   outpatientPharmacy,
-  kuyiShopping
+  kuyiShopping,
+  integration,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/modules/bedManagement.js

@@ -0,0 +1,46 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/bedManagement',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'bedManagement',
+  alwaysShow: true,
+  meta: {
+    title: 'bedManagement',
+    icon: 'bedManagement',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/device/groups',
+        component: () => import('@/xt_pages/device/group_main'),
+        name: 'deviceGroupManage',
+        meta: {
+          title: 'deviceGroupManage',
+          noCache: true,
+  
+        }
+    },
+    {
+        path: '/device/zones',
+        component: () => import('@/xt_pages/device/zone_main'),
+        name: 'deviceZoneManage',
+        meta: {
+          title: 'deviceZoneManage',
+          noCache: true,
+  
+        }
+    }, 
+    {
+        path: '/device/numbers',
+        component: () => import('@/xt_pages/device/number_main'),
+        name: 'deviceNumberManage',
+        meta: {
+          title: 'deviceNumberManage',
+          noCache: true,
+  
+        }
+    },
+  ]
+}

src/router/modules/device.js

@@ -13,32 +13,14 @@ export default {
     title: 'deviceManage',
     icon: 'shebei'
   },
-  children: [{
-      path: '/device/zones',
-      component: () => import('@/xt_pages/device/zone_main'),
-      name: 'deviceZoneManage',
-      meta: {
-        title: 'deviceZoneManage',
-        noCache: true,
-
-      }
-    },
-    {
-      path: '/device/groups',
-      component: () => import('@/xt_pages/device/group_main'),
-      name: 'deviceGroupManage',
-      meta: {
-        title: 'deviceGroupManage',
-        noCache: true,
-
-      }
-    },
+  children: [
     {
-      path: '/device/numbers',
-      component: () => import('@/xt_pages/device/number_main'),
-      name: 'deviceNumberManage',
+      path: '/device/main',
+      component: () => import('@/xt_pages/management/index'),
+      // component: () => import("@/xt_pages/device/main"),
+      name: 'dialysisMachineManage',
       meta: {
-        title: 'deviceNumberManage',
+        title: 'dialysisMachineManage',
         noCache: true,
 
       }
@@ -53,17 +35,7 @@ export default {
 
       }
     },
-    {
-      path: '/device/main',
-      component: () => import('@/xt_pages/management/index'),
-      // component: () => import("@/xt_pages/device/main"),
-      name: 'dialysisMachineManage',
-      meta: {
-        title: 'dialysisMachineManage',
-        noCache: true,
-
-      }
-    },
+    
     {
       path: '/device/home',
       component: () => import('@/xt_pages/management/home'),

src/router/modules/dialysis.js

@@ -20,24 +20,24 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/board',
-      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
-      name: '数据看板',
-      meta: {
-        title: '数据看板',
-        noCache: true
-      }
-    },
     // {
-    //   path: '/dialysis/consumableDrugs',
-    //   component: () => import('@/xt_pages/dialysis/consumableDrugs'),
-    //   name: '耗材药品',
+    //   path: '/dialysis/board',
+    //   component: () => import('@/xt_pages/dialysis/bulletinBoard'),
+    //   name: '数据看板',
     //   meta: {
-    //     title: '耗材药品',
+    //     title: '数据看板',
     //     noCache: true
     //   }
     // },
+    {
+      path: '/dialysis/consumableDrugs',
+      component: () => import('@/xt_pages/dialysis/consumableDrugs'),
+      name: '耗材药品',
+      meta: {
+        title: '耗材药品',
+        noCache: true
+      }
+    },
     // {
     //   path: '/dialysis/consumableDrugs_print',
     //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),

src/router/modules/dictionaryManagement.js

@@ -0,0 +1,36 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/dictionaryManagement',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'dictionaryManagement',
+  alwaysShow: true,
+  meta: {
+    title: 'dictionaryManagement',
+    icon: 'dictionaryManagement',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/data/dictionary',
+        component: () => import('@/xt_pages/data/index'),
+        name: 'dictionary',
+        meta: {
+          title: 'data_dictionary',
+          noCache: true,
+    
+        }
+    },
+    {
+        path: '/data/specialDictionary',
+        component: () => import('@/xt_pages/data/specialDictionary'),
+        name: 'specialDictionary',
+        meta: {
+          title: 'specialDictionary',
+          noCache: true,
+    
+        }
+    }
+  ]
+}

src/router/modules/drugs.js

@@ -12,59 +12,123 @@ export default {
     isChild: true
   },
   children: [
+    {
+        path: '/stock/drugs/stock/query',
+        component: () => import('@/xt_pages/stock/drugs/query'),
+        name: 'drugsQuery',
+        meta: { title: 'drugsQuery', noCache: true }
+    },
     {
         path: '/stock/drugs/stock/in',
-        component: () => import('@/xt_pages/stock/drugs/stockIn'),
+        component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
         name: 'drugsStockIn',
         meta: { title: 'drugsStockIn', noCache: true }
     },
     {
         path: '/stock/drugs/stock/out',
-        component: () => import('@/xt_pages/stock/drugs/stockOut'),
+        component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
         name: 'drugsStockOut',
         meta: { title: 'drugsStockOut', noCache: true }
     },
     {
         path: '/stock/drugs/stock/return',
-        component: () => import('@/xt_pages/stock/drugs/stockReturn'),
+        component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
         name: 'drugsStockReturn',
         meta: { title: 'drugsStockReturn', noCache: true }
     },
     {
         path: '/stock/drugs/stock/cancel',
-        component: () => import('@/xt_pages/stock/drugs/stockCancel'),
+        component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
         name: 'drugsStockCancel',
         meta: { title: 'drugsStockCancel', noCache: true }
     },
+    // {
+    //     path: '/stock/drugs/stock/adjustPrice',
+    //     component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
+    //     name: 'drugsAdjustPrice',
+    //     meta: { title: 'drugsAdjustPrice', noCache: true }
+    // },
+    // {
+    //     path: '/stock/drugs/stock/reportLoss',
+    //     component: () => import('@/xt_pages/stock/drugs/reportLoss'),
+    //     name: 'drugsReportLoss',
+    //     meta: { title: 'drugsReportLoss', noCache: true }
+    // },
+    // {
+    //     path: '/stock/drugs/stock/drugsSurplus',
+    //     component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
+    //     name: 'drugsSurplus',
+    //     meta: { title: 'drugsSurplus', noCache: true }
+    // },
+    // {
+    //     path: '/stock/drugs/stock/drugsExpiryDate',
+    //     component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
+    //     name: 'drugsExpiryDate',
+    //     meta: { title: 'drugsExpiryDate', noCache: true }
+    // },
     {
-        path: '/stock/drugs/stock/adjustPrice',
-        component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
-        name: 'drugsAdjustPrice',
-        meta: { title: 'drugsAdjustPrice', noCache: true }
-    },
-    {
-        path: '/stock/drugs/stock/reportLoss',
-        component: () => import('@/xt_pages/stock/drugs/reportLoss'),
-        name: 'drugsReportLoss',
-        meta: { title: 'drugsReportLoss', noCache: true }
-    },
-    {
-        path: '/stock/drugs/stock/query',
-        component: () => import('@/xt_pages/stock/drugs/query'),
-        name: 'drugsQuery',
-        meta: { title: 'drugsQuery', noCache: true }
-    },
-    {
-        path: '/stock/drugs/stock/drugsSurplus',
-        component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
-        name: 'drugsSurplus',
-        meta: { title: 'drugsSurplus', noCache: true }
-    },
-    {
-        path: '/stock/drugs/stock/drugsExpiryDate',
-        component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
-        name: 'drugsExpiryDate',
-        meta: { title: 'drugsExpiryDate', noCache: true }
+      path: '/drugstock/in/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderAdd'),
+      name: 'drugStockInOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInOrderAdd', noCache: true }
+    },{
+      path: '/drugstock/in/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
+      name: 'drugStockInDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInDetail', noCache: true }
+    }, {
+      path: '/drugstock/return/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
+      name: 'drugSalesReturnDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnDetail', noCache: true }
+    }, {
+      path: '/drugstock/return/add',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrderAdd'),
+      name: 'drugSalesReturnOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/out/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderAdd'),
+      name: 'drugStockOutOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/out/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutDetail'),
+      name: 'drugStockOutDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutDetail', noCache: true }
+    }, {
+      path: '/drugstock/cancel/add',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderAdd'),
+      name: 'cancelDrugStockOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
+    },{
+      path: '/drugstock/cancel/detail',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
+      name: 'cancelDrugStockDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockDetail', noCache: true }
+    },{
+      path: '/drugstock/user/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockUserDetail'),
+      name: 'drugStockUserDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockUserDetail', noCache: true }
     },
   ]
 }

src/router/modules/qcd.js

@@ -67,15 +67,7 @@ export default {
     //     noCache: true
     //   }
     // },
-    {
-      path: '/qcd/patientanalysis/statisticalConfig',
-      component: () => import('@/xt_pages/qcd/statisticalConfiguration'),
-      name: 'statisticalConfig',
-      meta: {
-        title: '统计配置',
-        noCache: true
-      }
-    },
+    
     {
       path: '/qcd/basicInformationAnalysis',
       component: () => import('@/xt_pages/qcd/basicInformationAnalysis'),
@@ -156,6 +148,7 @@ export default {
         noCache: true
       }
     },
+    
     {
       path: '/qcd/indicatorControlAnalysis/process',
       hidden: true,
@@ -248,6 +241,15 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/qcd/patientanalysis/statisticalConfig',
+      component: () => import('@/xt_pages/qcd/statisticalConfiguration'),
+      name: 'statisticalConfig',
+      meta: {
+        title: '统计配置',
+        noCache: true
+      }
+    },
     {
       path: '/qcd/workAnalysis/nurse',
       hidden: true,

src/router/modules/stock.js

@@ -12,6 +12,12 @@ export default {
     isChild: true
   },
   children: [
+    {
+      path: '/stock/query',
+      component: () => import('@/xt_pages/stock/stockQuery'),
+      name: 'stockQuery',
+      meta: { title: 'stockQuery', noCache: true }
+    },
     {
       path: '/stock/in',
       component: () => import('@/xt_pages/stock/stockInOrder'),
@@ -87,12 +93,7 @@ export default {
     //     }
     //   ]
     // },
-    {
-      path: '/stock/query',
-      component: () => import('@/xt_pages/stock/stockQuery'),
-      name: 'stockQuery',
-      meta: { title: 'stockQuery', noCache: true }
-    },
+    
     {
       path: '/stock/detail',
       component: () => import('@/xt_pages/stock/stockDetailIndex'),

src/router/modules/templateManagement.js

@@ -0,0 +1,43 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/templateManagement',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'templateManagement',
+  alwaysShow: true,
+  meta: {
+    title: 'templateManagement',
+    icon: 'templateManagement',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/data/druguse',
+        component: () => import('@/xt_pages/data/druguseTemplate'),
+        name: 'druguse',
+        meta: {
+          title: 'druguse'
+        }
+    },
+    {
+        path: '/data/template',
+        component: () => import('@/xt_pages/data/template'),
+        name: 'template',
+        meta: {
+          title: 'template',
+          noCache: true,
+    
+        }
+    },
+    {
+        path: '/data/prescription',
+        component: () => import('@/xt_pages/data/prescription'),
+        name: 'prescription',
+        meta: {
+          title: 'system_prescription'
+        }
+    },
+    
+  ]
+}

src/styles/sidebar.scss

@@ -25,7 +25,7 @@
     }
     .scrollbar-wrapper {
       overflow-x: hidden !important;
-      width: 150px;
+      width: 140px;
       border-right:1px solid #e5e5e5;
       .el-scrollbar__view {
         height: 96%;

src/views/layout/Layout.vue

@@ -16,9 +16,9 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库存管理')">
+        <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
-          <p>库存管理</p>
+          <p>库房管理</p>
         </div>
         <div v-if="kuyishoppingShow" :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'酷医商城')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
@@ -125,9 +125,9 @@ export default {
     console.log('permission_routers',this.permission_routers)
     let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
     let bingli = ['User','createPatient']
-    let touxi = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
-    let kucun = ['stockManage','selfPreparedMedicine','stockDrugs','otherManagement']
-    let peizhi = ['system','roleManage','dictionary','specialDictionary','template','prescription','druguse','showconfig','printTemplate']
+    let touxi = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
+    let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']
+    let peizhi = ['system','roleManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
     let kuyishopping = ['kuyiShopping']
     let menzhenArr = []
     let bingliArr = []
@@ -255,6 +255,7 @@ export default {
     background: #1F2D3D;
     margin-top:50px;
     .navOne{
+      font-size:14px;
       width:80px;
       height:80px;
       color:#BFCBD9;
@@ -278,7 +279,7 @@ export default {
     height:calc(100% - 50px)
   }
   #app .sidebar-container {
-    width: 150px !important;
+    width: 140px !important;
     height: 100%;
     margin-top:50px;
     overflow: visible;

src/views/layout/components/Navbar.vue

@@ -315,7 +315,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  color: #666666;
+  color: #000;
   .dropdownBox {
     margin-left: 10px;
   }
@@ -330,7 +330,7 @@ export default {
       float: right;
       height: 100%;
       z-index: 99999;
-      color: #666666;
+      color: #000;
       & :focus {
         outline: none;
       }
@@ -376,12 +376,12 @@ export default {
           .user-title {
             margin: 0 8px;
             font-size: 14px;
-            color: #666666;
+            color: #000;
           }
 
           .el-icon-caret-bottom {
             font-size: 12px;
-            color: #666666;
+            color: #000;
           }
         }
       }
@@ -474,12 +474,12 @@ export default {
           .user-title {
             margin: 0 8px;
             font-size: 14px;
-            color: #666666;
+            color: #000;
           }
 
           .el-icon-caret-bottom {
             font-size: 12px;
-            color: #666666;
+            color: #000;
           }
         }
       }
@@ -537,7 +537,7 @@ export default {
 .dropdownBox {
   .el-dropdown-link {
     font-size: 14px;
-    color: #666;
+    color: #000;
   }
 }
 </style>

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

@@ -11,7 +11,7 @@
       :default-active="$route.path"
       background-color="#f3f5f6"
       text-color="#000"
-      active-text-color="#000"
+      active-text-color="#409EFF"
     >
       <sidebar-item v-for="route in arr" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
     </el-menu>
@@ -48,7 +48,7 @@ export default {
   },
   created(){
     if(this.navTitle == '透析管理'){
-      let nameArr = ['workforce','dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
+      let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
       // console.log('permission_routers',this.permission_routers)
       let routerArr = []
       this.permission_routers.map(item => {
@@ -103,7 +103,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '透析管理'){
-          let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
+          let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
@@ -120,8 +120,8 @@ export default {
             let a = false
             this.$emit('func',a)
           }
-        }else if(newVal == '库存管理'){
-          let nameArr = ['stockManage','selfPreparedMedicine','stockDrugs','otherManagement']
+        }else if(newVal == '库房管理'){
+          let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
@@ -138,7 +138,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '配置管理'){
-          let nameArr = ['system','roleManage','dictionary','specialDictionary','template','prescription','druguse','showconfig','printTemplate']
+          let nameArr = ['system','roleManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {

src/xt_pages/components/bread-crumb.vue

@@ -39,4 +39,13 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
+<style lang="scss">
+.el-breadcrumb__inner{
+  color:#000;
+}
+.el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner a, .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover{
+  color:#000;
+}
 </style>

src/xt_pages/data/components/addDrugs.vue

@@ -1,14 +1,15 @@
 <template>
   <el-dialog
     :title="formTitle"
-    width="900px"
+    width="1000px"
     :visible.sync="visible"
     :before-close="_close"
+    class="addDrugsDialog"
   >
     <el-tabs v-model="activeName" >
       <el-tab-pane label="基础数据" name="first">
         <div>
-          <el-form :model="form" :rules="rules" ref="form" label-width="100px"
+          <el-form :model="form" :rules="rules" ref="form" label-width="120px"
                    style="display: flex;flex-wrap: wrap;justify-content: space-between;">
             <el-form-item label="药品名称 : " prop="drug_name" >
               <el-input v-model="form.drug_name" style="width:160px;" placeholder="" maxlength="30"></el-input>
@@ -573,3 +574,11 @@
     }
   }
 </script>
+
+<style lang="scss">
+.addDrugsDialog{
+  .el-dialog__body{
+    padding-top: 0px;
+  }
+}
+</style>

src/xt_pages/data/components/consumables.vue

@@ -43,11 +43,7 @@
       :data="goodInfo.goodInfoData"
       v-loading="goodInfo.loading"
     >
-      <el-table-column label="商品编码" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.good_code }}
-        </template>
-      </el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column label="名称" align="center">
         <template slot-scope="scope">
           {{ scope.row.good_name }}
@@ -149,6 +145,9 @@
         is_charge:'',
         search_input: '',
         options: [{
+          value: '0',
+          label: '全部'
+        },{
           value: '1',
           label: '是'
         }, {

src/xt_pages/data/components/drugs.vue

@@ -39,11 +39,8 @@
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-      <el-table-column prop="date" label="药品编码" width="80" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.drug_code}}</div>
-        </template>
-      </el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+
       <el-table-column prop="date" label="药品名称" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>
@@ -97,6 +94,19 @@
 
     ></add-drugs>
     <!-- <maintain ref='maintain'></maintain> -->
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
+      background
+      align="right"
+      style="margin-top:20px;"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+    >
+    </el-pagination>
+
   </div>
 </template>
 
@@ -237,7 +247,11 @@
         current_id:0,
 
         search_input: '',
-        options: [{
+        options: [
+          {
+            value: '0',
+            label: '全部'
+          },{
           value: '1',
           label: '是'
         }, {
@@ -266,6 +280,14 @@
       }
     },
     methods: {
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
       changeInject(val){
         this.getList()
 

src/xt_pages/data/prescription.vue

@@ -1,435 +1,442 @@
 <template>
-  <div class="app-container ">
-    <div class="dataTitle">透析方案</div>
-
-    <div
-      class="app-container"
-      style="margin-left: -20px;margin-top: -20px"
-      v-loading="pageLoading"
-      element-loading-text="拼命加载中"
-    >
-      <el-row :gutter="20">
-        <el-col :span="7">
-          <el-table
-            :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-            }"
-            height="450"
-            :row-style="{ color: '#303133' }"
-            :data="treatment_mode"
-            border
-            style="width: 100%"
-            highlight-current-row
-            :row-class-name="tableRows"
-            @row-click="onRowClicks"
-            ref="singleTable"
-          >
-            <el-table-column label="透析模式" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.name }}
-              </template>
-            </el-table-column>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container ">
+      
+      <div class="dataTitle">透析模板</div>
 
-            <el-table-column label="状态" width="80" align="center">
-              <template slot-scope="scope">
-                {{ getModeStatus(scope.row.id) }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="17" v-loading="itemLoading">
-          <div class="filter-container">
-            <el-row :gutter="20">
-              <el-col :span="16">
-                <div>{{ mode_name }}</div>
-              </el-col>
-              <el-col :span="8">
-                <el-button
-                  style="float: right;visibility: hidden"
-                  size="small"
-                  class="filter-item"
-                  type="primary"
-                  icon="el-icon-edit-outline"
-                  @click="openEdit()"
-                  >修改
-                </el-button>
-              </el-col>
-            </el-row>
-          </div>
-          <div class="filter-container" style="float:right">
-            <el-form
-              ref="addPlan"
-              :model="addPlan"
-              label-width="160px"
-              style="border: black"
+      <div
+        class="app-container"
+        style="margin-left: -20px;margin-top: -20px"
+        v-loading="pageLoading"
+        element-loading-text="拼命加载中"
+      >
+        <el-row :gutter="20">
+          <el-col :span="7">
+            <el-table
+              :header-cell-style="{
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266'
+              }"
+              height="450"
+              :row-style="{ color: '#303133' }"
+              :data="treatment_mode"
+              border
+              style="width: 100%"
+              highlight-current-row
+              :row-class-name="tableRows"
+              @row-click="onRowClicks"
+              ref="singleTable"
             >
+              <el-table-column label="透析模式" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.name }}
+                </template>
+              </el-table-column>
+
+              <el-table-column label="状态" width="80" align="center">
+                <template slot-scope="scope">
+                  {{ getModeStatus(scope.row.id) }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="17" v-loading="itemLoading">
+            <div class="filter-container">
               <el-row :gutter="20">
-                <el-col :span="8">
-                  <el-form-item label="透析时长（h）:" prop="dialysis_duration">
-                    <el-time-picker
-                      v-model="dialysisTimeShow"
-                      :picker-options="{
-                        selectableRange: '00:01:00 - 23:59:00'
-                      }"
-                      placeholder="透析时长"
-                      style="width:100%;"
-                      value-format="H:m"
-                      format="H:m"
-                      @change="selectnDialysisTime"
-                    >
-                    </el-time-picker>
-                  </el-form-item>
+                <el-col :span="16">
+                  <div>{{ mode_name }}</div>
                 </el-col>
-
                 <el-col :span="8">
-                  <el-form-item
-                    label="血流量(ml/min):"
-                    prop="blood_flow_volume"
-                  >
-                    <el-input v-model="addPlan.blood_flow_volume"></el-input>
-                  </el-form-item>
+                  <el-button
+                    style="float: right;visibility: hidden"
+                    size="small"
+                    class="filter-item"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="openEdit()"
+                    >修改
+                  </el-button>
                 </el-col>
-                <!--<el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id == 6">-->
-                <!--<el-form-item label="目标超滤量(ml) : ">-->
-                <!--<el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>-->
-                <!--</el-form-item>-->
-                <!--</el-col>-->
+              </el-row>
+            </div>
+            <div class="filter-container" style="float:right">
+              <el-form
+                ref="addPlan"
+                :model="addPlan"
+                label-width="160px"
+                style="border: black"
+              >
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="透析时长（h）:" prop="dialysis_duration">
+                      <el-time-picker
+                        v-model="dialysisTimeShow"
+                        :picker-options="{
+                          selectableRange: '00:01:00 - 23:59:00'
+                        }"
+                        placeholder="透析时长"
+                        style="width:100%;"
+                        value-format="H:m"
+                        format="H:m"
+                        @change="selectnDialysisTime"
+                      >
+                      </el-time-picker>
+                    </el-form-item>
+                  </el-col>
 
-                <!--<el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id != 6">-->
-                <!--<el-form-item label="目标超滤量(L) : ">-->
-                <!--<el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>-->
-                <!--</el-form-item>-->
-                <!--</el-col>-->
+                  <el-col :span="8">
+                    <el-form-item
+                      label="血流量(ml/min):"
+                      prop="blood_flow_volume"
+                    >
+                      <el-input v-model="addPlan.blood_flow_volume"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <!--<el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id == 6">-->
+                  <!--<el-form-item label="目标超滤量(ml) : ">-->
+                  <!--<el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>-->
+                  <!--</el-form-item>-->
+                  <!--</el-col>-->
 
-                <el-col :span="8">
-                  <el-form-item label="透析液配方:">
-                    <el-select v-model="addPlan.dialysate_formulation">
-                      <el-option
-                        v-for="(item, index) in dialysate_formulation"
-                        :label="item.name"
-                        :key="index"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                  <!--<el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id != 6">-->
+                  <!--<el-form-item label="目标超滤量(L) : ">-->
+                  <!--<el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>-->
+                  <!--</el-form-item>-->
+                  <!--</el-col>-->
 
-                <el-col :span="8">
-                  <el-form-item label="抗凝剂:" prop="anticoagulant">
-                    <el-select
-                      v-model="addPlan.anticoagulant"
-                      @change="changeThisAnticoagulant"
+                  <el-col :span="8">
+                    <el-form-item label="透析液配方:">
+                      <el-select v-model="addPlan.dialysate_formulation">
+                        <el-option
+                          v-for="(item, index) in dialysate_formulation"
+                          :label="item.name"
+                          :key="index"
+                          :value="item.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="抗凝剂:" prop="anticoagulant">
+                      <el-select
+                        v-model="addPlan.anticoagulant"
+                        @change="changeThisAnticoagulant"
+                      >
+                        <el-option
+                          v-for="(item, index) in anticoagulantsConfit"
+                          :label="item.name"
+                          :key="index"
+                          :value="item.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8" v-if="anticoagulant.shouji != -1">
+                    <el-form-item
+                      :label="'首剂（' + anticoagulant.shouji_unit + '）: '"
+                      prop="anticoagulant_shouji"
                     >
-                      <el-option
-                        v-for="(item, index) in anticoagulantsConfit"
-                        :label="item.name"
-                        :key="index"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="anticoagulant.shouji != -1">
-                  <el-form-item
-                    :label="'首剂（' + anticoagulant.shouji_unit + '）: '"
-                    prop="anticoagulant_shouji"
-                  >
-                    <el-input
-                      v-model="addPlan.anticoagulant_shouji"
-                      :disabled="anticoagulant.shouji == 1 ? false : true"
-                      type="number"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="anticoagulant.weichi != -1">
-                  <el-form-item
-                    :label="'维持（' + anticoagulant.weichi_unit + '）: '"
-                    prop="anticoagulant_weichi"
-                  >
-                    <el-input
-                      v-model="addPlan.anticoagulant_weichi"
-                      :disabled="anticoagulant.weichi == 1 ? false : true"
-                      type="number"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="anticoagulant.zongliang != -1">
-                  <el-form-item
-                    :label="'总量（' + anticoagulant.zongliang_unit + '）: '"
-                    prop="anticoagulant_zongliang"
-                  >
-                    <el-input
-                      v-model="addPlan.anticoagulant_zongliang"
-                      :disabled="anticoagulant.zongliang == 1 ? false : true"
-                      type="number"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="anticoagulant.gaimingcheng != -1">
-                  <el-form-item
-                    label="钙名称:"
-                    prop="anticoagulant_gaimingcheng"
-                  >
-                    <el-input
-                      v-model="addPlan.anticoagulant_gaimingcheng"
-                      :disabled="anticoagulant.gaimingcheng == 1 ? false : true"
-                      placeholder="钙名称"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="anticoagulant.gaijiliang != -1">
-                  <el-form-item
-                    :label="
-                      '钙剂量（' + anticoagulant.gaimingcheng_unit + '）: '
+                      <el-input
+                        v-model="addPlan.anticoagulant_shouji"
+                        :disabled="anticoagulant.shouji == 1 ? false : true"
+                        type="number"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8" v-if="anticoagulant.weichi != -1">
+                    <el-form-item
+                      :label="'维持（' + anticoagulant.weichi_unit + '）: '"
+                      prop="anticoagulant_weichi"
+                    >
+                      <el-input
+                        v-model="addPlan.anticoagulant_weichi"
+                        :disabled="anticoagulant.weichi == 1 ? false : true"
+                        type="number"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8" v-if="anticoagulant.zongliang != -1">
+                    <el-form-item
+                      :label="'总量（' + anticoagulant.zongliang_unit + '）: '"
+                      prop="anticoagulant_zongliang"
+                    >
+                      <el-input
+                        v-model="addPlan.anticoagulant_zongliang"
+                        :disabled="anticoagulant.zongliang == 1 ? false : true"
+                        type="number"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8" v-if="anticoagulant.gaimingcheng != -1">
+                    <el-form-item
+                      label="钙名称:"
+                      prop="anticoagulant_gaimingcheng"
+                    >
+                      <el-input
+                        v-model="addPlan.anticoagulant_gaimingcheng"
+                        :disabled="anticoagulant.gaimingcheng == 1 ? false : true"
+                        placeholder="钙名称"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8" v-if="anticoagulant.gaijiliang != -1">
+                    <el-form-item
+                      :label="
+                        '钙剂量（' + anticoagulant.gaimingcheng_unit + '）: '
+                      "
+                      prop="anticoagulant_gaijiliang"
+                    >
+                      <el-input
+                        v-model="addPlan.anticoagulant_gaijiliang"
+                        :disabled="anticoagulant.gaijiliang == 1 ? false : true"
+                        placeholder="钙剂量"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col
+                    :span="8"
+                    v-if="
+                      current_select == 2 ||
+                        current_select == 5 ||
+                        current_select == 12
                     "
-                    prop="anticoagulant_gaijiliang"
                   >
-                    <el-input
-                      v-model="addPlan.anticoagulant_gaijiliang"
-                      :disabled="anticoagulant.gaijiliang == 1 ? false : true"
-                      placeholder="钙剂量"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="8"
-                  v-if="
-                    current_select == 2 ||
-                      current_select == 5 ||
-                      current_select == 12
-                  "
-                >
-                  <el-form-item label="置换量(L) : " prop="replacement_total">
-                    <el-input
-                      v-model="addPlan.replacement_total"
-                      type="number"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
+                    <el-form-item label="置换量(L) : " prop="replacement_total">
+                      <el-input
+                        v-model="addPlan.replacement_total"
+                        type="number"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="钾（mmol/L）: " prop="kalium">
-                    <el-input v-model="addPlan.kalium"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="钠（mmol/L）: " prop="sodium">
-                    <el-input v-model="addPlan.sodium"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="钙（mmol/L）: " prop="calcium">
-                    <el-input v-model="addPlan.calcium"></el-input>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="钾（mmol/L）: " prop="kalium">
+                      <el-input v-model="addPlan.kalium"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="钠（mmol/L）: " prop="sodium">
+                      <el-input v-model="addPlan.sodium"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="钙（mmol/L）: " prop="calcium">
+                      <el-input v-model="addPlan.calcium"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="透析器/灌流器：">
+                  <el-col :span="8">
+                    <el-form-item label="透析器/灌流器：">
 
-                    <el-input
-                      v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
-                  </el-form-item>
-                </el-col>
+                      <el-input
+                        v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
-                    <el-input v-model="addPlan.bicarbonate"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="葡萄糖（mmol/L）: " prop="glucose">
-                    <el-input v-model="addPlan.glucose"></el-input>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
+                      <el-input v-model="addPlan.bicarbonate"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="葡萄糖（mmol/L）: " prop="glucose">
+                      <el-input v-model="addPlan.glucose"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item
-                    label="透析液流量（ml/min）: "
-                    prop="dialysate_flow"
-                  >
-                    <el-input v-model="addPlan.dialysate_flow"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item
-                    label="透析液温度（℃）: "
-                    prop="dialysate_temperature"
-                  >
-                    <el-input
-                      v-model="addPlan.dialysate_temperature"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item
+                      label="透析液流量（ml/min）: "
+                      prop="dialysate_flow"
+                    >
+                      <el-input v-model="addPlan.dialysate_flow"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item
+                      label="透析液温度（℃）: "
+                      prop="dialysate_temperature"
+                    >
+                      <el-input
+                        v-model="addPlan.dialysate_temperature"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="电导度（mS/cm）: " prop="conductivity">
-                    <el-input v-model="addPlan.conductivity"></el-input>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="电导度（mS/cm）: " prop="conductivity">
+                      <el-input v-model="addPlan.conductivity"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="体液过多症状:">
-                    <el-select v-model="addPlan.body_fluid">
-                      <el-option
-                        v-for="(item, index) in body_fluid_option"
-                        :label="item.name"
-                        :key="index"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="体液过多症状:">
+                      <el-select v-model="addPlan.body_fluid">
+                        <el-option
+                          v-for="(item, index) in body_fluid_option"
+                          :label="item.name"
+                          :key="index"
+                          :value="item.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="体液过多其他症状">
-                    <el-input v-model="addPlan.body_fluid_other"></el-input>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="体液过多其他症状">
+                      <el-input v-model="addPlan.body_fluid_other"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="透析前使用特殊药物">
-                    <el-select
-                      v-model="addPlan.special_medicine"
-                      placeholder="请选择"
-                      style="width:100%;"
-                    >
-                      <el-option :key="0" label="请选择" :value="0"></el-option>
-                      <el-option
-                        v-for="(item, index) in special_medicine_option"
-                        :label="item.name"
-                        :key="index"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="透析前使用特殊药物">
+                      <el-select
+                        v-model="addPlan.special_medicine"
+                        placeholder="请选择"
+                        style="width:100%;"
+                      >
+                        <el-option :key="0" label="请选择" :value="0"></el-option>
+                        <el-option
+                          v-for="(item, index) in special_medicine_option"
+                          :label="item.name"
+                          :key="index"
+                          :value="item.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="使用其他特殊药物">
-                    <el-input
-                      v-model="addPlan.special_medicine_other"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="使用其他特殊药物">
+                      <el-input
+                        v-model="addPlan.special_medicine_other"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item
-                    label="置换液："
-                    v-if="
-                      (current_select == 2 ||
-                        current_select == 5 ||
-                        current_select == 12) &&
-                        this.$store.getters.xt_user.template_info.template_id !=
-                          6
-                    "
-                  >
-                    <el-select
-                      v-model="addPlan.displace_liqui_part"
-                      placeholder="请选择"
+                  <el-col :span="8">
+                    <el-form-item
+                      label="置换液："
+                      v-if="
+                        (current_select == 2 ||
+                          current_select == 5 ||
+                          current_select == 12) &&
+                          this.$store.getters.xt_user.template_info.template_id !=
+                            6
+                      "
+                    >
+                      <el-select
+                        v-model="addPlan.displace_liqui_part"
+                        placeholder="请选择"
+                      >
+                        <el-option :key="0" label="请选择" :value="0"></el-option>
+                        <el-option
+                          v-for="(option, index) in displace_liqui_part_option"
+                          :key="index"
+                          :label="option.name"
+                          :value="option.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <el-form-item
+                      label="置换方式："
+                      v-if="
+                        current_select == 2 &&
+                          this.$store.getters.xt_user.template_info.template_id ==
+                            6
+                      "
                     >
-                      <el-option :key="0" label="请选择" :value="0"></el-option>
-                      <el-option
-                        v-for="(option, index) in displace_liqui_part_option"
-                        :key="index"
-                        :label="option.name"
-                        :value="option.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
+                      <el-select
+                        v-model="addPlan.displace_liqui_part"
+                        placeholder="请选择"
+                      >
+                        <el-option :key="0" label="请选择" :value="0"></el-option>
+                        <el-option
+                          v-for="(option, index) in displace_liqui_part_option"
+                          :key="index"
+                          :label="option.name"
+                          :value="option.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-                  <el-form-item
-                    label="置换方式："
+                  <el-col
+                    :span="8"
                     v-if="
-                      current_select == 2 &&
-                        this.$store.getters.xt_user.template_info.template_id ==
-                          6
+                      current_select == 2 ||
+                        current_select == 5 ||
+                        current_select == 12
                     "
                   >
-                    <el-select
-                      v-model="addPlan.displace_liqui_part"
-                      placeholder="请选择"
-                    >
-                      <el-option :key="0" label="请选择" :value="0"></el-option>
-                      <el-option
-                        v-for="(option, index) in displace_liqui_part_option"
-                        :key="index"
-                        :label="option.name"
-                        :value="option.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col
-                  :span="8"
-                  v-if="
-                    current_select == 2 ||
-                      current_select == 5 ||
-                      current_select == 12
-                  "
-                >
-                  <el-form-item label="置换液总量(L)">
-                    <el-input v-model="addPlan.displace_liqui_value"></el-input>
-                  </el-form-item>
-                </el-col>
+                    <el-form-item label="置换液总量(L)">
+                      <el-input v-model="addPlan.displace_liqui_value"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="血管通路：">
-                    <el-select
-                      v-model="addPlan.blood_access"
-                      placeholder="请选择"
-                    >
-                      <el-option :key="0" label="请选择" :value="0"></el-option>
+                  <el-col :span="8">
+                    <el-form-item label="血管通路：">
+                      <el-select
+                        v-model="addPlan.blood_access"
+                        placeholder="请选择"
+                      >
+                        <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                      <el-option
-                        v-for="(option, index) in blood_access_option"
-                        :key="index"
-                        :label="option.name"
-                        :value="option.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                        <el-option
+                          v-for="(option, index) in blood_access_option"
+                          :key="index"
+                          :label="option.name"
+                          :value="option.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-                <!-- </el-row>
-                <el-row :gutter="20" > -->
-                <el-col :span="8">
-                  <el-form-item label="实际超滤量(L)">
-                    <el-input v-model="addPlan.ultrafiltration"></el-input>
-                  </el-form-item>
-                </el-col>
+                  <!-- </el-row>
+                  <el-row :gutter="20" > -->
+                  <el-col :span="8">
+                    <el-form-item label="实际超滤量(L)">
+                      <el-input v-model="addPlan.ultrafiltration"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="目标KT/V">
-                    <el-input v-model="addPlan.target_ktv"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <el-button
-              style="float: right"
-              size="small"
-              class="filter-item"
-              type="primary"
-              icon="el-icon-edit-outline"
-              @click="savePrescription()"
-              >保存
-            </el-button>
-          </div>
-        </el-col>
-      </el-row>
+                  <el-col :span="8">
+                    <el-form-item label="目标KT/V">
+                      <el-input v-model="addPlan.target_ktv"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <el-button
+                style="float: right"
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="savePrescription()"
+                >保存
+              </el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <multi-select-box
+        :propsForm="InnerDialogProps"
+        v-on:dialog-comfirm="innerDialogComfirm"
+        v-on:dialog-cancle="innerDialogCancle"
+      >
+      </multi-select-box>
     </div>
-    <multi-select-box
-      :propsForm="InnerDialogProps"
-      v-on:dialog-comfirm="innerDialogComfirm"
-      v-on:dialog-cancle="innerDialogCancle"
-    >
-    </multi-select-box>
   </div>
 </template>
 
 <script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { calculateAnticoagulantZL, uParseTime } from "@/utils/tools";
 import {
   getAllSystemPrescription,
@@ -443,10 +450,14 @@ import MultiSelectBox from '../dialysis/details/dialog/MultiSelectBox/index'
 
 export default {
   name: "prescription",
-  components: { MultiSelectBox },
+  components: { MultiSelectBox,BreadCrumb },
 
   data() {
     return {
+      crumbs: [
+        { path: false, name: '配置管理' },
+        { path: false, name: '处方模板' }
+      ],
       InnerDialogProps: {
         values: [],
         visibility: false,

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -204,7 +204,7 @@
         this.$emit('edit-record')
       },jump(row){
         this.$router.push({
-          name: 'user_detail',
+          name: 'drugStockUserDetail',
           query: { id: row.id }
         })
       },merge({ row, column, rowIndex, columnIndex }) {

src/xt_pages/stock/drugs/drugStockUserDetail.vue

@@ -11,8 +11,8 @@
       </div>
 
       <div class="cell clearfix">
-        <span style="width: 300px;color: #606266">商品类型: {{userList[0].type.type_name}} </span>
-        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</span>
+        <span style="width: 300px;color: #606266">商品类型: {{userList[0].drug.drug_name}} </span>
+        <span style="width: 300px;color: #606266">规格名称: {{userList[0].drug.drug_spec}}</span>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -64,8 +64,8 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { getWarehouseOutUser } from '@/api/stock'
-  import BreadCrumb from '../components/bread-crumb'
+  import { getDrugWarehouseOutUser } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
 
   export default {
     name: 'stockInOrderDetail',
@@ -88,27 +88,11 @@
       }
     },
     methods: {
-      getSpecificationName: function(id) {
-        let name = ''
-        for (let i = 0; i < this.goodInfo.length; i++) {
-          if (this.goodInfo[i].id == id) {
-            name = this.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, getTypeName: function(id) {
-        let name = ''
-        for (let i = 0; i < this.goodType.length; i++) {
-          if (this.goodType[i].id == id) {
-            name = this.goodType[i].type_name
-          }
-        }
-        return name
-      }, GetOrderDetail: function(order_id) {
+    GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
-        getWarehouseOutUser(params).then(response => {
+        getDrugWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -17,20 +17,17 @@
                 <div style="width:250px;">
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">药品名称</div>
-                        <el-button type="primary" @click="addDrug">新增</el-button>
+                        <el-button type="primary" size="mini" @click="addDrug">新增</el-button>
                     </div>
                     <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                      highlight-current-row
                       @current-change="handleCurrentChange"  ref="monthlyPlanTable">
-                        <el-table-column align="center" prop="dialysis_no" label="序号" width="70">
-                            <template slot-scope="scope">
-                               {{scope.$index+1}} 
-                            </template>
+                        <el-table-column align="center" type="index" label="序号" width="70">
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="名称" width="90">
                             <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="操作" width="80">
+                        <el-table-column align="center" prop="name" label="操作" width="90">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="danger" @click="DeleteDrugById(scope.row.id,scope.row.drug_name,scope.$index)">删除</el-button>
                             </template>
@@ -41,7 +38,7 @@
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">药品规格</div>
                         <div>
-                            <el-button type="primary" @click="addRule">新增</el-button>
+                            <el-button type="primary" size="mini" @click="addRule">新增</el-button>
                         </div>
                     </div>
                     <el-table :data="rullerList" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>