From 0d22f5a40385a43ae86ef6ed2c4bf7a63344f86c Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 22 Apr 2024 10:33:36 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=92=8C=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=82=B9=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=AE=8C=E6=96=87=E4=BB=B6=E8=B0=83=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardChangeFlow.vue | 22 +++++++------ .../modules/MainDrafterInitBaseInfo.vue | 2 ++ .../EnterpriseStandardRevisionFlow.vue | 31 +++++++++++-------- .../modules/MainDrafterCollectBaseInfo.vue | 2 ++ ...MainDrafterCollectUploadMinuteBaseInfo.vue | 2 ++ .../modules/MainDrafterPublishBaseInfo.vue | 2 ++ .../modules/MainDrafterSentBaseInfo.vue | 2 ++ .../MainDrafterUploadMinuteBaseInfo.vue | 2 ++ 8 files changed, 43 insertions(+), 22 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index fc925fb6..8afe7ad8 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -52,7 +52,7 @@
{{ $t('basicServiceInformation') }}
- + @@ -308,7 +308,7 @@ export default { }) }, // 保存 - handleSave () { + handleSave (isReturn) { if (this.loading) { return } @@ -368,15 +368,19 @@ export default { } paramObj.infoJsonStr = JSON.stringify(personnelObj) } - this.loading = true + if (isReturn) { + this.loading = true + } // 保存到草稿 enStandardChangeSave(paramObj).then(res => { - if (res.success) { - this.$message.success(res.message) - this.goBack() - } else { - this.$message.warning(res.message) - this.loading = false + if (isReturn) { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warning(res.message) + this.loading = false + } } }) }, diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index fbd92061..e30a502e 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -608,6 +608,8 @@ export default { if (validateResult) { console.log(this.onEditFile) this.onEditFile = await onlineEditor(params, this.onEditFile || this.standardCanOnlineEditFile) + // false表示保存后不返回 + this.$emit('save', false) } } } diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index c082c62f..a8db4474 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -54,11 +54,11 @@
{{ $t('basicServiceInformation') }}
- + - + - + - + @@ -88,7 +88,7 @@ - +
{{ $t('processApprovalInformation') }}
@@ -456,7 +456,8 @@ export default { } }, // 保存 - handleSave () { + handleSave (isReturn) { + console.log('----------isReturn', isReturn) if (this.loading) { return } @@ -513,15 +514,19 @@ export default { return } } - this.loading = true + if (isReturn) { + this.loading = true + } // 保存到草稿 enStandardEditSave(paramObj).then(res => { - if (res.success) { - this.$message.success(res.message) - this.goBack() - } else { - this.$message.warning(res.message) - this.loading = false + if (isReturn) { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warning(res.message) + this.loading = false + } } }) }, diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue index 37499f1e..8e5818c2 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue @@ -287,6 +287,8 @@ export default { const params = this.$refs.baseInfoForm.getOnlineEditorParams() if (!this.onEditFile) { this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '') + // false表示保存后不返回 + this.$emit('save', false) } else { onlineEditor(params, this.onEditFile) } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue index 4efcfa1b..d6a27dd4 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue @@ -536,6 +536,8 @@ export default { const params = this.$refs.baseInfoForm.getOnlineEditorParams() if (!this.onEditFile) { this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '') + // false表示保存后不返回 + this.$emit('save', false) } else { onlineEditor(params, this.onEditFile) } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue index 4838755b..1695d529 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue @@ -179,6 +179,8 @@ export default { params.processId = this.$route.query.processInstanceId if (!this.onEditFile) { this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '') + // false表示保存后不返回 + this.$emit('save', false) } else { onlineEditor(params, this.onEditFile) } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue index dce0cba9..951fe515 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue @@ -239,6 +239,8 @@ export default { if (validateResult) { console.log(this.onEditFile || this.standardCanOnlineEditFile || '') this.onEditFile = await onlineEditor(params, this.onEditFile || this.standardCanOnlineEditFile || '') + // false表示保存后不返回 + this.$emit('save', false) } } } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue index 8952db6f..74caee2d 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue @@ -386,6 +386,8 @@ export default { const params = this.$refs.baseInfoForm.getOnlineEditorParams() if (!this.onEditFile) { this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '') + // false表示保存后不返回 + this.$emit('save', false) } else { onlineEditor(params, this.onEditFile) }