Procházet zdrojové kódy

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

XMLWAN před 2 roky
rodič
revize
267fba3ecb

+ 2 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue Zobrazit soubor

@@ -327,7 +327,7 @@
327 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 331
                         &nbsp;&nbsp;{{
332 332
                         record.prescription.dialysis_irrigation
333 333
                         ? record.prescription.dialysis_irrigation
@@ -349,6 +349,7 @@
349 349
                       </span> 
350 350
                       </span>
351 351
                   </td>
352
+                  <td></td>
352 353
              <tr>
353 354
 
354 355
              </tr>

+ 13 - 13
src/xt_permission.js Zobrazit soubor

@@ -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))