慰问整改

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java

@@ -89,13 +89,22 @@ public class CondolenceApplyController {
 	public Result submit(@Param("data") Condolence condolence) {
 		if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now());
 		dao.insertOrUpdate(condolence);
-		// 开启流程实例
+
+		//开启流程实例
 		Dict args = Dict.create();
+		String type = "normal";
+		if ("b8ee30faacb2469593dfedb5b52565aa".equals(condolence.getType())) {
+			type = "died";
+			args.set("userId", condolence.getCertifierUserId());
+		} else {
+			args.set("userId", condolence.getHelpUserId());
+		}
 		args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
 		args.set(FlowConst.FORM_DATA, condolence);
-		args.set("userId", condolence.getCertifierUserId());
+		args.set("type", type);
 		ProcessInstance instance = flowEngine.startProcessInstanceByKey("ZGWW", condolence.getId(), SecurityUtil.getUserId(), args);
 
+
 		// 自动完成第一个申请任务
 		List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
 		for (ProcessTask task : doingTaskList) {

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java

@@ -205,23 +205,34 @@ public class CondolenceMineController {
         dao.execute(sql);
         NutMap info = (NutMap) sql.getResult();
 
+        //慰问报销审批单
         HashMap<String, Object> docData = new HashMap<>();
+        //武汉城市职业学院报销审批单
         HashMap<String, Object> docData2 = new HashMap<>();
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime createTime = LocalDateTime.parse(condolence.getCreateTime(), formatter);
 
-        docData.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日"));
         docData.put("applyUnionName", condolence.getApplyUnionName());
+        docData.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日"));
         docData.put("info", info);
 
+        if (StrUtil.isNotBlank(condolence.getSignature())) {
+            docData.put("sign", sysOfficeTemplateUtil.createPictureRenderData(condolence.getSignature()));
+        }
+
         docData2.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日"));
         docData2.put("applyUnionName", condolence.getApplyUnionName());
+        docData2.put("name", condolence.getHelpUserName() + "(" + condolence.getHelpLoginName() + ")");
         docData2.put("bankUserName", condolence.getBankUserName());
         docData2.put("bankCardNumber", condolence.getBankCardNumber());
         docData2.put("bankOfDeposit", condolence.getBankOfDeposit());
         docData2.put("info", info);
 
+        if (StrUtil.isNotBlank(condolence.getSignature())) {
+            docData2.put("sign", sysOfficeTemplateUtil.createPictureRenderData(condolence.getSignature()));
+        }
+
         // 金额转大写
 //		if (condolence.getMoney() != null) {
 //			docData.put("money_big", MoneyUtil.toRMBUpper(String.valueOf(condolence.getMoney())));
@@ -328,6 +339,40 @@ public class CondolenceMineController {
             doneTaskVos.add(taskVO);
         }
 
+        // 慰问人签字
+        doneTaskVos.stream().filter(task -> "慰问人签字".equals(task.getDisplayName()))
+                .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
+                .ifPresent(v -> {
+                    Dict taskFormData = v.getTaskFormData();
+                    HashMap<String, Object> approval = new HashMap<>();
+
+                    approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
+                    approval.put("user", taskFormData.getStr("tf_userName"));
+                    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("wwr", approval);
+                    docData2.put("wwr", approval);
+                });
+
+        // 证明人签字
+        doneTaskVos.stream().filter(task -> "证明人签字".equals(task.getDisplayName()))
+                .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
+                .ifPresent(v -> {
+                    Dict taskFormData = v.getTaskFormData();
+                    HashMap<String, Object> approval = new HashMap<>();
+
+                    approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
+                    approval.put("user", taskFormData.getStr("tf_userName"));
+                    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("zmr", approval);
+                    docData2.put("zmr", approval);
+                });
+
         // 分工会审核
         doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName()))
                 .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
@@ -345,7 +390,7 @@ public class CondolenceMineController {
                     docData2.put("fgh", approval);
                 });
 
-        // 校工会副主席审核
+        // 校工会副主席审核   校工会审核
         doneTaskVos.stream().filter(task -> "校工会审核".equals(task.getDisplayName()))
                 .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
                 .ifPresent(v -> {

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java

@@ -2,7 +2,9 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
@@ -120,4 +122,13 @@ public class CondolenceSchoolPrincipalApprovalController {
         Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pageVO);
     }
+
+    @At
+    @ApiOperation("保存退休人员-账户、户名、开户行")
+    @SaCheckPermission(value = {"condolence.schoolPrincipalApproval", "h5.condolence.schoolPrincipalApproval"}, mode = SaMode.OR)
+    @SLog(tag = "职工慰问系统-校工会预审", msg = "保存信息")
+    public Result save(@Param("data") Condolence condolence) {
+        condolenceService.dao().updateIgnoreNull(condolence);
+        return Result.success();
+    }
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java

@@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.base.sms.SmsService;
+import com.budwk.app.base.sms.WechatEnterpriseService;
 import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -13,10 +15,12 @@ import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -39,6 +43,8 @@ import java.util.List;
 @Ok("json:full")
 public class CondolenceSchoolUnionApprovalController {
 
+	@Inject
+	private WechatEnterpriseService wechatEnterpriseService;
 	@Inject
 	private CondolenceService condolenceService;
 
@@ -122,4 +128,19 @@ public class CondolenceSchoolUnionApprovalController {
 		Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pageVO);
 	}
+
+	@At
+	@ApiOperation("发送企业微信通知")
+	@SaCheckPermission("condolence.schoolUnionApproval")
+	@Aop(TransAop.READ_COMMITTED)
+	public Result sendWechat(@Param("id") String id) {
+		Condolence condolence = condolenceService.fetch(id);
+		if (condolence == null) {
+			return Result.error("慰问申请不存在");
+		}
+		String content = "您的慰问流程已审批完毕，请及时登陆电脑版下载文件。";
+		wechatEnterpriseService.sendSingleMessage(condolence.getApplyLoginName(),content);
+
+		return Result.success();
+    }
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolencesHelpUserSignController.java

@@ -0,0 +1,130 @@
+package com.budwk.app.zhgh.staffbenefit.condolence.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2026/1/9 09:50
+ * @description 慰问人签字
+ */
+@IocBean
+@At("/platform/condolence/helpUserSign")
+@Ok("json:full")
+@Api("证明人签字")
+@Slf4j
+public class CondolencesHelpUserSignController {
+
+
+    @Inject
+    private CondolenceService condolenceService;
+
+    @At("/")
+    @Ok("beetl:/platform/zhgh/staffbenefit/condolence/helpUserSign/index.html")
+    @SaCheckPermission("condolence.helpUserSign")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/helpUserSign/index.html")
+    @SaCheckPermission("h5.condolence.helpUserSign")
+    public void h5Index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"condolence.helpUserSign", "h5.condolence.helpUserSign"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           boolean approval,
+                           Integer year,
+                           String unionId,
+                           String unitId,
+                           String type) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  type.name as typeName,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                  FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN condolence info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN condolence_type type ON info.type = type.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "701e247f-e2a4-49e7-bdf9-e2c5afc7a3ea");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (approval) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+
+        cnd.andEX("year(info.createTime)", "=", year);
+        cnd.andEX("info.applyUnionId", "=", unionId);
+        cnd.andEX("info.applyUnitId", "=", unitId);
+        cnd.andEX("info.type", "=", type);
+
+
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
+            seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
+            cnd.and(seg);
+        }
+        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.createTime");
+        } else {
+            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("info.id");
+        cnd.desc("info.createdAt");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+}

src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html

@@ -93,7 +93,7 @@ layout("/layouts/platform.html"){
                         <el-input-number style="width: 100%" v-model="formData.money"
                                   controls-position="right"
                                   :controls="false"
-                                  precision="2"
+                                  :precision="2"
                                   placeholder="选择慰问类型自动匹配金额"
                                   :min="0"
                                   :max="10000"></el-input-number>
@@ -127,14 +127,14 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="收款账户">
+                <el-descriptions-item label="收款账户" v-if="formData.type !== '1a2f7e8decb649a6ba8ca76e2af07779'">
                     <el-form-item prop="bankCardNumber" label="收款账户">
                         <el-input maxlength="20" v-model="formData.bankCardNumber" placeholder="请填写收款账户"
                         ></el-input>
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="户名">
+                <el-descriptions-item label="户名" v-if="formData.type !== '1a2f7e8decb649a6ba8ca76e2af07779'">
                     <el-form-item prop="bankUserName" label="户名">
                         <el-input maxlength="20" v-model="formData.bankUserName"
                                   placeholder="请填写户名"
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="开户行" >
+                <el-descriptions-item label="开户行" v-if="formData.type !== '1a2f7e8decb649a6ba8ca76e2af07779'">
                     <el-form-item prop="bankOfDeposit" label="开户行">
                         <el-input maxlength="20" v-model="formData.bankOfDeposit"
                                   placeholder="请填写开户行"

src/main/resources/views/platform/zhgh/staffbenefit/condolence/helpUserSign/index.html

@@ -0,0 +1,221 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app">
+    <guava ref="guava">
+        <el-card shadow="never">
+            <search @search="doSearch">
+                <search-item label="年度">
+                    <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
+                                    style="width: 100%"></el-date-picker>
+                </search-item>
+                <search-item label="姓名/工号">
+                    <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+                </search-item>
+                <search-item label="慰问类型">
+                    <el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
+                               placeholder="请选择慰问类型" filterable clearable>
+                        <el-option v-for="item in typeOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="所属工会">
+                    <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择所属工会" clearable>
+                        <el-option v-for="item in unionOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+                <search-item label="所属单位">
+                    <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
+                               placeholder="请选择所属单位" clearable>
+                        <el-option v-for="item in unitOptions"
+                                   :value="item.id"
+                                   :key="item.id"
+                                   :label="item.name"
+                        ></el-option>
+                    </el-select>
+                </search-item>
+            </search>
+        </el-card>
+        <el-card shadow="never">
+            <table-tool>
+                <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
+                    <el-radio-button :label="true">已签字</el-radio-button>
+                    <el-radio-button :label="false">未签字</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
+                <el-table-column prop="helpUserName" label="慰问对象"></el-table-column>
+                <el-table-column prop="helpLoginName" label="慰问对象工号"></el-table-column>
+                <el-table-column prop="applyUserName" label="申请人"></el-table-column>
+                <el-table-column prop="applyUnionName" label="所属工会"></el-table-column>
+                <el-table-column prop="applyUnitName" label="所属单位"></el-table-column>
+                <el-table-column prop="certifierUserName" label="证明人">
+                    <template slot-scope="{row}">
+                        {{row.certifierUserName}}({{row.certifierLoginName}})
+                    </template>
+                </el-table-column>
+                <el-table-column prop="typeName" label="慰问类型"></el-table-column>
+<!--                <el-table-column prop="createTime" label="申请时间"></el-table-column>-->
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
+                <el-table-column prop="instanceState" label="流程状态">
+                    <template slot-scope="{row}">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="300px">
+                    <template slot-scope="{row}">
+                        <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">签字
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
+        <template #edit>
+            <condolence-info ref="condolenceInfoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                        <el-form-item label="签字" prop="tf_userSign"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <pc-signature v-model="formData.tf_userSign"></pc-signature>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
+                    </el-row>
+                </div>
+            </condolence-info>
+        </template>
+    </guava>
+</div>
+
+
+<script nonce="${cspNonce!}">
+    <!--#include('../common/info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        //分页数据
+        mixins: [initTableMixins],
+        components: {
+            "condolence-info": condolenceInfo
+        },
+        data() {
+            return {
+                pageDataUrl: "/platform/condolence/helpUserSign/pageData",
+                pageForm: {
+                    approval: false
+                },
+                typeOptions: [],
+                formData: {},
+                showApprovalForm: false,
+                unionOptions: [],
+                unitOptions: []
+            }
+        }
+        ,
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.condolenceInfoRef.onOpen(row)
+                })
+            },
+
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.condolenceInfoRef.onOpen(row)
+                })
+            },
+
+            handleTaskAction(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()
+                                }
+                            })
+                        })
+                    }
+                })
+            },
+
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", { taskId: row.taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                })
+            },
+            queryCondolenceType() {
+                this.$axios.post('/platform/condolence/type/queryCondolenceType')
+                    .then((resp) => {
+                        this.typeOptions = resp.data
+                    })
+            },
+
+
+        },
+        created() {
+            this.pageData()
+            this.queryCondolenceType()
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html

@@ -97,6 +97,27 @@ layout("/layouts/platform.html"){
                     </div>
                     <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
                              class="flow-task-form">
+                        <el-row :gutter="20" v-if="condolenceType === '1a2f7e8decb649a6ba8ca76e2af07779'">
+                            <el-col :span="8">
+                                <el-form-item prop="bankCardNumber" label="收款账户"
+                                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                                    <el-input maxlength="20" v-model="formData.bankCardNumber" placeholder="请填写慰问人收款账户"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item prop="bankUserName" label="户名"
+                                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                                    <el-input maxlength="20" v-model="formData.bankUserName" placeholder="请填写慰问人户名"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item prop="bankOfDeposit" label="开户行"
+                                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                                    <el-input maxlength="20" v-model="formData.bankOfDeposit" placeholder="请填写慰问人开户行"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
                         <el-form-item label="审批意见" prop="tf_opinion"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
@@ -147,7 +168,8 @@ layout("/layouts/platform.html"){
                 unionList: [],
                 unitList: [],
                 formData: {},
-                showApprovalForm: false
+                showApprovalForm: false,
+                condolenceType: ''
             }
         },
         methods: {
@@ -160,31 +182,52 @@ layout("/layouts/platform.html"){
             onAudit(row) {
                 this.$refs.guava.edit(()=>{
                     this.showApprovalForm = true
+                    this.condolenceType = row.type
                     this.formData = {
                         processTaskId: row.taskId,
-                        taskName: row.curTaskName
+                        taskName: row.curTaskName,
+                        bankCardNumber: row.bankCardNumber || '',
+                        bankUserName: row.bankUserName || '',
+                        bankOfDeposit: row.bankOfDeposit || ''
                     }
                     this.$refs.condolenceInfoRef.onOpen(row)
                 })
             },
             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,
+                            const submitData = {
-                            submitType: val
+                                ...this.formData,
+                                submitType: val
+                            };
+
+                            if (val === 1) {
+                                this.$axios.post("/platform/condolence/schoolPrincipalApproval/save", {
+                                    data: JSON.stringify({
+                                        id: this.$refs.condolenceInfoRef.row.id,
+                                        bankCardNumber: this.formData.bankCardNumber,
+                                        bankUserName: this.formData.bankUserName,
+                                        bankOfDeposit: this.formData.bankOfDeposit
+                                    })
+                                });
+                            }
+
+                            this.$axios.post("/flow/common/executeTask", {
+                                data: JSON.stringify(submitData)
+                            }).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) {

src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html

@@ -162,29 +162,43 @@ layout("/layouts/platform.html"){
                     this.showApprovalForm = true
                     this.formData = {
                         processTaskId: row.taskId,
-                        taskName: row.curTaskName
+                        taskName: row.curTaskName,
+                        id: row.id
                     }
                     this.$refs.condolenceInfoRef.onOpen(row)
                 })
             },
             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,
+                            const submitData = {
-                            submitType: val
+                                ...this.formData,
+                                submitType: val
+                            };
+
+                            this.$axios.post("/flow/common/executeTask", {
+                                data: JSON.stringify(submitData)
+                            }).then((res) => {
+                                if (res.code === 0) {
+                                    if (val === 1) {
+                                        this.$axios.post("/platform/condolence/schoolUnionApproval/sendWechat", {
+                                            id: this.formData.id
+                                        }).catch(err => {
+                                            console.error("发送企业微信消息失败：", err);
+                                        });
+                                    }
+                                    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) {

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html

@@ -195,6 +195,7 @@ layout("/layouts/platform_h5.html"){
             </van-popup>
 
             <van-field
+                v-if="formData.type !== '1a2f7e8decb649a6ba8ca76e2af07779'"
                 v-model="formData.bankCardNumber"
                 label="收款账户"
                 maxlength="20"
@@ -206,6 +207,7 @@ layout("/layouts/platform_h5.html"){
             ></van-field>
 
             <van-field
+                v-if="formData.type !== '1a2f7e8decb649a6ba8ca76e2af07779'"
                 v-model="formData.bankUserName"
                 label="户名"
                 placeholder="请填写户名"
@@ -215,6 +217,7 @@ layout("/layouts/platform_h5.html"){
                 name="bankUserName"
             ></van-field>
             <van-field
+                v-if="formData.type !== '1a2f7e8decb649a6ba8ca76e2af07779'"
                 v-model="formData.bankOfDeposit"
                 label="开户行"
                 maxlength="30"

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/helpUserSign/index.html

@@ -0,0 +1,191 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+
+<div id="app" v-cloak>
+    <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="慰问人签字" placeholder
+                 fixed></van-nav-bar>
+    <van-sticky offset-top="46px">
+        <van-search
+            v-model="pageForm.searchKeyword"
+            :show-action="false"
+            :reverse-color="false"
+            input-align="left"
+            placeholder="请输入姓名或者工号搜索"
+            @search="doSearch"
+        ></van-search>
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.type" :options="typeOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+            <van-tab title="已审核" name="1"></van-tab>
+            <van-tab title="未审核" name="0"></van-tab>
+        </van-tabs>
+    </van-sticky>
+
+
+    <table-list api="/platform/condolence/helpUserSign/pageData" :page_form.sync="pageForm" ref="tableListRef" @ready="onReady">
+    <template v-slot="{index,row}">
+            <table-column label="慰问对象">{{row.helpUserName}}</table-column>
+            <table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
+            <table-column label="申请人">{{row.applyUserName}}</table-column>
+            <table-column label="所属工会">{{row.applyUnionName}}</table-column>
+            <table-column label="所属单位">{{row.applyUnitName}}</table-column>
+            <table-column label="慰问类型">{{row.typeName}}</table-column>
+            <table-column label="证明人">{{row.certifierUserName}}({{row.certifierLoginName}})</table-column>
+            <table-column label="当前节点">{{row.curTaskName}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+                <i class="fa fa-edit"></i>
+                <span>审核</span>
+            </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
+        </template>
+    </table-list>
+
+    <info ref="infoRef">
+        <div v-if="showApprovalForm">
+            <div class="form-container">
+                <van-form ref="formRef">
+                    <van-cell-group title="经办人签字">
+                        <van-field label="审批意见"
+                                   :rules="[{ required: true,message:'请填审批意见' }]"
+                                   v-model="formData.tf_opinion"
+                                   required
+                                   type="textarea"
+                                   name="tf_opinion"
+                                   rows="4"
+                                   autosize
+                                   class="more-text"
+                                   placeholder="请填审批意见"></van-field>
+                    </van-cell-group>
+                    <van-cell-group title="电子签名" class="form-section">
+                        <van-field class="more-text" name="tf_userSign" label="" required>
+                            <template #input>
+                                <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
+                            </template>
+                        </van-field>
+                    </van-cell-group>
+                    <!-- 按钮区域 -->
+                    <div class="form-actions">
+                        <van-button type="danger" @click="handleTaskAction(6)">退回到发起人</van-button>
+                        <van-button type="primary" @click="handleTaskAction(1)">同意</van-button>
+                    </div>
+                </van-form>
+            </div>
+        </div>
+    </info>
+
+</div>
+<script nonce="${cspNonce!}">
+    <!--#include('../common/info.js'){}#-->
+    const vue = new Vue({
+        el: "#app",
+        store,
+        components: {
+            info: condolenceInfo
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    searchKeyword: "",
+                    approvalText: "0",
+                    approval: false,
+                    year: new Date().getFullYear(),
+                    type: null,
+                },
+                typeOptions: [],
+                formData: {},
+                showApprovalForm: false,
+                infoShow: false
+            }
+        },
+        methods: {
+            async onReady() {
+                const typeList = await this.queryCondolenceType()
+                this.typeOptions = [
+                    {
+                        text: "全部慰问类型",
+                        value: null
+                    }
+                ].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
+                if (this.typeOptions.length > 0) {
+                    this.pageForm.type = this.typeOptions[0].value
+                    this.doSearch()
+                }
+            },
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.infoRef.onOpen(row)
+            },
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.infoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+            },
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.infoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+            async queryCondolenceType() {
+                const res = await this.$axios.post('/platform/condolence/type/queryCondolenceType')
+                return res.data
+            },
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+
+        },
+        created() {
+
+        }
+    })
+</script>
+
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html

@@ -60,6 +60,35 @@ layout("/layouts/platform_h5.html"){
         <div v-if="showApprovalForm">
             <div class="process-title">{{formData.taskName}}</div>
             <van-form ref="formRef">
+                <van-cell-group title="银行账户信息" v-if="condolenceType === '1a2f7e8decb649a6ba8ca76e2af07779'">
+                    <van-field
+                        v-model="formData.bankCardNumber"
+                        name="bankCardNumber"
+                        label="收款账户"
+                        placeholder="请填写慰问人收款账户"
+                        :rules="[{ required: true, message: '请填写收款账户' }]"
+                        required
+                        maxlength="20"
+                    ></van-field>
+                    <van-field
+                        v-model="formData.bankUserName"
+                        name="bankUserName"
+                        label="户名"
+                        placeholder="请填写慰问人户名"
+                        :rules="[{ required: true, message: '请填写户名' }]"
+                        required
+                        maxlength="20"
+                    ></van-field>
+                    <van-field
+                        v-model="formData.bankOfDeposit"
+                        name="bankOfDeposit"
+                        label="开户行"
+                        placeholder="请填写慰问人开户行"
+                        :rules="[{ required: true, message: '请填写开户行' }]"
+                        required
+                        maxlength="20"
+                    ></van-field>
+                </van-cell-group>
                 <van-field
                     v-model="formData.tf_opinion"
                     name="tf_opinion"
@@ -109,7 +138,8 @@ layout("/layouts/platform_h5.html"){
                 },
                 typeOptions: [],
                 formData: {},
-                showApprovalForm: false
+                showApprovalForm: false,
+                condolenceType: ''
             }
         },
         methods: {
@@ -132,10 +162,14 @@ layout("/layouts/platform_h5.html"){
             },
             onApproval(row) {
                 this.showApprovalForm = true
+                this.condolenceType = row.type
                 this.$refs.infoRef.onOpen(row)
                 this.formData = {
                     processTaskId: row.taskId,
-                    taskName: row.curTaskName
+                    taskName: row.curTaskName,
+                    bankCardNumber: row.bankCardNumber || '',
+                    bankUserName: row.bankUserName || '',
+                    bankOfDeposit: row.bankOfDeposit || ''
                 }
             },
             async handleTaskAction(val) {
@@ -144,19 +178,32 @@ layout("/layouts/platform_h5.html"){
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
-                    }).then(() => {
+                    }).then(async () => {
-                        this.$axios.post("/flow/common/executeTask", {
+                        const submitData = {
-                            data: JSON.stringify({
+                            ...this.formData,
-                                ...this.formData,
+                            submitType: val
-                                submitType: val
+                        };
-                            })
+
-                        }).then((res) => {
+                        if (val === 1) {
-                            if (res.code === 0) {
+                            await this.$axios.post("/platform/condolence/schoolPrincipalApproval/save", {
-                                this.$refs.infoRef.onClose()
+                                data: JSON.stringify({
-                                this.$toast.success(res.msg)
+                                    id: this.$refs.infoRef.row.id,
-                                this.doSearch()
+                                    bankCardNumber: this.formData.bankCardNumber,
-                            }
+                                    bankUserName: this.formData.bankUserName,
-                        })
+                                    bankOfDeposit: this.formData.bankOfDeposit
+                                })
+                            });
+                        }
+
+                        const res = await this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify(submitData)
+                        });
+
+                        if (res.code === 0) {
+                            this.$refs.infoRef.onClose()
+                            this.$toast.success(res.msg)
+                            this.doSearch()
+                        }
                     }).catch(() => {
 
                     })

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html

@@ -135,7 +135,8 @@ layout("/layouts/platform_h5.html"){
                 this.$refs.infoRef.onOpen(row)
                 this.formData = {
                     processTaskId: row.taskId,
-                    taskName: row.curTaskName
+                    taskName: row.curTaskName,
+                    id: row.id
                 }
             },
             async handleTaskAction(val) {
@@ -152,17 +153,20 @@ layout("/layouts/platform_h5.html"){
                             })
                         }).then((res) => {
                             if (res.code === 0) {
+                                if (val === 1) { // 同意时发企业微信
+                                    this.$axios.post("/platform/condolence/schoolUnionApproval/sendWechat", {
+                                        id: this.formData.id
+                                    }).catch(err => {
+                                        console.error("发送企业微信消息失败：", err);
+                                    });
+                                }
                                 this.$refs.infoRef.onClose()
                                 this.$toast.success(res.msg)
                                 this.doSearch()
                             }
                         })
-                    }).catch(() => {
+                    }).catch(() => {})
-
+                } catch (error) {}
-                    })
-                } catch (error) {
-
-                }
             },
             onRevoke(row){
                 this.$dialog.confirm({