Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/store/modules/user.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
This commit is contained in:
高嵩
2022-10-27 09:49:39 +08:00
68 changed files with 7336 additions and 117 deletions
+15 -2
View File
@@ -516,8 +516,8 @@ module.exports = {
AddProcess: '添加流程',
RelatedItems: '相关项目',
Sponsor: '发起人',
CurrentProcessor: '当前处理人',
LastProcessor: '上一处理人',
CurrentProcessor: '当前操作人',
LastProcessor: '上一操作人',
ProcessingTime: '办理时间',
cutoffTime: '截止时间',
ProcessStatus: '流程状态',
@@ -1438,4 +1438,17 @@ module.exports = {
Topping:'置顶',
cancelTopping:'取消置顶',
relatedProjectVersion:'相关项目版本',
taskType:'任务类型',
taskStatus:'任务状态',
taskConfirmationHandling:'任务确认办理',
relatedVersion:'相关版本',
filledBy:'待分配填写人',
parameterToBeInitiated:'参数待发起',
listTaskConfirmation:'清单任务确认',
completednum: '待填写',
filledBynum:'待分配填写人',
parameterToBeInitiatednum:'参数待发起',
listToConfirm:'待确认',
toSubmit:'待提交',
toAudit:'待审核',
}