新分支

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -958,13 +958,15 @@ export default {
 
     getStockBatchNumber(id){
        var params = {
-         id:id
+         id:id,
+         storehouse_id:this.storehouse_id,
        }
+       console.log("parmas----------------------",params)
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-
           this.numberList = list
+          var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
         }
      })
     },

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