Browse Source

新分支

28169 2 months ago
parent
commit
080aead19d

+ 2 - 2
src/xt_pages/stock/drugs/drugInventory.vue View File

@@ -26,9 +26,9 @@
26 26
           <drug-damaged ref="childOne"></drug-damaged>
27 27
         </el-tab-pane>
28 28
 
29
-        <el-tab-pane label="盘点日志表" name="seven">
29
+        <!-- <el-tab-pane label="盘点日志表" name="seven">
30 30
             <inventory-record ref="childSeven"></inventory-record>
31
-         </el-tab-pane>
31
+         </el-tab-pane> -->
32 32
       </el-tabs>
33 33
     </div>
34 34
   </div>

+ 2 - 2
src/xt_pages/stock/stockInventory.vue View File

@@ -22,9 +22,9 @@
22 22
                 <stockDamaged ref="childOne"></stockDamaged>
23 23
             </el-tab-pane>
24 24
 
25
-            <el-tab-pane label="盘点日志表" name="seven">
25
+            <!-- <el-tab-pane label="盘点日志表" name="seven">
26 26
                 <inventory-record ref="childSeven"></inventory-record>
27
-            </el-tab-pane>
27
+            </el-tab-pane> -->
28 28
         </el-tabs>
29 29
         
30 30
     </div>

+ 13 - 13
src/xt_permission.js View File

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 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 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))