Przeglądaj źródła

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

陈少旭 7 miesięcy temu
rodzic
commit
addbaa6d8e
2 zmienionych plików z 14 dodań i 14 usunięć
  1. 1 1
      src/xt_pages/Pharmacy/PatientDispensing.vue
  2. 13 13
      src/xt_permission.js

+ 1 - 1
src/xt_pages/Pharmacy/PatientDispensing.vue Wyświetl plik

883
       if (event.key === 'Enter') {
883
       if (event.key === 'Enter') {
884
         var textarea = ""
884
         var textarea = ""
885
         textarea += this.textarea + ","
885
         textarea += this.textarea + ","
886
-        console.log("textarea-=----------------------",textarea)
886
+       
887
         this.textarea = textarea
887
         this.textarea = textarea
888
       }
888
       }
889
    
889
    

+ 13 - 13
src/xt_permission.js Wyświetl plik

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