Merge pull request '修改bug' (#79) from zwq 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: #79
This commit is contained in:
commit
6d3309ed2b
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: fzq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-19 10:24:03
|
* @LastEditTime: 2022-03-22 10:35:16
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -362,6 +362,11 @@ export default {
|
|||||||
publishTask: 'Publish The Task',
|
publishTask: 'Publish The Task',
|
||||||
startPosition: 'Start',
|
startPosition: 'Start',
|
||||||
endPosition: 'End',
|
endPosition: 'End',
|
||||||
taskType: 'Task Type'
|
taskType: 'Task Type',
|
||||||
|
ExWarehouse: 'Ex Warehouse',
|
||||||
|
InWarehouse: 'In Warehouse',
|
||||||
|
Circulation: 'Circulation',
|
||||||
|
Initialization: 'Initialization',
|
||||||
|
Damage: 'Damage'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: fzq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-20 09:45:01
|
* @LastEditTime: 2022-03-22 10:34:57
|
||||||
* * @Description: file content
|
* * @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -366,6 +366,11 @@ export default {
|
|||||||
publishTask: '发布任务',
|
publishTask: '发布任务',
|
||||||
startPosition: '起点',
|
startPosition: '起点',
|
||||||
endPosition: '终点',
|
endPosition: '终点',
|
||||||
taskType: '任务类型'
|
taskType: '任务类型',
|
||||||
|
ExWarehouse: '出库',
|
||||||
|
InWarehouse: '入库',
|
||||||
|
Circulation: '流转',
|
||||||
|
Initialization: '初始化',
|
||||||
|
Damage: '损坏'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-16 09:45:43
|
* @LastEditTime: 2022-03-22 10:36:05
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -194,20 +194,20 @@ export default {
|
|||||||
size: 10
|
size: 10
|
||||||
},
|
},
|
||||||
taskTypeList: [{
|
taskTypeList: [{
|
||||||
'label': '出库',
|
'label': i18n.t('module.basicData.Warehouse.ExWarehouse'),
|
||||||
'value': 0
|
'value': 0
|
||||||
}, {
|
}, {
|
||||||
'label': '入库',
|
'label': i18n.t('module.basicData.Warehouse.InWarehouse'),
|
||||||
'value': 1
|
'value': 1
|
||||||
}, {
|
}, {
|
||||||
'label': '流转',
|
'label': i18n.t('module.basicData.Warehouse.Circulation'),
|
||||||
'value': 2
|
'value': 2
|
||||||
}],
|
}],
|
||||||
TaskStatusList: [{
|
TaskStatusList: [{
|
||||||
'label': '初始化',
|
'label': i18n.t('module.basicData.Warehouse.Initialization'),
|
||||||
'value': 0
|
'value': 0
|
||||||
}, {
|
}, {
|
||||||
'label': '损坏',
|
'label': i18n.t('module.basicData.Warehouse.Damage'),
|
||||||
'value': 1
|
'value': 1
|
||||||
}],
|
}],
|
||||||
VehicleNameList: [{
|
VehicleNameList: [{
|
||||||
|
Loading…
Reference in New Issue
Block a user