代码合并-多仓库

lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue

@@ -265,6 +265,7 @@ import AddDtl from '@/views/wms/st/inStor/change/AddDtl'
 import handmovestor from '@/views/wms/st/inStor/change/change'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import StructDiv from '@/views/wms/pub/StructDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -325,9 +326,8 @@ export default {
   methods: {
     open() {
       debugger
-      // 查询原材料库的仓库
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-        this.storlist = res.content
+      crudUserStor.getUserStor().then(res => {
+        this.storlist = res
       })
     },
     close() {

lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue

@@ -188,6 +188,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/st/inStor/change/AddDialog'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Change',
@@ -227,8 +228,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
-      this.storlist = res.content
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
     })
   },
   methods: {