mt-ck-00a/mt-ck-wms-ui
8
0
Derivar 0
Código Questões Pedidos de integração Lançamentos Wiki Trabalho

Merge branch 'develop' into gtz

Ver a proveniência
Este cometimento está contido em:
gtz217 2022-03-15 16:59:11 +08:00
ascendente 9eea286c08 d4e0384e10
cometimento 8502f5d7d1
12 ficheiros modificados com 682 adições e 1053 eliminações
Mostrar estatísticas Descarregar ficheiro patch Descarregar ficheiro diff Expandir todos os ficheiros Colapsar todos os ficheiros

7
src/lang/i18n/en/module/basicData.js
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:58:20
* @LastEditTime: 2022-03-15 10:17:01
* @Description: file content
*/
export default {
@ -181,7 +181,10 @@ export default {
remark: 'Remark',
PositionNo: 'PositionNo',
PositionCode: 'PositionCode',
PositionCodeAlias: 'PositionCodeAlias'
PositionCodeAlias: 'PositionCodeAlias',
scrapped: 'Scrapped',
normal: 'Normal',
repairing: 'Repairing'
},
equipment: {
EquipmentName: 'Equipment Name',

8
src/lang/i18n/zh/module/basicData.js
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:58:12
* @LastEditTime: 2022-03-15 10:16:52
*/
export default {
visual: {
@ -171,7 +171,11 @@ export default {
remark: '备注',
PositionNo: '位置序号',
PositionCode: '位置编码',
PositionCodeAlias: '位置编码别名'
PositionCodeAlias: '位置编码别名',
scrapped: '报废',
normal: '正常',
repairing: '维修中'
},
equipment: {
shortName: '名称缩写',

4
src/views/basicData/Cache/components/location-add.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:14:02
* @LastEditTime: 2022-03-15 09:45:30
* @Description:
-->
<template>
@ -157,7 +157,7 @@ export default {
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.num = this.$route.query.total
this.getList()
},
methods: {

51
src/views/basicData/Cache/components/locationAttr-add.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:03:31
* @LastEditTime: 2022-03-15 09:54:52
* @Description:
-->
<template>
@ -20,11 +20,14 @@
<el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias">
<el-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
<!-- <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
<el-input v-model="dataForm.layers" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
</el-form-item> -->
<el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
<el-input-number v-model="dataForm.layers" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
<el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
<el-input-number v-model="dataForm.columns" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
</el-form-item>
<!-- <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 />
@ -71,8 +74,6 @@ export default {
code: '',
locationNameAlias: '',
rowNum: '',
columns: 0,
layers: 0,
status: null,
locationType: ''
},
@ -96,17 +97,13 @@ export default {
],
code: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
],
layers: [
{ pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
],
columns: [
{ pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), 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"
// }]
}
}
},
@ -119,7 +116,7 @@ export default {
if (this.dataForm.id) {
locationDetail(this.dataForm.id).then(res => {
this.dataForm = res.data
console.log(this.dataForm)
// console.log(this.dataForm)
})
} else {
locationCode().then(res => {
@ -173,6 +170,28 @@ export default {
}
})
}
// isInt(value){
// for(var i = 0; i < value.length; i++) {
// if(charAt[i] == '.'){
// }
// }
// }
// isInt(value) {
// let zero = /^0+\d*$/ // 过滤以0开头的数据(不含小数点)
// let dublue = /^0{2,}\.\d+$/ // 过滤小数点前有两个以上0的数字
// let point = /^\d+\.?\d+$/ // 以数字开头,可以允许出现一次或0次小数点,以数字结尾(这里的数字必须有两个)
// let reg = /^[1-9]{1}$/ // 匹配只有一个数字的情况
// if (!value) {
// return false
// }
// if (zero.test(value) || dublue.test(value)) { // 首先过滤掉错误的数据
// return false
// } else if (point.test(value) || reg.test(value)) { // 匹配数据,如果输入的数字只有一位数时用reg匹配
// return true
// } else {
// return false
// }
// }
}
}
</script>

4
src/views/basicData/Cache/components/locationBtn.vue
Ver ficheiro

@ -1,7 +1,7 @@
<!--
* @Date: 2021-01-07 20:09:37
* @LastEditors: fzq
* @LastEditTime: 2022-03-10 20:20:44
* @LastEditTime: 2022-03-15 09:48:09
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
* @Description:
-->
@ -26,7 +26,7 @@ export default {
query: {
id: this.injectData.id,
code: this.injectData.code,
columnNum: this.injectData.columnNum,
total: this.injectData.total,
shelfName: this.injectData.shelfName
}
})

8
src/views/basicData/Cache/components/storageBox-add.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: fzq
* @LastEditTime: 2022-03-09 16:53:31
* @LastEditTime: 2022-03-14 16:23:19
* @Description:
-->
<template>
@ -59,15 +59,15 @@ export default {
options: [
{
value: 0,
label: '正常'
label: this.$t('module.basicData.storageBox.normal')
},
{
value: 1,
label: '维修中'
label: this.$t('module.basicData.storageBox.repairing')
},
{
value: 2,
label: '报废'
label: this.$t('module.basicData.storageBox.scrapped')
}
],
dataRule: {

4
src/views/basicData/Equipment/components/equipmentInfo-add.vue
Ver ficheiro

@ -58,7 +58,7 @@
<el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
</el-form-item> -->
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType">
<el-select v-model="dataForm.equipmentType" :placeholder="dataForm.equipmentType">
<el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default>
<el-option
v-for="item in options"
:key="item.value"
@ -399,7 +399,7 @@ export default {
code: '',
enName: '',
abbr: '',
equipmentType: '',
equipmentType: this.$t('module.basicData.cache.logisticsEquipment'),
spec: '',
createTime: '',
enterTime: '',

4
src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 16:29:46
* @LastEditTime: 2022-03-15 14:15:30
* @Description:
-->
<template>
@ -33,7 +33,6 @@ import { locationByProcessList } from '@/api/basicData/Warehouse/StorageBoxInfo'
import i18n from '@/lang'
import BaseTable from '@/components/BaseTable'
// import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { timeFormatter } from '@/filters'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@ -60,7 +59,6 @@ const tableProps = [
{
prop: 'code',
label: i18n.t('module.basicData.cache.LocationCode'),
filter: timeFormatter,
align: 'center'
},
{

80
src/views/basicData/Warehouse/components/processStorageLink.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 09:16:10
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 16:33:41
* @LastEditTime: 2022-03-15 14:27:57
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
-->
@ -117,26 +117,8 @@
)
"
>
<div
v-if="
z.portList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
].attribute !== 3
"
class="dashboard-layout-item-cricle"
:style="{
background:
cassetteStatusObj[
z.portList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
].cassetteList[0].status
]
}"
/>
{{
z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
.name
}}
<div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
</div>
</el-col>
</el-row>
@ -216,26 +198,8 @@
)
"
>
<div
v-if="
z.portList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
].attribute !== 3
"
class="dashboard-layout-item-cricle"
:style="{
background:
cassetteStatusObj[
z.portList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
].cassetteList[0].status
]
}"
/>
{{
z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
.name
}}
<div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
</div>
</el-col>
</el-row>
@ -283,26 +247,8 @@
)
"
>
<div
v-if="
z.portList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
].attribute !== 3
"
class="dashboard-layout-item-cricle"
:style="{
background:
cassetteStatusObj[
z.portList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1)
].cassetteList[0].status
]
}"
/>
{{
z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
.name
}}
<div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
</div>
</el-col>
</el-row>
@ -330,7 +276,7 @@ import testdata from './testdata'
import processStorageType from './processStorageType'
export default {
name: 'Dashboard',
name: 'ProcessStorageLink1',
components: { processStorageType },
data() {
return testdata
@ -353,13 +299,13 @@ export default {
} else {
this.typeVisible = true
this.$nextTick(() => {
this.$refs.typeRef.init(item.id)
this.$refs.typeRef.init(item.id, item.name)
})
}
}
},
setStorageList(locationId, dataForm) {
const obj = Object.assign({ locationId }, dataForm)
setStorageList(locationId, locationName, dataForm) {
const obj = Object.assign({ locationId, locationName }, dataForm)
this.selectStorageList.push(obj)
},
handleChange(v) {
@ -367,10 +313,10 @@ export default {
},
submitLinkList() {
const tipArr = this.selectStorageList.map(item => {
return item.locationId
return item.locationName
})
const obj = {
id: this.id,
workSequenId: this.id,
processLocationStorageList: this.selectStorageList
}
this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {

11
src/views/basicData/Warehouse/components/processStorageType.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 14:48:18
* @LastEditTime: 2022-03-15 11:02:46
* @Description:
-->
<template>
@ -49,6 +49,7 @@ export default {
return {
visible: false,
locationId: '',
locationName: '',
dataForm: {
portAttrId: 1,
storageId: ''
@ -65,8 +66,9 @@ export default {
}
},
methods: {
init(id) {
init(id, name) {
this.locationId = id
this.locationName = name
const listQuery = {
current: 1,
size: 999
@ -78,6 +80,9 @@ export default {
this.storageBoxArr.splice(0, this.list.length)
}
})
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
this.visible = true
},
// 表单提交
@ -85,7 +90,7 @@ export default {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.visible = false
this.$emit('refreshDataList', this.locationId, this.dataForm)
this.$emit('refreshDataList', this.locationId, this.locationName, this.dataForm)
}
})
}

1548
src/views/basicData/Warehouse/components/testdata.js
Ver ficheiro

A apresentação das diferenças no ficheiro foi suprimida por ser demasiado grande Carregar diff

6
src/views/orderManage/components/ExecutionInfoDetail.vue
Ver ficheiro

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 09:05:38
* @LastEditTime: 2022-03-15 10:50:00
* @Description:
-->
<template>
@ -114,7 +114,7 @@
</template>
<script>
import { ProcessInfoDetail } from '@/api/orderManage/00A'
import { ExecutionInfoDetail } from '@/api/orderManage/00A'
export default {
data() {
@ -146,7 +146,7 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
ProcessInfoDetail(this.dataForm.id).then(res => {
ExecutionInfoDetail(this.dataForm.id).then(res => {
res.data.status = this.statusfilter('orderStatus', res.data.status)
res.data.type = this.statusfilter('orderType', res.data.type)
res.data.priority = this.statusfilter('priority', res.data.priority)