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

gtz #61

Merged
gtz217 merged 22 commits from gtz into test 2022-03-15 16:59:59 +08:00
Conversation 0 Commits 22 Files Changed 29 +51 -35
5 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit afde4d5225 - Show all commits

12
src/lang/i18n/en/module/basicData.js
View File

@ -1,13 +1,8 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
<<<<<<< HEAD
* @LastEditors: fzq * @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:13:47 * @LastEditTime: 2022-03-14 16:22:38
=======
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:22:52
>>>>>>> develop
* @Description: file content * @Description: file content
*/ */
export default { export default {
@ -186,7 +181,10 @@ export default {
remark: 'Remark', remark: 'Remark',
PositionNo: 'PositionNo', PositionNo: 'PositionNo',
PositionCode: 'PositionCode', PositionCode: 'PositionCode',
PositionCodeAlias: 'PositionCodeAlias' PositionCodeAlias: 'PositionCodeAlias',
scrapped: 'Scrapped',
normal: 'Normal',
repairing: 'Repairing'
}, },
equipment: { equipment: {
EquipmentName: 'Equipment Name', EquipmentName: 'Equipment Name',

13
src/lang/i18n/zh/module/basicData.js
View File

@ -1,14 +1,9 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
<<<<<<< HEAD
* @LastEditors: fzq * @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:13:22 * @LastEditTime: 2022-03-14 16:22:20
* @Description: file content * @Description: file content
=======
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:23:06
>>>>>>> develop
*/ */
export default { export default {
visual: { visual: {
@ -177,7 +172,11 @@ export default {
remark: '备注', remark: '备注',
PositionNo: '位置序号', PositionNo: '位置序号',
PositionCode: '位置编码', PositionCode: '位置编码',
PositionCodeAlias: '位置编码别名' PositionCodeAlias: '位置编码别名',
scrapped: '报废',
normal: '正常',
repairing: '维修中'
}, },
equipment: { equipment: {
shortName: '名称缩写', shortName: '名称缩写',

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

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: fzq * @LastEditors: fzq
* @LastEditTime: 2022-03-11 11:03:31 * @LastEditTime: 2022-03-14 16:37:47
* @Description: * @Description:
--> -->
<template> <template>
@ -20,11 +20,14 @@
<el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias"> <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-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
</el-form-item> </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-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>
<el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns"> <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>
<!-- <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType"> <!-- <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-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
@ -71,8 +74,6 @@ export default {
code: '', code: '',
locationNameAlias: '', locationNameAlias: '',
rowNum: '', rowNum: '',
columns: 0,
layers: 0,
status: null, status: null,
locationType: '' locationType: ''
}, },
@ -96,17 +97,13 @@ export default {
], ],
code: [ code: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' } { 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) { if (this.dataForm.id) {
locationDetail(this.dataForm.id).then(res => { locationDetail(this.dataForm.id).then(res => {
this.dataForm = res.data this.dataForm = res.data
console.log(this.dataForm) // console.log(this.dataForm)
}) })
} else { } else {
locationCode().then(res => { 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> </script>

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

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

2
src/views/basicData/Equipment/components/equipmentInfo-add.vue
View File

@ -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-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> -->
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType"> <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 <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"