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

src/lang/zh.js

@@ -254,7 +254,10 @@ export default {
     hospitalStation: '住院工作站',
     pastInquiries: '既往查询',
 
-    prescriptionTemplate: '处方模版'
+    prescriptionTemplate: '处方模版',
+    hospitalRecord:"住院登记",
+    hisTool:"HIS工具",
+    hospitalCharges:'住院收费',
 
   },
   navbar: {

src/router/index.js

@@ -27,10 +27,16 @@ import outpatientRegistration from './modules/outpatientRegistration'
 import outpatientDoctorStation from './modules/outpatientDoctorStation'
 import outpatientCharges from './modules/outpatientCharges'
 import outpatientPharmacy from './modules/outpatientPharmacy'
+import hospitalRecord from './modules/hospitalRecord'
 import hospitalStation from './modules/hospitalStation'
+import hospitalCharges from './modules/hospitalCharges'
+import hisTool from './modules/hisTool'
 
 
-import outpatientRecord from './modules/outpatientRecord'
+
+
+
+// import outpatientRecord from './modules/outpatientRecord'
 import kuyiShopping from './modules/kuyiShopping'
 import createPatient from './modules/createPatient'
 import dialysisRecord from './modules/dialysisRecord'
@@ -49,6 +55,8 @@ import templateManagement from './modules/templateManagement'
 import DepartManage from './modules/DepartManage'
 import basicConfig from './modules/basicConfig'
 
+
+
 Vue.use(Router);
 
 /** note: submenu only apppear when children.length>=1
@@ -155,7 +163,6 @@ var _asy_router_map = [
   slow,
   scrm,
   shop,
-
   systems,
   DepartManage,
   roleManage,
@@ -173,9 +180,10 @@ var _asy_router_map = [
   outpatientDoctorStation,
   outpatientCharges,
   outpatientPharmacy,
-  outpatientRecord,
+  hospitalRecord,
   hospitalStation,
-  // kuyiShopping,
+  hospitalCharges,
+  hisTool,
   integration,
   basicConfig
 ];

src/router/modules/hisTool.js

@@ -0,0 +1,40 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/hisTool',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'hisTool',
+  alwaysShow: true,
+  meta: {
+    title: 'hisTool',
+    icon: 'hisTool',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/hisTool/prescriptionTemplate',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
+      name: 'prescriptionTemplate',
+      meta: { title: 'prescriptionTemplate', noCache: true }
+    }, {
+      path: '/hisTool/prescriptionTemplatedetail',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail'),
+      name: 'prescriptionTemplatedetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'prescriptionTemplatedetail', noCache: true }
+    }, {
+      path: '/hisTool/costComparison',
+      component: () => import('@/xt_pages/outpatientCharges/costComparison'),
+      name: 'costComparison',
+      meta: { title: 'costComparison', noCache: true }
+    }, {
+      path: '/hisTool/outpatientRecord',
+      component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
+      name: 'outpatientSickRecord',
+      meta: { title: 'outpatientSickRecord', noCache: true }
+    },
+
+  ]
+}

src/router/modules/hospitalCharges.js

@@ -0,0 +1,82 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/hospitalCharges',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'hospitalCharges',
+  alwaysShow: true,
+  meta: {
+    title: 'hospitalCharges',
+    icon: 'hospitalCharges',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/hospitalCharges/outpatientChargesManagement',
+      component: () => import('@/xt_pages/hospitalStation/outpatientChargesManagement'),
+      name: 'outpatientChargesManagement',
+      meta: { title: 'outpatientChargesManagement', noCache: true }
+    },
+    // {
+    //   path: '/outpatientCharges/outpatientInvoice',
+    //   component: () => import('@/xt_pages/outpatientCharges/outpatientInvoice'),
+    //   name: 'outpatientInvoice',
+    //   meta: { title: 'outpatientInvoice', noCache: true }
+    // },
+    // {
+    //   path: '/outpatientCharges/advancePayment',
+    //   component: () => import('@/xt_pages/outpatientCharges/advancePayment'),
+    //   name: 'advancePayment',
+    //   meta: { title: 'advancePayment', noCache: true }
+    // },
+    // {
+    //   path: '/outpatientCharges/labelPrinting',
+    //   component: () => import('@/xt_pages/outpatientCharges/labelPrinting'),
+    //   name: 'labelPrinting',
+    //   meta: { title: 'labelPrinting', noCache: true }
+    // },
+    {
+      path: '/hospitalCharges/summary',
+      component: () => import('@/xt_pages/hospitalStation/summary'),
+      name: 'summary',
+      meta: { title: 'summary', noCache: true }
+    },
+    // {
+    //   path: '/outpatientCharges/incomeStatistics',
+    //   component: () => import('@/xt_pages/outpatientCharges/incomeStatistics'),
+    //   name: 'incomeStatistics',
+    //   meta: { title: 'incomeStatistics', noCache: true }
+    // },
+    // {
+    //     path: '/outpatientCharges/costComparison',
+    //     component: () => import('@/xt_pages/outpatientCharges/costComparison'),
+    //     name: 'costComparison',
+    //     meta: { title: 'costComparison', noCache: true }
+    // },
+    {
+      path: '/hospitalCharges/summaryDetail',
+      component: () => import('@/xt_pages/hospitalStation/summaryDetail'),
+      hidden: true,
+      is_menu: false,
+      name: 'summaryDetail',
+      meta: { title: 'summaryDetail', noCache: true }
+    },
+    {
+      path: '/outpatientCharges/treatPrint',
+      component: () => import('@/xt_pages/outpatientCharges/treatPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'outpatientChargesTreatPrint',
+      meta: { title: 'outpatientChargesTreatPrint', noCache: true }
+    },
+    {
+      path: '/outpatientCharges/print',
+      component: () => import('@/xt_pages/outpatientCharges/print'),
+      hidden: true,
+      is_menu: false,
+      name: 'outpatientChargesPrint',
+      meta: { title: 'outpatientChargesPrint', noCache: true }
+    },
+  ]
+}

src/router/modules/hospitalRecord.js

@@ -0,0 +1,23 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/hospitalRecord',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'hospitalRecord',
+  alwaysShow: true,
+  meta: {
+    title: 'hospitalRecord',
+    icon: 'hospitalRecord',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/hospitalRecord/index',
+      component: () => import('@/xt_pages/hospitalStation/index'),
+      name: 'hospitalIndex',
+      meta: { title: 'hospitalIndex', noCache: true }
+    },
+
+  ]
+}

src/router/modules/hospitalStation.js

@@ -12,12 +12,7 @@ export default {
     isChild: true
   },
   children: [
-    {
-      path: '/hospitalStation/index',
-      component: () => import('@/xt_pages/hospitalStation/index'),
-      name: 'hospitalIndex',
-      meta: { title: 'hospitalIndex', noCache: true }
-    },
+
     {
       path: '/hospitalStation/doctorDesk',
       component: () => import('@/xt_pages/hospitalStation/doctorDesk'),
@@ -25,10 +20,10 @@ export default {
       meta: { title: 'outpatientDoctorStationDoctorDesk', noCache: true }
     },
     {
-      path: '/hospitalStation/outpatientChargesManagement',
-      component: () => import('@/xt_pages/hospitalStation/outpatientChargesManagement'),
-      name: 'hospitalChargesManagement',
-      meta: { title: 'hospitalChargesManagement', noCache: true }
+      path: '/hospitalStation/pastInquiries',
+      component: () => import('@/xt_pages/hospitalStation/pastInquiries'),
+      name: 'pastInquiries',
+      meta: { title: 'pastInquiries', noCache: true }
     },
 
     // {

src/router/modules/outpatientCharges.js

@@ -48,12 +48,12 @@ export default {
         name: 'incomeStatistics',
         meta: { title: 'incomeStatistics', noCache: true }
     },
-    {
-        path: '/outpatientCharges/costComparison',
-        component: () => import('@/xt_pages/outpatientCharges/costComparison'),
-        name: 'costComparison',
-        meta: { title: 'costComparison', noCache: true }
-    },
+    // {
+    //     path: '/outpatientCharges/costComparison',
+    //     component: () => import('@/xt_pages/outpatientCharges/costComparison'),
+    //     name: 'costComparison',
+    //     meta: { title: 'costComparison', noCache: true }
+    // },
     {
         path: '/outpatientCharges/summaryDetail',
         component: () => import('@/xt_pages/outpatientCharges/summaryDetail'),

src/router/modules/outpatientDoctorStation.js

@@ -24,22 +24,22 @@ export default {
         name: 'outpatientDoctorStationPastInquiries',
         meta: { title: 'outpatientDoctorStationPastInquiries', noCache: true }
     },
-    {
-      path: '/outpatientDoctorStation/prescriptionTemplate',
-      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
-      name: 'prescriptionTemplate',
-      meta: { title: 'prescriptionTemplate', noCache: true }
-    },
-
-    {
-      path: '/outpatientDoctorStation/prescriptionTemplatedetail',
-      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail'),
-      name: 'prescriptionTemplatedetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'prescriptionTemplatedetail', noCache: true }
-    },
-
+    // {
+    //   path: '/outpatientDoctorStation/prescriptionTemplate',
+    //   component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
+    //   name: 'prescriptionTemplate',
+    //   meta: { title: 'prescriptionTemplate', noCache: true }
+    // },
+    //
+    // {
+    //   path: '/outpatientDoctorStation/prescriptionTemplatedetail',
+    //   component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail'),
+    //   name: 'prescriptionTemplatedetail',
+    //   hidden: true,
+    //   is_menu: false,
+    //   meta: { title: 'prescriptionTemplatedetail', noCache: true }
+    // },
+    //
 
 
     {

src/views/layout/Layout.vue

@@ -123,7 +123,7 @@ export default {
   },
   created(){
     console.log('permission_routers',this.permission_routers);
-    let menzhen = ['hospitalStation','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
+    let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];

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

@@ -69,7 +69,7 @@ export default {
     navTitle:{
       handler(newVal,oldVal){
         if(newVal == 'HIS管理'){
-          let nameArr = ['hospitalStation','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
+          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/hospitalStation/index.vue

@@ -557,6 +557,7 @@
                   // this.$refs.register.hide()
                   return false
                 } else {
+                  this.loadingone = false
                   that.$message({ message: '登记成功', type: 'success' })
                   that.form.name = ''
                   that.form.certificates = ''