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.js

@@ -216,4 +216,14 @@ export function getDrugDescByDrugName(params){
       methods:"get",
       params:params
    })
-}
+}
+
+export function getDrugSet(params){
+  
+   return request({
+      url:"/api/drug/getdrugset",
+      methods:"get",
+      params:params
+   })
+}
+

src/lang/zh.js

@@ -224,7 +224,8 @@ export default {
     signIndex:'签到排队',
     signIn:'签到窗口',
     lineUp:'排队窗口',
-
+    otherManagement:'其他管理',
+    calling:'排队叫号',
 
   },
   navbar: {

src/router/modules/dialysis.js

@@ -20,106 +20,68 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/board',
+      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
+      name: '数据看板',
+      meta: {
+        title: '数据看板',
+        noCache: true
+      }
+    },
     // {
-    //   path: '/dialysis/board',
-    //   component: () => import('@/xt_pages/dialysis/bulletinBoard'),
-    //   name: '数据看板',
+    //   path: '/dialysis/consumableDrugs',
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs'),
+    //   name: '耗材药品',
     //   meta: {
-    //     title: '数据看板',
+    //     title: '耗材药品',
     //     noCache: true
     //   }
     // },
     // {
-    //   path: '/dialysis/calling',
-    //   component: () => import('@/xt_pages/dialysis/calling'),
-    //   name: '透析叫号',
+    //   path: '/dialysis/consumableDrugs_print',
+    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'consumableDrugs_print',
     //   meta: {
-    //     title: '透析叫号',
+    //     title: 'consumableDrugs_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/dialysisDrugs_print',
+    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysisDrugs_print',
+    //   meta: {
+    //     title: 'dialysisDrugs_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/dialysisParameters_print',
+    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysisParameters_print',
+    //   meta: {
+    //     title: 'dialysisParameters_print',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/dialysis/allSummary_print',
+    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'allSummary_print',
+    //   meta: {
+    //     title: 'allSummary_print',
     //     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'),
-      hidden: true,
-      is_menu: false,
-      name: 'consumableDrugs_print',
-      meta: {
-        title: 'consumableDrugs_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/dialysisDrugs_print',
-      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisDrugs_print',
-      meta: {
-        title: 'dialysisDrugs_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/dialysisParameters_print',
-      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisParameters_print',
-      meta: {
-        title: 'dialysisParameters_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/allSummary_print',
-      component: () => import('@/xt_pages/dialysis/allSummary_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'allSummary_print',
-      meta: {
-        title: 'allSummary_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/consumables_print',
-      component: () => import('@/xt_pages/dialysis/consumables_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'consumables_print',
-      meta: {
-        title: 'consumables_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/dialysis/allsummarydialog_print',
-      component: () => import('@/xt_pages/dialysis/allSummaryDialog_print'),
-      hidden: true,
-      is_menu: false,
-      name: 'allsummarydialog_print',
-      meta: {
-        title: 'allsummarydialog_print',
-        noCache: true
-      }
-    },
-    {
-      path:'/dialysis/dialysisdrugs_print',
-      component:()=>import('@/xt_pages/dialysis/dialysisDrugs_print'),
-      hidden:true,
-      is_menu:false
-    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/router/modules/qcd.js

@@ -240,25 +240,25 @@ export default {
       }
     },
     {
-      path: '/qcd/workAnalysis/index',
-      component: () => import('@/xt_pages/qcd/workAnalysis/index'),
+      path: '/qcd/workAnalysis/doctor',
+      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
       name: 'workAnalysisDoctor',
       meta: {
         title: '工作量分析统计',
         noCache: true
       }
     },
-    // {
-    //   path: '/qcd/workAnalysis/nurse',
-    //   hidden: true,
-    //   is_menu: false,
-    //   component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
-    //   name: 'workAnalysisNurse',
-    //   meta: {
-    //     title: '工作量分析统计护士',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/qcd/workAnalysis/nurse',
+      hidden: true,
+      is_menu: false,
+      component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
+      name: 'workAnalysisNurse',
+      meta: {
+        title: '工作量分析统计护士',
+        noCache: true
+      }
+    },
     {
       path: '/qcd/patientanalysis/checkStatistical',
       hidden: true,

src/router/modules/stock.js

@@ -12,90 +12,31 @@ export default {
     isChild: true
   },
   children: [
-    {
-      path: '/stock/consumablesManagement',
-      component: Layout,
-      redirect: '/stock/in',
-      name: 'consumablesManagement',
-      parentNum: 1,
-      meta: {
-        isChild: true,
-        title: 'consumablesManagement',
-        noCache: true
-      }
-    },
     {
       path: '/stock/in',
       component: () => import('@/xt_pages/stock/stockInOrder'),
       name: 'stockInOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockInOrder', noCache: true }
     },
     {
       path: '/stock/return',
       component: () => import('@/xt_pages/stock/salesReturnOrder'),
       name: 'salesReturnOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'salesReturnOrder', noCache: true }
     },
     {
       path: '/stock/out',
       component: () => import('@/xt_pages/stock/stockOutOrder'),
       name: 'stockOutOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockOutOrder', noCache: true }
     },
     {
       path: '/stock/cancel',
       component: () => import('@/xt_pages/stock/cancelStockOrder'),
       name: 'cancelStockOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-    {
-      path: '/stock/in/other',
-      component: () => import('@/xt_pages/stock/otherStockInOrder'),
-      name: 'otherStockInOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherStockInOrder', noCache: true }
-    },
-    {
-      path: '/stock/return/other',
-      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-      name: 'otherSalesReturnOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherSalesReturnOrder', noCache: true }
-    },
-    {
-      path: '/stock/out/other',
-      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-      name: 'otherStockOutOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherStockOutOrder', noCache: true }
-    },
-    {
-      path: '/stock/cancel/other',
-      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
-      name: 'otherCancelStockOrder',
-      hidden: true,
-      is_menu: false,
-      num: 1,
-      meta: { title: 'otherCancelStockOrder', noCache: true }
-    },
+    
     // {
     //   path: "/stock/",
     //   component: Layout,
@@ -150,18 +91,12 @@ export default {
       path: '/stock/query',
       component: () => import('@/xt_pages/stock/stockQuery'),
       name: 'stockQuery',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockQuery', noCache: true }
     },
     {
       path: '/stock/detail',
       component: () => import('@/xt_pages/stock/stockDetailIndex'),
       name: 'stockDetail',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'stockDetail', noCache: true }
     },
     {
@@ -171,13 +106,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInOrderAdd', 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: '/stock/in/detail',
@@ -186,13 +114,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInDetail', 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: '/stock/return/detail',
@@ -201,13 +122,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'salesReturnDetail', 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: '/stock/return/add',
@@ -216,13 +130,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'salesReturnOrderAdd', 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: '/stock/out/add',
@@ -231,13 +138,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutOrderAdd', 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: '/stock/out/detail',
@@ -246,13 +146,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutDetail', 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: '/stock/cancel/add',
@@ -261,13 +154,6 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelStockOrderAdd', 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: '/stock/cancel/detail',
@@ -276,21 +162,11 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelStockDetail', 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: '/stock/config',
       component: () => import('@/xt_pages/stock/index'),
       name: 'config',
-      hidden: true,
-      is_menu: false,
-      num: 1,
       meta: { title: 'config', noCache: true }
     },
     {
@@ -312,146 +188,5 @@ export default {
       is_menu: false,
       meta: { title: 'user_detail', noCache: true }
     },
-    {
-      path: '/stock/selfPreparedMedicine',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-      redirect: '/stock/selfPreparedMedicineIndex',
-      name: 'selfPreparedMedicine',
-      parentNum: 2,
-      meta: {
-        isChild: true,
-        title: 'selfPreparedMedicine',
-        noCache: true
-      }
-    },
-    {
-      path: '/stock/selfPreparedMedicineIndex',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-      name: 'selfPreparedMedicineIndex',
-      hidden: true,
-      is_menu: false,
-      num: 2,
-      meta: { title: 'selfPreparedMedicineIndex', noCache: true }
-    },
-    {
-      path: '/stock/selfPreparedMedicineQuery',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
-      name: 'selfPreparedMedicineQuery',
-      hidden: true,
-      is_menu: false,
-      num: 2,
-      meta: { title: 'selfPreparedMedicineQuery', noCache: true }
-    },
-    {
-      path: '/stock/selfPreparedMedicineQueryPrint',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
-      name: 'selfPreparedMedicineQueryPrint',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
-    },
-    {
-      path: '/stock/selfPreparedMedicineInfo',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
-      name: 'selfPreparedMedicineInfo',
-      hidden: true,
-      is_menu: false,
-      num: 2,
-      meta: { title: 'selfPreparedMedicineInfo', noCache: true }
-    },
-    {
-      path: '/stock/drugs',
-      component: Layout,
-      redirect: '/stock/drugs/stock/in',
-      name: 'stockDrugs',
-      parentNum: 3,
-      meta: {
-        isChild: true,
-        title: 'stockDrugs',
-        noCache: true
-      }
-    },
-
-    {
-      path: '/stock/drugs/stock/in',
-      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
-      name: 'drugsStockIn',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockIn', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/out',
-      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
-      name: 'drugsStockOut',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockOut', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/return',
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
-      name: 'drugsStockReturn',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockReturn', noCache: true }
-    },
-    {
-      path: '/stock/drugs/stock/cancel',
-      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-      name: 'drugsStockCancel',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsStockCancel', noCache: true }
-    },
-    // {
-    //   path: '/stock/drugs/stock/adjustPrice',
-    //   component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
-    //   name: 'drugsAdjustPrice',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsAdjustPrice', noCache: true }
-    // },
-    // {
-    //   path: '/stock/drugs/stock/reportLoss',
-    //   component: () => import('@/xt_pages/stock/drugs/reportLoss'),
-    //   name: 'drugsReportLoss',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsReportLoss', noCache: true }
-    // },
-    {
-      path: '/stock/drugs/stock/query',
-      component: () => import('@/xt_pages/stock/drugs/query'),
-      name: 'drugsQuery',
-      hidden: true,
-      is_menu: false,
-      num: 3,
-      meta: { title: 'drugsQuery', noCache: true }
-    },
-    // {
-    //   path: '/stock/drugs/stock/drugsSurplus',
-    //   component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
-    //   name: 'drugsSurplus',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsSurplus', noCache: true }
-    // },
-    // {
-    //   path: '/stock/drugs/stock/drugsExpiryDate',
-    //   component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
-    //   name: 'drugsExpiryDate',
-    //   hidden: true,
-    //   is_menu: false,
-    //   num: 3,
-    //   meta: { title: 'drugsExpiryDate', noCache: true }
-    // },
   ]
 }

src/router/modules/systems.js

@@ -5,7 +5,6 @@ export default {
   component: Layout,
   redirect: '/role/admin/manage',
   name: 'system',
-  alwaysShow: true,
   meta: {
     title: 'systemManage',
     icon: 'system'
@@ -20,16 +19,7 @@ export default {
 
     }
   },
-  {
-    path: '/role/manage',
-    component: () => import('@/xt_pages/role/role'),
-    name: 'roleManage',
-    meta: {
-      title: 'roleManage',
-      noCache: true,
-
-    }
-  },
+  
   {
     path: '/role/admin/create',
     component: () => import('@/xt_pages/role/CreateAdmin'),
@@ -71,63 +61,9 @@ export default {
   //     title: 'special_permission_manage'
   //   }
   // },
-  {
-    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,
-
-    }
-  },
-  {
-    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'
-      }
-    }, {
-    path: '/data/druguse',
-    component: () => import('@/xt_pages/data/druguseTemplate'),
-    name: 'druguse',
-    meta: {
-      title: 'druguse'
-    }
-  }, {
-    path: '/data/showconfig',
-    component: () => import('@/xt_pages/data/showConfig'),
-    name: 'showconfig',
-    meta: {
-      title: 'showconfig'
-    }
-  },{
-    path: '/data/print',
-    component: () => import('@/xt_pages/data/printTemplate'),
-    name: 'printTemplate',
-    meta: {
-      title: 'printTemplate'
-    }
-  }
+  
+  
+    
   ]
 }
+

src/router/modules/weight_sign.js

@@ -30,6 +30,16 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/calling',
+    component: () => import('@/xt_pages/sign/calling'),
+    name: 'calling',
+    meta: {
+      title: 'calling',
+      icon: 'calling',
+      noCache: true
+    }
+  },
   {
     path: '/sign',
     component: () => import('@/xt_pages/sign/index'),

src/views/layout/Layout.vue

@@ -4,23 +4,23 @@
     
     <div class="mainBox">
       <div class="navLeft">
-        <div :class="index == 0 ? 'navOne navActive' : 'navOne'" @click="clickActive(0,'门诊管理')">
+        <div v-if="menzhenShow" :class="index == 0 ? 'navOne navActive' : 'navOne'" @click="clickActive(0,'门诊管理')">
           <i class="iconfont icon--yishengmenzhen navIcon"></i>
           <p>门诊管理</p>
         </div>
-        <div :class="index == 1 ? 'navOne navActive' : 'navOne'" @click="clickActive(1,'电子病历')">
+        <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 :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
+        <div v-if="touxiShow" :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <div :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>
         </div>
-        <div :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'酷医商城')">
+        <div v-if="kuyishoppingShow" :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'酷医商城')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
           <p>酷医商城</p>
         </div>
@@ -67,12 +67,12 @@
             <p>营销管理</p>
           </div>
         </a>
-        <div class="dialogMainOne">
+        <!-- <div class="dialogMainOne">
           <div class="dialogIcon">
             <i class="iconfont icon-shujufenxi-jingyinggaikuang newIcon"></i>
           </div>
           <p>经营中心</p>
-        </div>
+        </div> -->
         <a :href="MircoMallWebsit()" target="_blank" v-if="this.$store.getters.xt_user.mall_role_exist">
           <div class="dialogMainOne">
             <div class="dialogIcon">
@@ -81,7 +81,7 @@
             <p>分销商城</p>
           </div>
         </a>
-        <div class="dialogMainOne" @click="clickActive(11,'配置管理')">
+        <div v-if="peizhiShow" class="dialogMainOne" @click="clickActive(11,'配置管理')">
           <div class="dialogIcon">
             <i class="iconfont icon-setup_fill newIcon"></i>
           </div>
@@ -93,6 +93,7 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import { Navbar, Sidebar, AppMain, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 
@@ -110,10 +111,67 @@ export default {
       index:2,
       navTitle:'透析管理',
       sign:false,
-      navShow:true
+      navShow:true,
+      //
+      menzhenShow:true,
+      bingliShow:true,
+      touxiShow:true,
+      kucunShow:true,
+      peizhiShow:true,
+      kuyishoppingShow:true,
+    }
+  },
+  created(){
+    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 kuyishopping = ['kuyiShopping']
+    let menzhenArr = []
+    let bingliArr = []
+    let touxiArr = []
+    let kucunArr = []
+    let peizhiArr = []
+    let kuyishoppingArr = []
+    this.permission_routers.map(item => {
+      if(menzhen.indexOf(item.name) > -1){
+        menzhenArr.push(item)
+      }else if(bingli.indexOf(item.name) > -1){
+        bingliArr.push(item)
+      }else if(touxi.indexOf(item.name) > -1){
+        touxiArr.push(item)
+      }else if(kucun.indexOf(item.name) > -1){
+        kucunArr.push(item)
+      }else if(peizhi.indexOf(item.name) > -1){
+        peizhiArr.push(item)
+      }else if(kuyishopping.indexOf(item.name) > -1){
+        kuyishoppingArr.push(item)
+      }
+    })
+    // console.log('menzhenArr.length',menzhenArr.length)
+    // console.log('bingliArr.length',bingliArr.length)
+    // console.log('touxiArr.length',touxiArr.length)
+    // console.log('kucunArr.length',kucunArr.length)
+    // console.log('peizhiArr.length',peizhiArr.length)
+    // console.log('kuyishoppingArr.length',kuyishoppingArr.length)
+    if(menzhenArr.length == 0){
+      this.menzhenShow = false
+    }else if(bingliArr.length == 0){
+      this.bingliShow = false
+    }else if(touxiArr.length == 0){
+      this.touxiShow = false
+    }else if(kucunArr.length == 0){
+      this.kucunShow = false
+    }else if(peizhiArr.length == 0){
+      this.peizhiShow = false
+    }else if(kuyishoppingArr.length == 0){
+      this.kuyishoppingShow = false
     }
   },
   computed: {
+    ...mapGetters(["permission_routers"]),
     sidebar() {
       return this.$store.state.app.sidebar
     },

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

@@ -49,7 +49,7 @@ export default {
   created(){
     if(this.navTitle == '透析管理'){
       let nameArr = ['workforce','dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
-      console.log('permission_routers',this.permission_routers)
+      // console.log('permission_routers',this.permission_routers)
       let routerArr = []
       this.permission_routers.map(item => {
         if(nameArr.indexOf(item.name) > -1){
@@ -70,7 +70,7 @@ export default {
       handler(newVal,oldVal){
         if(newVal == '门诊管理'){
           let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
-          console.log('permission_routers',this.permission_routers)
+          // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){
@@ -87,7 +87,7 @@ export default {
           }
         }else if(newVal == '电子病历'){
           let nameArr = ['User','createPatient']
-          console.log('permission_routers',this.permission_routers)
+          // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){
@@ -104,7 +104,7 @@ export default {
           }
         }else if(newVal == '透析管理'){
           let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
-          console.log('permission_routers',this.permission_routers)
+          // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){
@@ -122,7 +122,7 @@ export default {
           }
         }else if(newVal == '库存管理'){
           let nameArr = ['stockManage','selfPreparedMedicine','stockDrugs','otherManagement']
-          console.log('permission_routers',this.permission_routers)
+          // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){
@@ -139,7 +139,7 @@ export default {
           }
         }else if(newVal == '配置管理'){
           let nameArr = ['system','roleManage','dictionary','specialDictionary','template','prescription','druguse','showconfig','printTemplate']
-          console.log('permission_routers',this.permission_routers)
+          // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -768,6 +768,7 @@
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
       doctor_advices: function() {
+
         this.handleSpanTempArr()
         this.hoverOrderArr = []
         this.handleStyle()
@@ -840,6 +841,7 @@
               adviceNames: this.other_doctor_advices,
               remark: ''
             }
+
             let mode = '1'
             CreateGroupAdvice(this.patientid, 0, submitForm, mode).then(
               response => {
@@ -1176,7 +1178,6 @@
         }
         this.exceLoading = true
         let mode = '6'
-
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1461,7 +1462,7 @@
       }
       ,
       checkAdvice() {
-        console.log(this.$store.getters.xt_user)
+        // console.log(this.$store.getters.xt_user)
         if (this.currentRow == null) {
           this.$message.error('请先选择要核对的医嘱！')
           return false

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -385,11 +385,13 @@
                   v-for="item in medicals"
                   :key="item.id"
                   :label="item.drug_name"
-                  :value="item.drug_name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
-
+            <!-- <div style="margin-left:120px;margin-top:-20px;font-size:12px;color:red">
+               库存不足50
+            </div> -->
             
           </el-col>
 
@@ -568,6 +570,7 @@ import {
 } from "@/api/advice";
 
 import {getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import { duration } from 'moment';
 export default {
   name: "AddGroupAdvice",
   data() {
@@ -611,7 +614,9 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        drug_id:"",
+        way:"",
       },
       submitGroupForm: {
         advice_type: "",
@@ -629,13 +634,15 @@ export default {
         adviceNames: [],
         advice_doctor: "",
         remark: "",
-        parent_id: 0
+        parent_id: 0,
+        drug_id:"",
+        way:"",
       },
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
       allSelectedTemplate: [],
       medicals:[],
-      drugSpec:[],
+      drugSpec:[]
     };
   },
   props: {
@@ -686,6 +693,7 @@ export default {
   },
   methods: {
     submitgroupAdvice(formName) {
+      
       this.$refs[formName].validate(valid => {
         if (valid) {
           var submitForm = {
@@ -697,7 +705,8 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id
           };
-
+          
+          console.log("888888",this.groupForm.adviceNames)
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
@@ -705,7 +714,9 @@ export default {
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
-        
+     
+          console.log("88888888",submitForm)
+ 
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -827,16 +838,40 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-      //截取自备药名称
-      var arr = this.nameForm.advice_name.split("(自备药)")
-      this.nameForm.advice_name = arr[0]
+      
+      if(typeof(this.nameForm.advice_name) == "string"){
+         
+          this.nameForm.advice_name == this.nameForm.advice_name
+      }
 
+      if(typeof(this.nameForm.advice_name) == "number"){
+          var drug_name = ""
+          var name = ""
+          var way = 0
+          this.nameForm.drug_id = this.nameForm.advice_name
+          for(let i=0;i<this.medicals.length;i++){
+            if(this.nameForm.advice_name == this.medicals[i].id){
+              name = this.medicals[i].drug_name
+              way  = this.medicals[i].way
+            }
+          }
+          if(way == 1){
+            drug_name = name
+          }
+          if(way == 2){
+            var arr = name.split("(自备药)")
+            drug_name = arr[0]
+          }
+          
+          this.nameForm.advice_name = drug_name
+          this.nameForm.way = way
+      }
+      
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
-            var ale = _this.groupForm.adviceNames.length;
-            console.log("进来诶呦")
+            var ale = _this.groupForm.adviceNames.length; 
             if (_this.isChild) {
               for (let index = 0; index < ale; index++) {
                 if (_this.groupSelectRow.parent_row ==_this.groupForm.adviceNames[index].row_key) {
@@ -856,7 +891,10 @@ export default {
                       _this.groupForm.adviceNames[index].children[j].delivery_way = _this.nameForm.delivery_way;
                       _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
                       _this.groupForm.adviceNames[index].children[j].remark =_this.nameForm.remark;
+                      _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
+                      _this.groupForm.adviceNames[index].children[j].way = this.nameForm.way;
                       _this.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
+                     
                       );
                       break;
                     }
@@ -877,7 +915,8 @@ export default {
                   _this.groupForm.adviceNames[index].delivery_way =_this.nameForm.delivery_way;
                   _this.groupForm.adviceNames[index].execution_frequency =_this.nameForm.execution_frequency;
                   _this.groupForm.adviceNames[index].remark =_this.nameForm.remark;
-
+                  _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
+                  _this.groupForm.adviceNames[index].children[j].way = this.nameForm.way;
                   _this.$set(
                     _this.groupForm.adviceNames,
                     index,
@@ -1271,8 +1310,6 @@ export default {
               }
               this.$set(item, "children", item.children);
             }
-            console.log("11122333")
-            console.log(item)
             this.allSelectedTemplate.unshift(item);
             adviceTemplate.DoctorAdviceTemplate[index].selection = false;
           }
@@ -1359,40 +1396,16 @@ export default {
             for (const index in _this.adviceTemplateMaps[mapid]
               .DoctorAdviceTemplate) {
               this.editRowKey++;
-              var item = {
-                advice_name:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .advice_name,
-                advice_desc:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .advice_desc,
-                single_dose:
-                  "" +
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .single_dose,
-                single_dose_unit:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .single_dose_unit,
-                drug_spec:
-                  "" +
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .drug_spec,
-                drug_spec_unit:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .drug_spec_unit,
-                prescribing_number:
-                  "" +
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .prescribing_number,
-                prescribing_number_unit:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .prescribing_number_unit,
-                delivery_way:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .delivery_way,
-                execution_frequency:
-                  _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                    .execution_frequency,
+              var item = {advice_name:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_name,
+                advice_desc:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_desc,
+                single_dose:"" +_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose,
+                single_dose_unit:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose_unit,
+                drug_spec:"" +_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
+                drug_spec_unit:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec_unit,
+                prescribing_number:"" +_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number,
+                prescribing_number_unit:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number_unit,
+                delivery_way:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].delivery_way,
+                execution_frequency:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1516,25 +1529,82 @@ export default {
       getSelfMedicalList(params).then(response=>{
           if(response.data.state == 1){
             var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
             for(let i=0;i<medicalList.length;i++){
                medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
             }
-            this.medicals = medicalList
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+            
+            this.medicals = drugname
           }
       })
     },
-    changeDrugName(name){
-       console.log("name",name)
-      var arr = name.split("(自备药)");
+    changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == this.medicals[i].id){
+          name = this.medicals[i].drug_name
+          way  = this.medicals[i].way
+        }
+      }
+      if(way == 1){
+        drug_name = name
+      }
+      if(way == 2){
+        var arr = name.split("(自备药)")
+        drug_name = arr[0]
+      }
         const params = {
-          drug_name:arr[0],
-          patient_id:this.$route.query.patient_id
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
+          id:id,
         }
-        console.log("params",params)
       getDrugDescByDrugName(params).then(response=>{
           if(response.data.state == 1){
              var drugspec = response.data.data.drugspec
-             console.log("drugspec",drugspec)
+          
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = drugspec[0].single_dose.toString()
+             } 
+             if(drugspec[0].min_unit !=0){
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number.toString()
+             }
+             var countInfo = response.data.data.countInfo
+             console.log("countInfo",countInfo)
+             var countOut = response.data.data.countout
+             console.log("countout",countOut)
+             var arr = countInfo[0].Count - countOut[0].Count
+             console.log("arr222",arr)
              this.drugSpec = drugspec
           }
       })

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -358,30 +358,63 @@
     <el-dialog
       :title="nameFormTitle"
       :visible.sync="nameFormVisible"
-      width="700px"
+      width="800px"
     >
       <el-form
         ref="nameForm"
         :rules="nameRules"
         :model="nameForm"
-        label-width="90px"
+        label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <el-input v-model="nameForm.advice_name"></el-input>
+              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
+               <el-select
+                v-model="nameForm.advice_name"
+                filterable
+                clearable
+                allow-create
+                :disabled="isChild"
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
+              >
+                <el-option
+                  v-for="item in medicals"
+                  :key="item.id"
+                  :label="item.drug_name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="14">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
-              <el-col :span="8">
-                <el-input v-model="nameForm.advice_desc"></el-input>
+              <el-col :span="10">
+                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
+                 <el-select
+                  v-model="nameForm.advice_desc"
+                  filterable
+                  clearable
+                  allow-create
+                  :disabled="isChild"
+                  placeholder="请选择(输入可搜索)"
+                  style="width:150px"
+                >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
-              <el-col :span="14">
+              <el-col :span="10">
                 <el-select
                   v-model="nameForm.drug_spec_unit"
                   filterable
@@ -520,7 +553,7 @@ import {
   SaveEditAdvices
 } from "@/api/advice";
 import { jsGetAge, uParseTime } from "@/utils/tools";
-
+import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 export default {
   name: "AddGroupAdvice",
   data() {
@@ -585,7 +618,9 @@ export default {
       adminusername: "",
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
-      allSelectedTemplate: []
+      allSelectedTemplate: [],
+      medicals:[],
+      drugSpec:[]
     };
   },
   props: {
@@ -794,6 +829,33 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
+       if(typeof(this.nameForm.advice_name) == "string"){
+         
+          this.nameForm.advice_name == this.nameForm.advice_name
+      }
+
+      if(typeof(this.nameForm.advice_name) == "number"){
+          var drug_name = ""
+          var name = ""
+          var way = 0
+          this.nameForm.drug_id = this.nameForm.advice_name
+          for(let i=0;i<this.medicals.length;i++){
+            if(this.nameForm.advice_name == this.medicals[i].id){
+              name = this.medicals[i].drug_name
+              way  = this.medicals[i].way
+            }
+          }
+          if(way == 1){
+            drug_name = name
+          }
+          if(way == 2){
+            var arr = name.split("(自备药)")
+            drug_name = arr[0]
+          }
+          
+          this.nameForm.advice_name = drug_name
+          this.nameForm.way = way
+      }
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2161,12 +2223,106 @@ export default {
           this.groupEditFormVisible = false;
         }
       });
+    },
+   getSelfMedicalList(){
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      getSelfMedicalList(params).then(response=>{
+          if(response.data.state == 1){
+            var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
+            }
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+            console.log("222222222我的",drugname)
+            this.medicals = drugname
+          }
+      })
+    },
+  changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == this.medicals[i].id){
+          name = this.medicals[i].drug_name
+          way  = this.medicals[i].way
+        }
+      }
+      if(way == 1){
+        drug_name = name
+      }
+      if(way == 2){
+        var arr = name.split("(自备药)")
+        drug_name = arr[0]
+      }
+        const params = {
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
+        }
+      getDrugDescByDrugName(params).then(response=>{
+          if(response.data.state == 1){
+             var drugspec = response.data.data.drugspec
+             console.log("drugspec999",drugspec)
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = ""
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = ""
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = ""
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = ""
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = ""
+                this.nameForm.single_dose = drugspec[0].single_dose.toString()
+             } 
+             if(drugspec[0].min_unit !=0){
+              this.nameForm.single_dose_unit = ""
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = ""
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+               this.nameForm.prescribing_number = ""
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number.toString()
+             }
+          
+             this.drugSpec = drugspec
+          }
+      })
+    
     }
   },
   watch: {
     "selectedTemp.list": function() {
       this.calcselectedTemp();
     }
+  },
+  created(){
+     //获取自备药
+    this.getSelfMedicalList()
   }
 };
 </script>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1370,7 +1370,7 @@
       },
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
         
-        console.log("德玛西亚22222",schedual)
+       
         this.treatment_mode = this.$store.getters.treatment_mode
         console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(

src/xt_pages/outpatientRegistration/index.vue

@@ -8,9 +8,9 @@
             <div class="formMain">
                 <el-form class="basicForm" ref="form" :model="form" label-width="80px">
                     <el-form-item label="结算类型">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in settlement"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -18,16 +18,16 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item class="specialFormItem" label="医保卡号">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model="form.medicalInsuranceCard"></el-input>
                         <el-button type="primary">读卡</el-button>
                     </el-form-item>
                     <el-form-item label="患者姓名">
                         <el-input v-model="form.name"></el-input>
                     </el-form-item>
                     <el-form-item label="性别">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.sex" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in sex"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -35,9 +35,9 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="证件类型">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.certificates" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in certificates"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -45,9 +45,9 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="医疗类别">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.medicalCare" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in medicalCare"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -55,13 +55,13 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="出生日期">
-                        <el-date-picker v-model="value1" type="date" placeholder="选择日期"></el-date-picker>
+                        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
                     </el-form-item>
                     <el-form-item label="年龄">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model="form.age" readonly=""></el-input>
                     </el-form-item>
                     <el-form-item label="证件号码">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model="form.idCard"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
@@ -69,9 +69,9 @@
             <div class="formMain">
                 <el-form class="basicForm" ref="form" :model="form" label-width="80px">
                     <el-form-item label="挂号类型">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.register" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in register"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -79,9 +79,9 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="医生">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.doctor" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in doctor"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -89,9 +89,9 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="科室">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.department" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
+                            v-for="item in department"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
@@ -99,25 +99,25 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-checkbox v-model="checked">是否需要工本费</el-checkbox>
+                        <el-checkbox v-model="form.costChecked">是否需要工本费</el-checkbox>
                     </el-form-item>
                     <el-form-item label="挂号费">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model.number="form.registrationFee"></el-input>
                     </el-form-item>
                     <el-form-item label="诊疗费">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model.number="form.medicalExpenses"></el-input>
                     </el-form-item>
                     <el-form-item label="工本费">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model.number="form.cost" :readonly="!form.costChecked"></el-input>
                     </el-form-item>
                     <el-form-item label="合计">
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model.number="total" readonly></el-input>
                     </el-form-item>
                     <el-form-item>
                         <!-- <el-input v-model="form.name"></el-input> -->
                     </el-form-item>
                 </el-form>
-                <el-button style="float:right" type="primary">挂号</el-button>
+                <el-button style="float:right" @click="getForm" type="primary">挂号</el-button>
             </div>
             
         </div>
@@ -126,6 +126,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment')
 export default {
     components:{
         BreadCrumb
@@ -136,25 +137,177 @@ export default {
                 { path: false, name: '门诊挂号' },
                 { path: false, name: '门诊挂号' }
             ],
-            form:{},
-            options: [{
-                value: '选项1',
-                label: '黄金糕'
+            form:{
+                settlementValue: '',
+                medicalInsuranceCard:'',
+                name:'',
+                sex:'',
+                certificates:'',
+                medicalCare:'',
+                birthday:'',
+                age:'',
+                idCard:'',
+                register:'',
+                doctor:'',
+                department:'',
+                costChecked:false,
+                registrationFee:'',
+                medicalExpenses:'',
+                cost:'',
+                total: ''
+
+            
+            },
+            settlement: [{
+                value: 1,
+                label: '医保'
                 }, {
-                value: '选项2',
-                label: '双皮奶'
+                value: 2,
+                label: '自费'
+            }],
+            sex: [{
+                value: 1,
+                label: '男'
                 }, {
-                value: '选项3',
-                label: '蚵仔煎'
+                value: 2,
+                label: '女'
+            }],
+            certificates: [{
+                value: 1,
+                label: '内地身份证'
                 }, {
-                value: '选项4',
-                label: '龙须面'
+                value: 2,
+                label: "社保卡"
+                },{
+                value: 3,
+                label: "护照"
+                },{
+                value: 4,
+                label: "军官证"
+                },{
+                value: 5,
+                label: "台胞证"
+                },{
+                value: 6,
+                label: "港澳地区身份证"
+            }],
+            medicalCare: [{
+                value: 1,
+                label: '普通门诊'
+                }, {
+                value: 2,
+                label: "门诊大病"
+                },{
+                value: 3,
+                label: "重疾特药"
+                },{
+                value: 4,
+                label: "门诊特检"
+                },{
+                value: 5,
+                label: "健康接种"
+                },{
+                value: 6,
+                label: "预防接种"
+                },
+                {
+                value: 7,
+                label: "门诊输液"
+            }],
+            register: [{
+                value: 1,
+                label: '普通'
                 }, {
-                value: '选项5',
-                label: '北京烤鸭'
+                value: 2,
+                label: "主治"
+                },{
+                value: 3,
+                label: "主任"
+                },{
+                value: 4,
+                label: "免收诊金"
+                },{
+                value: 5,
+                label: "专家"
             }],
-            value: ''
         }
+    },
+    computed:{
+        total(){
+            if(this.form.registrationFee || this.form.medicalExpenses || this.form.cost){
+                return parseFloat(this.form.registrationFee ? this.form.registrationFee : 0) + parseFloat(this.form.medicalExpenses ? this.form.medicalExpenses : 0) + parseFloat(this.form.cost ? this.form.cost : 0) 
+            }
+        }
+    },
+    methods:{
+        getBirthday(date){
+            console.log(date)
+            let curTime = moment(new Date(date)).format('YYYY-MM-DD')
+            console.log(this.jsGetAge(curTime))
+
+            this.form.age = this.jsGetAge(curTime)
+        },
+        jsGetAge(strBirthday) { //传入形式yyyy-MM-dd
+            //strBirthday = util.formatTime(strBirthday);转换成yyyy-MM-dd形式
+            var returnAge
+            var strBirthdayArr = strBirthday.split('-')
+            var birthYear = strBirthdayArr[0]
+            var birthMonth = strBirthdayArr[1]
+            var birthDay = strBirthdayArr[2]
+            var d = new Date()
+            var nowYear = d.getFullYear()
+            var nowMonth = d.getMonth() + 1
+            var nowDay = d.getDate()
+            if (nowYear == birthYear) {
+            returnAge = 0 //同年 则为0岁
+            } else {
+            var ageDiff = nowYear - birthYear //年之差
+            if (ageDiff > 0) {
+                if (nowMonth == birthMonth) {
+                var dayDiff = nowDay - birthDay //日之差
+                if (dayDiff < 0) {
+                    returnAge = ageDiff - 1
+                } else {
+                    returnAge = ageDiff
+                }
+                } else {
+                var monthDiff = nowMonth - birthMonth //月之差
+                if (monthDiff < 0) {
+                    returnAge = ageDiff - 1
+                } else {
+                    returnAge = ageDiff
+                }
+                }
+            } else {
+                returnAge = -1 //返回-1 表示出生日期输入错误 晚于今天
+            }
+            }
+            return returnAge //返回周岁年龄
+        },
+        getForm(){
+            this.form.total = this.total
+            // console.log(this.form)
+            // console.log(JSON.parse(localStorage.getItem("temp")))
+            if(localStorage.getItem("temp")){
+                let a = JSON.parse(localStorage.getItem("temp"))
+                // let arr = []
+                a.push(this.form)
+                console.log(111,a)
+                localStorage.setItem("temp",JSON.stringify(a));
+                Object.keys(this.form).forEach((key)=>{
+                    this.form[key] = ''
+                })
+                this.$message({message: '添加成功',type: 'success'});
+            }else {
+                let arr = []
+                arr.push(this.form)
+                localStorage.setItem("temp",JSON.stringify(arr));
+                Object.keys(this.form).forEach((key)=>{
+                    this.form[key] = ''
+                })
+                this.$message({message: '添加成功',type: 'success'});
+            }
+        }   
     }
 }
 </script>

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -26,8 +26,7 @@
                 </el-select>
             </div>
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                <el-table-column align="center" prop="dialysis_no" label="序号" width="60">
-                    <template slot-scope="scope">1</template>
+                <el-table-column align="center" type="index" label="序号" width="60">
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间" width="100">
                     <template slot-scope="scope">{{ scope.row.date }}</template>

src/xt_pages/sign/calling.vue

@@ -0,0 +1,53 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+            <bread-crumb :crumbs="crumbs"></bread-crumb>
+        </div>
+        <div class="app-container">
+            <el-tabs v-model="activeName">
+                <el-tab-pane label="透前叫号" name="first">
+                    <before-dialysis-calling></before-dialysis-calling>
+                </el-tab-pane>
+                <el-tab-pane label="上机叫号" name="second">
+                    <computer-calling></computer-calling>
+                </el-tab-pane>
+                <el-tab-pane label="诊台配置" name="third">
+                    <treatment-configure></treatment-configure>
+                </el-tab-pane>
+                <el-tab-pane label="叫号配置" name="fourth">
+                    <calling-configure></calling-configure>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import BreadCrumb from "../components/bread-crumb";
+import beforeDialysisCalling from './components/beforeDialysisCalling'
+import computerCalling from './components/computerCalling'
+import treatmentConfigure from "./components/treatmentConfigure"
+import callingConfigure from './components/callingConfigure'
+export default {
+    components:{
+       BreadCrumb,
+       beforeDialysisCalling,
+       computerCalling,
+       treatmentConfigure,
+       callingConfigure 
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: "透析管理" },
+                { path: "dialysis/board", name: "透析叫号" }
+            ],
+            activeName:'first'
+        }
+    },
+    methods:{
+    }
+}
+</script>
+      

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -0,0 +1,90 @@
+<template>
+    <div class="page_beforeDialysisCalling">
+        <div class="cell clearfix">
+            <label class="title"><span class="name">叫号状态</span> : </label>
+            <div class="time ">
+                <ul class="">
+                    <li v-for="option in patient_state" :key="option.value" @click="handleStateChange(option.value)" :class="patientStateVal == option.value ? 'active' : ''" >{{option.label}}
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div class="callingArea">
+                <waiting-called v-if="patientStateVal == 0"></waiting-called>
+                <called v-if="patientStateVal == 1"></called>
+            </div>
+            <div class="nowCalling" v-if="patientStateVal == 0">
+                <p class="nowCallingTitle">当前叫号</p>
+                <p class="nowCallingName">李小明</p>
+                <p class="nowCallingTime">签到时间：07:20</p>
+                <p class="nowCallingTime">下一位：张三</p>
+                <el-button style="margin: 30px 0 20px 0;">重新叫号</el-button>
+                <el-button type="primary" style="margin-left:0;">&ensp;&ensp;叫号&ensp;&ensp;</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import waitingCalled from './waitingCalled'
+import called from './called'
+export default {
+    components:{
+        waitingCalled,
+        called
+    },
+    data(){
+        return{
+            patient_state:[
+                {value: 0,label: '待叫号'},
+                {value: 1,label: '已叫号'},
+            ],
+            patientStateVal: 0,
+        }
+    },
+    methods:{
+        handleStateChange: function(index) {
+            this.patientStateVal = index
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.callingArea{
+    display: flex;
+    flex-wrap: wrap;
+    width: 88%;
+    // @media only screen and (max-width: 1340px) {
+    //     width:750px;
+    // }
+
+    // @media only screen and (min-width: 415px) and (max-width: 767px) {
+    // }
+}
+.nowCalling{
+    height: 313px;
+    border: 1px solid #e5e5ee;
+    // flex: 1;
+    width: 12%;
+    text-align: center;
+    .nowCallingTitle{
+        font-size: 20px;
+        font-weight: 600;
+        margin-top: 20px;
+        text-align: center;
+    }
+    .nowCallingName{
+        color: #338AFB;
+        font-size: 18px;
+        margin-top: 10px;
+        font-weight: 600;
+    }
+    .nowCallingTime{
+        font-size: 16px;
+        margin-top: 30px;
+    }
+}
+</style>

src/xt_pages/sign/components/called.vue

@@ -0,0 +1,93 @@
+<template>
+    <div class="page_called">
+        <div class="calledOne" v-for="item in 12" :key="item">
+            <div class="calledOneLeft">
+                <img src="https://images.shengws.com/201809182128111.png?imageView2/2/w/500/h/500/q/90" alt="">
+                <div class="name">
+                    <p>吴保龄</p>
+                    <p>
+                        <span class="nameTips">签到时间：07:00:00</span>
+                        <span class="nameTips" v-if="index == 1">床位号：A区5号床</span>
+                        <span class="nameTips" v-else>叫号时间：07:30:00</span>
+                    </p>
+                    <p>
+                        <span class="nameTips">透前体重：59kg</span>
+                        <span class="nameTips lastNameTips">透前血压：120/110mmHg</span>
+                    </p>
+                </div>
+            </div>
+            <div class="calledOneRight" v-if="index == 1">
+                <img src="../../../assets/img/volume.png" alt="">
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props:{
+        index:Number
+    },
+    data(){
+        return{
+
+        }
+    },
+}
+</script>
+
+
+<style lang="scss" scoped>
+.page_called{
+    .calledOne{
+        border: 1px #e5e5ee solid;
+        padding: 9px 0;
+        margin: 0 15px 15px 0;
+        float: left;
+        width: 360px;
+        cursor: pointer;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10px;
+        .calledOneLeft{
+            display: flex;
+            img{
+                width: 45px;
+                height: 45px;
+                border-radius: 50%;
+                margin-right: 15px;
+            }
+            .name{
+                >p:first-child{
+                    font-size: 16px;
+                    font-weight: bold;
+                    color:#000;
+                }
+                >p:nth-of-type(2){
+                    font-size: 12px;
+                    color:#999999;
+                    margin-top: 6px;
+                }
+                >p:nth-of-type(3){
+                    font-size: 12px;
+                    color:#999999;
+                    margin-top: 3px;
+                }
+                .nameTips{
+                    margin-right:10px;
+                    display: inline-block;
+                }
+                
+            }
+            
+        }
+        .calledOneRight{
+            img{
+                width: 30px;
+                margin-top: 8px;
+            }
+        }
+    }
+}
+</style>

src/xt_pages/sign/components/callingConfigure.vue

@@ -0,0 +1,160 @@
+<template>
+    <div class="page_callingConfigure">
+        <div class="cell clearfix">
+            就诊状态显示屏幕切换屏幕时长配置(秒) : 
+            <div class="time ">
+                <el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number>
+            </div>
+        </div>
+        <div style="display:flex;">
+            <div class="configureBox">
+                <div class="configureBoxTitle">接诊叫号</div>
+                <div class="configureBoxMain">
+                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number></div>
+                    <div style="margin-bottom:10px;">叫号语音内容设置：</div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">请</p>
+                        <el-select style="width:140px;" v-model="type" placeholder="请选择">
+                            <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">到</p>
+                        <el-select style="width:140px;" v-model="state" placeholder="请选择">
+                            <el-option
+                            v-for="item in stateOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;" v-if="state == 2">
+                        <p style="width:50px;display: inline-block;"></p>
+                        <el-input style="width:200px;" v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div>就诊</div>
+                </div>
+                
+            </div>
+            <div class="configureBox" style="border-left:none;">
+                <div class="configureBoxTitle">上机叫号</div>
+                <div class="configureBoxMain">
+                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number></div>
+                    <div style="margin-bottom:10px;">叫号语音内容设置：</div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">请</p>
+                        <el-select style="width:140px;" v-model="type" placeholder="请选择">
+                            <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;">
+                        <p style="width:50px;display: inline-block;">到</p>
+                        <el-select style="width:140px;" v-model="state" placeholder="请选择">
+                            <el-option
+                            v-for="item in stateOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="margin-bottom:10px;" v-if="state == 2">
+                        <p style="width:50px;display: inline-block;"></p>
+                        <el-input style="width:200px;" v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div>上机</div>
+                </div>
+                
+            </div>
+        </div>
+        <div style="display:flex;margin-top:10px;">
+            <div style="width:480px;">
+                语音播报声音：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">男生</el-radio>
+                    <el-radio :label="2">女生</el-radio>
+                </el-radio-group>
+            </div>
+            <div style="width:480px;">
+                隐藏接诊叫号区域：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">是</el-radio>
+                    <el-radio :label="2">否</el-radio>
+                </el-radio-group>
+            </div>
+        </div>
+        <div style="display:flex;margin-top:10px;">
+            <div style="width:480px;">
+                隐藏上机叫号区域：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">是</el-radio>
+                    <el-radio :label="2">否</el-radio>
+                </el-radio-group>
+            </div>
+            <div style="width:480px;">
+                是否在透析管理页面显示排队叫号：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">显示</el-radio>
+                    <el-radio :label="2">不显示</el-radio>
+                </el-radio-group>
+            </div>
+        </div>
+        <div style="display:flex;margin-top:10px;">
+            <div style="width:480px;">
+                是否在透析记录详情页面显示排队叫号：
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">显示</el-radio>
+                    <el-radio :label="2">不显示</el-radio>
+                </el-radio-group>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            num:3,
+            typeOptions:[{ value: 1, label: '姓名'},{ value: 2, label: '透析号'}],
+            type: 1,
+            stateOptions:[{ value: 1, label: '智能匹配诊台'},{ value: 2, label: '自定义内容'}],
+            state: 1,
+            input:'',
+            radio:1
+        }
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.configureBox{
+    width:480px;
+    height: 300px;
+    border: 1px solid #e5e5e5;
+    .configureBoxTitle{
+        height: 40px;
+        text-align: center;
+        line-height: 40px;
+        background: rgb(245, 247, 250);
+        color:rgb(96, 98, 102);
+        font-weight: 600;
+        border-bottom: 1px solid #e5e5e5;
+    }
+    .configureBoxMain{
+        padding: 10px;
+    }
+}
+</style>

src/xt_pages/sign/components/computerCalling.vue

@@ -0,0 +1,82 @@
+<template>
+    <div class="page_computerCalling">
+        <div class="cell clearfix">
+            <label class="title"><span class="name">叫号状态</span> : </label>
+            <div class="time ">
+                <ul class="">
+                    <li v-for="option in patient_state" :key="option.value" @click="handleStateChange(option.value)" :class="patientStateVal == option.value ? 'active' : ''" >{{option.label}}
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div class="callingArea">
+                <called v-if="patientStateVal == 0" :index='1'></called>
+                <called v-if="patientStateVal == 1"></called>
+            </div>
+            <div class="nowCalling" v-if="patientStateVal == 0">
+                <p class="nowCallingTitle">当前叫号</p>
+                <p class="nowCallingName">李小明</p>
+                <p class="nowCallingTime">签到时间：07:20</p>
+                <p class="nowCallingTime">下一位：张三</p>
+                <el-button style="margin: 30px 0 20px 0;">重新叫号</el-button>
+                <el-button type="primary" style="margin-left:0;">&ensp;&ensp;叫号&ensp;&ensp;</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import called from './called'
+export default {
+    components:{
+       called 
+    },
+    data(){
+        return{
+            patient_state:[
+                {value: 0,label: '待叫号'},
+                {value: 1,label: '已叫号'},
+            ],
+            patientStateVal: 0,
+        }
+    },
+    methods:{
+        handleStateChange: function(index) {
+            this.patientStateVal = index
+        },
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.callingArea{
+    display: flex;
+    flex-wrap: wrap;
+    width: 86%;
+}
+.nowCalling{
+    height: 351px;
+    border: 1px solid #e5e5ee;
+    // flex: 1;
+    width: 14%;
+    text-align: center;
+    .nowCallingTitle{
+        font-size: 20px;
+        font-weight: 600;
+        margin-top: 20px;
+        text-align: center;
+    }
+    .nowCallingName{
+        color: #338AFB;
+        font-size: 18px;
+        margin-top: 10px;
+        font-weight: 600;
+    }
+    .nowCallingTime{
+        font-size: 16px;
+        margin-top: 30px;
+    }
+}
+</style>

src/xt_pages/sign/components/treatmentConfigure.vue

@@ -0,0 +1,84 @@
+<template>
+    <div class="page_configure">
+        <div style="display:flex;align-items:center;margin-bottom:12px;justify-content: space-between;">
+            <div>接诊台列表</div>
+            <el-button type="primary" @click="newVisible = true">新增</el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%">
+            <el-table-column prop="date" label="接诊台号" align="center"></el-table-column>
+            <el-table-column label="诊台负责医生" align="center">
+                <template slot-scope="scope">
+                    <el-tag size="medium">{{ scope.row.name }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-dialog title="新增诊台" width="800px" :visible.sync="newVisible" >
+            <el-form :model="form" :rules="rules" ref="form" label-width="140px">
+                <el-form-item label="诊台号 : " required prop="type">
+                    <el-input v-model.trim="form.type" placeholder="" ></el-input>
+                </el-form-item>
+                <el-form-item label="诊台负责医生 : " required  prop="doctor">
+                    <el-select style="width:100%" v-model="form.doctor" placeholder="请选择" multiple filterable allow-create default-first-option>
+                        <el-option
+                        v-for="item in typeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="newVisible=false">取 消</el-button>
+                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            newVisible:false,
+            form: {
+                id: 0,
+                type: "",
+                doctor:[],
+            },
+            rules: {
+              type: [{ required: true, message: "请输入诊台号" }],
+              doctor: [{ required: true, message: "请选择接诊台负责医生"}],  
+            },
+            typeOptions:[{ value: 1, label: '张三'},{ value: 2, label: '李四'}],
+        }
+    },
+    methods:{
+        handleEdit(){},
+        handleDelete(){},
+    }
+}
+</script>

src/xt_pages/sign/components/waitingCalled.vue

@@ -0,0 +1,61 @@
+<template>
+    <div class="waitingCalled">
+        <div class="waitingOne" v-for="item in 12" :key="item">
+            <div class="waitingOneLeft">
+                <img src="https://images.shengws.com/201809182128111.png?imageView2/2/w/500/h/500/q/90" alt="">
+                <div class="name">
+                    <p>吴保龄</p>
+                    <p>签到时间：07:00:00</p>
+                </div>
+            </div>
+            <div class="waitingOneRight">
+                <img src="../../../assets/img/volume.png" alt="">
+            </div>
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.waitingCalled{
+    .waitingOne{
+        border: 1px #e5e5ee solid;
+        padding: 9px 0;
+        margin: 0 15px 15px 0;
+        float: left;
+        width: 360px;
+        cursor: pointer;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10px;
+        .waitingOneLeft{
+            display: flex;
+            img{
+                width: 45px;
+                height: 45px;
+                border-radius: 50%;
+                margin-right: 15px;
+            }
+            .name{
+                >p:first-child{
+                    font-size: 16px;
+                    font-weight: bold;
+                    color:#000;
+                }
+                >p:last-child{
+                    font-size: 12px;
+                    color:#999999;
+                    margin-top: 10px;
+                }
+            }
+            
+        }
+        .waitingOneRight{
+            img{
+                width: 30px;
+                margin-top: 6px;
+            }
+        }
+    }
+}
+</style>

src/xt_pages/sign/lineUp.vue

@@ -0,0 +1,201 @@
+<template>
+    <div class="app-container">
+        <div class="page_lineUp">
+            <div class="lineUpTitle">
+                <div>唐山朝阳医院<span>温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
+                <div>2020.8.18   07:22(星期四）</div>
+            </div>
+            <div class="lineUpMain">
+                <div class="lineUpMainLeft">
+                    <div class="lineUpMainLeftTitle">
+                        <p style="width:14%">排号</p>
+                        <p style="width:14%">姓名</p>
+                        <p style="width:14%">病例号</p>
+                        <p style="width:14%">床位号</p>
+                        <p style="width:14%">治疗状态</p>
+                        <p style="width:14%">上机时间</p>
+                        <p style="width:14%">预计下机时间</p>
+                    </div>
+                    <div class="lineUpList">
+                        <div class="lineUpListOne" v-for="item in 8" :key="item">
+                            <p style="width:14%">P01</p>
+                            <p style="width:14%">张*等</p>
+                            <p style="width:14%">001</p>
+                            <p style="width:14%">普通区1号床</p>
+                            <p style="width:14%">已下机</p>
+                            <p style="width:14%">09:01</p>
+                            <p style="width:14%">09:01</p>
+                        </div>
+                    </div>
+                </div> 
+                <div class="callingBox">
+                    <div class="callingBoxLeft">
+                        <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
+                        <div style="flex: 1;">
+                            <div class="callingTop" style="margin-bottom:4px;">
+                                <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
+                                <div class="callingContent">
+                                    <p style="margin-top:13px;">请李四宋到1号诊台就诊</p>
+                                    <p>请王岐岐到2号诊台就诊</p>
+                                </div>
+                            </div>
+                            <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
+                                <div class="callingContent">
+                                    <p style="margin-top:13px;">欧大大、王思思、陈啦啦、吴东汉、</p>
+                                    <p>孔豆豆、陈米春、孔豆豆、陈米春、</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="callingBoxLeft">
+                        <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
+                        <div style="flex: 1;">
+                            <div class="callingTop" style="margin-bottom:4px;">
+                                <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
+                                <div class="callingContent">
+                                    <p style="margin-top:13px;">请李四宋到普通区2号床上机</p>
+                                    <p>请王岐岐到普通区3号床上机</p>
+                                </div>
+                            </div>
+                            <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
+                                <div class="callingContent">
+                                    <p style="margin-top:13px;">欧大大、王思思、陈啦啦、吴东汉、</p>
+                                    <p>孔豆豆、陈米春、孔豆豆、陈米春、</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.page_lineUp{
+    .lineUpTitle{
+        height: 50px;
+        background: #1A82BF;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 20px;
+        color:#fff;
+        font-size: 20px;
+        font-weight: 600;
+    }
+    .lineUpMain{
+        background: linear-gradient(0deg, #76ECEC, #479CD2);
+        height: 550px;
+        padding:10px;
+    }
+    .lineUpMainLeft{
+        height: 370px;
+        border-radius: 15px;
+        
+    }
+    .lineUpMainLeftTitle{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        color:#fff;
+        font-size: 18px;
+        font-weight: 600;
+        height:50px;
+        background: #1A82BF;
+        border-radius: 15px 15px 0 0;
+        >p{
+            text-align: center;
+        }
+    }
+    .lineUpList{
+        font-size: 18px;
+        font-weight: 600;
+        >div:nth-child(odd){
+            background: #F9FDFF;
+        }
+        >div:nth-child(even){
+            background: #CCEBFF;
+        }
+        >div:last-child{
+            border-radius: 0 0 15px 15px;
+        }
+        .lineUpListOne{
+            height:40px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            color:#1C6895;
+            >p{
+                width:25%;
+                text-align: center;
+            }
+        }
+    }
+    .callingBox{
+        height: 150px;
+        margin-top: 10px;
+        display: flex;
+        justify-content: space-between;
+        .callingBoxLeft{
+            width: 49%;
+            height: 100%;
+            display: flex;
+            justify-content: space-between;
+            .callingTitle{
+                width: 60px;
+                height: 100%;
+                border-radius: 15px 0 0 15px;
+                font-size: 30px;
+                font-weight:600;
+                text-align: center;
+                color: #fff;
+                background: #1A82BF;
+                display: flex;
+                align-items: center;
+                margin-right: 5px;
+            }
+            .newCallingTitle{
+                background: linear-gradient(90deg, rgba(66, 231, 167, 1), rgba(26, 191, 84, 1), rgba(157, 254, 31, 1));
+            }
+        } 
+        .callingTop{
+            height: 73px;
+            border-radius: 0 15px 0 0;
+            background: #F9FDFF;
+            display: flex;
+            justify-content: space-between;
+            .callingTopTip{
+                width: 73px;
+                height: 100%;
+                color: #fff;
+                font-size: 18px;
+                font-weight: 600;
+                background: #1A82BF;
+                display: flex;
+                align-items: center;
+            }
+            .newCallingTopTip{
+                background: linear-gradient(90deg, rgba(66, 231, 167, 1), rgba(26, 191, 84, 1), rgba(157, 254, 31, 1));
+            }
+            .callingContent{
+                flex: 1;
+                display: flex;
+                flex-direction: column;
+                font-size: 16px;
+                color:#1C6895;
+                font-weight: 600;
+                padding-left: 20px;
+                >p{
+                    width:100%;
+                    text-align: left;
+                    line-height: 24px;
+                }
+            }
+        }
+    }
+}
+</style>

src/xt_pages/sign/signIn.vue

@@ -0,0 +1,154 @@
+<template>
+    <div class="app-container">
+        <div class="page_signIn">
+            <div class="signInTitle">
+                <div>唐山朝阳医院</div>
+                <div>2020.8.18   07:22(星期四）</div>
+            </div>
+            <div class="signInMain">
+                <div style="display: flex;justify-content: space-between;padding:10px;">
+                    <div class="signInMainLeft">
+                        <div class="signInMainLeftTitle">
+                            <p>排号</p>
+                            <p>姓名</p>
+                            <p>病历号</p>
+                            <p>签到时间</p>
+                        </div>
+                        <div class="signInList">
+                            <div class="signInListOne" v-for="item in 12" :key="item">
+                                <p>P13</p>
+                                <p>张*等</p>
+                                <p>001</p>
+                                <p>09:01:00</p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="signInMainRight">
+                        <div class="signInMainRightTitle"><span style="margin:0 auto;">张三</span></div>
+                        <div class="signInMainRightContent">
+                            <p style="margin: 0 auto;display:flex;align-items: center;"><span>排号&nbsp;&nbsp;</span><span style="font-size:120px;">P06</span></p>
+                        </div>
+                        <div class="signInMianRightBottom"><span style="margin:0 auto;">签到成功</span></div>
+                    </div>
+                </div>
+                <div class="signInTip">
+                    温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<style lang="scss" scoped>
+.page_signIn{
+    .signInTitle{
+        height: 50px;
+        background: #1A82BF;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 20px;
+        color:#fff;
+        font-size: 20px;
+        font-weight: 600;
+    }
+    .signInMain{
+        background: linear-gradient(0deg, #76ECEC, #479CD2);
+        height: 600px;
+        
+        
+    }
+    .signInMainLeft{
+        width:65%;
+        height: 530px;
+        border-radius: 15px;
+    }
+    .signInMainLeftTitle{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        color:#fff;
+        font-size: 18px;
+        font-weight: 600;
+        height:50px;
+        background: #1A82BF;
+        border-radius: 15px 15px 0 0;
+        >p{
+            width:25%;
+            text-align: center;
+        }
+    }
+    .signInList{
+        font-size: 18px;
+        font-weight: 600;
+        >div:nth-child(odd){
+            background: #F9FDFF;
+        }
+        >div:nth-child(even){
+            background: #CCEBFF;
+        }
+        >div:last-child{
+            border-radius: 0 0 15px 15px;
+        }
+        .signInListOne{
+            height:40px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            color:#1C6895;
+            >p{
+                width:25%;
+                text-align: center;
+            }
+        }
+    }
+    .signInMainRight{
+        width: 34%;
+        height: 530px;
+    }
+    .signInMainRightTitle{
+        height: 130px;
+        border-radius: 15px 15px 0 0;
+        background: #1A82BF;
+        font-size: 80px;
+        font-weight: 600;
+        color:#fff;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .signInMainRightContent{
+        background: #F9FDFF;
+        height: 300px;
+        text-align: center;
+        font-weight: 600;
+        color:#1C6895;
+        box-sizing: border-box;
+        font-size:70px;
+        display:flex;
+        align-items:center;
+    }
+    .signInMianRightBottom{
+        height: 100px;
+        background: #1A82BF;
+        border-radius: 0 0 15px 15px;
+        font-size: 40px;
+        font-weight: 600;
+        color:#fff;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .signInTip{
+        color:#fff;
+        font-size: 18px;
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+        height: 50px;
+        background: linear-gradient(0deg, #42A9E7, #3686B9, #42A9E7);
+        margin-top: 1px;
+    }
+}
+</style>

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -83,7 +83,6 @@ export default {
            }) 
         },
         handleCurrentChange(val){
-           console.log("val===",val)
            this.currentRow = val
            this.getRullListByDrugName(val.drug_name)
         },
@@ -94,7 +93,6 @@ export default {
            getRullListByDrugName(params).then(response=>{
               if(response.data.state ==  1){
                 var drugName =  response.data.data.drugName
-                console.log("drugname",drugName)
                 this.tableDatatwo = drugName
               }
            })
@@ -113,6 +111,7 @@ export default {
                 var msg = response.data.data.msg
                 this.$message.success("保存成功")
                 this.visible = false
+                this.$emit('getlist');
              }else {
                 this.$message.error("药品名称规格已存在")
              }

src/xt_pages/stock/selfPreparedMedicine/components/medicineDetail.vue

@@ -24,7 +24,8 @@
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd"
+                @change="changeStartime">
             </el-date-picker>
                 <el-date-picker
                 v-model="end_time"
@@ -35,7 +36,8 @@
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd"
+                @change="changeEndtime">
             </el-date-picker>
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -152,7 +154,9 @@ export default {
                 }
                 if(this.type == 1){
                    stockDetail.push(...outStockDetail)
-                   this.tableData = stockDetail
+                   var arr = stockDetail
+                  var newarr  =  arr.sort((a,b)=>{ return a.storck_time-b.storck_time})
+                  this.tableData = newarr
                 }
                 
                 if(this.type == 2){
@@ -187,6 +191,12 @@ export default {
        getTimes(time) {
         return uParseTime(time, "{y}-{m}-{d}");
       },
+      changeStartime(){
+        this.getDrugDetail()   
+      },
+      changeEndtime(){
+        this.getDrugDetail()
+      }
     },
 
     created(){

src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue

@@ -111,10 +111,15 @@ export default {
         // },
        
         saveOutStock(){
+           var arr=[]
+            for(let i=0;i<this.tableData.length;i++){
+              if(this.tableData[i].outstore_number){
+                  arr.push(this.tableData[i])
+              }
+            }
             const params = {
-               outStocks:this.tableData,
+               outStocks:arr,
             }
-            console.log("outStocks",params)
             if(this.admin_user_id ==''){
               this.$message.error("请选择出库人")
               return
@@ -122,8 +127,9 @@ export default {
           saveOutStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
               if(response.data.state == 1){
                  var msg = response.data.data.msg
-                 console.log("msg",msg)
+                 this.$message.success("保存成功")
                  this.visible = false
+                 this.$emit('getlist');
               }
           })
         },
@@ -132,7 +138,6 @@ export default {
            const params = {
               patient_id:this.patient_id
            }
-           console.log("params",params)
           getDrugDataByPatientId(params).then(response=>{
              if(response.data.state == 1){
                var medicalList = response.data.data.medicalList

src/xt_pages/stock/selfPreparedMedicine/components/warehousing.vue

@@ -27,6 +27,7 @@
             </el-select>
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+           
             <el-table-column align="center" label="药品名称">
                 <template slot-scope="scope">{{scope.row.drug_name}}</template>
             </el-table-column>
@@ -109,20 +110,25 @@ export default {
         //   })
         // },
         saveStock(){
+            var arr=[]
+            for(let i=0;i<this.tableData.length;i++){
+              if(this.tableData[i].store_number){
+                  arr.push(this.tableData[i])
+              }
+            }
             const params ={
-               stocks:this.tableData
+               stocks:arr
             }
             if(this.admin_user_id ==''){
               this.$message.error("请选择入库人")
               return
             }
-           console.log("params",params)
-       
           saveStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
               if(response.data.state == 1){
                  var msg = response.data.data.msg
                  this.$message.success("保存成功")
                  this.visible = false
+                 this.$emit('getlist');
               }
           })
         },

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -70,13 +70,15 @@
                             <template slot-scope="scope">{{scope.row.min_unit}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="自备数量" width="90">
-                            <template slot-scope="scope">{{ scope.row.Total }}</template>
+                            <template slot-scope="scope">
+                              {{getTotal(scope.row.patient_id,scope.row.id)}}
+                            </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="已使用" width="90">
                             <template slot-scope="scope">{{getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="剩余" width="90">
-                            <template slot-scope="scope">{{scope.row.Total - getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
+                            <template slot-scope="scope">{{getTotal(scope.row.patient_id,scope.row.id)- getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <!-- <el-table-column align="center" prop="name" label="停用" width="90">
                             <template slot-scope="scope">
@@ -85,7 +87,10 @@
                             </template>
                         </el-table-column> -->
                         <el-table-column align="center" prop="name" label="备注">
-                            <template slot-scope="scope">{{ scope.row.remarks }}</template>
+                            <!-- <template slot-scope="scope">{{ scope.row.remarks }}</template> -->
+                            <template slot-scope="scope">
+                                {{getRemarks(scope.row.patient_id,scope.row.id)}}
+                            </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
@@ -111,10 +116,10 @@
                 <el-button type="primary" @click="saveRadio">确 定</el-button>
             </span>
         </el-dialog>
-        <add-medicine ref="addMedicine"></add-medicine>
+        <add-medicine ref="addMedicine" @getlist="getlist"></add-medicine>
         <medicine-detail ref="medicineDetail"></medicine-detail>
-        <warehousing ref="warehousing"></warehousing>
-        <warehouse-out ref="warehouseOut"></warehouse-out>
+        <warehousing  ref="warehousing" @getlist="getlist"></warehousing>
+        <warehouse-out ref="warehouseOut" @getlist="getlist"></warehouse-out>
     </div>
 </template>
 
@@ -126,7 +131,7 @@ import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
 const moment = require('moment')
-import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName } from "@/api/drug/drug"
+import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName,getDrugSet } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -164,6 +169,7 @@ export default {
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             search_input:"",
             patient_id:0,
+            stockList:[],
             outStocklist:[]
         }
     },
@@ -203,9 +209,6 @@ export default {
             
         },
         toDetail(drugname,drugspec,patientid){
-            console.log("drugname",drugname)
-            console.log("drugspec",drugspec)
-            console.log("patientid",patientid)
             this.$refs.medicineDetail.show(drugname,drugspec,patientid);
         },
 
@@ -217,6 +220,7 @@ export default {
           })
         },
         searchAction(){
+          this.patient_id = 0
           this.getlist()
         },
         saveRadio(){
@@ -226,7 +230,6 @@ export default {
          saveRadio(params).then(response=>{
             if(response.data.state == 1){
               var drugset = response.data.data.drugSet
-              console.log("drugset",drugset)
               this.$message.success("保存成功")
               this.dialogVisible = false
             } 
@@ -240,11 +243,16 @@ export default {
             }
           getStockList(params).then(response=>{
              if(response.data.state == 1){
+                var medicalList = response.data.data.medicalList
+                console.log("medicalist",medicalList)
+                this.tableData = medicalList
                 var stocklist =  response.data.data.stocklist
+                console.log("stocklist",stocklist)
+                this.stockList = stocklist
                 var outstocklist = response.data.data.outStocklist
                 this.outStocklist = outstocklist
-                this.tableData = stocklist
-
+                console.log("outStockList",outstocklist)
+              
               }
           })  
         },
@@ -280,11 +288,40 @@ export default {
               }
            }
            return total
+        },
+
+        getDrugSet(){
+         getDrugSet().then(response=>{
+            if(response.data.state == 1){
+              var drugset =  response.data.data.drugSet
+              this.radio  = drugset.drug_start.toString()
+            }
+         })
+        },
+
+        getTotal(patientid,id){
+          var total = 0
+          for(let i=0;i<this.stockList.length;i++){
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
+                total = this.stockList[i].Total
+             }
+          }
+          return total
+        },
+        getRemarks(patientid,id){
+          var remarks = ""  
+           for(let i=0;i<this.stockList.length;i++){
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
+                remarks = this.stockList[i].remarks
+             }
+          }
+          return remarks
         }
     },
     created(){
       //获取当前机构下的所有患者
       this.getCurrentPatient()
+      this.getDrugSet()
     },
     watch: {
      tablePatient: function() {

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -95,7 +95,7 @@
             <el-radio v-model="radio" label="2">不开启</el-radio>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="saveRadio">确 定</el-button>
             </span>
         </el-dialog>
        
@@ -239,7 +239,7 @@ import addMedicine from "./components/addMedicine"
 import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
-import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand }  from "@/api/drug/drug"
+import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand,saveRadio,getDrugSet }  from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -274,7 +274,7 @@ export default {
             value: '',
             tableData:[],
             dialogVisible:false,
-            radio:'1',
+            radio:'2',
             drugDialogVisible:false,
             options:[],
             drugName:[],
@@ -532,7 +532,7 @@ export default {
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name
            }
-           console.log("params999",params)
+         
          updatedRulleName(params).then(response=>{
             if(response.data.state == 1){
                var rullername = response.data.data.RullerName
@@ -586,13 +586,37 @@ export default {
           })
           .catch(() => {
           })
-       }
+       },
+
+         saveRadio(){
+          const params = {
+            radio:this.radio
+          }
+         saveRadio(params).then(response=>{
+            if(response.data.state == 1){
+              var drugset = response.data.data.drugSet
+              this.$message.success("保存成功")
+              this.dialogVisible = false
+            } 
+          }) 
+        },
+
+        getDrugSet(){
+         getDrugSet().then(response=>{
+            if(response.data.state == 1){
+              var drugset =  response.data.data.drugSet
+              this.radio  = drugset.drug_start.toString()
+            }
+         })
+        }
     },
     created(){
        //获取药品库所有药品名称
        this.getAllDrugName()
-
        this.getdrugNameList()
+
+       //获取设置
+       this.getDrugSet()
       
      
     },

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -87,13 +87,13 @@
                     <template slot-scope="scope">{{ scope.row.min_unit }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="自备量" width="80">
-                    <template slot-scope="scope">{{ scope.row.store_number }}</template>
+                    <template slot-scope="scope">{{ scope.row.Total }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="已使用" width="80">
                     <template slot-scope="scope">{{ scope.row.Count }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="剩余" width="80">
-                    <template slot-scope="scope">{{ scope.row.store_number - scope.row.Count }}</template>
+                    <template slot-scope="scope">{{ scope.row.Total - scope.row.Count }}</template>
                 </el-table-column>
             </el-table>
         </div>
@@ -166,7 +166,6 @@ export default {
         getAllDrugName().then(response=>{
           if(response.data.state == 1){
              var drugName =  response.data.data.drugName
-             console.log("drugName",drugName)
              this.drugName = drugName
 
              this.getlist()
@@ -180,7 +179,6 @@ export default {
         getRulleName(params).then(response=>{
            if(response.data.state == 1){
              var rulleName = response.data.data.rulleName
-             console.log("rulleName",rulleName)
              this.rulleName = rulleName
            }
         })  
@@ -217,7 +215,6 @@ export default {
             drug_spec:this.drug_spec,
             search_input:this.search_input
           }
-          console.log("params====",params)
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
@@ -233,7 +230,7 @@ export default {
                    }
                 }
               }
-              console.log("stocklist3333",stocklist)
+
               this.tableData = stocklist
             }
         })   

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -371,30 +371,66 @@
     <el-dialog
       :title="nameFormTitle"
       :visible.sync="nameFormVisible"
-      width="700px"
+      width="800px"
     >
       <el-form
         ref="nameForm"
         :rules="nameRules"
         :model="nameForm"
-        label-width="90px"
+        label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <el-input v-model="nameForm.advice_name"></el-input>
+              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
+
+              <el-select
+                v-model="nameForm.advice_name"
+                filterable
+                clearable
+                allow-create
+                :disabled="isChild"
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
+              >
+                <el-option
+                  v-for="item in medicals"
+                  :key="item.id"
+                  :label="item.drug_name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+              
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="14">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
-              <el-col :span="8">
-                <el-input v-model="nameForm.advice_desc"></el-input>
+              <el-col :span="10">
+                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
+
+                <el-select
+                  v-model="nameForm.advice_desc"
+                  filterable
+                  clearable
+                  allow-create
+                  :disabled="isChild"
+                  placeholder="请选择(输入可搜索)"
+                  style="width:150px"
+                >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
-              <el-col :span="14">
+              <el-col :span="10">
                 <el-select
                   v-model="nameForm.drug_spec_unit"
                   filterable
@@ -564,7 +600,7 @@ import {
   getDoctorAdviceList,
   StopDoctorAdvice
 } from "@/api/advice";
-
+import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 export default {
   name: "EditGroupAdvice",
   data() {
@@ -607,7 +643,9 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        way:"",
+        drug_id:""
       },
 
       drugOptions: [],
@@ -626,7 +664,9 @@ export default {
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
       allSelectedTemplate: [],
-      adviceTemplateMaps: {}
+      adviceTemplateMaps: {},
+      medicals:[],
+      drugSpec:[]
     };
   },
   props: {
@@ -813,6 +853,33 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
+       if(typeof(this.nameForm.advice_name) == "string"){
+         
+          this.nameForm.advice_name == this.nameForm.advice_name
+      }
+
+      if(typeof(this.nameForm.advice_name) == "number"){
+          var drug_name = ""
+          var name = ""
+          var way = 0
+          this.nameForm.drug_id = this.nameForm.advice_name
+          for(let i=0;i<this.medicals.length;i++){
+            if(this.nameForm.advice_name == this.medicals[i].id){
+              name = this.medicals[i].drug_name
+              way  = this.medicals[i].way
+            }
+          }
+          if(way == 1){
+            drug_name = name
+          }
+          if(way == 2){
+            var arr = name.split("(自备药)")
+            drug_name = arr[0]
+          }
+          
+          this.nameForm.advice_name = drug_name
+          this.nameForm.way = way
+      }
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2319,6 +2386,89 @@ export default {
           }
         }
       });
+    },
+
+     getSelfMedicalList(){
+        const params = {
+          patient_id:this.patientID
+        }
+      getSelfMedicalList(params).then(response=>{
+          if(response.data.state == 1){
+            var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
+            }
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+          
+            this.medicals = drugname
+          }
+      })
+    },
+    changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == this.medicals[i].id){
+          name = this.medicals[i].drug_name
+          way  = this.medicals[i].way
+        }
+      }
+      if(way == 1){
+        drug_name = name
+      }
+      if(way == 2){
+        var arr = name.split("(自备药)")
+        drug_name = arr[0]
+      }
+        const params = {
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
+        }
+      getDrugDescByDrugName(params).then(response=>{
+          if(response.data.state == 1){
+             var drugspec = response.data.data.drugspec
+          
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = drugspec[0].single_dose.toString()
+             } 
+             if(drugspec[0].min_unit !=0){
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number.toString()
+             }
+          
+             this.drugSpec = drugspec
+          }
+      })
+    
     }
   },
   watch: {
@@ -2328,6 +2478,10 @@ export default {
     "selectedTemp.list": function() {
       this.calcselectedTemp();
     }
+  },
+  created(){
+    //获取自备药
+    this.getSelfMedicalList()
   }
 };
 </script>

src/xt_pages/user/doctorAdvice.vue

@@ -961,9 +961,12 @@
                   v-for="item in medicals"
                   :key="item.id"
                   :label="item.drug_name"
-                  :value="item.drug_name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
+              <!-- <div style="color:red;font-size:12px;">
+                库存不足50
+              </div> -->
               </el-form-item>
             </el-col>
 
@@ -1057,6 +1060,7 @@
                     >
                     </el-option>
                   </el-select>
+                
                 </el-col>
               </el-form-item>
             </el-col>
@@ -2610,6 +2614,8 @@ export default {
           drug_spec_unit: this.groupSelectRow.drug_spec_unit,
           prescribing_number: this.groupSelectRow.prescribing_number,
           prescribing_number_unit: this.groupSelectRow.prescribing_number_unit,
+          way:this.groupSelectRow.way,
+          drug_id:this.groupSelectRow.drug_id,
           delivery_way: this.isChild ? "" : this.groupSelectRow.delivery_way,
           execution_frequency: this.isChild
             ? ""
@@ -2650,7 +2656,9 @@ export default {
           index: 0,
           id: 0,
           children: [],
-          parent_row: 0
+          parent_row: 0,
+          way:"",
+          drug_id:''
         };
         this.nameFormTitle = "新增医嘱内容";
       }
@@ -3964,8 +3972,26 @@ export default {
       });
     },
     submitNameForm(formName) {
-      var arr = this.nameForm.advice_name.split("(自备药)")
-      this.nameForm.advice_name = arr[0]
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      this.nameForm.drug_id = this.nameForm.advice_name
+      for(let i=0;i<this.medicals.length;i++){
+        if(this.nameForm.advice_name == this.medicals[i].id){
+          name = this.medicals[i].drug_name
+          way  = this.medicals[i].way
+        }
+      }
+      if(way == 1){
+        drug_name = name
+      }
+      if(way == 2){
+        var arr = name.split("(自备药)")
+        drug_name = arr[0]
+      }
+      
+      this.nameForm.advice_name = drug_name
+      this.nameForm.way = way
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -3980,40 +4006,18 @@ export default {
                   var cle = _this.groupForm.adviceNames[index].children.length;
                   var children = _this.groupForm.adviceNames[index].children;
                   for (let j = 0; j < ale; j++) {
-                    if (_this.groupSelectRow.row_key == children[j].row_key) {
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].advice_name = _this.nameForm.advice_name;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].advice_desc = _this.nameForm.advice_desc;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].single_dose = "" + _this.nameForm.single_dose;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].single_dose_unit = _this.nameForm.single_dose_unit;
-                      _this.groupForm.adviceNames[index].children[j].drug_spec =
-                        "" + _this.nameForm.drug_spec;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].drug_spec_unit = _this.nameForm.drug_spec_unit;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].prescribing_number =
-                        "" + _this.nameForm.prescribing_number;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].prescribing_number_unit =
-                        _this.nameForm.prescribing_number_unit;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].delivery_way = _this.nameForm.delivery_way;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].execution_frequency =
-                        _this.nameForm.execution_frequency;
-
+                    if (_this.groupSelectRow.row_key == children[j].row_key) {_this.groupForm.adviceNames[index].children[j].advice_name = _this.nameForm.advice_name;
+                      _this.groupForm.adviceNames[index].children[j].advice_desc = _this.nameForm.advice_desc;
+                      _this.groupForm.adviceNames[index].children[j].single_dose = "" + _this.nameForm.single_dose;
+                      _this.groupForm.adviceNames[index].children[j].single_dose_unit = _this.nameForm.single_dose_unit;
+                      _this.groupForm.adviceNames[index].children[j].drug_spec ="" + _this.nameForm.drug_spec;
+                      _this.groupForm.adviceNames[index].children[j].drug_spec_unit = _this.nameForm.drug_spec_unit;
+                      _this.groupForm.adviceNames[index].children[j].prescribing_number ="" + _this.nameForm.prescribing_number;
+                      _this.groupForm.adviceNames[index].children[j].prescribing_number_unit =_this.nameForm.prescribing_number_unit;
+                      _this.groupForm.adviceNames[index].children[j].delivery_way = _this.nameForm.delivery_way;
+                      _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
+                      _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
+                      _this.groupForm.adviceNames[index].children[j].way = this.nameForm.way;
                       _this.$set(
                         _this.groupForm.adviceNames[index].children,
                         j,
@@ -4348,25 +4352,80 @@ export default {
         const params = {
           patient_id:id
         }
+      console.log("params9999999999",params)
       getSelfMedicalList(params).then(response=>{
          if(response.data.state == 1){
+
             var medicalList =  response.data.data.medicalList
+            //way字段区分数据源:1代表来自基础库  2代表来自药品库
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].way = 2
+            }
             for(let i=0;i<medicalList.length;i++){
                medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
             }
-            this.medicals = medicalList
+            var drugname = response.data.data.drugName
+            for(let i=0;i<drugname.length;i++){
+               drugname[i].way = 1
+            }
+
+            drugname.push(...medicalList)
+            this.medicals = drugname
          }
       })
     },
-    changeDrugName(name){
-      var arr = name.split("(自备药)");
+    changeDrugName(id){
+      var drug_name = ""
+      var name = ""
+      var way = 0
+      for(let i=0;i<this.medicals.length;i++){
+        if(id == this.medicals[i].id){
+          name = this.medicals[i].drug_name
+          way  = this.medicals[i].way
+        }
+      }
+      if(way == 1){
+        drug_name = name
+      }
+      if(way == 2){
+        var arr = name.split("(自备药)")
+        drug_name = arr[0]
+      }
         const params = {
-          drug_name:arr[0],
-          patient_id:this.$route.params && this.$route.params.id
+          drug_name:drug_name,
+          patient_id:this.$route.query.patient_id,
+          way:way,
         }
       getDrugDescByDrugName(params).then(response=>{
           if(response.data.state == 1){
-             var drugspec = response.data.data.drugspec
+            var drugspec = response.data.data.drugspec
+          
+             if(drugspec[0].drug_spec !=0){
+                this.nameForm.advice_desc = drugspec[0].drug_spec
+             }
+             if(drugspec[0].min_unit!=0){
+                 this.nameForm.drug_spec_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].delivery_way!=0){
+                 this.nameForm.delivery_way = drugspec[0].delivery_way
+             }
+             if(drugspec[0].execution_frequency!=0){
+                this.nameForm.execution_frequency = drugspec[0].execution_frequency
+             }
+             if(drugspec[0].single_dose !=0){
+                this.nameForm.single_dose = drugspec[0].single_dose
+             } 
+             if(drugspec[0].min_unit !=0){
+               this.nameForm.single_dose_unit = drugspec[0].min_unit
+             }
+             if(drugspec[0].min_unit!=0){
+               this.nameForm.prescribing_number_unit = drugspec[0].min_unit
+             }
+              
+             if( drugspec[0].prescribing_number!=0){
+                this.nameForm.prescribing_number = drugspec[0].prescribing_number
+             }
+          
              this.drugSpec = drugspec
           }
       })

src/xt_pages/user/patients.vue

@@ -1267,7 +1267,7 @@
             return false
           } else {
             this.tableData = response.data.data.patients
-           console.log('病人是', this.tableData)
+          //  console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-      store.dispatch('VerifyConfigList', []).then(() => {
-        next()
-      })
-    }
-    if (store.getters.permission_routers === undefined) {
-      store.dispatch('xt_GenerateRoutes', []).then(() => {
-        next()
-      })
-    } else {
-      next()
-    }
-    return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //     store.dispatch('VerifyConfigList', []).then(() => {
+  //       next()
+  //     })
+  //   }
+  //   if (store.getters.permission_routers === undefined) {
+  //     store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //       next()
+  //     })
+  //   } else {
+  //     next()
+  //   }
+  //   return
   // 线上注释
 
   NProgress.start()