代码合并-多仓库

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

@@ -172,6 +172,7 @@ import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -236,9 +237,8 @@ export default {
   },
   methods: {
     open() {
-      // 查询原材料库的仓库
-      crudStorattr.getStor({ 'is_virtualstore': '1' }).then(res => {
-        this.storlist = res.content
+      crudUserStor.getUserStor().then(res => {
+        this.storlist = res
       })
     },
     close() {