2 次程式碼提交 63a1aa8f15 ... 7160555307

作者 SHA1 備註 提交日期
  yq1 7160555307 Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch 1 月之前
  yq1 12a5fbf2aa 9月14, 1 月之前
共有 5 個文件被更改,包括 18 次插入12 次删除
  1. 1 0
      src/lang/en.js
  2. 3 3
      src/lang/zh.js
  3. 7 3
      src/router/modules/eleFaPiao.js
  4. 6 5
      src/router/modules/hisTool.js
  5. 1 1
      src/views/layout/components/Sidebar/index.vue

+ 1 - 0
src/lang/en.js 查看文件

@@ -129,6 +129,7 @@ export default {
129 129
     user_detail: 'user_detail',
130 130
     objectRegistration:'objectRegistration',
131 131
     Dialysisanalysis:'Dialysisanalysis',
132
+    eleFaPiao:'eleFaPiao',
132 133
   },
133 134
   navbar: {
134 135
     logOut: 'Log Out',

+ 3 - 3
src/lang/zh.js 查看文件

@@ -294,7 +294,8 @@ export default {
294 294
     summary_tool: '结算明细汇总',
295 295
     p_summary_tool: '处方明细汇总',
296 296
     labelPrint: '标签打印',
297
-    faPiao: '发票设置',
297
+    // faPiao: '发票设置',
298
+    // fapiao:'电子发票',
298 299
     chargeDetailManagement: '收费明细',
299 300
     yidiClear: '异地清分',
300 301
     zeroSummary: '零用明细汇总',
@@ -308,10 +309,9 @@ export default {
308 309
     orgExportData:"数据导出",
309 310
     eleFaPiao:"电子发票",
310 311
 
311
-
312 312
     settleDetail:"结算明细列表",
313 313
     patientSettleDetail:"患者结算列表",
314
-    elefapiao:"电子发票列表",
314
+    fapiao:"电子发票列表",
315 315
 
316 316
   },
317 317
   navbar: {

+ 7 - 3
src/router/modules/eleFaPiao.js 查看文件

@@ -1,5 +1,6 @@
1 1
 import Layout from '@/views/layout/Layout'
2 2
 
3
+
3 4
 export default {
4 5
   path: '/eleFaPiao',
5 6
   component: Layout,
@@ -8,6 +9,7 @@ export default {
8 9
   alwaysShow: true,
9 10
   meta: {
10 11
     title: 'eleFaPiao',
12
+    icon: 'eleFaPiao',
11 13
     isChild: true
12 14
   },
13 15
   children: [
@@ -24,10 +26,12 @@ export default {
24 26
       meta: { title: 'patientSettleDetail', noCache: true },
25 27
     },
26 28
     {
27
-      path: '/eleFaPiao/elefapiao',
29
+      path: '/eleFaPiao/fapiao',
28 30
       component: () => import('@/xt_pages/eleFaPiao/fapiao'),
29
-      name: 'elefapiao',
30
-      meta: { title: 'elefapiao', noCache: true },
31
+      name: 'fapiao',
32
+      meta: { title: 'fapiao', noCache: true },
31 33
     },
34
+
35
+   
32 36
   ]
33 37
 }

+ 6 - 5
src/router/modules/hisTool.js 查看文件

@@ -96,12 +96,13 @@ export default {
96 96
     //   name: 'faPiao',
97 97
     //   meta: { title: 'faPiao', noCache: true }
98 98
     // },
99
+    // {
100
+    //   path: '/hisTool/faPiao',
101
+    //   component: () => import('@/xt_pages/outpatientTool/fapiao'),
102
+    //   name: 'faPiao',
103
+    //   meta: { title: 'faPiao', noCache: true }
104
+    // }, 
99 105
     {
100
-      path: '/hisTool/faPiao',
101
-      component: () => import('@/xt_pages/outpatientTool/fapiao'),
102
-      name: 'faPiao',
103
-      meta: { title: 'faPiao', noCache: true }
104
-    }, {
105 106
       path: '/hisTool/yidiClear',
106 107
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
107 108
       name: 'yidiClear',

+ 1 - 1
src/views/layout/components/Sidebar/index.vue 查看文件

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