mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

'修改bug'

Browse Source
This commit is contained in:
Fanzink
2022-03-10 21:15:33 +08:00
parent 95afd175a3
commit 7afe3c3ec7
25 changed files with 419 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/basicData/Cache/components/location-add.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-04 19:08:00
* @LastEditTime: 2022-03-10 21:00:58
* @Description:
-->
<template>
@@ -17,7 +17,9 @@
@getDataList="getList"
@add="addNew"
/>
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
<div style="title">货架编码:{{ shCode }} 货架名称：{{ shName }} 库存量：{{ num }}
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
</div>
<base-table
:page="listQuery.current"
:limit="listQuery.size"
@@ -106,7 +108,7 @@ const tableProps = [
align: 'center'
},
{
prop: 'status',
prop: 'statusName',
label: i18n.t('module.basicData.cache.status'),
align: 'center'
}
@@ -127,13 +129,18 @@ export default {
},
data() {
return {
shCode: '',
shName: '',
num: 0,
addOrUpdateVisible: false,
keyNameAdd: i18n.t('module.basicData.visual.keyword'),
placeholderName: this.$t('module.basicData.cache.LocationName'),
tableBtn,
trueWidth: 200,
tableProps,
list: [],
list: [{
statusName: ''
}],
listLoading: true,
listQuery: {
current: 1,
@@ -145,6 +152,9 @@ export default {
},
created() {
this.listQuery.shelfId = this.$route.query.id
this.shCode = this.$route.query.code
this.shName = this.$route.query.shelfName
this.num = this.$route.query.columnNum
this.getList()
},
methods: {
@@ -180,6 +190,16 @@ export default {
if (response.data.records) {
this.list = response.data.records
console.log(this.list)
// 1是Working Port，2是Buffer Port，3是Exception Port与status进行替换
for (var x = 0; x < this.list.length; x++) {
if (this.list[x].status === 1) {
this.list[x].statusName = 'Working Port'
} else if (this.list[x].status === 2) {
this.list[x].statusName = 'Buffer Port'
} else if (this.list[x].status === 3) {
this.list[x].statusName = 'Exception Port'
}
}
} else {
this.list.splice(0, this.list.length)
}

45
src/views/basicData/Cache/components/locationAttr-add.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: fzq
* @LastEditTime: 2022-03-04 18:59:53
* @LastEditTime: 2022-03-10 21:14:13
* @Description:
-->
<template>
@@ -29,8 +29,18 @@
<el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
<el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.cache.status')" prop="status">
<!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
<el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
</el-form-item> -->
<el-form-item :label="$t('module.basicData.cache.status')" prop="status">
<el-select v-model="dataForm.status">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -61,11 +71,25 @@ export default {
code: '',
locationNameAlias: '',
rowNum: '',
columns: '',
layers: '',
status: '',
columns: 0,
layers: 0,
status: null,
locationType: ''
},
options: [
{
value: 1,
label: 'Working Port'
},
{
value: 2,
label: 'Buffer Port'
},
{
value: 3,
label: 'Exception Port'
}
],
dataRule: {
name: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationName')]), trigger: 'blur' }
@@ -73,6 +97,16 @@ export default {
code: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
]
// layers: [{
// type: 'number',
// message: this.$t('module.basicData.cache.warning'),
// trigger: "blur"
// }],
// columns: [{
// type: 'number',
// message: this.$t('module.basicData.cache.warning'),
// trigger: "blur"
// }]
}
}
},
@@ -85,6 +119,7 @@ export default {
if (this.dataForm.id) {
locationDetail(this.dataForm.id).then(res => {
this.dataForm = res.data
console.log(this.dataForm)
})
} else {
locationCode().then(res => {

7
src/views/basicData/Cache/components/locationBtn.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Date: 2021-01-07 20:09:37
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 18:39:03
* @LastEditTime: 2022-03-10 20:20:44
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
* @Description:
-->
@@ -24,7 +24,10 @@ export default {
this.$router.push({
name: 'locationAdd',
query: {
id: this.injectData.id
id: this.injectData.id,
code: this.injectData.code,
columnNum: this.injectData.columnNum,
shelfName: this.injectData.shelfName
}
})
}

8
src/views/basicData/Cache/components/shelf-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2021-03-11 09:22:52
* @LastEditors: fzq
* @LastEditTime: 2022-03-10 19:20:22
* @Description:
-->
<template>
@@ -25,7 +25,7 @@
@clickBtn="handleClick"
/>
</base-table>
<shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :area-id="listQuery.areaId" @refreshDataList="getList" />
<shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
</div>
</template>
@@ -163,7 +163,7 @@ export default {
addNew(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
this.$refs.addOrUpdate.init(id, true)
})
},
goback() {

60
src/views/basicData/Cache/components/shelfAttr-add.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 19:00:08
* @LastEditTime: 2022-03-10 19:38:31
* @Description:
-->
<template>
@@ -47,7 +47,7 @@
</template>
<script>
import { shelfList, shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
import { shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
export default {
props: {
@@ -86,36 +86,60 @@ export default {
}
},
methods: {
init(id, isPage) {
this.isPage = isPage || false
// init(id, isPage) {
// this.isPage = isPage || false
// this.dataForm.id = id || ''
// if (!this.isPage) {
// this.dataForm.areaId = this.areaId
// }
// this.areaArr.splice(0, this.areaArr.length)
// const params = {
// current: 1,
// size: 500
// }
// shelfList(params).then(response => {
// if (response.data.records) {
// this.areaArr = response.data.records
// }
// })
// this.visible = true
// this.$nextTick(() => {
// this.$refs['dataForm'].resetFields()
// if (this.dataForm.id) {
// shelfDetail(this.dataForm.id).then(res => {
// this.dataForm = res.data
// })
// } else {
// shelfCode().then(res => {
// this.dataForm.code = res.data
// })
// }
// })
// },
init(id) {
this.dataForm.id = id || ''
if (!this.isPage) {
this.dataForm.areaId = this.areaId
}
this.areaArr.splice(0, this.areaArr.length)
const params = {
current: 1,
size: 500
}
shelfList(params).then(response => {
if (response.data.records) {
this.areaArr = response.data.records
}
})
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
// console.log(this.dataForm)
shelfDetail(this.dataForm.id).then(res => {
// console.log(res)
this.dataForm = res.data
})
} else {
this.dataForm.shelfName = ''
shelfCode().then(res => {
this.dataForm.code = res.data
})
}
})
// console.log(this.dataForm)
},
// getClose() {
// this.dataForm.shelfName = ''
// console.log(this.dataForm)
// },
// 表单提交
dataFormSubmit() {
this.$refs['dataForm'].validate((valid) => {
@@ -136,7 +160,7 @@ export default {
})
} else {
shelfAdd(data).then(res => {
console.log(res)
// console.log(res)
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',

6
src/views/basicData/Cache/components/storageBox-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-01-11 16:45:30
* @LastEditors: fzq
* @LastEditTime: 2022-03-09 16:53:31
* @Description:
-->
<template>
@@ -52,7 +52,7 @@ export default {
id: 0,
storageBoxName: '',
code: '',
status: 0,
status: '',
enName: '',
note: ''
},

16
src/views/basicData/Cache/shelf.vue
View File

@@ -2,17 +2,17 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-04 19:00:14
* @LastEditTime: 2022-03-10 20:18:52
* @Description:
-->
<template>
<div class="app-container">
<!-- <head-form
<head-form
:placeholder-name="placeholderName"
:key-name="keyName"
@getDataList="getList"
@add="addNew"
/> -->
/>
<base-table
:page="listQuery.current"
:limit="listQuery.size"
@@ -39,7 +39,7 @@
</template>
<script>import i18n from '@/lang'
// import HeadForm from '@/components/basicData/HeadForm'
import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
@@ -108,7 +108,7 @@ const tableProps = [
export default {
name: 'Area',
components: { Pagination, BaseTable, MethodBtn, shelfAttrAdd },
components: { Pagination, BaseTable, MethodBtn, HeadForm, shelfAttrAdd },
filters: {
statusFilter(status) {
const statusMap = {
@@ -122,7 +122,7 @@ export default {
data() {
return {
addOrUpdateVisible: false,
keyName: i18n.t('module.basicData.visual.keyword'),
keyName: this.$t('module.basicData.cache.ShelfName'),
placeholderName: this.$t('module.basicData.cache.ShelfName'),
tableBtn,
trueWidth: 200,
@@ -178,9 +178,9 @@ export default {
getList(key) {
this.listLoading = true
this.listQuery.shelfName = key
console.log(this.listQuery)
// console.log(this.listQuery)
shelfList(this.listQuery).then(response => {
// console.log(response)
console.log(response)
if (response.data.records) {
this.list = response.data.records
this.list.forEach(item => {

16
src/views/basicData/Cache/storageBox.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-11 16:46:48
* @LastEditors: fzq
* @LastEditTime: 2022-03-10 10:55:34
* @Description:
-->
<template>
@@ -81,13 +81,13 @@ const tableProps = [
align: 'center'
},
{
prop: 'storageBoxName',
label: i18n.t('module.basicData.storageBox.name'),
prop: 'code',
label: i18n.t('module.basicData.storageBox.code'),
align: 'center'
},
{
prop: 'code',
label: i18n.t('module.basicData.storageBox.code'),
prop: 'storageBoxName',
label: i18n.t('module.basicData.storageBox.name'),
align: 'center'
},
{
@@ -124,8 +124,8 @@ export default {
data() {
return {
addOrUpdateVisible: false,
keyName: i18n.t('module.basicData.visual.keyword'),
placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
keyName: this.$t('module.basicData.storageBox.name'),
placeholderName: this.$t('module.basicData.storageBox.name'),
tableBtn,
trueWidth: 200,
tableProps,