diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index b9bd734cd..82e3aff4a 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1411,5 +1411,7 @@ module.exports = {
conditionsNotMet:'Conditions not met',
onlyProcessStatusReturned:'Only the data whose process status is list to be checked and rejected by the responsible person can be returned',
onlyProcessReturned:'Only data with process status of list to be checked and rejected by responsible person can be initiated',
-
+ confirmToAcceptTheTask:'Confirm to accept the task ?',
+ confirmRejectTask:'Confirm Reject Task ?',
+ onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected',
}
\ 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 f256d2c70..1ceca39a7 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1512,4 +1512,7 @@ module.exports = {
conditionsNotMet:'不满足条件',
onlyProcessStatusReturned:'只能退回流程状态为清单待校核和责任人拒绝的数据',
onlyProcessReturned:'只能发起流程状态为清单待校核和责任人拒绝的数据',
+ confirmToAcceptTheTask:'确认接受任务?',
+ confirmRejectTask:'确认拒绝任务?',
+ onlyDataStatusConfirmedSelected:'只能选择流程状态为任务待确认的数据',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index c0e8b6c67..73d765295 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -212,14 +212,14 @@
-
{{ $t('missionAccepted') }}
-
{{ $t('missionRejection') }}
@@ -1042,14 +1042,6 @@
//审批退回
returnedForApprovalClick() {
- },
- //任务接受
- missionAcceptedClick() {
-
- },
- //任务退回
- missionRejectionClick() {
-
},
//提交
submitClick() {
@@ -1099,12 +1091,12 @@
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
ids.push(this.selectedRowKeysList[i].id)
} else {
- notConditions.push(this.selectedRowKeysList[i].serialNumber)
+ notConditions.push(this.selectedRowKeysList[i].inspectionItem)
}
}
let data = ''
if (notConditions && notConditions.length > 0) {
- data = this.$t('standardNo') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessReturned')
+ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessReturned')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
@@ -1125,12 +1117,37 @@
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
ids.push(this.selectedRowKeysList[i].id)
} else {
- notConditions.push(this.selectedRowKeysList[i].serialNumber)
+ notConditions.push(this.selectedRowKeysList[i].inspectionItem)
}
}
let data = ''
if (notConditions && notConditions.length > 0) {
- data = this.$t('standardNo') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusReturned')
+ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessStatusReturned')
+ }
+ if (ids && ids.length > 0) {
+ this.submitTask(value, prompt, ids, notConditions, data)
+ } else {
+ this.failedMessage(data)
+ }
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
+ },
+ //任务接受\拒绝
+ missionAcceptedClick(value,prompt) {
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ let ids = []
+ let notConditions = []
+ for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+ if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') {
+ ids.push(this.selectedRowKeysList[i].id)
+ } else {
+ notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+ }
+ }
+ let data = ''
+ if (notConditions && notConditions.length > 0) {
+ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusConfirmedSelected')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)