新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2980,9 +2980,10 @@
                           />
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 1" v-if="org_id!=10677">
+                      <div class="inline_block" style="flex: 1" >
                         治疗医生：
                         <div
+                          v-if="org_id!=10677"
                           class="under_line"
                           style="width: 80px; text-align: center"
                         >

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2505,7 +2505,7 @@
                         />
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10677">
+                    <div class="inline_block" style="flex: 1">
                       治疗医生：
                       <div
                         v-if="org_id ==10191"
@@ -2527,7 +2527,7 @@
                         />
                       </div>
                       <div
-                        v-if="org_id!=10191"
+                        v-if="org_id!=10191 && org_id!=10677"
                         class="under_line"
                         style="width: 80px; text-align: center"
                       >

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))