Merge pull request 'fzq' (#58) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #58
This commit is contained in:
commit
6ac3fcb572
@ -1,8 +1,13 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-04 16:13:51
|
||||
<<<<<<< HEAD
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-14 16:22:38
|
||||
=======
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 10:58:20
|
||||
>>>>>>> develop
|
||||
* @Description: file content
|
||||
*/
|
||||
export default {
|
||||
@ -181,7 +186,10 @@ export default {
|
||||
remark: 'Remark',
|
||||
PositionNo: 'PositionNo',
|
||||
PositionCode: 'PositionCode',
|
||||
PositionCodeAlias: 'PositionCodeAlias'
|
||||
PositionCodeAlias: 'PositionCodeAlias',
|
||||
scrapped: 'Scrapped',
|
||||
normal: 'Normal',
|
||||
repairing: 'Repairing'
|
||||
},
|
||||
equipment: {
|
||||
EquipmentName: 'Equipment Name',
|
||||
|
@ -1,8 +1,14 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-04 16:13:51
|
||||
<<<<<<< HEAD
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-14 16:22:20
|
||||
* @Description: file content
|
||||
=======
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 10:58:12
|
||||
>>>>>>> develop
|
||||
*/
|
||||
export default {
|
||||
visual: {
|
||||
@ -171,7 +177,11 @@ export default {
|
||||
remark: '备注',
|
||||
PositionNo: '位置序号',
|
||||
PositionCode: '位置编码',
|
||||
PositionCodeAlias: '位置编码别名'
|
||||
PositionCodeAlias: '位置编码别名',
|
||||
scrapped: '报废',
|
||||
normal: '正常',
|
||||
repairing: '维修中'
|
||||
|
||||
},
|
||||
equipment: {
|
||||
shortName: '名称缩写',
|
||||
|
@ -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: {
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
}
|
||||
})
|
||||
|
@ -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: {
|
||||
|
@ -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: '',
|
||||
|
Loading…
Reference in New Issue
Block a user