diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java index beff311..57f614d 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java @@ -382,8 +382,8 @@ public class CondolenceMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); - if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("fgh", approval); @@ -399,8 +399,8 @@ public class CondolenceMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); - if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xzx", approval); diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html index ab1da74..5c7f41b 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html @@ -177,7 +177,7 @@ layout("/layouts/platform.html"){ - + { - this.$axios.post("/flow/common/executeTask", { - data: JSON.stringify({ - ...this.formData, - submitType: val + this.$refs.formRef.validate((valid) => { + if (valid) { + this.$confirm("您确定要提交吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.$axios.post("/flow/common/executeTask", { + data: JSON.stringify({ + ...this.formData, + submitType: val + }) + }).then((res) => { + if (res.code === 0) { + this.$refs.guava.index() + this.$message.success(res.msg) + this.doSearch() + } + }) }) - }).then((res) => { - if (res.code === 0) { - this.$refs.guava.index() - this.$message.success(res.msg) - this.doSearch() - } - }) + } }) }, onRevoke(row) { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js index bc59728..71bc2dc 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js @@ -32,7 +32,7 @@ const condolenceInfo = { diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html index aae995b..d83acf8 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html @@ -279,6 +279,7 @@ layout("/layouts/platform_h5.html"){ - + @@ -141,6 +143,11 @@ layout("/layouts/platform_h5.html"){ async handleTaskAction(val) { try { await this.$refs.formRef.validate(); + // 电子签名组件使用插槽输入,手动校验防止空签名提交 + if (!this.formData.tf_userSign) { + this.$toast.fail("请填写电子签名") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交吗?" diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js index 59f0f82..bbce70b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js @@ -33,7 +33,7 @@ const condolenceInfo = { {{ viewData.remark || '暂无' }} diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html index d947745..62bdb4e 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html @@ -100,7 +100,9 @@ layout("/layouts/platform_h5.html"){ show-word-limit > - + @@ -175,6 +177,11 @@ layout("/layouts/platform_h5.html"){ async handleTaskAction(val) { try { await this.$refs.formRef.validate(); + // 电子签名组件使用插槽输入,手动校验防止空签名提交 + if (!this.formData.tf_userSign) { + this.$toast.fail("请填写电子签名") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交吗?" diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html index 0352a11..229050c 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html @@ -71,7 +71,9 @@ layout("/layouts/platform_h5.html"){ show-word-limit > - + @@ -142,6 +144,11 @@ layout("/layouts/platform_h5.html"){ async handleTaskAction(val) { try { await this.$refs.formRef.validate(); + // 电子签名组件使用插槽输入,手动校验防止空签名提交 + if (!this.formData.tf_userSign) { + this.$toast.fail("请填写电子签名") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交吗?"