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 @@
+
+
+
+
+
+
+
+
+ {{$t('edit')}}
+ {{$t('details')}}
+ {{$t('answer')}}
+ {{$t('deleteLib')}}
+
+
+
+
+
+
+
+
+ *
+ {{$t('engineer')}}
+
+
+
+
+
+
+
+
+
+ *
+ {{$t('feedbackFromTheEngineer')}}
+
+
+
+
+
+
+
+
+
+ *
+ {{$t('Deliverables')}}
+
+
+
+ {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
+ formInline.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ }}
+
+
+
+
+
+
+
+ *
+ {{$t('replyFromProjectContactPerson')}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('cancel')}}
+
+
+
+
+ {{this.$t('feedbackFromTheEngineer')}}:
+
+
+
+ {{this.formInlineDetails.engineerFeedbackContent}}
+
+
+
+
+
+ {{this.$t('Deliverables')}}:
+
+
+
+ {{ (formInlineDetails.fileId === 'null' || formInlineDetails.fileId === '' ||
+ formInlineDetails.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ }}
+
+
+
+
+
+ {{this.$t('completedBy')}}:
+
+
+
+ {{formInlineDetails.createBy}}
+
+
+
+
+
+ {{this.$t('completedTime')}}:
+
+
+
+ {{formInlineDetails.createTime}}
+
+
+
+
+
+ {{this.$t('replyFromProjectContactPerson')}}:
+
+
+
+ {{formInlineDetails.engineeringInterfacePersonReply}}
+
+
+
+
+
+
+
+ {{$t('cancel')}}
+
+
+
+
+ {{$t('reminder')}}
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
@@ -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