Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

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

@@ -153,6 +153,7 @@ import { crud } from '@crud/crud'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'ViewDialog',
@@ -195,10 +196,9 @@ export default {
   created() {
     checkoutbill.getInvTypes().then(res => {
       this.billtypelist = res
-    }),
-    // 查询原材料库的仓库
-    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
-      this.storlist = res.content
+    })
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
     })
   },
   methods: {