This commit is contained in:
Fanzink 2022-03-16 09:41:00 +08:00
parent 6ac3fcb572
commit 79b7fe0eec
3 changed files with 16 additions and 18 deletions

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-14 16:22:38 * @LastEditTime: 2022-03-15 18:33:48
=======
* @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:58:20
>>>>>>> develop
* @Description: file content * @Description: file content
*/ */
export default { export default {
@ -174,7 +169,13 @@ export default {
processEquipment: 'Process Equipment', processEquipment: 'Process Equipment',
sheCode: 'Shelf Code', sheCode: 'Shelf Code',
sheName: 'Shelf Name', sheName: 'Shelf Name',
locaNum: 'Location Number' locaNum: 'Location Number',
addLocation: 'Add Location',
columnMark: 'Column Mark',
rowMark: 'Row Mark',
status: 'Status',
man: 'Man',
woman: 'Woman'
}, },
storageBox: { storageBox: {
name: 'Name', name: 'Name',

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-14 16:22:20 * @LastEditTime: 2022-03-15 18:33:24
* @Description: file content * @Description: file content
=======
* @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:58:12
>>>>>>> develop
*/ */
export default { export default {
visual: { visual: {
@ -165,7 +160,9 @@ export default {
processEquipment: '工艺设备', processEquipment: '工艺设备',
sheCode: '货架编码', sheCode: '货架编码',
sheName: '货架名', sheName: '货架名',
locaNum: '库存数量' locaNum: '库存数量',
man: '男',
woman: '女'
}, },
storageBox: { storageBox: {
name: '存储箱名称', name: '存储箱名称',

View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: fzq
* @LastEditTime: 2022-03-04 10:06:01 * @LastEditTime: 2022-03-15 18:33:01
* @Description: * @Description:
--> -->
<template> <template>
@ -169,10 +169,10 @@ export default {
}] }]
}, },
sexOptions: [{ sexOptions: [{
'label': '男', 'label': this.$t('module.basicData.cache.man'),
'value': 1 'value': 1
}, { }, {
'label': '女', 'label': this.$t('module.basicData.cache.woman'),
'value': 0 'value': 0
}], }],
onDutyOptions: [{ onDutyOptions: [{