From a944dcf896bf78cfc7645aaad2d32bf02e7de6a8 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 16 Apr 2024 15:50:37 +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=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=BC=81=E6=A0=87=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E7=82=B9=E5=9C=A8=E7=BA=BF=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E8=8E=B7=E5=8F=96=E5=88=B0=E6=96=87=E4=BB=B6id?=
=?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=B0=83=E7=94=A8=E4=BF=9D=E5=AD=98=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EnterpriseStandardChangeFlow.vue | 22 ++++++++------
.../modules/MainDrafterInitBaseInfo.vue | 1 +
.../EnterpriseStandardRevisionFlow.vue | 30 +++++++++++--------
.../modules/MainDrafterCollectBaseInfo.vue | 1 +
...MainDrafterCollectUploadMinuteBaseInfo.vue | 1 +
.../modules/MainDrafterPublishBaseInfo.vue | 1 +
.../modules/MainDrafterSentBaseInfo.vue | 1 +
.../MainDrafterUploadMinuteBaseInfo.vue | 1 +
8 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
index fc925fb6..57ebf361 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 (noReturn) {
if (this.loading) {
return
}
@@ -368,15 +368,19 @@ export default {
}
paramObj.infoJsonStr = JSON.stringify(personnelObj)
}
- this.loading = true
+ if (!noReturn) {
+ 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 (!noReturn) {
+ 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..e7a62790 100644
--- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
@@ -608,6 +608,7 @@ export default {
if (validateResult) {
console.log(this.onEditFile)
this.onEditFile = await onlineEditor(params, this.onEditFile || this.standardCanOnlineEditFile)
+ this.$emit('save')
}
}
}
diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
index c082c62f..b2d2aa96 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,7 @@ export default {
}
},
// 保存
- handleSave () {
+ handleSave (noReturn) {
if (this.loading) {
return
}
@@ -513,15 +513,19 @@ export default {
return
}
}
- this.loading = true
+ if (!noReturn) {
+ 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 (!noReturn) {
+ 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..f9180fdb 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
@@ -287,6 +287,7 @@ export default {
const params = this.$refs.baseInfoForm.getOnlineEditorParams()
if (!this.onEditFile) {
this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '')
+ this.$emit('save')
} 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..f64d1280 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
@@ -536,6 +536,7 @@ export default {
const params = this.$refs.baseInfoForm.getOnlineEditorParams()
if (!this.onEditFile) {
this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '')
+ this.$emit('save')
} 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..04dde936 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue
@@ -179,6 +179,7 @@ export default {
params.processId = this.$route.query.processInstanceId
if (!this.onEditFile) {
this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '')
+ this.$emit('save')
} 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..b4864d86 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue
@@ -239,6 +239,7 @@ export default {
if (validateResult) {
console.log(this.onEditFile || this.standardCanOnlineEditFile || '')
this.onEditFile = await onlineEditor(params, this.onEditFile || this.standardCanOnlineEditFile || '')
+ this.$emit('save')
}
}
}
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue
index 8952db6f..a5522125 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue
@@ -386,6 +386,7 @@ export default {
const params = this.$refs.baseInfoForm.getOnlineEditorParams()
if (!this.onEditFile) {
this.onEditFile = await onlineEditor(params, this.standardCanOnlineEditFile || '')
+ this.$emit('save')
} else {
onlineEditor(params, this.onEditFile)
}