代码合并-多仓库

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

@@ -152,6 +152,7 @@ import DateRangePicker from '@/components/DateRangePicker/index'
 import crudInchargefrom from '@/views/wms/st/incharge/incharge'
 import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import ViewDialog from '@/views/wms/st/outbill/ViewDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'Incharge',
@@ -185,8 +186,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
-      this.storlist = res.content
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
     })
   },
   methods: {