diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue index 03cf4362..d89e322a 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue @@ -351,7 +351,10 @@ export default { } const params = {} // 业务表信息 - params.processEsInspectPlanList = this.$refs.inspectionPlanTable.dataSource + params.processEsInspectPlanList = this.$refs.inspectionPlanTable.dataSource.map(item => { + delete item.createTime + return item + }) // 获取删除业务信息的ids列表 params.processAllDelIds = this.$refs.inspectionPlanTable.getDelIds() // 收集所有表单信息 diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue index 6b91b48a..79a66932 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue @@ -139,6 +139,7 @@ export default { this.$refs.form.validate(valid => { if (valid) { const params = Object.assign({}, this.model, this.form) + params.baseClause = this.sectionClauseList.find(item => item.id === params.inspectContentId).clause if (!params.createTime) { params.createTime = moment().format('YYYY-MM-DD HH:mm:ss') } diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue index 3d4b21a7..f773d8a6 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue @@ -255,19 +255,6 @@ export default { }) } }, - watch: { - // 列表查询带上项目id - projectId: { - immediate: true, - handler (val) { - if (!val) { - return - } - this.filters.projectId = this.projectId - this.loadData() - } - } - }, mounted () { if (this.isInputInspectionReport) { this.getUserList() @@ -303,6 +290,7 @@ export default { standardInspectContentCount: data.length }) }, + // 稽查报告回调 handleReportCallback (data, index) { console.log('稽查报告回调', data, index) this.dataSource.splice(index, 1, { @@ -310,6 +298,7 @@ export default { enterpriseStandardInspectReportList: data }) }, + // 整改计划回调 handleRectificationCallback (data, index) { console.log('整改计划回调', data, index) this.dataSource.splice(index, 1, { @@ -342,12 +331,12 @@ export default { this.getTableList() }, // 稽查报告 - handleInspectionReport (record) { - this.$refs.inspectionProcessReport.show(record) + handleInspectionReport (record, index) { + this.$refs.inspectionProcessReport.show(record, index) }, // 整改计划 - handleRectificationPlan (record) { - this.$refs.inspectionProcessRectificationPlan.show(record) + handleRectificationPlan (record, index) { + this.$refs.inspectionProcessRectificationPlan.show(record, index) }, // 获取向上第n个父节点 getNumParentNode (el, n) { diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue index efb103ce..49c81acf 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue @@ -57,7 +57,6 @@