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

代码合并-多仓库

Browse Source
This commit is contained in:
liuxy
2022-12-01 09:15:12 +08:00
parent 1bcf3bd93f
commit 45cfc646bd
46 changed files with 388 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
View File

@@ -246,6 +246,7 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
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: 'Return',
@@ -284,8 +285,8 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
debugger
this.billtypelist = this.dict.ST_INV_IN_TYPE

6
lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
View File

@@ -265,6 +265,7 @@ import AddDtl from '@/views/wms/st/inStor/change/AddDtl'
import handmovestor from '@/views/wms/st/inStor/change/change'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import StructDiv from '@/views/wms/pub/StructDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
const defaultForm = {
bill_code: '',
@@ -325,9 +326,8 @@ export default {
methods: {
open() {
debugger
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
close() {

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

@@ -188,6 +188,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/inStor/change/AddDialog'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'Change',
@@ -227,8 +228,8 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
methods: {

6
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
View File

@@ -138,6 +138,7 @@ import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/inStor/check/AddDtl'
import check from '@/views/wms/st/inStor/check/check'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
const defaultForm = {
check_code: '',
@@ -189,9 +190,8 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
close() {

5
lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue
View File

@@ -206,6 +206,7 @@ import ProcessDialog from '@/views/wms/st/inStor/check/ProcessDialog'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'Check',
@@ -245,8 +246,8 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
methods: {

7
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue
View File

@@ -239,6 +239,7 @@ import AddDtl from '@/views/wms/st/inStor/moveStor/AddDtl'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import StructDiv from '@/views/wms/pub/StructDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
const defaultForm = {
bill_code: '',
@@ -298,10 +299,8 @@ export default {
},
methods: {
open() {
debugger
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
close() {

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

@@ -199,6 +199,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/inStor/moveStor/AddDialog'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'Handmovestor',
@@ -238,8 +239,8 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
methods: {

6
lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
View File

@@ -172,6 +172,7 @@ import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
const defaultForm = {
bill_code: '',
@@ -236,9 +237,8 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_virtualstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
close() {

5
lms/nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -233,6 +233,7 @@ import ViewDialog from '@/views/wms/st/inbill/ViewDialog'
import TaskDialog from '@/views/wms/st/inbill/TaskDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'Rawassist',
@@ -286,8 +287,8 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
methods: {

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

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

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

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

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

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

5
lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
View File

@@ -173,6 +173,7 @@ import DateRangePicker from '@/components/DateRangePicker/index'
import crudOutchargefrom from '@/views/wms/st/outcharge/outcharge'
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: 'Outcharge',
@@ -210,8 +211,8 @@ export default {
}
},
created() {
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
methods: {