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

src/store/index.js

@@ -37,7 +37,6 @@ const store = new Vuex.Store({
     global_config,
     temp_params,
     pagedata,
-    insuplcAdmdvs_config
   },
   getters
 

src/xt_pages/user/components/PatientForm.vue

@@ -1186,7 +1186,7 @@ const defaultForm = {
   response_result: "",
   remind_cycle: 0,
   record_date: "",
-  patient_type:"1",
+  patient_type:1,
   tell_phone: "",
   first_treatment_date: "",
   dialysis_age: "",

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