Merge pull request 'fzq' (#64) 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: #64
This commit is contained in:
commit
74883db1c0
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: zwq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-15 10:17:01
|
* @LastEditTime: 2022-03-15 18:33:48
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -169,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',
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: zwq
|
* @LastEditors: fzq
|
||||||
* @LastEditTime: 2022-03-15 10:16:52
|
* @LastEditTime: 2022-03-15 18:33:48
|
||||||
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
visual: {
|
visual: {
|
||||||
@ -159,7 +160,9 @@ export default {
|
|||||||
processEquipment: '工艺设备',
|
processEquipment: '工艺设备',
|
||||||
sheCode: '货架编码',
|
sheCode: '货架编码',
|
||||||
sheName: '货架名',
|
sheName: '货架名',
|
||||||
locaNum: '库存数量'
|
locaNum: '库存数量',
|
||||||
|
man: '男',
|
||||||
|
woman: '女'
|
||||||
},
|
},
|
||||||
storageBox: {
|
storageBox: {
|
||||||
name: '存储箱名称',
|
name: '存储箱名称',
|
||||||
|
@ -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: [{
|
||||||
|
Loading…
Reference in New Issue
Block a user