新分支

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -268,6 +268,7 @@ export default {
               if(this.org_id ==10210){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
+                console.log("good_id",list[i].id)
                 console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
                 console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
                 console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )

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