diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6a69c579a..ec2b465bc 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1080,7 +1080,7 @@ ...this.queryParam, ids: selectedRowKeys.join(','), ...this.queryParamQuery, - roleCode:roleCodeIndex, + roleCode: roleCodeIndex, projectLibraryId: this.$route.query.id } downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect) @@ -1629,30 +1629,42 @@ this.detailedWarningList = [] }) } else { - for (let i = 0; i < this.TaskSuccessList.length; i++) { - ((i) => { - this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate - Object.keys(this.TaskSuccessList[i]).forEach(res => { - if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') - } - }) - setTimeout(() => { - this.confirmLoading = true - this.startProcess(this.TaskSuccessList[i], (i + 1)) - }, 500) - })(i) + // for (let i = 0; i < this.TaskSuccessList.length; i++) { + // ((i) => { + // this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + // Object.keys(this.TaskSuccessList[i]).forEach(res => { + // if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { + // this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') + // this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') + // } + // }) + // setTimeout(() => { + // this.confirmLoading = true + // this.startProcess(this.TaskSuccessList[i], (i + 1)) + // }, 500) + // })(i) + // } + let TaskSuccessList = JSON.parse(JSON.stringify(this.TaskSuccessList)) + for (let i = 0; i < TaskSuccessList.length; i++) { + TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + Object.keys(TaskSuccessList[i]).forEach(res => { + if (TaskSuccessList[i][res] && TaskSuccessList[i][res] instanceof String) { + TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\"/g, '“') + TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\'/g, '‘') + } + }) } + this.confirmLoading = true + this.startProcess(TaskSuccessList) } } }) }, - startProcess(value, index) { + startProcess(value) { let query = { type: 1, - msg: JSON.stringify(value).replace(/\"/g, '\''), + projectLawsInvnetoryList:value, projectNameId: this.$route.query.projectNameId, projectName: this.$route.query.projectName, projectLawsInventoryId: value.id, @@ -1660,7 +1672,24 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result, index) + this.visible = false + this.selectedRowKeys = [] + this.$message.success(this.$t('OperationSuccessful')) + this.confirmLoading = false + this.getList() + let that = this + if (this.TaskWarningList.length > 0) { + this.$warning({ + content: ( + < div > + { that.TaskWarningList } + < /div> + ) + }) + } + // this.completeTask(value, res.result, index) + }else{ + this.$message.warning(this.$t('operationFailed')) } }) },