From 5e439359e51f35fb9e5c5214254a4e4ab035ab47 Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 19 Jan 2024 17:42:39 +0800 Subject: [PATCH] fix 81062 --- ...erpriseStandardInspectionRectification.vue | 27 +++++++----- .../PermissionApplicationProcess.vue | 43 +++++++++++-------- .../PostMeetingManageProcess.vue | 29 ++++++++----- 3 files changed, 59 insertions(+), 40 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue index 639b5043..b530a197 100644 --- a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue +++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue @@ -261,24 +261,31 @@ export default { this.$nextTick(() => { this.$refs.baseInfoForm.initData(this.formInfo) }) + } else { + // 非强制撤回调接口查数据 + this.getFormInfo() } } else { - // 非草稿调用接口拿数据回显 - getInspectRectifyDataById({ projectId }).then(res => { - if (res.success) { - const data = res.result || {} - this.formInfo = data - this.$nextTick(() => { - this.$refs.baseInfoForm.initData(data) - }) - } - }) + // 非草稿调用接口查数据 + this.getFormInfo() } } }).finally(() => { this.loading = false }) }, + // 获取业务数据 + getFormInfo () { + getInspectRectifyDataById({ projectId: this.projectId }).then(res => { + if (res.success) { + const data = res.result || {} + this.formInfo = data + this.$nextTick(() => { + this.$refs.baseInfoForm.initData(data) + }) + } + }) + }, // 获取人员信息 getPersonInfo (isValidate = true) { let personnelObj = {} diff --git a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue index 89e1f881..f6cfa980 100644 --- a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue +++ b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue @@ -357,33 +357,38 @@ export default { standardNumbers: data.standardNumbers, applyDetail: data.applyDetail }) + } else { + // 非强制撤回调接口查数据 + this.getFormInfo() } } else { - // 非草稿获取业务数据 - getPermissionApplyDataById({ projectId: this.projectId }).then(res => { - if (res.success) { - const data = res.result || {} - const list = data.lawsEnterpriseStandardList || [] - // 发起节点的表格和审批节点的表格,哪个存在回显哪个的数据 - this.$refs.baseInfoTable && this.$refs.baseInfoTable.setData(list) - this.$refs.applyPermissionTable && this.$refs.applyPermissionTable.setData(list) - // 保存并回显表单信息 - this.info = cloneDeep(data) - this.formInfo = data - this.baseInfoForm.setFieldsValue({ - expirationDate: data.expirationDate, - userDictText: data.userDictText, - standardNumbers: data.standardNumbers, - applyDetail: data.applyDetail - }) - } - }) + // 非草稿调用接口查数据 + this.getFormInfo() } } }).finally(() => { this.loading = false }) }, + // 获取业务表单信息 + getFormInfo () { + getPermissionApplyDataById({ projectId: this.projectId }).then(res => { + if (res.success) { + const data = res.result || {} + const list = data.lawsEnterpriseStandardList || [] + // 发起节点的表格和审批节点的表格,哪个存在回显哪个的数据 + this.$refs.baseInfoTable && this.$refs.baseInfoTable.setData(list) + this.$refs.applyPermissionTable && this.$refs.applyPermissionTable.setData(list) + this.formInfo = data + this.baseInfoForm.setFieldsValue({ + expirationDate: data.expirationDate, + userDictText: data.userDictText, + standardNumbers: data.standardNumbers, + applyDetail: data.applyDetail + }) + } + }) + }, // 获取人员信息 getPersonInfo (isValidate = true) { let personnelObj = {} diff --git a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue index 9205e3ae..82af03d4 100644 --- a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue +++ b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue @@ -286,25 +286,32 @@ export default { this.$nextTick(() => { this.$refs.baseInfoForm.initData(this.formInfo) }) + } else { + // 非强制撤回调接口查数据 + this.getFormInfo() } } else { - // 非草稿获取业务数据 - getPostMeetingManageDataById({ projectId: this.projectId }).then(res => { - if (res.success) { - const data = res.result || {} - // 保存并回显表单信息 - this.formInfo = data - this.$nextTick(() => { - this.$refs.baseInfoForm.initData(data) - }) - } - }) + // 非草稿调用接口查数据 + this.getFormInfo() } } }).finally(() => { this.loading = false }) }, + // 获取表单业务数据 + getFormInfo () { + getPostMeetingManageDataById({ projectId: this.projectId }).then(res => { + if (res.success) { + const data = res.result || {} + // 保存并回显表单信息 + this.formInfo = data + this.$nextTick(() => { + this.$refs.baseInfoForm.initData(data) + }) + } + }) + }, // 获取人员信息 getPersonInfo (isValidate = true) { let personnelObj = {}