diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 72373bebd..2a48eadea 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -856,4 +856,5 @@ module.exports = {
confirmOperation:'Confirm Operation',
sponsorReview:'Sponsor review',
fillInProjectDelivery:'Fill in project delivery',
+ Resubmit:'Resubmit',
}
\ 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 c815f66b7..2045b71d1 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -861,4 +861,5 @@ module.exports = {
confirmOperation:'确认操作',
sponsorReview:'发起人审查',
fillInProjectDelivery:'填写工程交付',
+ Resubmit:'重新提交',
}
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 3147ed8e1..f485910d0 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -6,9 +6,9 @@
+ v-if="$route.query.TaskKey == 'zrrclrw'"
+ @click="distributionEngineerClick($t('addFeedback'),2)">
{{ $t('addFeedback') }}
@@ -384,7 +384,7 @@
]
},
visibleDetails: false,
- columns: [
+ columnsAll: [
{
title: this.$t('serialNumber'),
dataIndex: 'index',
@@ -450,6 +450,20 @@
mounted() {
this.getList()
},
+ computed: {
+ columns() {
+ let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
+ if (this.$route.query.TaskKey != 'zrrclrw') {
+ for (var i = 0; i < columnResult.length; i++) {
+ if (columnResult[i].title === this.$t('operation')) {
+ columnResult.splice(i, 1)
+ i--
+ }
+ }
+ }
+ return columnResult
+ }
+ },
methods: {
pageOnChange(page, pageSize) {
this.pageNo = page
@@ -525,10 +539,13 @@
handleCancel() {
this.visible = false
},
- distributionEngineerClick(title) {
+ distributionEngineerClick(title, num) {
this.title = title
this.visible = true
this.formInline = {}
+ if (num == 1) {
+ this.getReminderHandlingList(1)
+ }
this.$nextTick(() => {
this.$refs.ruleForm.validateField()
})
@@ -563,9 +580,9 @@
},
reminderHandling() {
this.visibleTable = true
- this.getReminderHandlingList()
+ this.getReminderHandlingList(2)
},
- getReminderHandlingList() {
+ getReminderHandlingList(num) {
this.loadingTable = true
let query = {
taskDefinitionKey: 'dreDispose',
@@ -574,6 +591,24 @@
getAction(this.url.queryByActiProcInstId, query).then((res) => {
if (res.success) {
this.dataSourceTable = res.result || []
+ if (num == 1) {
+ this.distributionEngineerList = []
+ let userName = []
+ let userId = []
+ if (this.dataSourceTable && this.dataSourceTable.length > 0) {
+ this.dataSourceTable.forEach(val => {
+ this.distributionEngineerList.push({
+ name: val.userName,
+ userId: val.userId,
+ deliveryInstructions: val.deliveryInstructions
+ })
+ userName.push(val.userName)
+ userId.push(val.userId)
+ })
+ }
+ this.formInline.userId = userId.join(',')
+ this.formInline.userName = userName.join(',')
+ }
this.loadingTable = false
} else {
this.dataSourceTable = []
diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue
index 574dbc2e8..3c01e42c5 100644
--- a/jero-web/src/views/processCenter/components/footerProcess.vue
+++ b/jero-web/src/views/processCenter/components/footerProcess.vue
@@ -15,7 +15,8 @@
-
+
+
@@ -59,7 +60,11 @@
isAdopt: {
type: Boolean,
default: false
- }
+ },
+ isResubmit:{
+ type: Boolean,
+ default: false
+ },
},
methods: {
terminationProcess() {
@@ -82,6 +87,10 @@
},
backTo() {
+ },
+ Resubmit(){
+ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+ this.$emit('Resubmit', handlingTime)
},
adopt() {
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
@@ -108,7 +117,8 @@
.header-btn {
margin-right: 10px;
}
- .header-btn:last-child{
+
+ .header-btn:last-child {
margin-right: 0;
}
}
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 5c81f85b6..696d8a45a 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -56,7 +56,7 @@