c-zhouhf1/zhgh_whcp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
=
2026-06-05 17:16:20 +08:00
parent 67ea2030b5
commit a5556a1f3d
9 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java
+4 -4
View File
@@ -382,8 +382,8 @@ public class CondolenceMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
@@ -399,8 +399,8 @@ public class CondolenceMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xzx", approval); docData.put("xzx", approval);
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+4 -1
View File
@@ -177,7 +177,7 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="当年第几次住院"> <el-descriptions-item label="当年第几次住院" v-if="formData.typeCode !== '3'">
<el-form-item prop="thisYearHospitalizationNum" label="当年第几次住院"> <el-form-item prop="thisYearHospitalizationNum" label="当年第几次住院">
<el-input-number style="width: 100%" v-model="formData.thisYearHospitalizationNum" <el-input-number style="width: 100%" v-model="formData.thisYearHospitalizationNum"
placeholder="请输入当年第几次住院" placeholder="请输入当年第几次住院"
@@ -337,6 +337,9 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "money", this.chooseType.money) this.$set(this.formData, "money", this.chooseType.money)
this.$set(this.formData, "way", this.chooseType.way) this.$set(this.formData, "way", this.chooseType.way)
this.$set(this.formData, "typeCode", this.chooseType.code) this.$set(this.formData, "typeCode", this.chooseType.code)
if (this.chooseType.code === '3') {
this.$set(this.formData, "thisYearHospitalizationNum", null)
}
} }
}, },
onSave() { onSave() {
src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html
+20 -16
View File
@@ -145,23 +145,27 @@ layout("/layouts/platform.html"){
}) })
}, },
handleTaskAction(val) { handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", { this.$refs.formRef.validate((valid) => {
confirmButtonText: "确定", if (valid) {
cancelButtonText: "取消", this.$confirm("您确定要提交吗？", "提示", {
type: "warning" confirmButtonText: "确定",
}).then(() => { cancelButtonText: "取消",
this.$axios.post("/flow/common/executeTask", { type: "warning"
data: JSON.stringify({ }).then(() => {
...this.formData, this.$axios.post("/flow/common/executeTask", {
submitType: val 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) { onRevoke(row) {
src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js
+1 -1
View File
@@ -32,7 +32,7 @@ const condolenceInfo = {
<template v-if="['2','3'].includes(viewData.typeCode)"> <template v-if="['2','3'].includes(viewData.typeCode)">
<el-descriptions-item label="入院时间">{{ viewData.hospitalizationTime }}</el-descriptions-item> <el-descriptions-item label="入院时间">{{ viewData.hospitalizationTime }}</el-descriptions-item>
<el-descriptions-item label="出院时间">{{ viewData.leaveHospitalTime }}</el-descriptions-item> <el-descriptions-item label="出院时间">{{ viewData.leaveHospitalTime }}</el-descriptions-item>
<el-descriptions-item label="当年第几次住院">{{ viewData.thisYearHospitalizationNum }} <el-descriptions-item label="当年第几次住院" v-if="viewData.typeCode !== '3'">{{ viewData.thisYearHospitalizationNum }}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<el-descriptions-item label="申请事由" :span="3"> <el-descriptions-item label="申请事由" :span="3">
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html
+4
View File
@@ -279,6 +279,7 @@ layout("/layouts/platform_h5.html"){
</van-popup> </van-popup>
<van-field type="digit" label="当年第几次住院" <van-field type="digit" label="当年第几次住院"
v-if="formData.typeCode !== '3'"
:rules="[{ required: true }]" :rules="[{ required: true }]"
required required
placeholder="请输入当年第几次住院" placeholder="请输入当年第几次住院"
@@ -490,6 +491,9 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, "money", this.chooseType.money) this.$set(this.formData, "money", this.chooseType.money)
this.$set(this.formData, "way", this.chooseType.way) this.$set(this.formData, "way", this.chooseType.way)
this.$set(this.formData, "typeCode", this.chooseType.code) this.$set(this.formData, "typeCode", this.chooseType.code)
if (this.chooseType.code === '3') {
this.$set(this.formData, "thisYearHospitalizationNum", null)
}
} }
}, },
onTypeConfirm(o) { onTypeConfirm(o) {
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html
+8 -1
View File
@@ -71,7 +71,9 @@ layout("/layouts/platform_h5.html"){
show-word-limit show-word-limit
></van-field> ></van-field>
<van-cell-group title="电子签名" class="form-section"> <van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label=""> <van-field class="more-text" name="tf_userSign" label=""
:rules="[{ required: true, message: '请填写电子签名' }]"
required>
<template #input> <template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature> <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template> </template>
@@ -141,6 +143,11 @@ layout("/layouts/platform_h5.html"){
async handleTaskAction(val) { async handleTaskAction(val) {
try { try {
await this.$refs.formRef.validate(); await this.$refs.formRef.validate();
// 电子签名组件使用插槽输入，手动校验防止空签名提交
if (!this.formData.tf_userSign) {
this.$toast.fail("请填写电子签名")
return
}
this.$dialog.confirm({ this.$dialog.confirm({
title: "提示", title: "提示",
message: "您确定要提交吗？" message: "您确定要提交吗？"
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js
+1 -1
View File
@@ -33,7 +33,7 @@ const condolenceInfo = {
<template v-if="['2','3'].includes(viewData.typeCode)"> <template v-if="['2','3'].includes(viewData.typeCode)">
<van-cell title="入院时间">{{ viewData.hospitalizationTime }}</van-cell> <van-cell title="入院时间">{{ viewData.hospitalizationTime }}</van-cell>
<van-cell title="出院时间">{{ viewData.leaveHospitalTime }}</van-cell> <van-cell title="出院时间">{{ viewData.leaveHospitalTime }}</van-cell>
<van-cell title="当年第几次住院（次）">{{ viewData.thisYearHospitalizationNum }}</van-cell> <van-cell title="当年第几次住院（次）" v-if="viewData.typeCode !== '3'">{{ viewData.thisYearHospitalizationNum }}</van-cell>
</template> </template>
<van-cell class="direction-column-cell" title="申请事由"> <van-cell class="direction-column-cell" title="申请事由">
{{ viewData.remark || '暂无' }} {{ viewData.remark || '暂无' }}
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html
+8 -1
View File
@@ -100,7 +100,9 @@ layout("/layouts/platform_h5.html"){
show-word-limit show-word-limit
></van-field> ></van-field>
<van-cell-group title="电子签名" class="form-section"> <van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label=""> <van-field class="more-text" name="tf_userSign" label=""
:rules="[{ required: true, message: '请填写电子签名' }]"
required>
<template #input> <template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature> <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template> </template>
@@ -175,6 +177,11 @@ layout("/layouts/platform_h5.html"){
async handleTaskAction(val) { async handleTaskAction(val) {
try { try {
await this.$refs.formRef.validate(); await this.$refs.formRef.validate();
// 电子签名组件使用插槽输入，手动校验防止空签名提交
if (!this.formData.tf_userSign) {
this.$toast.fail("请填写电子签名")
return
}
this.$dialog.confirm({ this.$dialog.confirm({
title: "提示", title: "提示",
message: "您确定要提交吗？" message: "您确定要提交吗？"
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html
+8 -1
View File
@@ -71,7 +71,9 @@ layout("/layouts/platform_h5.html"){
show-word-limit show-word-limit
></van-field> ></van-field>
<van-cell-group title="电子签名" class="form-section"> <van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label=""> <van-field class="more-text" name="tf_userSign" label=""
:rules="[{ required: true, message: '请填写电子签名' }]"
required>
<template #input> <template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature> <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template> </template>
@@ -142,6 +144,11 @@ layout("/layouts/platform_h5.html"){
async handleTaskAction(val) { async handleTaskAction(val) {
try { try {
await this.$refs.formRef.validate(); await this.$refs.formRef.validate();
// 电子签名组件使用插槽输入，手动校验防止空签名提交
if (!this.formData.tf_userSign) {
this.$toast.fail("请填写电子签名")
return
}
this.$dialog.confirm({ this.$dialog.confirm({
title: "提示", title: "提示",
message: "您确定要提交吗？" message: "您确定要提交吗？"