Browse Source

hah阿凡达

28169 1 month ago
parent
commit
579279a7ee
2 changed files with 16 additions and 14 deletions
  1. 3 1
      src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue
  2. 13 13
      src/xt_permission.js

+ 3 - 1
src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue View File

@@ -255,7 +255,9 @@
255 255
                   处方医生:
256 256
                   <span
257 257
                     style="height: 30px; display: inline-block">
258
-                     {{ getAdminUser(doctor_advices[0].advice_doctor) }}
258
+                     <!-- {{ getAdminUser(doctor_advices[0].advice_doctor) }} -->
259
+                     <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span>
260
+                     <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor==0">{{getAdminUser(prescription.creater)}}</span>
259 261
                   </span>
260 262
                   <!-- <img
261 263
                     style="height: 60px; width:30%"

+ 13 - 13
src/xt_permission.js View File

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //   store.dispatch('VerifyConfigList', []).then(() => {
17
-  //     next()
18
-  //   })
19
-  // }
20
-  // if (store.getters.permission_routers === undefined) {
21
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //     next()
23
-  //   })
24
-  // } else {
25
-  //   next()
26
-  // }
27
-  // return
15
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+    store.dispatch('VerifyConfigList', []).then(() => {
17
+      next()
18
+    })
19
+  }
20
+  if (store.getters.permission_routers === undefined) {
21
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+      next()
23
+    })
24
+  } else {
25
+    next()
26
+  }
27
+  return
28 28
  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))