From 6ae5efebd4319c3f92252b0c0106c8dadeead597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 7 Jul 2023 17:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 11 +++++------ jero-web/src/common/lang/zh-cn.js | 6 +----- jero-web/src/views/phoneView/processManagement.vue | 7 ++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 65c817c45..f42881606 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -875,7 +875,7 @@ module.exports = { engineer: 'Engineer', engineeringConfirmationDetails: 'Engineering Deliverable Details', reminder: 'Reminder', - adopt: 'Pass', + adopt: 'Approve', reviewedByThePersonInCharge: 'Reviewed by Owner', onlyDeleted: 'Only delete data when the process is not started or already ended', experimentPassed: 'Test Passed', @@ -1037,7 +1037,7 @@ module.exports = { primaryCoverageEn: 'Description (En)', workProgressCn: 'NIO Work Progress (Cn)', workProgressEn: 'NIO Work Progress (En)', - initiatingProcess: 'Initiate Process', + initiatingProcess: 'Process Initiation', collectResults: 'Collect Results', dateOfInitiation: 'Date Of Initiation', closingDate: 'Due Date', @@ -1526,7 +1526,7 @@ module.exports = { VINcodelist:'VIN code list', VINcodeupload:'VIN code upload', Tasknode:'Task Node', - Taskresponsibilityrecognition:'Responsibility Confirm', + Taskresponsibilityrecognition:'Responsibilty Confirmation', uploadattachment:'Upload', Processhistory:'Process History', historyData:'1. Regulatory Engineer, 2. Responsible person, 3. Responsible person, 4. Regulatory Engineer', @@ -1665,7 +1665,6 @@ module.exports = { taskname:'Task name', updatereleasetime:'Update release time', upgradeplanexpirationtime:'Upgrade plan expiration time', - resultofhandling:'Result of handling', Listoftreatableregulations:'List of treatable regulations', Listofuntractableregulations:'List of untractable regulations', project:'Project', @@ -1713,7 +1712,6 @@ module.exports = { implementedupgrade:'Whether the implemented upgrade is consistent with the record', numberofvehicles:'Number of vehicles that have completed upgrades', vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade', - cause:'cause', implementationrecords:'Fault handling measures and emergency response implementation records', onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted', implementationDateTwo:'Implementation Date', @@ -1757,7 +1755,7 @@ module.exports = { resultsToBeReviewed:'Results to be reviewed', compliance:'Compliance', nonCompliance:'Non-compliance', - toBeTracked:'To be Tracked', + toBeTracked:'To be tracked', NA:'NA', electroniccontrollerparameter:'Electronic controller parameter', reviewAndPass:'Approve', @@ -1906,4 +1904,5 @@ module.exports = { documentsHaveBeenStored:'documents have been stored', knowledgeSharingHaveBeenStored:'Knowledge Sharing have been stored', regulationMonthlyReportHaveBeenStored:'Regulation Monthly Report have been stored', + sendBackOne:'Return', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 18e2c3ae7..96f81402f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1638,7 +1638,6 @@ module.exports = { Categoryofdeliverables: "交付物类型", Taskconfirmationresult: '任务确认结果', Compliancetaskhandling: '符合性任务办理', - resultofhandling: '处理结果', networksecurityrequirements: '网络安全要求', upgradefunctionrequirements: '升级功能要求', usernotificationrequirement: '用户告知要求', @@ -2839,8 +2838,6 @@ module.exports = { blueUndeterminedState: '蓝:未判断状态', authenticationMessage: '认证参数任务', taskRegulationComplianceTask: '法规符合性任务', - accept: '接受', - refuse: '拒绝', taskTermination: '任务终止', projectStatusAndProgress: '项目状态进度', listConfirmationProgress: '清单确认进度', @@ -3540,14 +3537,12 @@ module.exports = { uploadattachment: '上传附件', Processhistory: '流程历史', historyData: '1.法规工程师,2.责任人,3.责任人,4.法规工程师', - resultofhandling: '处理结果', Listoftreatableregulations: '可处理法规列表', Listofuntractableregulations: '不可处理法规列表', project: '项目', Categoryofdeliverables: "交付物类型", Taskconfirmationresult: '任务确认结果', Compliancetaskhandling: '符合性任务办理', - resultofhandling: '处理结果', networksecurityrequirements: '网络安全要求', upgradefunctionrequirements: '升级功能要求', usernotificationrequirement: '用户告知要求', @@ -3866,4 +3861,5 @@ module.exports = { includeTitle:'包含标题', Notitleincluded:'不包含标题', backToHomePage:'返回主页', + sendBackOne:'退回', } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index a3816a618..97e48de40 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -143,9 +143,14 @@ + queryData.TaskKey == 'zrrtjjfw'"> {{$t('sendBack')}} + + {{$t('sendBackOne')}} + +