@@ -2,7 +2,7 @@ | |||||
* @Author: gtz | * @Author: gtz | ||||
* @Date: 2021-03-04 16:13:51 | * @Date: 2021-03-04 16:13:51 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-18 14:03:12 | |||||
* @LastEditTime: 2022-03-19 10:24:03 | |||||
* @Description: file content | * @Description: file content | ||||
*/ | */ | ||||
export default { | export default { | ||||
@@ -31,6 +31,7 @@ export default { | |||||
Tips: 'Tips', | Tips: 'Tips', | ||||
TipsBefore: 'Are you sure you want to delete', | TipsBefore: 'Are you sure you want to delete', | ||||
TipsStorageBefore: 'Confirm to add location:', | TipsStorageBefore: 'Confirm to add location:', | ||||
PleaseAddLocationFirst: 'Please Add Location First!', | |||||
Description: 'Description', | Description: 'Description', | ||||
Remarks: 'Remarks', | Remarks: 'Remarks', | ||||
Yes: 'Yes', | Yes: 'Yes', | ||||
@@ -175,7 +176,8 @@ export default { | |||||
rowMark: 'Row Mark', | rowMark: 'Row Mark', | ||||
status: 'Status', | status: 'Status', | ||||
man: 'Man', | man: 'Man', | ||||
woman: 'Woman' | |||||
woman: 'Woman', | |||||
locationNumber: 'Location Number' | |||||
}, | }, | ||||
storageBox: { | storageBox: { | ||||
name: 'Name', | name: 'Name', | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: gtz | * @Author: gtz | ||||
* @Date: 2021-03-04 16:13:51 | * @Date: 2021-03-04 16:13:51 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-18 14:56:18 | |||||
* @LastEditTime: 2022-03-20 09:45:01 | |||||
* * @Description: file content | * * @Description: file content | ||||
*/ | */ | ||||
export default { | export default { | ||||
@@ -163,7 +163,8 @@ export default { | |||||
sheName: '货架名', | sheName: '货架名', | ||||
locaNum: '库存数量', | locaNum: '库存数量', | ||||
man: '男', | man: '男', | ||||
woman: '女' | |||||
woman: '女', | |||||
locationNumber: '库位编号' | |||||
}, | }, | ||||
storageBox: { | storageBox: { | ||||
name: '存储箱名称', | name: '存储箱名称', | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2020-12-29 15:41:11 | * @Date: 2020-12-29 15:41:11 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-18 13:53:50 | |||||
* @LastEditTime: 2022-03-19 10:25:46 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -111,6 +111,11 @@ const tableProps = [ | |||||
prop: 'statusName', | prop: 'statusName', | ||||
label: i18n.t('module.basicData.cache.status'), | label: i18n.t('module.basicData.cache.status'), | ||||
align: 'center' | align: 'center' | ||||
}, | |||||
{ | |||||
prop: 'locationNumber', | |||||
label: i18n.t('module.basicData.cache.locationNumber'), | |||||
align: 'center' | |||||
} | } | ||||
] | ] | ||||
@@ -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-15 09:54:52 | |||||
* @LastEditTime: 2022-03-20 09:36:54 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -35,7 +35,7 @@ | |||||
<!-- <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-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable /> | ||||
</el-form-item> --> | </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-select v-model="dataForm.status"> | <el-select v-model="dataForm.status"> | ||||
<el-option | <el-option | ||||
v-for="item in options" | v-for="item in options" | ||||
@@ -44,6 +44,9 @@ | |||||
:value="item.value" | :value="item.value" | ||||
/> | /> | ||||
</el-select> | </el-select> | ||||
</el-form-item> --> | |||||
<el-form-item :label="$t('module.basicData.cache.locationNumber')" prop="locationNumber"> | |||||
<el-input v-model="dataForm.locationNumber" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationNumber')])" clearable /> | |||||
</el-form-item> | </el-form-item> | ||||
</el-form> | </el-form> | ||||
<span slot="footer" class="dialog-footer"> | <span slot="footer" class="dialog-footer"> | ||||
@@ -75,7 +78,8 @@ export default { | |||||
locationNameAlias: '', | locationNameAlias: '', | ||||
rowNum: '', | rowNum: '', | ||||
status: null, | status: null, | ||||
locationType: '' | |||||
locationType: '', | |||||
locationNumber: 0 | |||||
}, | }, | ||||
options: [ | options: [ | ||||
{ | { | ||||
@@ -99,10 +103,13 @@ export default { | |||||
{ 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: [ | layers: [ | ||||
{ pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' } | |||||
{ required: true, pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' } | |||||
], | ], | ||||
columns: [ | columns: [ | ||||
{ pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' } | |||||
{ required: true, pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' } | |||||
], | |||||
locationNumber: [ | |||||
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.locationNumber')]), trigger: 'blur' } | |||||
] | ] | ||||
} | } | ||||
} | } | ||||
@@ -138,7 +145,8 @@ export default { | |||||
'shelfId': this.shelfId, | 'shelfId': this.shelfId, | ||||
'id': this.dataForm.id, | 'id': this.dataForm.id, | ||||
'status': this.dataForm.status, | 'status': this.dataForm.status, | ||||
'locationType': this.dataForm.locationType | |||||
'locationType': this.dataForm.locationType, | |||||
'locationNumber': this.dataForm.locationNumber | |||||
} | } | ||||
if (this.dataForm.id) { | if (this.dataForm.id) { | ||||
locationUpdate(data).then(res => { | locationUpdate(data).then(res => { | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2020-12-29 15:41:11 | * @Date: 2020-12-29 15:41:11 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-10 13:43:01 | |||||
* @LastEditTime: 2022-03-19 10:20:40 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -4,7 +4,7 @@ | |||||
* @Author: fzq | * @Author: fzq | ||||
* @Date: 2022-03-04 20:54:54 | * @Date: 2022-03-04 20:54:54 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-18 14:55:13 | |||||
* @LastEditTime: 2022-03-20 09:31:14 | |||||
--> | --> | ||||
<template> | <template> | ||||
<div class="app-container"> | <div class="app-container"> | ||||
@@ -4,7 +4,7 @@ | |||||
* @Author: fzq | * @Author: fzq | ||||
* @Date: 2022-03-05 17:45:46 | * @Date: 2022-03-05 17:45:46 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-18 14:46:26 | |||||
* @LastEditTime: 2022-03-20 09:35:03 | |||||
--> | --> | ||||
<template> | <template> | ||||
<!-- <el-dialog | <!-- <el-dialog | ||||
@@ -19,8 +19,8 @@ | |||||
<el-form-item :label="$t('module.report.substrate.substrateCode')" prop="substrateCode"> | <el-form-item :label="$t('module.report.substrate.substrateCode')" prop="substrateCode"> | ||||
<el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable /> | <el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable /> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item :label="$t('module.report.substrate.location')" prop="locationName"> | |||||
<el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable /> | |||||
<el-form-item :label="$t('module.report.substrate.location')" prop="subPosition"> | |||||
<el-input v-model="dataForm.subPosition" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable /> | |||||
</el-form-item> | </el-form-item> | ||||
<el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime"> | <el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime"> | ||||
<el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable /> | <el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable /> | ||||
@@ -159,7 +159,7 @@ export default { | |||||
'storeTime': this.dataForm.storeTime, | 'storeTime': this.dataForm.storeTime, | ||||
'id': this.dataForm.id, | 'id': this.dataForm.id, | ||||
'substrateCode': this.dataForm.substrateCode, | 'substrateCode': this.dataForm.substrateCode, | ||||
'locationName': this.dataForm.locationName, | |||||
'subPosition': this.dataForm.subPosition, | |||||
// 'interCode': this.dataForm.interCode, | // 'interCode': this.dataForm.interCode, | ||||
'storageBoxFid': this.dataForm.storageBoxFid, | 'storageBoxFid': this.dataForm.storageBoxFid, | ||||
'machineHandID': this.dataForm.machineHandID, | 'machineHandID': this.dataForm.machineHandID, | ||||
@@ -4,7 +4,7 @@ | |||||
* @Author: fzq | * @Author: fzq | ||||
* @Date: 2022-03-05 15:55:45 | * @Date: 2022-03-05 15:55:45 | ||||
* @LastEditors: fzq | * @LastEditors: fzq | ||||
* @LastEditTime: 2022-03-18 14:39:56 | |||||
* @LastEditTime: 2022-03-20 09:35:05 | |||||
--> | --> | ||||
<template> | <template> | ||||
<div class="app-container"> | <div class="app-container"> | ||||
@@ -71,7 +71,7 @@ const tableProps = [ | |||||
align: 'center' | align: 'center' | ||||
}, | }, | ||||
{ | { | ||||
prop: 'locationName', | |||||
prop: 'subPosition', | |||||
label: i18n.t('module.report.substrate.location'), | label: i18n.t('module.report.substrate.location'), | ||||
align: 'center' | align: 'center' | ||||
}, | }, | ||||