From 25451fd6c01d08cd4f5e7206b63f9b1eab62b236 Mon Sep 17 00:00:00 2001 From: danshihao Date: Sun, 7 Jan 2024 11:56:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=A8=BD=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectionProcess.vue | 17 +++++- .../InspectionProcessRectificationPlan.vue | 4 +- ...nspectionProcessRectificationPlanModal.vue | 60 ++++++++++--------- .../modules/InspectionProcessReport.vue | 2 +- .../modules/InspectionProcessReportModal.vue | 21 ++++--- 5 files changed, 65 insertions(+), 39 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue index 70e09eee..58a063e3 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue @@ -330,7 +330,22 @@ export default { } const params = {} // 收集表格数据 - params.processEsInspectList = this.$refs.inspectionProcessTable.dataSource + params.processEsInspectList = this.$refs.inspectionProcessTable.dataSource.map(item => { + // 如果没有子表格数据，就默认空数组，否则后端报错 + // 稽查内容 + if (!item.enterpriseStandardInspectContentList) { + item.enterpriseStandardInspectContentList = [] + } + // 稽查报告 + if (!item.enterpriseStandardInspectReportList) { + item.enterpriseStandardInspectReportList = [] + } + // 整改计划 + if (!item.enterpriseStandardInspectRectifyPlanList) { + item.enterpriseStandardInspectRectifyPlanList = [] + } + return item + }) // 获取删除业务信息的ids列表 params.processAllDelIds = this.$refs.inspectionProcessTable.getDelIds() // 收集所有表单信息 diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue index 218abac2..7b89b4c1 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue @@ -48,7 +48,7 @@ - + @@ -149,7 +149,7 @@ export default { dataSource: [], // 需要删除的数据id（前端添加后没有保存表的数据没有id） delIds: [], - columns: columns.slice(0, this.disabled ? 6 : 7) + columns: columns.slice(0, this.disabled ? 8 : 9) } }, methods: { diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue index fb9343d0..54d1fb5b 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue @@ -19,6 +19,7 @@ {{ item.clause }} @@ -145,14 +146,17 @@ import UploadFile from '@comp/UploadFile' import UserSelection from '@comp/selection/UserSelection' -import { - getInspectionContentTable, - queryByInspectContentId -} from '@api/workCenter' import moment from 'moment' export default { name: 'InspectionProcessRectificationPlanModal', components: { UserSelection, UploadFile }, + props: { + // 临时的数据，如果不提交就不保存 + tempDataSource: { + type: Array, + default: () => [] + } + }, data () { return { title: this.$t('workCenter.esInspectionProcess.inspectionPlanEs'), @@ -224,10 +228,10 @@ export default { this.index = index // 获取章节条款下拉 this.initSectionClauseList() - const { inspectContentId, requirement, executionStatus, attachment, evaluateScore } = record.enterpriseStandardInspectReport || {} + const { standardRequire, executionStatus, attachment, evaluateScore } = record.enterpriseStandardInspectReport || {} this.form = Object.assign({}, record, { - inspectContentId, - standardRequire: requirement, + // inspectContentId, + standardRequire, executionStatus, attachment, evaluateScore @@ -317,38 +321,38 @@ export default { }, // 初始化章节条款下拉 initSectionClauseList () { - getInspectionContentTable({ - processEsInspectId: this.data.id - }).then(res => { - if (res.success) { - this.sectionClauseList = res.result || [] - } + // 过滤已经被选择的下拉 + const contentlist = this.data.enterpriseStandardInspectContentList || [] + const planList = this.tempDataSource || [] + this.sectionClauseList = contentlist.filter(content => { + // 当前没有被选择过，或者编辑时选择的就是当前数据就显示在下拉 + return !planList.find(report => report.inspectContentId === content.id) || this.model.inspectContentId === content.id }) }, // 章节条款改变 changeSectionClause (val) { + console.log(val) if (val) { - // const obj = this.sectionClauseList.find(item => item.id === val) - queryByInspectContentId({ - inspectContentId: val - }).then(res => { - if (res.success) { - const { id, standardRequire, executionStatus, attachment, evaluateScore } = res.result || {} - this.form.inspectReportId = id - this.form.standardRequire = standardRequire - this.form.executionStatus = executionStatus - this.form.attachment = attachment - this.form.evaluateScore = evaluateScore - this.$forceUpdate() - } - }) + console.log(this) + 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) || {} + // this.form.inspectReportId = report.inspectReportId + this.form.standardRequire = content.requirement + this.form.executionStatus = report.executionStatus + this.form.attachment = report.attachment + this.form.evaluateScore = report.evaluateScore + this.form.enterpriseStandardInspectReport = report } else { - this.form.inspectReportId = undefined + // this.form.inspectReportId = undefined this.form.standardRequire = undefined this.form.executionStatus = undefined this.form.attachment = undefined this.form.evaluateScore = undefined + this.form.enterpriseStandardInspectReport = undefined } + this.$forceUpdate() } } } diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue index 1bdfff59..49239e56 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue index 79a66932..20e3bd29 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue @@ -19,6 +19,7 @@ {{ item.clause }} @@ -78,11 +79,17 @@