代码合并-多仓库

lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue

@@ -238,6 +238,7 @@ import TaskDialog from '@/views/wms/statistics/ioStorQuery/TaskDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import inandoutreturn from '@/views/wms/st/inAndOutReturn/inandoutreturn'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'IoStorQuery',
@@ -285,8 +286,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-      this.storlist = res.content
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
     })
     debugger
     this.billtypelist = this.dict.ST_INV_IN_TYPE

lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue

@@ -24,9 +24,9 @@
               @change="hand"
             >
               <el-option
-                v-for="item in this.storList"
-                :label="item.label"
-                :value="item.value"
+                v-for="item in storList"
+                :label="item.stor_name"
+                :value="item.stor_id"
               />
             </el-select>
           </el-form-item>
@@ -108,6 +108,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 import crudMaterialbase from '@/views/wms/basedata/master/material/materialbase'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   stordaily_id: null,
@@ -164,7 +165,7 @@ export default {
     }
   },
   created() {
-    crudIostordaily.getStor().then(res => {
+    crudUserStor.getUserStor().then(res => {
       this.storList = res
     })
     const param = {