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

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

@@ -95,6 +95,7 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'AddDtl',
@@ -148,7 +149,7 @@ export default {
   },
   methods: {
     open() {
-      crudSectattr.getSect({ is_materialstore: '1' }).then(res => {
+      crudUserStor.getSect({ 'stor_id': '' }).then(res => {
         this.sects = res.content
       })
       this.crud.toQuery()

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

@@ -143,7 +143,7 @@
         @select-all="onSelectAll"
       >
         <el-table-column
-          v-permission="['admin','checkoutbill:del','checkoutbill:edit']"
+          v-permission="['admin','ivtchange:del','ivtchange:edit']"
           label="操作"
           width="160"
           align="center"
@@ -210,9 +210,9 @@ export default {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
       permission: {
-        add: ['admin', 'handmovestor:add'],
-        edit: ['admin', 'handmovestor:edit'],
-        del: ['admin', 'handmovestor:del']
+        add: ['admin', 'ivtchange:add'],
+        edit: ['admin', 'ivtchange:edit'],
+        del: ['admin', 'ivtchange:del']
       },
       work_flag: true,
       confirm_flag: true,

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

@@ -154,7 +154,7 @@
         @select-all="onSelectAll"
       >
         <el-table-column
-          v-permission="['admin','checkoutbill:del','checkoutbill:edit']"
+          v-permission="['admin','handmovestor:del','handmovestor:edit']"
           label="操作"
           width="160"
           align="center"