代码合并-多仓库

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

@@ -242,6 +242,7 @@ import MaterDialog from '@/views/wms/pub/MaterDialog'
 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'
 
 const defaultForm = {
   bill_code: '',
@@ -301,16 +302,9 @@ export default {
   },
   methods: {
     open() {
-      // 查询原材料库的仓库
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-        this.storlist = res.content
+      crudUserStor.getUserStor().then(res => {
+        this.storlist = res
       })
-      /*     crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
-        this.billtypelist = res
-      })
-      checkoutbill.getInvTypes().then(res => {
-        this.invtypelist = res
-      })*/
     },
     close() {
       this.$emit('AddChanged')

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

@@ -238,6 +238,7 @@ import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Checkoutbill',
@@ -285,12 +286,9 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-      this.storlist = res.content
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
     })
-    // crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
-    //   this.billtypelist = res
-    // })
   },
   methods: {
     canUd(row) {