Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -5297,18 +5297,13 @@ mu
         if(this.$store.getters.xt_user.template_info.org_id==10598){
            
           if(this.dialysisPrescription.mode_id == 3){
-            if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
-              if(this.dialysisPrescription.prescription_water!=undefined){
-                this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water + 0.3
-              }
-              
-            }
+             this.dialysisPrescription.target_ultrafiltration = this.dialysisPrescription.prescription_water  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
               this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 
             }
           }
-         
+          
            
         }
       },

src/xt_pages/role/admin.vue

@@ -227,12 +227,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button>
+          @click="toAutoDiagnose">自动脚本</el-button> -->
 
         <!-- <el-button
           type="primary"

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