diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 513053f61..6ccd21d38 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -336,7 +336,7 @@ module.exports = { Users: 'users', reduction: 'reduction', UsersSucceeded: 'users succeeded!', - standard: 'serial number', + standard: 'Number', title: 'title', TextStatus: 'TextStatus', PleaseEnter: 'Please enter', @@ -523,7 +523,7 @@ module.exports = { newClause: 'new clause', clauseNo: 'clause No.', functionalAreas: 'functional areas', - technicalField: 'technical field', + technicalField: 'Technical Field', informationCategory: 'information category', contentValidity: 'content validity', content: 'content', @@ -554,11 +554,10 @@ module.exports = { newNode: 'new node', modifyNode: 'modify node', deleteNode: 'delete node', - ImplementationDate: 'Implementation Date', - vehicleInProductionDate: 'vehicle in Production Date', + ImplementationDate: 'New Type Execute Date', + vehicleInProductionDate: 'New Vehicle Execute Date', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', leastTwo: 'please select at least two pieces of data', - vehicleInProductionDate: 'vehicle in Production Date', mergeTerms: 'determine merger terms', documentSplitTemplate: 'document split template', batSetting: 'batch setting', @@ -581,14 +580,14 @@ module.exports = { withdraw: 'withdraw', maintenanceList: 'Maintenance list', instructionForUse: 'instruction for use', - subtitle: 'subtitle', + subtitle: 'Sub-Title', scopeOfApplication: 'Scope of application', correspondingStandard: 'Corresponding standard', implementationCategory: 'Implementation category', certificationType: 'Certification Type', - certificationLevel: 'Certification level', - areaOfResponsibility: 'Area of responsibility', - confirmationOfDesignConformity: 'Confirmation of design conformity', + certificationLevel: 'Certification Level', + areaOfResponsibility: 'Responsible Field', + confirmationOfDesignConformity: 'Design Compliance Check Deliverable', Deliverables: 'Deliverables', personLiable: 'person liable', PrehomoConfirmation: 'Prehomo confirmation', @@ -756,4 +755,19 @@ module.exports = { VirtualList:'VirtualList', importTemplate:'import template', verificationConfirmationDeadline:'Verification compliance confirmation deadline', + technicalEvaluationResults:'technical evaluation results', + engineeringConfirmation:'engineeringConfirmation', + feedbackFromTheEngineer:'Feedback from the Engineer', + completedBy:'Completed by', + completedTime:'Completed time', + replyFromProjectContactPerson:'Reply from project contact person', + answer:'answer', + distributionEngineer:'Distribution Engineer', + reminderHandling:'Reminder handling', + addFeedback:'Add feedback', + engineer:'engineer', + engineeringConfirmationDetails:'Engineering confirmation details', + reminder:'reminder', + adopt:'adopt', + reviewedByThePersonInCharge:'Reviewed by the person in charge', } \ 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 2e078e997..34867ed23 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -560,7 +560,6 @@ module.exports = { deleteNode: '删除节点', ImplementationDate: '新车型实施日期', vehicleInProductionDate: '在产车实施日期', - vehicleInProductionDate: '在产车实施日期', deleteNodes: '该节点下若有子节点将同步删除,确认删除该条数据?', leastTwo: '请选择至少两条数据', mergeTerms: '确定合并条款', @@ -761,4 +760,19 @@ module.exports = { standardInformation:'标准信息', importTemplate:'导入模板', verificationConfirmationDeadline:'验证符合性确认截止时间', + technicalEvaluationResults:'技术评估结果', + engineeringConfirmation:'工程确认', + feedbackFromTheEngineer:'工程师反馈意见', + completedBy:'填写人', + completedTime:'填写时间', + replyFromProjectContactPerson:'工程接口人回复', + answer:'回复', + distributionEngineer:'分发工程师', + reminderHandling:'提醒办理', + addFeedback:'添加反馈', + engineer:'工程师', + engineeringConfirmationDetails:'工程确认详情', + reminder:'提醒', + adopt:'通过', + reviewedByThePersonInCharge:'负责人审核', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 8dc37c162..6e2f408d4 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -90,6 +90,7 @@ this.$route.path == '/system/MessageDetails' || this.$route.path == '/ProcessMapping' || this.$route.path == '/virtualListDetails' || + this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || this.$route.path == '/handshakeProcess' || this.$route.path == '/historicalVersion' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index b63bf562a..bbe87b83f 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -337,6 +337,11 @@ export const constantRouterMap = [ name: 'ProjectDetails', component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index') }, + { + path: '/taskListProcess', + name: 'taskListProcess', + component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index') + }, { path: '/handshakeProcess', name: 'handshakeProcess', diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 9401e5bb7..1f365c633 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -57,7 +57,7 @@