diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue index 7d35bace..882c06e4 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue @@ -301,6 +301,7 @@ export default { this.delIds.push(...this.selectedRowKeys.filter(item => !item.includes(tempIdPrefix))) this.dataSource = this.dataSource.filter((item) => !this.selectedRowKeys.includes(item.id)) this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) } @@ -318,6 +319,7 @@ export default { } this.dataSource.splice(index, 1) this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) }, diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue index 0eb55a45..b93c7b26 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue @@ -168,6 +168,8 @@ export default { if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) { this.ipagination.current -= 1 } + this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) }, diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue index e6201ea4..8778392f 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue @@ -219,6 +219,8 @@ export default { if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) { this.ipagination.current -= 1 } + this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) }, diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue index 7e523bd9..9bdd8493 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue @@ -247,6 +247,11 @@ export default { handleOk () { this.$refs.form.validate(valid => { if (valid) { + // 如果没有稽查报告id,就提示 + if (!this.form.inspectReportId) { + this.$message.warning(this.$t('workCenter.esInspectionProcess.noInspectionReportAvailable')) + return + } const params = Object.assign({}, this.model, this.form) if (!params.processEsInspectId) { params.processEsInspectId = this.data.id @@ -358,7 +363,11 @@ export default { const contentList = this.data.enterpriseStandardInspectContentList || [] const reportList = this.data.enterpriseStandardInspectReportList || [] const content = contentList.find(item => item.id === val) || {} - const report = reportList.find(item => item.inspectContentId === val) || {} + const report = reportList.find(item => item.inspectContentId === val) || { + inspectContentId: content.id, + baseClause: content.clause, + standardRequire: content.requirement + } this.form.inspectReportId = report.id this.form.standardRequire = content.requirement this.form.executionStatus = report.executionStatus diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue index 62eaa24e..5ddcb54b 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue @@ -194,6 +194,12 @@ export default { title: this.$t('confirmDeletion'), content: this.$t('areYouSure'), onOk: () => { + // 如果整改计划已经关联,那就不可以删除该稽查报告 + const rectifyPlanList = this.model.enterpriseStandardInspectRectifyPlanList + if (rectifyPlanList && rectifyPlanList.some(item => item.inspectReportId === this.dataSource[index].id)) { + this.$message.warning(this.$t('workCenter.esInspectionProcess.contentLinkRectificationPlan')) + return + } if (this.dataSource[index].id) { this.delIds.push(this.dataSource[index].id) } @@ -202,6 +208,8 @@ export default { if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) { this.ipagination.current -= 1 } + this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) }, diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue index 2a249639..c3f8c162 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue @@ -345,6 +345,8 @@ export default { this.delIds.push(this.dataSource[index].id) } this.dataSource.splice(index, 1) + this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) }, diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue index 6f16fff8..409a001d 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue @@ -233,6 +233,8 @@ export default { this.delIds.push(this.dataSource[index].id) } this.dataSource.splice(index, 1) + this.onClearSelected() + this.$message.success(this.$t('operationSuccessful')) } }) }, diff --git a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue index a54c6eee..8357cb0c 100644 --- a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue +++ b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue @@ -116,6 +116,7 @@ export default { content: this.$t('areYouSure'), onOk: () => { this.dataSource.splice(index, 1) + this.$message.success(this.$t('operationSuccessful')) } }) },