代码合并-多仓库

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -19,6 +19,7 @@
               size="mini"
               class="filter-item"
               style="width: 200px;"
+              @change="hand"
             >
               <el-option
                 v-for="item in storlist"
@@ -77,6 +78,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="point_code" label="仓位编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_name" label="仓位名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="stor_name" label="仓库" min-width="120" show-overflow-tooltip />
         <el-table-column prop="sect_name" label="库区" min-width="120" show-overflow-tooltip />
 <!--        <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->
         <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
@@ -110,6 +112,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudPoint from '@/views/wms/sch/point/point'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = { stockrecord_id: null, cascader: null, struct_id: null, struct_code: null, struct_name: null, workprocedure_id: null, material_id: null, material_code: null, quality_scode: null, pcsn: null, canuse_qty: null, frozen_qty: null, ivt_qty: null, warehousing_qty: null, qty_unit_id: null, instorage_time: null, sale_id: null }
 export default {
@@ -138,8 +141,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-      this.storlist = res.content
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
     })
   },
   methods: {
@@ -150,6 +153,9 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    hand(value) {
+      this.crud.toQuery()
     }
   }
 }

lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue

@@ -182,6 +182,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import { isvalidPhone } from '@/utils/validate'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   sect_id: null,
@@ -283,8 +284,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor().then(res => {
-      this.stors = res.content
+    crudUserStor.getUserStor().then(res => {
+      this.stors = res
     })
   },
   methods: {

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -262,6 +262,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import crudUserStor, { getSect } from '@/views/wms/basedata/st/userStor/userStor'
 /* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/
 
 const defaultForm = {
@@ -384,12 +385,9 @@ export default {
     }
   },
   created() {
-    crudSectattr.getSect().then(res => {
+    crudUserStor.getSect().then(res => {
       this.sects = res.content
     })
-    /*    checkoutbill.getInvTypes().then(res => {
-      this.invtypelist = res
-    })*/
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

lms/nladmin-ui/src/views/wms/basedata/st/userStor/userStor.js

@@ -24,4 +24,19 @@ export function save(data) {
   })
 }
 
-export default { queryUserStor, queryStor, save }
+export function getUserStor(data) {
+  return request({
+    url: '/api/userStor/getUserStor',
+    method: 'post',
+    data
+  })
+}
+
+export function getSect() {
+  return request({
+    url: '/api/userStor/getSect',
+    method: 'post'
+  })
+}
+
+export default { queryUserStor, queryStor, save, getUserStor, getSect }