From 7b365267cf7118f45bdd96ef49995ac51e16b8f2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 17:44:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 15 + jero-web/src/common/lang/zh-cn.js | 15 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/engineeringConfirmation.vue | 504 ++++++++++++++++++ .../components/examineInformation.vue | 7 + .../components/headerProcess.vue | 11 +- .../components/projectInformation.vue | 22 +- .../reviewedByThePersonInCharge.vue | 166 ++++++ .../components/standardContent.vue | 29 +- .../processForm/taskListProcess/index.vue | 218 ++++++++ 11 files changed, 988 insertions(+), 5 deletions(-) create mode 100644 jero-web/src/views/processCenter/components/engineeringConfirmation.vue create mode 100644 jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue create mode 100644 jero-web/src/views/processCenter/processForm/taskListProcess/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 513053f61..608f7d1e4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -756,4 +756,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..dca0943de 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -761,4 +761,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/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue new file mode 100644 index 000000000..924bdf4cf --- /dev/null +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -0,0 +1,504 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 35f7a1bc9..2ebaeba43 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -133,6 +133,13 @@ message: this.$t('selectIssuer') + this.$t('cannotEmpty'), trigger: 'change' } + ], + approvalOpinion: [ + { + max: 300, + message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } ] } } diff --git a/jero-web/src/views/processCenter/components/headerProcess.vue b/jero-web/src/views/processCenter/components/headerProcess.vue index cce5f446f..9f552f7fc 100644 --- a/jero-web/src/views/processCenter/components/headerProcess.vue +++ b/jero-web/src/views/processCenter/components/headerProcess.vue @@ -19,6 +19,7 @@ {{$t('sendBack')}} + {{$t('adopt')}} @@ -59,6 +60,10 @@ type: Boolean, default: false }, + isAdopt:{ + type: Boolean, + default: false + }, }, methods: { terminationProcess() { @@ -81,7 +86,11 @@ }, backTo() { - } + }, + adopt(){ + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + this.$emit('adopt',handlingTime) + }, } } diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 741df14d7..7ee7a03e7 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -8,13 +8,23 @@
{{item.title}} + {{queryForm[item.value]}} {{queryForm[item.value]}}
- + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 11a198058..722669fca 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -8,13 +8,25 @@
{{item.title}} - {{queryForm[item.value]}} + + {{queryForm[item.value]}}
- + @@ -98,6 +116,11 @@ color: #040B29; font-weight: 400; } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + } } } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue new file mode 100644 index 000000000..d0796936e --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -0,0 +1,218 @@ + + + + + \ No newline at end of file From 2e06ed2496b4ba58a55b10833e3b2a9ad9241298 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 18:02:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/editModel.vue | 2 +- .../components/listOfRelevantPersonnel.vue | 38 ++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) 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 @@
WVTA ID
- + {{$t('remarks')}} - + { this.formInline = JSON.parse(JSON.stringify(item)) + this.$refs.ruleForm.clearValidate() }) }, PersonnelSelectionChange(value, id) { From 852c70953a5278cf61514134b5b92278039c50d5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 18:13:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 17 ++++++++--------- jero-web/src/common/lang/zh-cn.js | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 608f7d1e4..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', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index dca0943de..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: '确定合并条款',