diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue index 67c91de4..bff2f0db 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue @@ -281,6 +281,7 @@ export default { const processAll = data.processAll || {} const processApprovalRecord = data.processApprovalRecord || {} this.info = data + this.$refs.inspectionPlanTable.setData(data.processEsInspectPlanList || []) // 页面回显 this.processInfoForm && this.processInfoForm.setFieldsValue({ prcName: processAll.prcName, @@ -309,7 +310,10 @@ export default { if (this.isInitiate) { this.draftInitPersonInfo(personInfo) } - // 回显业务信息(需要等后端调整) + // 回显业务信息,如果有标识属性就是强制撤回 + if (Object.hasOwnProperty.call(draftData, 'revocation')) { + this.$refs.inspectionPlanTable.setData(draftData) + } } } }).finally(() => { @@ -420,6 +424,14 @@ export default { params.processApprovalRecord = Object.assign({}, this.info.processApprovalRecord, formDataList[2], { projectId: this.projectId }) + + // 保存草稿信息 + params.infoJsonStr = JSON.stringify({ + // 人员信息(要重新获取,流程里的信息不能直接用,后端需要多选人员处理成数组了) + personInfo: this.$refs.personnelInfo.getDataObj(), + // 业务表格数据,用于强制撤回后回显 + draftData: params.processEsInspectPlanList + }) return params }, /** @@ -456,13 +468,6 @@ export default { if (this.loading) return this.loading = true this.getPageParams(false).then(res => { - // 保存草稿信息 - res.infoJsonStr = JSON.stringify({ - // 人员信息(要重新获取,流程里的信息不能直接用,后端需要多选人员处理成数组了) - personInfo: this.$refs.personnelInfo.getDataObj() - // 业务数据(需要等后端调整) - // draftData: - }) // 1待办 2草稿 res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1 console.log(res) diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue index 4917ba4c..566d2fc1 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue @@ -99,7 +99,7 @@ export default { EsInspectionPlan, disableMixinCreated: true, url: { - list: '/process/processEsInspectPlan/list', + // list: '/process/processEsInspectPlan/list', delete: '/process/processEsInspectPlan/delete', deleteBatch: '/process/processEsInspectPlan/deleteBatch', // 默认是发起节点的导入和 下载模板,如果是节点2就用没有 征求意见对象 的模板和导入接口 @@ -234,20 +234,6 @@ export default { } }, watch: { - // 列表查询带上项目id - projectId: { - immediate: true, - handler (val) { - if (!val) { - return - } - this.filters.projectId = this.projectId - if (this.currentNode === EsInspectionPlan.fillInComments.value) { - this.filters.nodeId = this.$route.query.nodeId - } - this.loadData() - } - }, // 监听当前节点变化 currentNode: { immediate: true, @@ -294,6 +280,9 @@ export default { this.filters.taskId = this.$route.query.taskId }, methods: { + setData (list) { + this.dataSource = list || [] + }, // 父组件获取删除的ids getDelIds () { return Array.from(new Set(this.delIds)).filter(item => item).join(',')