root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-02 11:36:02 +08:00
parent d3c5f0a931 8116559cdf
commit f56285e075
21 changed files with 53 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()

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

@@ -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,

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

@@ -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"

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

@@ -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: {

8
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -155,6 +155,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',
@@ -196,10 +197,9 @@ export default {
created() {
checkoutbill.getInvTypes().then(res => {
this.billtypelist = res
}),
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
})
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
methods: {