소스 검색

新分支

28169 2 년 전
부모
커밋
35115b3a97
2개의 변경된 파일15개의 추가작업 그리고 14개의 파일을 삭제
  1. 2 1
      src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue
  2. 13 13
      src/xt_permission.js

+ 2 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue 파일 보기

327
                     <span style="display:inline-block;margin-left:15px;"
327
                     <span style="display:inline-block;margin-left:15px;"
328
                       >灌流器型号:
328
                       >灌流器型号:
329
                    
329
                    
330
-                      <span v-if="record.prescription.dialysis_irrigation==''">
330
+                      <span v-if="record.prescription.dialysis_irrigation!=''">
331
                         &nbsp;&nbsp;{{
331
                         &nbsp;&nbsp;{{
332
                         record.prescription.dialysis_irrigation
332
                         record.prescription.dialysis_irrigation
333
                         ? record.prescription.dialysis_irrigation
333
                         ? record.prescription.dialysis_irrigation
349
                       </span> 
349
                       </span> 
350
                       </span>
350
                       </span>
351
                   </td>
351
                   </td>
352
+                  <td></td>
352
              <tr>
353
              <tr>
353
 
354
 
354
              </tr>
355
              </tr>

+ 13 - 13
src/xt_permission.js 파일 보기

12
 
12
 
13
 router.beforeEach((to, from, next) => {
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
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))