From ae31df15575e7e40004bedabf3bdc8f2dc1034df Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 4 Mar 2026 14:48:46 +0800 Subject: [PATCH] commit --- .../transact/committeeFiling/index.html | 63 ++++++++++--------- .../proposal/transact/seconded/index.html | 2 - 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html index ff77bf23..f23a05ac 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html @@ -226,37 +226,40 @@ layout("/layouts/platform.html"){ }, handleTaskAction(val) { - this.$confirm("您确定要提交吗?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - // 是否有协办单位 - let tf_helpunitreply; - if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) { - tf_helpunitreply = 'HAS_HELP_UNIT' - } else { - tf_helpunitreply = 'NO_HELP_UNIT' - } - - const loading = createLoading('提交中') - this.$axios.post("/flow/common/executeTask", { - data: JSON.stringify({ - ...this.formData, - submitType: val, - tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null, - tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name), - tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','), - tf_helpunitreply: tf_helpunitreply - }) - }).then((res) => { - if (res.code === 0) { - this.$refs.guava.index() - this.$message.success(res.msg) - this.doSearch() + this.$refs.formRef.validate(valid => { + if (!valid) return + this.$confirm("您确定要提交吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + // 是否有协办单位 + let tf_helpunitreply; + if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) { + tf_helpunitreply = 'HAS_HELP_UNIT' + } else { + tf_helpunitreply = 'NO_HELP_UNIT' } - }).finally(() => { - loading.close() + + const loading = createLoading('提交中') + this.$axios.post("/flow/common/executeTask", { + data: JSON.stringify({ + ...this.formData, + submitType: val, + tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null, + tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name), + tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','), + tf_helpunitreply: tf_helpunitreply + }) + }).then((res) => { + if (res.code === 0) { + this.$refs.guava.index() + this.$message.success(res.msg) + this.doSearch() + } + }).finally(() => { + loading.close() + }) }) }) }, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html index a084700d..c6e2c902 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html @@ -148,8 +148,6 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - console.log(this.formData) - return this.$axios.post("/flow/common/executeTask", { data: JSON.stringify({ ...this.formData,