Browse Source

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

yq1 1 week ago
parent
commit
188d24d649
3 changed files with 14 additions and 15 deletions
  1. 0 1
      src/store/index.js
  2. 1 1
      src/xt_pages/user/components/PatientForm.vue
  3. 13 13
      src/xt_permission.js

+ 0 - 1
src/store/index.js View File

37
     global_config,
37
     global_config,
38
     temp_params,
38
     temp_params,
39
     pagedata,
39
     pagedata,
40
-    insuplcAdmdvs_config
41
   },
40
   },
42
   getters
41
   getters
43
 
42
 

+ 1 - 1
src/xt_pages/user/components/PatientForm.vue View File

1186
   response_result: "",
1186
   response_result: "",
1187
   remind_cycle: 0,
1187
   remind_cycle: 0,
1188
   record_date: "",
1188
   record_date: "",
1189
-  patient_type:"1",
1189
+  patient_type:1,
1190
   tell_phone: "",
1190
   tell_phone: "",
1191
   first_treatment_date: "",
1191
   first_treatment_date: "",
1192
   dialysis_age: "",
1192
   dialysis_age: "",

+ 13 - 13
src/xt_permission.js View File

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