commit

src/main/java/com/budwk/app/sys/models/Sys_user.java

@@ -319,6 +319,16 @@ public class Sys_user extends BaseModel implements Serializable {
     @ColDefine(type = ColType.VARCHAR, customType = "text")
     private String personalData;
 
+    @Column
+    @Comment("特长及获奖情况")
+    @ColDefine(type = ColType.VARCHAR, customType = "text")
+    private String specialty;
+
+    @Column
+    @Comment("家庭住址")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String homeAddress;
+
 
     @Column
     @Comment("常用审批意见")

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java

@@ -91,6 +91,7 @@ public class UnionReimburseApplyController {
 
     @At
     @ApiOperation("提交申请")
+    @Aop(TransAop.READ_COMMITTED)
     @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result submit(@Param("data") UnionReimburse unionReimburse) {
         if (StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(new Date());
@@ -100,6 +101,7 @@ public class UnionReimburseApplyController {
         Dict args = Dict.create();
         args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
         args.set(FlowConst.FORM_DATA, unionReimburse);
+        args.set("userId", unionReimburse.getCertifierUserId());
         ProcessInstance instance = flowEngine.startProcessInstanceByKey("GHBX", unionReimburse.getId(), SecurityUtil.getUserId(), args);
 
         // 自动完成第一个申请任务
@@ -122,6 +124,7 @@ public class UnionReimburseApplyController {
         Dict dict = Dict.create();
         dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
         dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+        dict.set("userId", unionReimburse.getCertifierUserId());
         flowCommonService.executeTask(dict);
         return Result.success();
     }

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCertifierUserSignController.java

@@ -0,0 +1,131 @@
+package com.budwk.app.zhgh.dayofficework.unionReimburse.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.dayofficework.unionReimburse.service.UnionReimburseService;
+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/unionReimburse/certifierUserSign")
+@Ok("json:full")
+@Api("证明人签字")
+@Slf4j
+public class UnionReimburseCertifierUserSignController {
+
+
+    @Inject
+    private UnionReimburseService unionReimburseService;
+
+    @At("/index")
+    @Ok("beetl:/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html")
+    @SaCheckPermission("unionReimburse.certifierUserSign")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html")
+    @SaCheckPermission("h5.unionReimburse.certifierUserSign")
+    public void h5Index() {
+    }
+
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission(value = {"unionReimburse.certifierUserSign", "h5.unionReimburse.certifierUserSign"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm,
+                           boolean approval,
+                           Integer year,
+                           String unionId,
+                           String unitId,
+                           String reimburseProject) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  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 union_reimburse info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.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", "=", "ffa104d4-be2e-4383-818b-1aa15403628f");
+        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.unionId", "=", unionId);
+        cnd.andEX("info.unitId", "=", unitId);
+
+        // 报销项目查询条件
+        cnd.andEX("info.reimburseProject", "=", reimburseProject);
+
+
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("info.userName",pageForm.getSearchKeyword());
+            seg.orLike("info.loginName",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("t.id");
+        cnd.desc("t.createdAt");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = unionReimburseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java

@@ -71,8 +71,7 @@ public class UnionReimburseCollectController {
                            @Param(value = "year") Integer year,
                            @Param(value = "unionId") String unionId,
                            @Param(value = "unitId") String unitId,
-                           @Param(value = "reimburseProject") String reimburseProject,
+                           @Param(value = "reimburseProject") String reimburseProject) {
-                           @Param(value = "userName") String searchKeyword) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.*,
@@ -110,10 +109,10 @@ public class UnionReimburseCollectController {
         // 报销项目查询条件
         cnd.andEX("info.reimburseProject", "=", reimburseProject);
         // 姓名和工号查询条件
-        if (StrUtil.isNotBlank(searchKeyword)) {
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup seg = new SqlExpressionGroup();
-            seg.orLike("info.userName", "%" + searchKeyword + "%");
+            seg.orLike("info.userName",pageForm.getSearchKeyword());
-            seg.orLike("info.loginName", "%" + searchKeyword + "%");
+            seg.orLike("info.loginName",pageForm.getSearchKeyword());
             cnd.and(seg);
         }
 

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java

@@ -57,8 +57,7 @@ public class UnionReimburseReviewController {
                            Integer year,
                            String unionId,
                            String unitId,
-                           String reimburseProject,
+                           String reimburseProject) {
-                           String searchKeyword) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.*,
@@ -108,10 +107,10 @@ public class UnionReimburseReviewController {
 
 
         // 姓名和工号查询条件
-        if (StrUtil.isNotBlank(searchKeyword)) {
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup seg = new SqlExpressionGroup();
-            seg.orLike("info.userName", "%" + searchKeyword + "%");
+            seg.orLike("info.userName",pageForm.getSearchKeyword());
-            seg.orLike("info.loginName", "%" + searchKeyword + "%");
+            seg.orLike("info.loginName",pageForm.getSearchKeyword());
             cnd.and(seg);
         }
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java

@@ -25,7 +25,7 @@ public class UnionReimburseFundSourceInterceptor implements FlowInterceptor {
 
     @Override
     public void intercept(Execution execution) {
-        String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
+       /* String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA);
         UnionReimburse unionReimburse = Json.fromJson(UnionReimburse.class, formDataStr);
         // 从ServiceContext获取Dao实例
         Dao dao = ServiceContext.find(Dao.class);
@@ -110,7 +110,7 @@ public class UnionReimburseFundSourceInterceptor implements FlowInterceptor {
             } else {
                 throw new BaseException("不支持的经费来源类型: " + reimburseFundSource);
             }
-        }
+        }*/
     }
 
 }

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburse.java

@@ -70,6 +70,41 @@ public class UnionReimburse extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, width = 100)
     private String unionName;
 
+    @Column
+    @Comment("证明人ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String certifierUserId;
+
+    @Column
+    @Comment("证明人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String certifierUserName;
+
+    @Column
+    @Comment("证明人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 120)
+    private String certifierLoginName;
+
+    @Column
+    @Comment("证明人分工会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String certifierUnionId;
+
+    @Column
+    @Comment("证明人分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String certifierUnionName;
+
+    @Column
+    @Comment("证明人单位ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String certifierUnitId;
+
+    @Column
+    @Comment("证明人单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String certifierUnitName;
+
 
     @Column
     @Comment("报销类别")
@@ -139,6 +174,11 @@ public class UnionReimburse extends BaseModel {
     @ColDefine(type = ColType.MYSQL_JSON)
     private List<JSONObject> files;
 
+    @Comment("签字")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    @Column(hump = true)
+    private String userSign;
+
 
     /**
      * 慰问

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

@@ -85,6 +85,7 @@ public class CondolenceApplyController {
 	@ApiOperation("提交申请")
 	@SaCheckPermission(value = {"condolence.apply", "h5.condolence.apply"}, mode = SaMode.OR)
 	@SLog(tag = "职工慰问系统-慰问申请", msg = "提交申请")
+	@Aop(TransAop.READ_COMMITTED)
 	public Result submit(@Param("data") Condolence condolence) {
 		if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now());
 		dao.insertOrUpdate(condolence);

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

@@ -85,7 +85,7 @@ public class CondolenceTypeController {
 	@ApiOperation("查询职工慰问类型")
 	@SaCheckLogin
 	public Result queryCondolenceType() {
-		List<CondolenceType> list = typeService.query(Cnd.where(CondolenceType::getEnable, "=", true).desc(CondolenceType::getCode));
+		List<CondolenceType> list = typeService.query(Cnd.where(CondolenceType::getEnable, "=", true).asc(CondolenceType::getCode));
 		return Result.success(list);
 	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/Condolence.java

@@ -125,6 +125,11 @@ public class Condolence extends BaseModel {
 	@ColDefine(type = ColType.VARCHAR, width = 32)
 	private String type;
 
+	@Column
+	@Comment("慰问编码")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String typeCode;
+
 	@Column
 	@Comment("慰问方式")
 	@ColDefine(type = ColType.VARCHAR, width = 20)
@@ -238,4 +243,54 @@ public class Condolence extends BaseModel {
 	@ColDefine(type = ColType.VARCHAR, width = 100)
 	private String certifierUnitName;
 
+	@Column
+	@Comment("经办人ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String handlerUserId;
+
+	@Column
+	@Comment("经办人姓名")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String handlerUserName;
+
+	@Column
+	@Comment("经办人工号")
+	@ColDefine(type = ColType.VARCHAR, width = 120)
+	private String handlerLoginName;
+
+	@Column
+	@Comment("经办人分工会ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String handlerUnionId;
+
+	@Column
+	@Comment("经办人分工会")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String handlerUnionName;
+
+	@Column
+	@Comment("经办人单位ID")
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	private String handlerUnitId;
+
+	@Column
+	@Comment("经办人单位")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String handlerUnitName;
+
+	@Column
+	@Comment("入院时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String hospitalizationTime;
+
+	@Column
+	@Comment("出院时间")
+	@ColDefine(type = ColType.VARCHAR, width = 30)
+	private String leaveHospitalTime;
+
+	@Column
+	@Comment("当年第几次住院")
+	@ColDefine(type = ColType.INT)
+	private Integer thisYearHospitalizationNum;
+
 }

src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java

@@ -182,6 +182,16 @@ public class MemberApplyRecord extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, customType = "text")
     private String personalData;
 
+    @Column
+    @Comment("特长及获奖情况")
+    @ColDefine(type = ColType.VARCHAR, customType = "text")
+    private String specialty;
+    @Column
+    @Comment("婚姻状况")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String marriage;
+
+
     @Column
     @Comment("备注")
     @ColDefine(type = ColType.VARCHAR, width = 255)
@@ -227,4 +237,9 @@ public class MemberApplyRecord extends BaseModel {
     @Comment("来源，高校编码")
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String origin;
+
+    @Column
+    @Comment("家庭住址")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String homeAddress;
 }

src/main/resources/static/components/module/activity/UserScope.vue

@@ -413,8 +413,8 @@ module.exports = {
         }
       ],
       sexTypeOptions: [
-        {code: "男", name: "男"},
+        {code: "男性", name: "男性"},
-        {code: "女", name: "女"}
+        {code: "女性", name: "女性"}
       ],
       pageForm: {
         age: [0, 0],

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html

@@ -33,14 +33,14 @@ layout("/layouts/platform.html"){
                 <el-descriptions-item label="报销项目" span="2">
                     <el-form-item label="报销项目" prop="reimburseProject">
                         <el-radio-group v-model="formData.reimburseProject" size="medium">
-                            <el-radio :label="item.code" border v-for="item in reimburseProjects">
+                            <el-radio :label="item.code" border v-for="item in reimburseProjectList">
                                 {{item.name}}
                             </el-radio>
                         </el-radio-group>
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="报销经费来源" span="2">
+                <!-- <el-descriptions-item label="报销经费来源" span="2">
                      <el-form-item label="报销经费来源" prop="reimburseFundSource">
                          <el-radio-group v-model="formData.reimburseFundSource" size="medium" @change="reimburseFundSourceChange">
                              <el-radio :label="item.code" border v-for="item in budgetTypeOption">
@@ -48,7 +48,7 @@ layout("/layouts/platform.html"){
                              </el-radio>
                          </el-radio-group>
                      </el-form-item>
-                </el-descriptions-item>
+                 </el-descriptions-item>-->
 
                 <el-descriptions-item label="联系方式">
                     <el-form-item prop="mobile" label="联系方式">
@@ -56,18 +56,28 @@ layout("/layouts/platform.html"){
                                   placeholder="请输入联系方式"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-
+                <el-descriptions-item label="证明人">
-                <el-descriptions-item label="所属社团" v-if="formData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3'">
+                    <el-form-item label="证明人" prop="certifierUserId">
-                    <el-form-item label="所属社团" prop="clubId">
+                        <el-select
-                        <el-select v-model="formData.clubId"  style="width: 100%"
+                            style="width: 100%"
-                                   placeholder="请选择所属社团" filterable clearable>
+                            v-model="formData.certifierUserId"
-                            <el-option v-for="item in clubOptions" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
+                            filterable
+                            clearable
+                            remote
+                            reserve-keyword
+                            placeholder="请输入姓名或工号查询"
+                            :remote-method="createRemoteMethod(userOptions)"
+                            @change="userChange">
+                            <el-option
+                                v-for="item in userOptions"
+                                :key="item.id"
+                                :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'"
+                                :value="item.id">
+                            </el-option>
                         </el-select>
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="经费余额">{{formData.fundBalance}}</el-descriptions-item>
-
                 <el-descriptions-item label="户名">
                     <el-form-item prop="bankUserName" label="户名">
                         <el-input v-model="formData.bankUserName" show-word-limit
@@ -87,70 +97,14 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="慰问对象" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
+                <el-descriptions-item label="活动名称">
-                    <el-form-item label="慰问对象" prop="condolenceId">
-                        <el-select
-                                style="width: 100%"
-                                v-model="formData.condolenceId"
-                                filterable
-                                clearable
-                                remote
-                                reserve-keyword
-                                placeholder="请输入姓名或工号查询"
-                                :remote-method="createRemoteMethod(userOptions)"
-                                @change="userChange">
-                            <el-option
-                                    v-for="item in userOptions"
-                                    :key="item.id"
-                                    :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
-                                    :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-descriptions-item>
-
-                <el-descriptions-item label="联系方式" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
-                    <el-form-item prop="condolenceMobile" label="联系方式">
-                        <el-input v-model="formData.condolenceMobile" show-word-limit
-                                  placeholder="请输入联系方式"></el-input>
-                    </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="慰问类型" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
-                    <el-form-item label="慰问类型" prop="type">
-                        <el-select v-model="formData.condolenceType" @change="typeChange" style="width: 100%"
-                                   placeholder="请选择慰问类型">
-                            <el-option v-for="item in typeOptions"
-                                       :value="item.id"
-                                       :key="item.id"
-                                       :disabled="item.isDisabled"
-                                       :label="item.name"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="慰问金额" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
-                    {{formData.money}}
-                </el-descriptions-item>
-                <el-descriptions-item label="慰问时间" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
-                    <el-form-item label="慰问时间" prop="condolenceTime">
-                        <el-date-picker
-                                clearable
-                                style="width: 100%"
-                                v-model="formData.condolenceTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择慰问时间">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-descriptions-item>
-
-                <el-descriptions-item label="活动名称" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
                     <el-form-item label="活动名称" prop="activityName">
                         <el-input type="text" v-model="formData.activityName" placeholder="请输入活动名称"
                                   maxlength="60"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="活动类型" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">
+                <!--   <el-descriptions-item label="活动类型" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">
                        <el-form-item label="活动类型" prop="activityType">
                            <el-select v-model="formData.activityType" placeholder="请选择活动类型" style="width: 100%">
                                <el-option label="分工会活动" value="分工会活动"></el-option>
@@ -158,26 +112,20 @@ layout("/layouts/platform.html"){
                                <el-option label="协会(社团)活动" value="协会(社团)活动"></el-option>
                            </el-select>
                        </el-form-item>
-                </el-descriptions-item>
+                   </el-descriptions-item>-->
-                <el-descriptions-item label="活动人数" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">
-                    <el-form-item label="活动人数" prop="activityNumber">
-                        <el-input v-model="formData.activityNumber" placeholder="请输入活动人数"
-                                  type="number"></el-input>
-                    </el-form-item>
-                </el-descriptions-item>
 
-                <el-descriptions-item label="活动地点" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                <el-descriptions-item label="活动地点">
                     <el-form-item label="活动地点" prop="activityPlace">
                         <el-input v-model="formData.activityPlace" placeholder="请输入活动地点" type="text"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="报销金额" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                <el-descriptions-item label="报销金额">
                     <el-form-item label="报销金额" prop="money">
                         <el-input v-model="formData.money" placeholder="输入报销金额"
                                   type="number"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="活动时间" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                <!--        <el-descriptions-item label="活动时间" >
                             <el-form-item label="活动时间" prop="activityTime">
                                 <el-date-picker v-model="formData.activityTime"
                                                 placeholder="活动时间"
@@ -185,9 +133,9 @@ layout("/layouts/platform.html"){
                                                 value-format="yyyy-MM-dd">
                                 </el-date-picker>
                             </el-form-item>
-                </el-descriptions-item>
+                        </el-descriptions-item>-->
 
-                <el-descriptions-item label="发票张数" v-if="formData.reimburseType === 'UNION_REIMBURSE_TYPE_1'">
+                <el-descriptions-item label="发票张数">
                     <el-form-item label="发票张数" prop="invoiceNumber">
                         <el-input-number v-model="formData.invoiceNumber"
                                          :max="1000" :min="0" controls-position="right"
@@ -195,16 +143,10 @@ layout("/layouts/platform.html"){
                                          style="width: 100%"></el-input-number>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="发票号码" v-if="formData.reimburseType === 'UNION_REIMBURSE_TYPE_1'">
+                <el-descriptions-item></el-descriptions-item>
-                    <el-form-item id="invoice" label="发票号码" prop="invoice">
-                        <el-input v-model="formData.invoice"
-                                  placeholder="请填写发票号码，如有多个请用逗号分隔"></el-input>
-                    </el-form-item>
-                </el-descriptions-item>
-
 
                 <el-descriptions-item label="支付内容" :span="2">
-                    <el-form-item prop="remark" label="支付内容">
+                    <el-form-item prop="paymentNotes" label="支付内容">
                         <el-input maxlength="500" v-model="formData.paymentNotes" placeholder="请填写支付内容"
                                   type="textarea" :autosize="{ minRows: 4, maxRows: 8}"></el-input>
                     </el-form-item>
@@ -223,6 +165,11 @@ layout("/layouts/platform.html"){
                         ></file-upload>
                     </el-form-item>
                 </el-descriptions-item>
+                <el-descriptions-item label="签字" :span="2">
+                    <el-form-item label="签字" prop="userSign">
+                        <pc-signature v-model="formData.userSign"></pc-signature>
+                    </el-form-item>
+                </el-descriptions-item>
             </el-descriptions>
         </el-form>
         <el-row type="flex" justify="end" class="mt20">
@@ -236,7 +183,7 @@ layout("/layouts/platform.html"){
 
 <script nonce="${cspNonce!}">
     new Vue({
-        el: '#app',
+        el: "#app",
         store,
         dicts: ["UNION_REIMBURSE_TYPE", "UNION_REIMBURSE_PAYMENT_WAY", "UNION_REIMBURSE_FUND_SOURCE"],
         data() {
@@ -244,21 +191,31 @@ layout("/layouts/platform.html"){
                 bizId: GetQueryString("bizId"),
                 taskId: GetQueryString("taskId"),
                 formData: {
-                    reimburseType: "",
+                    reimburseType: ""
                 },
                 formRules: {
-                    reimburseType: [{required: true, message: '请选择报销类别', trigger: ["change", "blur"]}],
+                    reimburseType: [{ required: true, message: "请选择报销类别", trigger: ["change", "blur"] }],
-                    paymentWay: [{required: true, message: '请选择支付方式', trigger: ["change", "blur"]}],
+                    paymentWay: [{ required: true, message: "请选择支付方式", trigger: ["change", "blur"] }],
-                    reimburseProject: [{required: true, message: '请选择报销项目', trigger: ["change", "blur"]}],
+                    reimburseProject: [{ required: true, message: "请选择报销项目", trigger: ["change", "blur"] }],
-                    reimburseFundSource: [{required: true, message: '请选择经费来源', trigger: ["change", "blur"]}],
+                    reimburseFundSource: [{ required: true, message: "请选择经费来源", trigger: ["change", "blur"] }],
-                    bankUserName: [{required: true, message: '请填写户名', trigger: ["change", "blur"]}],
+                    bankUserName: [{ required: true, message: "请填写户名", trigger: ["change", "blur"] }],
-                    bankCardNumber: [ {required: true, message: '请填写银行账号', trigger: ["change", "blur"]},{ pattern: /^([1-9]{1})(\d{15}|\d{18})$/, message: '请输入正确的银行卡号', trigger: 'blur' }],
+                    bankCardNumber: [{
-                    bankOfDeposit: [{required: true, message: '请填写开户行', trigger: ["change", "blur"]}],
+                        required: true,
-                    condolenceMobile: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }],
+                        message: "请填写银行账号",
-                    condolenceTime: [{required: true, message: '请选择慰问时间', trigger: ["change", "blur"]}],
+                        trigger: ["change", "blur"]
-                    invoiceNumber: [{required: true, message: '请填写发票张数', trigger: ["change", "blur"]}],
+                    }, { pattern: /^([1-9]{1})(\d{15}|\d{18})$/, message: "请输入正确的银行卡号", trigger: "blur" }],
-                    invoice: [{required: true, message: '请填写发票号码', trigger: ["change", "blur"]}],
+                    bankOfDeposit: [{ required: true, message: "请填写开户行", trigger: ["change", "blur"] }],
-                    paymentNotes: [{required: true, message: '请填写支付内容', trigger: ["change", "blur"]}],
+                    condolenceMobile: [{ pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+                    condolenceTime: [{ required: true, message: "请选择慰问时间", trigger: ["change", "blur"] }],
+                    invoiceNumber: [{ required: true, message: "请填写发票张数", trigger: ["change", "blur"] }],
+                    invoice: [{ required: true, message: "请填写发票号码", trigger: ["change", "blur"] }],
+                    paymentNotes: [{ required: true, message: "请填写支付内容", trigger: ["change", "blur"] }],
+                    activityName: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    money: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    mobile: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    userSign: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    certifierUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
                 },
                 chooseType: {},
                 userOptions: [],
@@ -272,26 +229,26 @@ layout("/layouts/platform.html"){
         // 监听报销类别发生变化，报销项目联动改变
         watch: {
             "formData.reimburseType"(newVal) {
-                if (newVal === 'UNION_REIMBURSE_TYPE_1') {
+                if (newVal === "UNION_REIMBURSE_TYPE_1") {
                     this.reimburseProjects = this.reimburseProjectList.filter((o) => {
-                        return ['1', 'UNION_REIMBURSE_TYPE_1'].includes(o.remark)
+                        return ["1", "UNION_REIMBURSE_TYPE_1"].includes(o.remark)
                     })
                 } else {
                     this.reimburseProjects = this.reimburseProjectList.filter((o) => {
-                        return ['1', 'UNION_REIMBURSE_TYPE_2'].includes(o.remark)
+                        return ["1", "UNION_REIMBURSE_TYPE_2"].includes(o.remark)
                     })
                 }
             },
             // 添加对社团选择的监听
             "formData.clubId"(newVal) {
                 // 当经费来源是社团且选择了具体社团时，重新查询余额
-                if (this.formData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3' && newVal) {
+                if (this.formData.reimburseFundSource === "UNION_REIMBURSE_FUND_SOURCE_3" && newVal) {
                     // 选择了具体社团，获取社团名称并保存
-                    const selectedClub = this.clubOptions.find(club => club.id === newVal);
+                    const selectedClub = this.clubOptions.find(club => club.id === newVal)
                     if (selectedClub) {
-                        this.$set(this.formData, 'clubName', selectedClub.clubName);
+                        this.$set(this.formData, "clubName", selectedClub.clubName)
                     }
-                    this.reimburseFundSourceChange();
+                    this.reimburseFundSourceChange()
                 }
             }
         },
@@ -301,24 +258,24 @@ layout("/layouts/platform.html"){
                     this.selectQueryUser(keyword, options)
                 }
             },
-            //查询慰问对象
             selectQueryUser(keyword, options) {
-                return new Promise((resolve) => {
                 options.length = 0
                 this.$axios.post("/platform/UnionReimburse/apply/listUser", { keyword: keyword }).then((res) => {
                     if (res.code === 0) {
                         options.push(...res.data)
                     }
-                        resolve()
-                    })
                 })
             },
             userChange(val) {
                 const user = this.userOptions.find(o => o.id === val)
                 if (user) {
-                    const { userName,mobile } = user
+                    const { userName, loginName, unitId, unitName, unionId, unionName } = user
-                    this.$set(this.formData, "condolenceName", userName)
+                    this.$set(this.formData, "certifierUserName", userName)
-                    this.$set(this.formData, "condolenceMobile", mobile)
+                    this.$set(this.formData, "certifierLoginName", loginName)
+                    this.$set(this.formData, "certifierUnitId", unitId)
+                    this.$set(this.formData, "certifierUnitName", unitName)
+                    this.$set(this.formData, "certifierUnionId", unionId)
+                    this.$set(this.formData, "certifierUnionName", unionName)
                 }
             },
             //
@@ -331,24 +288,15 @@ layout("/layouts/platform.html"){
             },
             // 保存
             onSave() {
-                // 余额校验
-                if (this.formData.money && this.formData.fundBalance) {
-                    const balance = parseFloat(this.formData.fundBalance);
-                    const money = parseFloat(this.formData.money);
-                    if (balance < money) {
-                        this.$message.warning("经费余额不足");
-                        return;
-                    }
-                }
                 this.$confirm("您确定保存吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post('/platform/unionReimburse/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
+                    this.$axios.post("/platform/unionReimburse/apply/save", { data: JSON.stringify(this.formData) }).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            commonUtil.pjaxPush('/platform/unionReimburse/mine/index')
+                            commonUtil.pjaxPush("/platform/unionReimburse/mine/index")
                         }
                     })
                 })
@@ -358,71 +306,53 @@ layout("/layouts/platform.html"){
                 return new Promise((resolve) => {
                     this.$refs.formRef.validate((valid) => {
                         if (valid) {
-                            resolve(true);
+                            resolve(true)
                         } else {
-                            this.$message.error('请完善必填信息');
+                            this.$message.error("请完善必填信息")
-                            resolve(false);
+                            resolve(false)
                         }
-                    });
+                    })
-                });
+                })
             },
             // 提交
             async onSubmit() {
-                // 余额校验
-                if (this.formData.money && this.formData.fundBalance) {
-                    const balance = parseFloat(this.formData.fundBalance);
-                    const money = parseFloat(this.formData.money);
-                    if (balance < money) {
-                        this.$message.warning("经费余额不足");
-                        return;
-                    }
-                }
                 // 表单验证
-                const isValid = await this.validateBeforeSubmit();
+                const isValid = await this.validateBeforeSubmit()
-                if (!isValid) return;
+                if (!isValid) return
 
                 this.$confirm("您确定要提交吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post('/platform/unionReimburse/apply/submit', {
+                    this.$axios.post("/platform/unionReimburse/apply/submit", {
                         data: JSON.stringify(this.formData)
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            commonUtil.pjaxPush('/platform/unionReimburse/mine/index')
+                            commonUtil.pjaxPush("/platform/unionReimburse/mine/index")
                         }
                     })
                 })
             },
             // 再次提交
             async onFinishTask() {
-                // 余额校验
-                if (this.formData.money && this.formData.fundBalance) {
-                    const balance = parseFloat(this.formData.fundBalance);
-                    const money = parseFloat(this.formData.money);
-                    if (balance < money) {
-                        this.$message.warning("经费余额不足");
-                        return;
-                    }
-                }
                 // 表单验证
-                const isValid = await this.validateBeforeSubmit();
+                const isValid = await this.validateBeforeSubmit()
-                if (!isValid) return;
+                if (!isValid) return
 
                 this.$confirm("您确定要提交吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post('/platform/unionReimburse/apply/submitAgain', {
+                    this.$axios.post("/platform/unionReimburse/apply/submitAgain", {
                         data: JSON.stringify(this.formData),
                         taskId: GetQueryString("taskId")
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            commonUtil.pjaxPush('/platform/unionReimburse/mine/index')
+                            commonUtil.pjaxPush("/platform/unionReimburse/mine/index")
                         }
                     })
                 })
@@ -438,66 +368,66 @@ layout("/layouts/platform.html"){
             reimburseFundSourceChange() {
                 // 检查是否有选择经费来源
                 if (!this.formData.reimburseFundSource) {
-                    this.$set(this.formData, 'fundBalance', '');
+                    this.$set(this.formData, "fundBalance", "")
-                    return;
+                    return
                 }
 
                 // 如果是社团经费来源，但没有选择具体社团，则不查询
-                if (this.formData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3' && !this.formData.clubId) {
+                if (this.formData.reimburseFundSource === "UNION_REIMBURSE_FUND_SOURCE_3" && !this.formData.clubId) {
-                    this.$set(this.formData, 'fundBalance', '');
+                    this.$set(this.formData, "fundBalance", "")
-                    return;
+                    return
                 }
 
                 // 定义API映射关系
                 const apiMap = {
-                    'UNION_REIMBURSE_FUND_SOURCE_1': {
+                    "UNION_REIMBURSE_FUND_SOURCE_1": {
-                        url: "/platform/unionReimburse/apply/getSchoolBudget",
+                        url: "/platform/unionReimburse/apply/getSchoolBudget"
                     },
-                    'UNION_REIMBURSE_FUND_SOURCE_2': {
+                    "UNION_REIMBURSE_FUND_SOURCE_2": {
-                        url: "/platform/unionReimburse/apply/getUnionBalance",
+                        url: "/platform/unionReimburse/apply/getUnionBalance"
                     },
-                    'UNION_REIMBURSE_FUND_SOURCE_3': {
+                    "UNION_REIMBURSE_FUND_SOURCE_3": {
-                        url: "/platform/unionReimburse/apply/getClubBudget",
+                        url: "/platform/unionReimburse/apply/getClubBudget"
+                    }
                 }
-                };
 
-                const fundSource = this.formData.reimburseFundSource;
+                const fundSource = this.formData.reimburseFundSource
-                const apiInfo = apiMap[fundSource];
+                const apiInfo = apiMap[fundSource]
 
                 // 如果没有匹配的API，清空经费余额并返回
                 if (!apiInfo) {
-                    this.$set(this.formData, 'fundBalance', '');
+                    this.$set(this.formData, "fundBalance", "")
-                    return;
+                    return
                 }
 
                 // 构造请求参数
                 const params = {
                     reimburseFundSource: fundSource
-                };
+                }
 
                 // 如果是社团经费，需要传递社团ID
-                if (fundSource === 'UNION_REIMBURSE_FUND_SOURCE_3' && this.formData.clubId) {
+                if (fundSource === "UNION_REIMBURSE_FUND_SOURCE_3" && this.formData.clubId) {
-                    params.clubId = this.formData.clubId;
+                    params.clubId = this.formData.clubId
                 }
 
                 // 显示加载状态
-                this.$set(this.formData, 'fundBalance', '查询中...');
+                this.$set(this.formData, "fundBalance", "查询中...")
 
                 // 发送请求
                 this.$axios.post(apiInfo.url, params)
                     .then(response => {
                         if (response.code === 0) {
                             // 显示经费余额（只显示数字，不显示"元"）
-                            this.$set(this.formData, 'fundBalance', response.data || '0.00');
+                            this.$set(this.formData, "fundBalance", response.data || "0.00")
                         } else {
-                            this.$set(this.formData, 'fundBalance', '查询失败');
+                            this.$set(this.formData, "fundBalance", "查询失败")
                         }
                     })
                     .catch(error => {
-                        console.error("经费余额查询失败:", error);
+                        console.error("经费余额查询失败:", error)
-                        this.$set(this.formData, 'fundBalance', '查询失败');
+                        this.$set(this.formData, "fundBalance", "查询失败")
-                        this.$message.error("经费余额查询失败");
+                        this.$message.error("经费余额查询失败")
-                    });
+                    })
             },
             // 初始化
             async init() {
@@ -535,22 +465,8 @@ layout("/layouts/platform.html"){
                     this.$axios.post("/platform/unionReimburse/apply/info", { id: this.bizId }).then(async (res) => {
                         if (res.code === 0) {
                             this.formData = res.data
-                            // 确保在加载用户列表后再设置默认值
+                            await this.selectQueryUser(this.formData.certifierLoginName, this.userOptions)
-                            await this.selectQueryUser('', this.userOptions)
+                            // this.chooseType = this.typeOptions.find(o => o.id === this.formData.type)
-                            // 如果有慰问对象ID，确保userOptions中有对应数据
-                            if (this.formData.condolenceId) {
-                                // 检查userOptions中是否已存在该用户
-                                const existingUser = this.userOptions.find(user => user.id === this.formData.condolenceId);
-                                if (!existingUser && this.formData.condolenceName) {
-                                    // 如果不存在但有名称信息，则手动添加
-                                    this.userOptions.unshift({
-                                        id: this.formData.condolenceId,
-                                        userName: this.formData.condolenceName,
-                                        mobile: this.formData.condolenceMobile || '',
-                                    });
-                                }
-                            }
-                            this.chooseType = this.typeOptions.find(o => o.id === this.formData.type)
                         }
                     })
                 } else {
@@ -564,13 +480,12 @@ layout("/layouts/platform.html"){
                         unionName: union?.name,
                         reimburseType: "UNION_REIMBURSE_TYPE_1",
                         mobile: mobile,
-                        userId: id,
+                        userId: id
+                    }
                 }
             }
-            },
         },
         created() {
-            this.queryCondolenceType()
             this.init()
             //社团查询
             this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res))

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html

@@ -0,0 +1,227 @@
+<!--#
+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.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-item label="报销项目">
+                    <el-select v-model="pageForm.reimburseProject" @change="doSearch" style="width: 100%"
+                               placeholder="请选择报销项目" clearable>
+                        <el-option v-for="item in dict.type.UNION_REIMBURSE_PROJECT"
+                                   :value="item.code"
+                                   :key="item.code"
+                                   :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="loginName" label="经办人工号"></el-table-column>
+                <el-table-column prop="userName" label="姓名"></el-table-column>
+                <el-table-column prop="unionName" label="所属工会"></el-table-column>
+                <el-table-column prop="unitName" 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="reimburseType" label="报销类别">
+                    <template slot-scope="{row}">
+                        <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
+                                  :value="row.reimburseType">
+                        </dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="reimburseProject" label="报销项目">
+                    <template slot-scope="{row}">
+                        <dict-tag :options="dict.type.UNION_REIMBURSE_PROJECT"
+                                  :value="row.reimburseProject">
+                        </dict-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="money" 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>
+            <union-reimburse-info ref="unionReimburseInfoRef">
+                <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>
+            </union-reimburse-info>
+        </template>
+    </guava>
+</div>
+
+
+<script nonce="${cspNonce!}">
+    <!--#include('../info.js'){}#-->
+    new Vue({
+        el: "#app",
+        store,
+        dicts: ["UNION_REIMBURSE_TYPE", "UNION_REIMBURSE_PROJECT"],
+        //分页数据
+        mixins: [initTableMixins],
+        components: {
+            "union-reimburse-info": unionReimburseInfo
+        },
+        data() {
+            return {
+                pageDataUrl: "/platform/unionReimburse/certifierUserSign/pageData",
+                pageForm: {
+                    approval: false
+                },
+                formData: {},
+                showApprovalForm: false,
+                unionOptions: [],
+                unitOptions: []
+            }
+        }
+        ,
+        methods: {
+            onView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.unionReimburseInfoRef.onOpen(row)
+                })
+            },
+
+            openAudit(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.unionReimburseInfoRef.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()
+                        }
+                    })
+                })
+            }
+
+
+        },
+        created() {
+            this.pageData()
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+        }
+    })
+</script>
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html

@@ -54,6 +54,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会"></el-table-column>
                 <el-table-column prop="unitName" 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="reimburseType" label="报销类别">
                     <template slot-scope="{row}">
                         <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js

@@ -25,36 +25,27 @@ const unionReimburseInfo = {
                               :value="viewData.reimburseProject">
                     </dict-tag>
                 </el-descriptions-item>
-                <el-descriptions-item label="报销经费来源">
-                    <dict-tag :options="dict.type.UNION_REIMBURSE_FUND_SOURCE"
-                              :value="viewData.reimburseFundSource">
-                    </dict-tag>
-                </el-descriptions-item>
                 <el-descriptions-item label="联系方式">{{viewData.mobile}}</el-descriptions-item>
-                <el-descriptions-item label="所属社团" v-if="viewData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3'">{{viewData.clubName}}</el-descriptions-item>
+                <el-descriptions-item label="证明人">{{viewData.certifierUserName}}（{{viewData.certifierLoginName}}）
-                <el-descriptions-item label="经费余额" >{{viewData.fundBalance}}</el-descriptions-item>
+                </el-descriptions-item>
                 <el-descriptions-item label="户名">{{viewData.bankUserName}}</el-descriptions-item>
                 <el-descriptions-item label="银行账号">{{viewData.bankCardNumber}}</el-descriptions-item>
                 <el-descriptions-item label="开户行">{{viewData.bankOfDeposit}}</el-descriptions-item>
-                <el-descriptions-item label="慰问对象" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{viewData.condolenceName}}</el-descriptions-item>
+                <el-descriptions-item label="活动名称">{{viewData.activityName}}</el-descriptions-item>
-                <el-descriptions-item label="联系方式" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{viewData.condolenceMobile}}</el-descriptions-item>
+                <el-descriptions-item label="活动地点">{{viewData.activityPlace||'暂无'}}</el-descriptions-item>
-                <el-descriptions-item label="慰问类型" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{viewData.typeName}}</el-descriptions-item>
+                <el-descriptions-item label="报销金额">{{viewData.money}}</el-descriptions-item>
-                <el-descriptions-item label="慰问金额" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{viewData.money}}</el-descriptions-item>
+                <el-descriptions-item label="发票张数">{{viewData.invoiceNumber}}</el-descriptions-item>
-                <el-descriptions-item label="慰问时间" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{$moment(viewData.condolenceTime).format('YYYY-MM-DD')}}</el-descriptions-item>
-                <el-descriptions-item label="活动名称" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{viewData.activityName}}</el-descriptions-item>
-                <el-descriptions-item label="活动类型" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">{{viewData.activityType}}</el-descriptions-item>
-                <el-descriptions-item label="活动人数" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">{{viewData.activityNumber}}</el-descriptions-item>
-                <el-descriptions-item label="活动地点" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{viewData.activityPlace}}</el-descriptions-item>
-                <el-descriptions-item label="报销金额" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{viewData.money}}</el-descriptions-item>
-                <el-descriptions-item label="活动时间" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{$moment(viewData.activityTime).format('YYYY-MM-DD')}}</el-descriptions-item>
-                <el-descriptions-item label="发票张数" v-if="viewData.reimburseType === 'UNION_REIMBURSE_TYPE_1'">{{viewData.invoiceNumber}}</el-descriptions-item>
-                <el-descriptions-item label="发票号码" v-if="viewData.reimburseType === 'UNION_REIMBURSE_TYPE_1'">{{viewData.invoice}}</el-descriptions-item>
                 <el-descriptions-item label="支付内容" :span="2">{{viewData.paymentNotes}}</el-descriptions-item>
+                <el-descriptions-item label="签字" :span="2">
+                    <el-image :src="viewData.userSign" fit="cover" style="height: 60px"
+                              v-if="viewData.userSign"></el-image>
+                    <span v-else>暂无附件</span>
+                </el-descriptions-item>
                 <el-descriptions-item label="附件" :span="2">
-                    <file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
+                    <file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files"
+                                  complete_result></file-preview>
                     <span v-else>暂无附件</span>
                 </el-descriptions-item>
-                
             </el-descriptions>
 
             <template v-for="task in doneTasks">
@@ -81,9 +72,15 @@ const unionReimburseInfo = {
                             <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
                                       :value="task.ext.submitType"></dict-tag>
                         </el-descriptions-item>
-                        <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
+                        <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode" :span="3">{{
                             task.taskFormData.opinion }}
                         </el-descriptions-item>
+                        <el-descriptions-item label="签字" :span="3">
+                            <el-image v-if="task.ext.tf_userSign"
+                                      :src="task.ext.tf_userSign"
+                                      class="signature-image"></el-image>
+                            <span v-else>暂无</span>
+                        </el-descriptions-item>
                     </el-descriptions>
                 </div>
             </template>

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html

@@ -52,6 +52,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会"></el-table-column>
                 <el-table-column prop="unitName" 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="reimburseType" label="报销类别">
                     <template slot-scope="{row}">
                         <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html

@@ -57,6 +57,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会"></el-table-column>
                 <el-table-column prop="unitName" 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="reimburseType" label="报销类别">
                     <template slot-scope="{row}">
                         <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
@@ -105,6 +110,10 @@ layout("/layouts/platform.html"){
                                       :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>
@@ -119,7 +128,6 @@ layout("/layouts/platform.html"){
 </div>
 
 
-
 <script nonce="${cspNonce!}">
     <!--#include('../info.js'){}#-->
     new Vue({
@@ -140,7 +148,7 @@ layout("/layouts/platform.html"){
                 formData: {},
                 showApprovalForm: false,
                 unionOptions: [],
-                unitOptions: [],
+                unitOptions: []
             }
         }
         ,
@@ -164,6 +172,8 @@ layout("/layouts/platform.html"){
             },
 
             handleTaskAction(val) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
                         this.$confirm("您确定要提交吗？", "提示", {
                             confirmButtonText: "确定",
                             cancelButtonText: "取消",
@@ -182,6 +192,8 @@ layout("/layouts/platform.html"){
                                 }
                             })
                         })
+                    }
+                })
             },
 
             onRevoke(row) {

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

@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
         <snaker-start slot="header" label="职工慰问" define_key="ZGWW"></snaker-start>
         <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
                  class="flow-task-form">
-            <el-descriptions :column="2" border>
+            <el-descriptions :column="3" border>
                 <el-descriptions-item label="申请人姓名">{{formData.applyUserName}}</el-descriptions-item>
                 <el-descriptions-item label="申请人工号">{{formData.applyLoginName}}</el-descriptions-item>
                 <el-descriptions-item label="申请人单位">{{formData.applyUnitName}}</el-descriptions-item>
@@ -28,28 +28,49 @@ layout("/layouts/platform.html"){
                             <el-option
                                 v-for="item in helpUserOptions"
                                 :key="item.id"
-                                    :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
+                                :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'"
                                 :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="收款人">
+               <!-- <el-descriptions-item label="经办人">
-                    <el-form-item prop="payUserId" label="慰问对象">
+                    <el-form-item prop="handlerUserId" label="经办人">
                         <el-select
                             style="width: 100%"
-                                v-model="formData.payUserId"
+                            v-model="formData.handlerUserId"
                             filterable
                             clearable
                             remote
                             reserve-keyword
                             placeholder="请输入姓名或工号查询"
-                                :remote-method="createRemoteMethod(payUserOptions)"
+                            :remote-method="createRemoteMethod(handlerUserOptions)"
-                                @change="payUserChange">
+                            @change="handlerUserChange">
                             <el-option
-                                    v-for="item in payUserOptions"
+                                v-for="item in handlerUserOptions"
                                 :key="item.id"
-                                    :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
+                                :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-descriptions-item>-->
+                <el-descriptions-item label="证明人">
+                    <el-form-item prop="certifierUserId" label="证明人">
+                        <el-select
+                            style="width: 100%"
+                            v-model="formData.certifierUserId"
+                            filterable
+                            clearable
+                            remote
+                            reserve-keyword
+                            placeholder="请输入姓名或工号查询"
+                            :remote-method="createRemoteMethod(certifierUserOptions)"
+                            @change="certifierUserChange">
+                            <el-option
+                                v-for="item in certifierUserOptions"
+                                :key="item.id"
+                                :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'"
                                 :value="item.id">
                             </el-option>
                         </el-select>
@@ -67,19 +88,6 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="慰问方式">
-                    <el-form-item prop="way" label="慰问方式">
-                        <el-select v-model="formData.way"
-                                   placeholder="选择慰问类型自动匹配慰问方式"
-                                   style="width: 100%"
-                                   clearable
-                                   disabled>
-                            <el-option label="慰问金 (A)" value="1"></el-option>
-                            <el-option label="提货券 (B)" value="2"></el-option>
-                            <el-option label="慰问品 (C)" value="3"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-descriptions-item>
                 <el-descriptions-item label="慰问金额">
                     <el-form-item prop="money" label="慰问金额">
                         <el-input style="width: 100%" v-model="formData.money"
@@ -104,68 +112,79 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <template v-if="['2'].includes(formData.type)">
+                <el-descriptions-item label="收款账户">
-                    <el-descriptions-item label="孩次">
+                    <el-form-item prop="bankCardNumber" label="收款账户">
-                        <el-form-item prop="child" label="孩次">
+                        <el-input maxlength="20" v-model="formData.bankCardNumber" placeholder="请填写收款账户"
-                            <el-select v-model="formData.child" placeholder="请选择孩次"
+                        ></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="户名">
+                    <el-form-item prop="bankUserName" label="户名">
+                        <el-input maxlength="20" v-model="formData.bankUserName"
+                                  placeholder="请填写户名"
+                        ></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="开户行" >
+                    <el-form-item prop="bankOfDeposit" label="开户行">
+                        <el-input maxlength="20" v-model="formData.bankOfDeposit"
+                                  placeholder="请填写开户行"
+                        ></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+
+                <template v-if="['2'].includes(formData.typeCode)">
+                    <el-descriptions-item label="入院时间">
+                        <el-form-item label="入院时间" prop="hospitalizationTime">
+                            <el-date-picker
+                                clearable
                                 style="width: 100%"
-                                       clearable>
+                                v-model="formData.hospitalizationTime"
-                                <el-option label="一孩" value="一孩"></el-option>
+                                type="date"
-                                <el-option label="二孩" value="二孩"></el-option>
+                                value-format="yyyy-MM-dd"
-                                <el-option label="三孩" value="三孩"></el-option>
+                                placeholder="请选择入院时间">
-                            </el-select>
+                            </el-date-picker>
                         </el-form-item>
                     </el-descriptions-item>
-                </template>
+
-                <template v-if="['3','4'].includes(formData.type)">
+                    <el-descriptions-item label="出院时间">
-                    <el-descriptions-item label="治疗医院">
+                        <el-form-item label="出院时间" prop="leaveHospitalTime">
-                        <el-form-item prop="hospital" label="治疗医院">
+                            <el-date-picker
-                            <el-input v-model="formData.hospital" maxlength="50"
+                                clearable
-                                      placeholder="请填写治疗医院"></el-input>
+                                style="width: 100%"
+                                v-model="formData.leaveHospitalTime"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                placeholder="请选择出院时间">
+                            </el-date-picker>
                         </el-form-item>
                     </el-descriptions-item>
-                    <el-descriptions-item label="病房号">
+
-                        <el-form-item prop="hospitalHouseNum" label="病房号">
+                    <el-descriptions-item label="当年第几次住院">
-                            <el-input v-model="formData.hospitalHouseNum" maxlength="50" placeholder="请填写病房号"
+                        <el-form-item prop="thisYearHospitalizationNum" label="当年第几次住院">
-                                      type="number"></el-input>
+                            <el-input style="width: 100%" v-model="formData.thisYearHospitalizationNum"
-                        </el-form-item>
+                                      controls-position="right"
-                    </el-descriptions-item>
+                                      :controls="false"
-                    <el-descriptions-item label="床号">
+                                      precision="2"
-                        <el-form-item prop="hospitalHouseBedNum" label="床号">
+                                      placeholder="请输入当年第几次住院"
-                            <el-input v-model="formData.hospitalHouseBedNum" maxlength="50" placeholder="请填写床号"
+                                      :min="0"
-                                      type="number"></el-input>
+                                      :max="10000"></el-input>
-                        </el-form-item>
-                    </el-descriptions-item>
-                </template>
-                <template v-if="['4'].includes(formData.type)">
-                    <el-descriptions-item label="患病病种">
-                        <el-form-item prop="hospitalBy" label="患病病种">
-                            <el-input v-model="formData.hospitalBy" maxlength="50"
-                                      placeholder="请填写患病病种"></el-input>
-                        </el-form-item>
-                    </el-descriptions-item>
-                </template>
-                <template v-if="['6'].includes(formData.type)">
-                    <el-descriptions-item label="直系亲属">
-                        <el-form-item prop="deadImmediateFamily" label="直系亲属">
-                            <el-select v-model="formData.deadImmediateFamily">
-                                <el-option label="配偶" value="配偶"></el-option>
-                                <el-option label="父亲" value="父亲"></el-option>
-                                <el-option label="母亲" value="母亲"></el-option>
-                                <el-option label="子女" value="子女"></el-option>
-                            </el-select>
                         </el-form-item>
                     </el-descriptions-item>
+                    <el-descriptions-item :span="2"></el-descriptions-item>
                 </template>
 
-                <el-descriptions-item label="申请事由" :span="2">
+
+                <el-descriptions-item label="申请事由" :span="3">
                     <el-form-item prop="remark" label="申请事由">
                         <el-input maxlength="500" v-model="formData.remark" placeholder="请填写申请事由"
                                   type="textarea" :autosize="{ minRows: 4, maxRows: 8}"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item :span="2" v-if="chooseType.isUploadFile === true">
+                <el-descriptions-item :span="3" v-if="chooseType.isUploadFile === true">
                     <template slot="label">
                         附件
                         <el-tooltip class="item" effect="dark" :content="'上传附件说明：' + chooseType.uploadFileDesc"
@@ -185,7 +204,7 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="签字" :span="2">
+                <el-descriptions-item label="签字" :span="3">
                     <el-form-item prop="signature" label="签字">
                         <pc-signature v-model="formData.signature"></pc-signature>
                     </el-form-item>
@@ -224,12 +243,23 @@ layout("/layouts/platform.html"){
                     deadImmediateFamily: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                     remark: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                     files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    signature: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
+                    signature: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    handlerUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    certifierUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    bankCardNumber: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    bankUserName: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    bankOfDeposit: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    thisYearHospitalizationNum: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    leaveHospitalTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    hospitalizationTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                 },
                 chooseType: {},
                 payUserOptions: [],
                 helpUserOptions: [],
-                typeOptions: []
+                typeOptions: [],
+
+                handlerUserOptions: [],
+                certifierUserOptions: []
             }
         },
         methods: {
@@ -258,6 +288,30 @@ layout("/layouts/platform.html"){
                     this.$set(this.formData, "helpUnionName", unionName)
                 }
             },
+            handlerUserChange(val) {
+                const user = this.handlerUserOptions.find(o => o.id === val)
+                if (user) {
+                    const { userName, loginName, unitId, unitName, unionId, unionName } = user
+                    this.$set(this.formData, "handlerUserName", userName)
+                    this.$set(this.formData, "handlerLoginName", loginName)
+                    this.$set(this.formData, "handlerUnitId", unitId)
+                    this.$set(this.formData, "handlerUnitName", unitName)
+                    this.$set(this.formData, "handlerUnionId", unionId)
+                    this.$set(this.formData, "handlerUnionName", unionName)
+                }
+            },
+            certifierUserChange(val) {
+                const user = this.certifierUserOptions.find(o => o.id === val)
+                if (user) {
+                    const { userName, loginName, unitId, unitName, unionId, unionName } = user
+                    this.$set(this.formData, "certifierUserName", userName)
+                    this.$set(this.formData, "certifierLoginName", loginName)
+                    this.$set(this.formData, "certifierUnitId", unitId)
+                    this.$set(this.formData, "certifierUnitName", unitName)
+                    this.$set(this.formData, "certifierUnionId", unionId)
+                    this.$set(this.formData, "certifierUnionName", unionName)
+                }
+            },
             payUserChange(val) {
                 const user = this.payUserOptions.find(o => o.id === val)
                 if (user) {
@@ -271,6 +325,7 @@ layout("/layouts/platform.html"){
                 if (this.chooseType) {
                     this.$set(this.formData, "money", this.chooseType.money)
                     this.$set(this.formData, "way", this.chooseType.way)
+                    this.$set(this.formData, "typeCode", this.chooseType.code)
                 }
             },
             onSave() {
@@ -334,7 +389,8 @@ layout("/layouts/platform.html"){
                         if (res.code === 0) {
                             this.formData = res.data
                             this.selectQueryUser(this.formData.helpLoginName, this.helpUserOptions)
-                            this.selectQueryUser(this.formData.payLoginName, this.payUserOptions)
+                            this.selectQueryUser(this.formData.certifierLoginName, this.certifierUserOptions)
+                            this.selectQueryUser(this.formData.handlerLoginName, this.handlerUserOptions)
                             this.chooseType = this.typeOptions.find(o => o.id === this.formData.type)
                         }
                     })

src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js

@@ -5,29 +5,35 @@ const condolenceInfo = {
                 申请信息
                 <el-link type="primary" @click="openChart">点击查看流程图</el-link>
             </div>
-            <el-descriptions :column="2" border>
+            <el-descriptions :column="3" border>
                 <el-descriptions-item label="申请人姓名">{{ viewData.applyUserName }}</el-descriptions-item>
                 <el-descriptions-item label="申请人工号">{{ viewData.applyLoginName }}</el-descriptions-item>
                 <el-descriptions-item label="申请人单位">{{ viewData.applyUnitName }}</el-descriptions-item>
                 <el-descriptions-item label="申请人工会">{{ viewData.applyUnionName }}</el-descriptions-item>
                 <el-descriptions-item label="慰问对象">{{ viewData.helpUserName }}</el-descriptions-item>
-                <el-descriptions-item label="收款人">{{ viewData.payUserName }}</el-descriptions-item>
+<!--                <el-descriptions-item label="经办人">{{ viewData.handlerUserName }}</el-descriptions-item>-->
+                <el-descriptions-item label="证明人">{{ viewData.certifierUserName }}</el-descriptions-item>
                 <el-descriptions-item label="慰问类型">{{ viewData.typeName }}</el-descriptions-item>
-                <el-descriptions-item label="慰问方式">{{ viewData.way }}</el-descriptions-item>
                 <el-descriptions-item label="慰问金额">{{ viewData.money }}</el-descriptions-item>
                 <el-descriptions-item label="慰问时间">{{ viewData.occurTime }}</el-descriptions-item>
-                <el-descriptions-item v-if="['2'].includes(viewData.type)" label="孩次">{{ viewData.child }}</el-descriptions-item>
+                <el-descriptions-item label="收款账户">{{ viewData.bankCardNumber }}</el-descriptions-item>
-                <el-descriptions-item v-if="['3','4'].includes(viewData.type)" label="治疗医院">{{ viewData.hospital }}</el-descriptions-item>
+                <el-descriptions-item label="户名">{{ viewData.bankUserName }}</el-descriptions-item>
-                <el-descriptions-item v-if="['3','4'].includes(viewData.type)" label="病房号">{{ viewData.hospitalHouseNum }}</el-descriptions-item>
+                <el-descriptions-item label="开户行">{{ viewData.bankOfDeposit }}</el-descriptions-item>
-                <el-descriptions-item v-if="['3','4'].includes(viewData.type)" label="床号">{{ viewData.hospitalHouseBedNum }}</el-descriptions-item>
+                <template v-if="['2'].includes(viewData.typeCode)">
-                <el-descriptions-item v-if="['4'].includes(viewData.type)" label="患病病种">{{ viewData.hospitalBy }}</el-descriptions-item>
+                    <el-descriptions-item label="入院时间">{{ viewData.hospitalizationTime }}</el-descriptions-item>
-                <el-descriptions-item v-if="['6'].includes(viewData.type)" label="直系亲属">{{ viewData.deadImmediateFamily }}</el-descriptions-item>
+                    <el-descriptions-item label="出院时间">{{ viewData.leaveHospitalTime }}</el-descriptions-item>
-                <el-descriptions-item label="申请事由" :span="2">{{ viewData.remark }}</el-descriptions-item>
+                    <el-descriptions-item label="当年第几次住院">{{ viewData.thisYearHospitalizationNum }}
-                <el-descriptions-item label="附件" :span="2">
+                    </el-descriptions-item>
-                    <file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
+                </template>
+                <el-descriptions-item label="申请事由" :span="3">
+                    <div style="white-space: pre-line">{{ viewData.remark }}</div>
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" :span="3">
+                    <file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files"
+                                  complete_result></file-preview>
                     <span v-else>暂无附件</span>
                 </el-descriptions-item>
-                <el-descriptions-item label="签字" :span="2">
+                <el-descriptions-item label="签字" :span="3">
                     <el-image :src="viewData.signature"
                               v-if="viewData.signature"
                               class="signature-image"></el-image>

src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js

@@ -20,17 +20,23 @@ const INFO = {
 			    
 			    <el-descriptions-item label="工作单位">{{ viewData.unitName }}</el-descriptions-item>
 			    <el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item>
-			    <el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>
+<!--			    <el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>-->
 			    
 			    <el-descriptions-item label="身份证号码">{{ viewData.idCard }}</el-descriptions-item>
 			    <el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
-			    <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
+<!--			    <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>-->
 			    
-			    <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
+<!--			    <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>-->
 			    <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
 			    <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
+			    <el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item>
+                <el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item>
+                <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="家庭住址" :span="3">{{ viewData.homeAddress }}</el-descriptions-item>
+                
 			    
 			    <template v-if="viewData.loginname == $store.state.user.loginname">
+                </template>
 				    <el-descriptions-item label="家庭主要成员" :span="3">
 					    <el-table v-if="viewData.families&&viewData.families.length"
 					              :data="viewData.families" size="mini" border
@@ -47,11 +53,15 @@ const INFO = {
 					    </el-table>
 					    <el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
 				    </el-descriptions-item>
-				    <el-descriptions-item label="个人简况" :span="3">
+				    <el-descriptions-item label="个人学习及工作经历" :span="3">
 					    <div v-if="viewData.personalData" class="text-left" v-html="viewData.personalData"></div>
 					    <el-tag type="warning" v-else>暂无</el-tag>
 				    </el-descriptions-item>
-                </template>
+				    <el-descriptions-item label="特长及获奖情况" :span="3">
+					    <div v-if="viewData.specialty" class="text-left" v-html="viewData.specialty"></div>
+					    <el-tag type="warning" v-else>暂无</el-tag>
+				    </el-descriptions-item>
+               
 			    
 			    <el-descriptions-item label="签字信息" :span="3" v-if="viewData.sign">
 				    <el-image :src="viewData.sign"

src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html

@@ -89,7 +89,7 @@ layout("/layouts/platform.html"){
 					{ prop: "preparedBy", label: "编制类别", sortable: true },
 					{ prop: "unionName", label: "所属工会", sortable: true },
 					{ prop: "unitName", label: "所属单位", sortable: true },
-					{ prop: "sign", label: "签字" },
+					// { prop: "sign", label: "签字" },
 					{ prop: "taskName", label: "当前节点"},
 					{ prop: "instanceState", label: "流程状态"}
 				],

src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html

@@ -4,7 +4,8 @@ layout("/layouts/platform.html"){
 <div id="app" v-cloak>
     <el-card shadow="never">
         <snaker-start slot="header" label="入会申请" define_key="HYRH"></snaker-start>
-		<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
+        <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                 class="flow-task-form">
             <el-descriptions :column="3" border>
                 <el-descriptions-item label="工号">
                     <el-form-item prop="loginname">
@@ -81,20 +82,20 @@ layout("/layouts/platform.html"){
                         <el-input v-model="formData.unionName" disabled placeholder="请输入所属工会"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-				<el-descriptions-item label="所属校区">
+                <!--		<el-descriptions-item label="所属校区">
                             <el-form-item prop="campus">
                                 <dict-select style="width: 100%" placeholder="请选择所属校区" v-model="formData.campus"
                                              code="USER_CAMPUS"></dict-select>
                             </el-form-item>
-				</el-descriptions-item>
+                        </el-descriptions-item>-->
 
 
-				<el-descriptions-item label="在职状态">
+                <!--<el-descriptions-item label="在职状态">
                     <el-form-item prop="userState">
                         <dict-select v-model="formData.userState" code="USER_STATE"
                                      disabled style="width: 100%"></dict-select>
                     </el-form-item>
-				</el-descriptions-item>
+                </el-descriptions-item>-->
                 <el-descriptions-item label="教职工类别">
                     <el-form-item prop="personType">
                         <dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
@@ -107,23 +108,37 @@ layout("/layouts/platform.html"){
                                      disabled style="width: 100%"></dict-select>
                     </el-form-item>
                 </el-descriptions-item>
+                <el-descriptions-item label="婚姻状况">
+                    <el-form-item prop="marriage" label="婚姻状况">
+                        <dict-select v-model="formData.marriage" code="USER_MARRIAGE"
+                                     style="width: 100%"></dict-select>
+                    </el-form-item>
+                </el-descriptions-item>
 
                 <el-descriptions-item label="身份证号码">
                     <el-form-item prop="idCard">
-						<el-input v-model="formData.idCard" disabled placeholder="请输入身份证号码" maxlength="18"></el-input>
+                        <el-input v-model="formData.idCard" disabled placeholder="请输入身份证号码"
+                                  maxlength="18"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
                 <el-descriptions-item label="联系电话">
                     <el-form-item prop="mobile">
-						<el-input v-model="formData.mobile" disabled placeholder="请输入联系电话" maxlength="32"></el-input>
+                        <el-input v-model="formData.mobile" disabled placeholder="请输入联系电话"
+                                  maxlength="32"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-				<el-descriptions-item label="电子邮箱">
+                <el-descriptions-item label="入职时间">
-					<el-form-item prop="email">
+                    <el-form-item prop="arrivalAtSchoolDate">
-						<el-input v-model="formData.email" placeholder="请输入电子邮箱" maxlength="50"></el-input>
+                        <el-input v-model="formData.arrivalAtSchoolDate" disabled placeholder="请输入入职时间"
+                                  maxlength="50"></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+                <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="家庭住址" :span="3">
+                    <el-form-item prop="homeAddress" label="家庭住址">
+                        <el-input v-model="formData.homeAddress" placeholder="请输入家庭住址" maxlength="90"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-
 
                 <el-descriptions-item label="家庭主要成员" :span="3">
                     <el-form-item prop="families">
@@ -170,12 +185,18 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-				<el-descriptions-item label="个人简况" :span="3">
+                <el-descriptions-item label="个人学习及工作经历" :span="3">
-					<el-form-item prop="personalData">
+                    <el-form-item prop="personalData" label="个人学习及工作经历">
                         <text-editor v-model="formData.personalData"></text-editor>
                     </el-form-item>
                 </el-descriptions-item>
 
+                <el-descriptions-item label="特长及获奖情况" :span="3">
+                    <el-form-item prop="specialty" label="特长及获奖情况">
+                        <text-editor v-model="formData.specialty"></text-editor>
+                    </el-form-item>
+                </el-descriptions-item>
+
                 <el-descriptions-item label="入会意愿" :span="3">
                     <el-form-item prop="isVoluntary">
                         <el-checkbox
@@ -183,12 +204,14 @@ layout("/layouts/platform.html"){
                             style="width: 95%; color: #F56C6C; display: flex; align-items: center;"
                             v-model="formData.isVoluntary">
                             <div>
-                                <span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
+                                <span
+                                    style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
                                     我自愿申请加入学校工会，并委托学校按规定代为扣缴工会会员会费。
                                 </span>
                             </div>
                             <div>
-                                <span style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
+                                <span
+                                    style="flex: 1; word-wrap: break-word; word-break: break-all; white-space: normal;">
                                     我将严格遵守工会章程，认真执行工会决议，积极参与工会活动，主动融入“学校健康幸福家”建设，为营造温暖、和谐、奋进的校园氛围贡献力量，以实际行动助力学校各项事业发展。
                                 </span>
                             </div>
@@ -229,6 +252,10 @@ layout("/layouts/platform.html"){
                     sex: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
                     isVoluntary: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                     sign: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    homeAddress: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    marriage: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
                     /*email: [
                         {
                             validator: (rule, value, callback) => {
@@ -289,7 +316,7 @@ layout("/layouts/platform.html"){
                             trigger: ["change", "blur"]
                         }
                     ]*/
-				},
+                }
             }
         },
         methods: {
@@ -300,10 +327,10 @@ layout("/layouts/platform.html"){
                     type: "warning"
                 }).then(() => {
                     const loading = createLoading()
-					this.$axios.post('/platform/member/apply/submit/save', {data: JSON.stringify(this.formData)}).then(res => {
+                    this.$axios.post("/platform/member/apply/submit/save", { data: JSON.stringify(this.formData) }).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            commonUtil.pjaxPush('/platform/member/apply/mine')
+                            commonUtil.pjaxPush("/platform/member/apply/mine")
                         }
                     }).finally(() => {
                         loading.close()
@@ -319,12 +346,12 @@ layout("/layouts/platform.html"){
                             type: "warning"
                         }).then(() => {
                             const loading = createLoading()
-							this.$axios.post('/platform/member/apply/submit/submit', {
+                            this.$axios.post("/platform/member/apply/submit/submit", {
                                 data: JSON.stringify(this.formData)
                             }).then(res => {
                                 if (res.code === 0) {
                                     this.$message.success(res.msg)
-                                    commonUtil.pjaxPush('/platform/member/apply/mine')
+                                    commonUtil.pjaxPush("/platform/member/apply/mine")
                                 }
                             }).finally(() => {
                                 loading.close()
@@ -340,13 +367,13 @@ layout("/layouts/platform.html"){
                     type: "warning"
                 }).then(() => {
                     const loading = createLoading()
-					this.$axios.post('/platform/member/apply/submit/submitAgain', {
+                    this.$axios.post("/platform/member/apply/submit/submitAgain", {
                         data: JSON.stringify(this.formData),
-						taskId: this.taskId,
+                        taskId: this.taskId
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            commonUtil.pjaxPush('/platform/member/apply/mine')
+                            commonUtil.pjaxPush("/platform/member/apply/mine")
                         }
                     }).finally(() => {
                         loading.close()
@@ -355,7 +382,7 @@ layout("/layouts/platform.html"){
             },
             async init() {
                 let user
-				const resp = await $.post('/platform/member/apply/submit/getSelfUserInfo')
+                const resp = await $.post("/platform/member/apply/submit/getSelfUserInfo")
                 if (resp.code === 0) {
                     if (!resp.data) {
                         user = this.$store.state.user
@@ -426,7 +453,7 @@ layout("/layouts/platform.html"){
                     this.$set(this.formData, "families", families ? families : [])
                     this.$set(this.formData, "personalData", personalData)
                 }
-			},
+            }
         },
         created() {
             this.init()

src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js

@@ -229,8 +229,8 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
             unions: [],
             units: [],
             sexTypeOptions: [
-                { code: "男", name: "男" },
+                { code: "男性", name: "男性" },
-                { code: "女", name: "女" }
+                { code: "女性", name: "女性" }
             ],
             pickerOptions: {
                 disabledDate: (time) => {

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html

@@ -0,0 +1,197 @@
+<!--#
+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
+            :reverse-color="false"
+            :show-action="false"
+            @search="doSearch"
+            input-align="left"
+            placeholder="请输入经办人搜索"
+            v-model="pageForm.userName"
+        ></van-search>
+        <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/unionReimburse/certifierUserSign/pageData" :page_form.sync="pageForm" ref="tableListRef"
+                @ready="doSearch">
+        <template v-slot="{index,row}">
+            <table-column label="经办人">{{row.userName}}</table-column>
+            <table-column label="所属工会">{{row.unionName}}</table-column>
+            <table-column label="所属单位">{{row.unitName}}</table-column>
+            <table-column label="证明人">{{row.certifierUserName}}({{row.certifierLoginName}})</table-column>
+            <table-column label="报销类别">
+                <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
+                          :value="row.reimburseType">
+                </dict-tag>
+            </table-column>
+            <table-column label="报销项目">
+                <dict-tag :options="dict.type.UNION_REIMBURSE_PROJECT"
+                          :value="row.reimburseProject">
+                </dict-tag>
+            </table-column>
+            <table-column label="金额（元）">{{row.money}}</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="onAudit(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>
+
+    <union-reimburse-info ref="unionReimburseInfoRef">
+        <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>
+    </union-reimburse-info>
+
+</div>
+<script nonce="${cspNonce!}">
+    <!--#include('../info.js'){}#-->
+    const vue = new Vue({
+        el: "#app",
+        store,
+        dicts: ["UNION_REIMBURSE_TYPE", "UNION_REIMBURSE_PROJECT"],
+        components: {
+            "union-reimburse-info": UNION_REIMBURSE_INFO
+        },
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    searchKeyword: "",
+                    approvalText: "0",
+                    approval: false,
+                    year: new Date().getFullYear()
+                },
+                formData: {},
+                showApprovalForm: false,
+                infoShow: false
+            }
+        },
+        methods: {
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: "温馨提示",
+                    message: "您确定要撤回吗？"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", { taskId: row.taskId }).then(res => {
+                        if (res.code === 0) {
+                            this.$toast.success("提交成功")
+                            this.doSearch()
+                            this.infoShow = false
+                        }
+                    })
+                }).catch(() => {
+                    // on cancel
+                })
+            },
+            handleTaskAction(val) {
+                if (!this.formData.tf_userSign) {
+                    this.$toast.fail("请签名")
+                    return
+                }
+                this.$refs.formRef.validate().then(() => {
+                    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.$toast.success("提交成功")
+                                this.doSearch()
+                                this.$refs.unionReimburseInfoRef.onClose()
+                            }
+                        })
+                    }).catch(() => {
+                        // on cancel
+                    })
+                }).catch()
+            },
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.unionReimburseInfoRef.onOpen(row)
+            },
+            onAudit(row) {
+                this.showApprovalForm = true
+                this.formData = {
+                    tf_opinion: null,
+                    tf_userSign: null,
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+                this.$refs.unionReimburseInfoRef.onOpen(row)
+            },
+
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            }
+
+        },
+        created() {
+
+        }
+    })
+</script>
+
+
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js

@@ -1,6 +1,7 @@
 const UNION_REIMBURSE_INFO = {
     template:
-    /*language=HTML*/`
+    /*language=HTML*/
+        `
             <van-action-sheet v-model="visible" title="查看详情">
                 <div class="detail-container">
                     <van-cell-group title="报销申请">
@@ -11,44 +12,46 @@ const UNION_REIMBURSE_INFO = {
                         <van-cell title="报销类别">
                             <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
                                       :value="viewData.reimburseType">
-                        </dict-tag></van-cell>
+                            </dict-tag>
+                        </van-cell>
                         <van-cell title="支付方式">
                             <dict-tag :options="dict.type.UNION_REIMBURSE_PAYMENT_WAY"
                                       :value="viewData.paymentWay">
-                        </dict-tag></van-cell>
+                            </dict-tag>
+                        </van-cell>
                         <van-cell title="报销项目">
                             <dict-tag :options="dict.type.UNION_REIMBURSE_PROJECT"
                                       :value="viewData.reimburseProject">
-                        </dict-tag></van-cell>
+                            </dict-tag>
-                        <van-cell title="报销经费来源">
+                        </van-cell>
-                        <dict-tag :options="dict.type.UNION_REIMBURSE_FUND_SOURCE"
-                                  :value="viewData.reimburseFundSource">
-                        </dict-tag></van-cell>
                         <van-cell title="联系方式">{{ viewData.mobile }}</van-cell>
-                    <van-cell title="所属社团" v-if="viewData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3'">{{ viewData.clubName }}</van-cell>
+                        <van-cell title="证明人">{{viewData.certifierUserName}}({{viewData.certifierLoginName}})
-                    <van-cell title="经费余额">{{ viewData.fundBalance }}</van-cell>
+                        </van-cell>
                         <van-cell title="户名">{{ viewData.bankUserName }}</van-cell>
                         <van-cell title="银行账号">{{ viewData.bankCardNumber }}</van-cell>
                         <van-cell title="开户行">{{ viewData.bankOfDeposit }}</van-cell>
-                    <van-cell title="慰问对象" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.condolenceName }}</van-cell>
+                        <van-cell title="活动名称">{{ viewData.activityName }}</van-cell>
-                    <van-cell title="联系方式" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.condolenceMobile }}</van-cell>
+                        <van-cell title="活动地点">{{ viewData.activityPlace || '暂无'}}</van-cell>
-                    <van-cell title="慰问类型" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.typeName }}</van-cell>
+                        <van-cell title="报销金额（元）">{{ viewData.money }}</van-cell>
-                    <van-cell title="慰问金额" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.money }}</van-cell>
+                        <van-cell title="活动时间">{{$moment(viewData.activityTime).format('YYYY-MM-DD')}}</van-cell>
-                    <van-cell title="慰问时间" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">{{$moment(viewData.condolenceTime).format('YYYY-MM-DD')}}</van-cell>
+                        <van-cell title="发票张数">{{ viewData.invoiceNumber }}</van-cell>
-                    <van-cell title="活动名称" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.activityName }}</van-cell>
+                        <van-cell title="支付内容">
-                    <van-cell title="活动类型" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">{{ viewData.activityType }}</van-cell>
+                            <div style="white-space: pre-line">
-                    <van-cell title="活动人数" v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">{{ viewData.activityNumber }}</van-cell>
+                                {{ viewData.paymentNotes }}
-                    <van-cell title="活动地点" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.activityPlace }}</van-cell>
+                            </div>
-                    <van-cell title="报销金额" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{ viewData.money }}</van-cell>
+                        </van-cell>
-                    <van-cell title="活动时间" v-if="viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">{{$moment(viewData.activityTime).format('YYYY-MM-DD')}}</van-cell>
+                        <van-cell title="签字">
-                    <van-cell title="发票张数"  v-if="viewData.reimburseType === 'UNION_REIMBURSE_TYPE_1'">{{ viewData.invoiceNumber }}</van-cell>
+                            <template #label>
-                    <van-cell title="发票号码"  v-if="viewData.reimburseType === 'UNION_REIMBURSE_TYPE_1'">{{ viewData.invoice }}</van-cell>
+                                <van-image :src="viewData.userSign"
-                    <van-cell title="支付内容">{{ viewData.paymentNotes }}</van-cell>
+                                           style="width: 100%;height: 150px;"></van-image>
+                            </template>
+                        </van-cell>
                         <van-cell title="附件">
+                            <template #label>
                                 <file-preview :files="viewData.files" complete_result></file-preview>
+                            </template>
                         </van-cell>
                     </van-cell-group>
-                    
                     <template v-for="(task,index) in doneTasks">
                         <div class="process-title">
                             {{ task.displayName }}
@@ -101,7 +104,7 @@ const UNION_REIMBURSE_INFO = {
             visible: false,
             viewData: {},
             doneTasks: [],
-            row: null,
+            row: null
         }
     },
     methods: {
@@ -136,7 +139,7 @@ const UNION_REIMBURSE_INFO = {
                     this.doneTasks = res.data
                 }
             })
-        },
+        }
-    },
+    }
 
 }

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/mine/index.html

@@ -17,6 +17,7 @@ layout("/layouts/platform_h5.html"){
             <table-column label="经办人">{{row.userName}}</table-column>
             <table-column label="所属工会">{{row.unionName}}</table-column>
             <table-column label="所属单位">{{row.unitName}}</table-column>
+            <table-column label="证明人">{{row.certifierUserName}}({{row.certifierLoginName}})</table-column>
             <table-column label="报销类别">
                 <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
                           :value="row.reimburseType">
@@ -27,7 +28,7 @@ layout("/layouts/platform_h5.html"){
                           :value="row.reimburseProject">
                 </dict-tag>
             </table-column>
-            <table-column label="金额">{{row.money}}</table-column>
+            <table-column label="金额（元）">{{row.money}}</table-column>
             <table-column label="当前节点">{{row.taskName}}</table-column>
         </template>
         <template #actions="{index,row}">

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html

@@ -27,6 +27,7 @@ layout("/layouts/platform_h5.html"){
             <table-column label="经办人">{{row.userName}}</table-column>
             <table-column label="所属工会">{{row.unionName}}</table-column>
             <table-column label="所属单位">{{row.unitName}}</table-column>
+            <table-column label="证明人">{{row.certifierUserName}}({{row.certifierLoginName}})</table-column>
             <table-column label="报销类别">
                 <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
                           :value="row.reimburseType">
@@ -37,7 +38,7 @@ layout("/layouts/platform_h5.html"){
                           :value="row.reimburseProject">
                 </dict-tag>
             </table-column>
-            <table-column label="金额">{{row.money}}</table-column>
+            <table-column label="金额（元）">{{row.money}}</table-column>
             <table-column label="当前节点">{{row.curTaskName}}</table-column>
         </template>
         <template #actions="{index,row}">
@@ -76,7 +77,8 @@ layout("/layouts/platform_h5.html"){
                                    placeholder="请填审批意见"></van-field>
                     </van-cell-group>
                     <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="" required
+                                   :rules="[{ required: true,message:'请签名' }]">
                             <template #input>
                                 <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
                             </template>
@@ -112,7 +114,7 @@ layout("/layouts/platform_h5.html"){
                     searchKeyword: "",
                     approvalText: "0",
                     approval: false,
-                    year: new Date().getFullYear(),
+                    year: new Date().getFullYear()
                 },
                 formData: {},
                 showApprovalForm: false,
@@ -122,8 +124,8 @@ layout("/layouts/platform_h5.html"){
         methods: {
             onRevoke(row) {
                 this.$dialog.confirm({
-                    title: '温馨提示',
+                    title: "温馨提示",
-                    message: '您确定要撤回吗？',
+                    message: "您确定要撤回吗？"
                 }).then(() => {
                     this.$axios.post("/flow/common/revokeTask", { taskId: row.taskId }).then(res => {
                         if (res.code === 0) {
@@ -134,15 +136,15 @@ layout("/layouts/platform_h5.html"){
                     })
                 }).catch(() => {
                     // on cancel
-                });
+                })
             },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({
-                        title: '温馨提示',
+                        title: "温馨提示",
-                        message: '您确定要提交吗？',
+                        message: "您确定要提交吗？"
                     }).then(() => {
-                        this.$axios.post('/flow/common/executeTask', {
+                        this.$axios.post("/flow/common/executeTask", {
                             data: JSON.stringify({
                                 ...this.formData,
                                 submitType: val
@@ -156,8 +158,8 @@ layout("/layouts/platform_h5.html"){
                         })
                     }).catch(() => {
                         // on cancel
-                    });
+                    })
-                }).catch();
+                }).catch()
             },
             onView(row) {
                 this.showApprovalForm = false
@@ -180,7 +182,7 @@ layout("/layouts/platform_h5.html"){
                     this.pageForm.totalCount = 0
                     this.$refs.tableListRef.doSearch()
                 })
-            },
+            }
 
         },
         created() {

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

@@ -10,7 +10,8 @@ layout("/layouts/platform_h5.html"){
 
 <div id="app">
     <!-- 导航栏 -->
-    <van-nav-bar title="职工慰问申请" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
+    <van-nav-bar title="职工慰问申请" left-text="返回" left-arrow @click-left="historyBack" fixed
+                 placeholder></van-nav-bar>
 
     <!-- 表单容器 -->
     <van-form ref="formRef" class="form-container">
@@ -51,7 +52,8 @@ layout("/layouts/platform_h5.html"){
                 <div class="van-action-sheet__content mt5" v-if="userOptions && userOptions.length>0">
                     <template>
                         <template v-for="item in userOptions">
-                            <van-button native-type="button" @click="helpUserChange(item)" class="van-action-sheet__item van-hairline--bottom">
+                            <van-button native-type="button" @click="helpUserChange(item)"
+                                        class="van-action-sheet__item van-hairline--bottom">
                                 <span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
                             </van-button>
                         </template>
@@ -60,7 +62,7 @@ layout("/layouts/platform_h5.html"){
                 <van-empty description="暂无数据" v-else></van-empty>
             </van-action-sheet>
 
-            <van-field
+           <!-- <van-field
                 v-model="formData.handlerUserName"
                 name="handlerUserName"
                 label="经办人"
@@ -85,14 +87,15 @@ layout("/layouts/platform_h5.html"){
                 <div class="van-action-sheet__content mt5" v-if="userOptions && userOptions.length>0">
                     <template>
                         <template v-for="item in userOptions">
-                            <van-button native-type="button" @click="handlerUserChange(item)" class="van-action-sheet__item van-hairline--bottom">
+                            <van-button native-type="button" @click="handlerUserChange(item)"
+                                        class="van-action-sheet__item van-hairline&#45;&#45;bottom">
                                 <span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
                             </van-button>
                         </template>
                     </template>
                 </div>
                 <van-empty description="暂无数据" v-else></van-empty>
-            </van-action-sheet>
+            </van-action-sheet>-->
 
             <van-field
                 v-model="formData.certifierUserName"
@@ -119,7 +122,8 @@ layout("/layouts/platform_h5.html"){
                 <div class="van-action-sheet__content mt5" v-if="userOptions && userOptions.length>0">
                     <template>
                         <template v-for="item in userOptions">
-                            <van-button native-type="button" @click="certifierUserChange(item)" class="van-action-sheet__item van-hairline--bottom">
+                            <van-button native-type="button" @click="certifierUserChange(item)"
+                                        class="van-action-sheet__item van-hairline--bottom">
                                 <span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
                             </van-button>
                         </template>
@@ -136,12 +140,13 @@ layout("/layouts/platform_h5.html"){
                 readonly
                 :rules="[{ required: true }]"
                 placeholder="请点击选择慰问类型"
-                @click="showTypePicker = true"
+                @click="showTypePickerClick"
                 clickable
                 is-link
             ></van-field>
             <van-popup position="bottom" round v-model:show="showTypePicker">
-                <van-picker :columns="typeColumns" @cancel="showTypePicker = false" @confirm="onTypeConfirm" show-toolbar></van-picker>
+                <van-picker :columns="typeColumns" @cancel="showTypePicker = false" @confirm="onTypeConfirm"
+                            show-toolbar :default-index="typeDefaultIndex"></van-picker>
             </van-popup>
 
             <!--<van-field
@@ -175,12 +180,14 @@ layout("/layouts/platform_h5.html"){
                 clickable
                 is-link
                 readonly
-                @click="showTimePicker = true"
+                @click="showTimePickerClick"
             ></van-field>
             <van-popup position="bottom" round v-model:show="showTimePicker">
                 <van-datetime-picker
-                    v-model="formData.occurTime"
+                    v-model="formData.occurDate"
                     type="date"
+                    :min-date="minDate"
+                    :max-date="maxDate"
                     title="请选择慰问时间"
                     @confirm="(val) => {formData.occurTime = $moment(val).format('YYYY-MM-DD'); showTimePicker = false}"
                     @cancel="showTimePicker = false"
@@ -188,11 +195,11 @@ layout("/layouts/platform_h5.html"){
             </van-popup>
 
             <van-field
-                v-model="formData.bankCardNum"
+                v-model="formData.bankCardNumber"
                 label="收款账户"
                 maxlength="20"
                 clearable
-                name="bankCardNum"
+                name="bankCardNumber"
                 placeholder="请填写收款账户"
                 :rules="[{ required: true }]"
                 required
@@ -201,16 +208,19 @@ layout("/layouts/platform_h5.html"){
             <van-field
                 v-model="formData.bankUserName"
                 label="户名"
-                type="number"
                 placeholder="请填写户名"
                 :rules="[{ required: true }]"
                 required
+                maxlength="20"
                 name="bankUserName"
             ></van-field>
             <van-field
                 v-model="formData.bankOfDeposit"
                 label="开户行"
-                type="number"
+                maxlength="30"
+                type="textarea"
+                rows="4"
+                autosize
                 placeholder="请填写开户行"
                 :rules="[{ required: true }]"
                 required
@@ -228,11 +238,11 @@ layout("/layouts/platform_h5.html"){
                     clickable
                     is-link
                     readonly
-                    @click="showHospitalizationTimePicker = true"
+                    @click="showHospitalizationTimePickerClick"
                 ></van-field>
                 <van-popup position="bottom" round v-model:show="showHospitalizationTimePicker">
                     <van-datetime-picker
-                        v-model="formData.hospitalizationTime"
+                        v-model="formData.hospitalizationDate"
                         type="date"
                         :min-date="minDate"
                         :max-date="maxDate"
@@ -251,11 +261,11 @@ layout("/layouts/platform_h5.html"){
                     clickable
                     is-link
                     readonly
-                    @click="showLeaveHospitalTimePicker = true"
+                    @click="showLeaveHospitalTimePickerClick"
                 ></van-field>
                 <van-popup position="bottom" round v-model:show="showLeaveHospitalTimePicker">
                     <van-datetime-picker
-                        v-model="formData.hospitalizationTime"
+                        v-model="formData.leaveHospitalDate"
                         type="date"
                         :min-date="minDate"
                         :max-date="maxDate"
@@ -264,6 +274,12 @@ layout("/layouts/platform_h5.html"){
                         @cancel="showLeaveHospitalTimePicker = false"
                     ></van-datetime-picker>
                 </van-popup>
+
+                <van-field type="digit" label="当年第几次住院"
+                           :rules="[{ required: true }]"
+                           required
+                           placeholder="请输入当年第几次住院"
+                           v-model="formData.thisYearHospitalizationNum"></van-field>
             </template>
 
             <van-field
@@ -335,7 +351,7 @@ layout("/layouts/platform_h5.html"){
                 payUserSelectShow: false,
                 showTypePicker: false,
                 typeColumns: [],
-                searchKeyword: '',
+                searchKeyword: "",
 
                 showTimePicker: false,
                 showChildPicker: false,
@@ -349,9 +365,39 @@ layout("/layouts/platform_h5.html"){
                 minDate: new Date(2024, 0, 1),
                 maxDate: new Date(),
 
+                typeDefaultIndex: 0
+
             }
         },
         methods: {
+            // 选择出院时间
+            showLeaveHospitalTimePickerClick() {
+                if (this.formData.leaveHospitalTime) {
+                    this.formData.leaveHospitalDate = new Date(this.formData.leaveHospitalTime)
+                }
+                this.showLeaveHospitalTimePicker = true
+            },
+            // 选择住院时间
+            showHospitalizationTimePickerClick() {
+                if (this.formData.hospitalizationTime) {
+                    this.formData.hospitalizationDate = new Date(this.formData.hospitalizationTime)
+                }
+                this.showHospitalizationTimePicker = true
+            },
+            // 选择慰问时间
+            showTimePickerClick() {
+                if (this.formData.occurTime) {
+                    this.formData.occurDate = new Date(this.formData.occurTime)
+                }
+                this.showTimePicker = true
+            },
+            // 选择慰问类型
+            showTypePickerClick() {
+                if (this.formData.type) {
+                    this.typeDefaultIndex = this.typeOptions.findIndex(item => item.id === this.formData.type)
+                }
+                this.showTypePicker = true
+            },
             //经办人
             handlerUserChange(user) {
                 const { id, userName, loginName, unitId, unitName, unionId, unionName } = user
@@ -363,7 +409,7 @@ layout("/layouts/platform_h5.html"){
                 this.$set(this.formData, "handlerUnionId", unionId)
                 this.$set(this.formData, "handlerUnionName", unionName)
                 this.handlerUserSelectShow = false
-                this.searchKeyword = ''
+                this.searchKeyword = ""
                 this.userOptions = []
             },
             //证明人
@@ -377,17 +423,17 @@ layout("/layouts/platform_h5.html"){
                 this.$set(this.formData, "certifierUnionId", unionId)
                 this.$set(this.formData, "certifierUnionName", unionName)
                 this.certifierUserSelectShow = false
-                this.searchKeyword = ''
+                this.searchKeyword = ""
                 this.userOptions = []
             },
             async userRemoteMethod(event, type) {
                 if (event) {
                     this.userOptions = await this.selectQueryUser(event)
-                    if (type === 'help'){
+                    if (type === "help") {
                         this.helpUserSelectShow = true
-                    }else if (type === 'certifier'){
+                    } else if (type === "certifier") {
                         this.certifierUserSelectShow = true
-                    }else if (type === 'handler'){
+                    } else if (type === "handler") {
                         this.handlerUserSelectShow = true
                     }
                 }
@@ -406,7 +452,7 @@ layout("/layouts/platform_h5.html"){
                 this.$set(this.formData, "helpUnionId", unionId)
                 this.$set(this.formData, "helpUnionName", unionName)
                 this.helpUserSelectShow = false
-                this.searchKeyword = ''
+                this.searchKeyword = ""
                 this.userOptions = []
             },
             payUserChange(user) {
@@ -415,7 +461,7 @@ layout("/layouts/platform_h5.html"){
                 this.$set(this.formData, "payUserName", userName)
                 this.$set(this.formData, "payLoginName", loginName)
                 this.payUserSelectShow = false
-                this.searchKeyword = ''
+                this.searchKeyword = ""
                 this.userOptions = []
             },
             typeChange(id) {
@@ -497,19 +543,19 @@ layout("/layouts/platform_h5.html"){
                         applyUnitId: unit?.id,
                         applyUnitName: unit?.name,
                         applyUnionId: union?.id,
-                        applyUnionName: union?.name,
+                        applyUnionName: union?.name
                     }
                 }
             },
             queryCondolenceType() {
-                this.$axios.post('/platform/condolence/type/queryCondolenceType')
+                this.$axios.post("/platform/condolence/type/queryCondolenceType")
                     .then((res) => {
                         this.typeOptions = JSON.parse(JSON.stringify(res.data))
                         res.data.forEach((v) => {
-                            this.typeColumns.push({ value: v.id, text: v.name + "(" + v.code + ")" })
+                            this.typeColumns.push({ value: v.id, text: v.name })
                         })
                     })
-            },
+            }
         },
         created() {
             this.queryCondolenceType()

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js

@@ -10,17 +10,21 @@ const condolenceInfo = {
                         <van-cell title="申请人单位">{{ viewData.applyUnitName }}</van-cell>
                         <van-cell title="申请人工会">{{ viewData.applyUnionName }}</van-cell>
                         <van-cell title="慰问对象">{{ viewData.helpUserName }}</van-cell>
-                        <van-cell title="收款人">{{ viewData.payUserName }}</van-cell>
+<!--                        <van-cell title="经办人">{{ viewData.handlerUserName }}</van-cell>-->
+                        <van-cell title="证明人">{{ viewData.certifierUserName }}</van-cell>
                         <van-cell title="慰问类型">{{ viewData.typeName }}</van-cell>
-                        <van-cell title="慰问方式">{{ viewData.way }}</van-cell>
                         <van-cell title="慰问金额">{{ viewData.money }}</van-cell>
                         <van-cell title="慰问时间">{{ viewData.occurTime }}</van-cell>
-                        <van-cell v-if="['2'].includes(viewData.type)" title="孩次">{{ viewData.child }}</van-cell>
+                        <van-cell title="收款账户">{{ viewData.bankCardNumber }}</van-cell>
-                        <van-cell v-if="['3','4'].includes(viewData.type)" title="治疗医院">{{ viewData.hospital }}</van-cell>
+                        <van-cell title="户名">{{ viewData.bankUserName }}</van-cell>
-                        <van-cell v-if="['3','4'].includes(viewData.type)" title="病房号">{{ viewData.hospitalHouseNum }}</van-cell>
+                        <van-cell class="direction-column-cell" title="开户行">
-                        <van-cell v-if="['3','4'].includes(viewData.type)" title="床号">{{ viewData.hospitalHouseBedNum }}</van-cell>
+                            {{ viewData.bankOfDeposit || '暂无' }}
-                        <van-cell v-if="['4'].includes(viewData.type)" title="患病病种">{{ viewData.hospitalBy }}</van-cell>
+                        </van-cell>
-                        <van-cell v-if="['6'].includes(viewData.type)" title="直系亲属">{{ viewData.deadImmediateFamily }}</van-cell>
+                        <template v-if="['2'].includes(viewData.typeCode)">
+                            <van-cell title="入院时间">{{ viewData.hospitalizationTime }}</van-cell>
+                            <van-cell title="出院时间">{{ viewData.leaveHospitalTime }}</van-cell>
+                            <van-cell title="当年第几次住院（次）">{{ viewData.thisYearHospitalizationNum }}</van-cell>
+                        </template>
                         <van-cell class="direction-column-cell" title="申请事由">
                             {{ viewData.remark || '暂无' }}
                         </van-cell>
@@ -28,7 +32,8 @@ const condolenceInfo = {
                             <file-preview :files="viewData.files" complete_result></file-preview>
                         </van-cell>
                         <van-cell class="direction-column-cell" title="签字">
-                            <van-image :src="viewData.signature" v-if="viewData.signature" class="signature-image"></van-image>
+                            <van-image :src="viewData.signature" v-if="viewData.signature"
+                                       class="signature-image"></van-image>
                             <span v-else>暂无签字</span>
                         </van-cell>
                     </van-cell-group>

src/main/resources/views/platform/zhghh5/staffmanage/member/apply/common/info.js

@@ -17,17 +17,25 @@ const INFO = {
 
                     <van-cell title="工作单位">{{ viewData.unitName }}</van-cell>
                     <van-cell title="所属工会">{{ viewData.unionName }}</van-cell>
-                    <van-cell title="所属校区">{{ viewData.campus }}</van-cell>
 
                     <van-cell title="身份证号码">{{ viewData.idCard }}</van-cell>
                     <van-cell title="联系电话">{{ viewData.mobile }}</van-cell>
-                    <van-cell title="电子邮箱">{{ viewData.email }}</van-cell>
+                    <van-cell title="入职时间">{{ viewData.arrivalAtSchoolDate }}</van-cell>
 
-                    <van-cell title="在职状态">{{ viewData.userState }}</van-cell>
                     <van-cell title="教职工类别">{{ viewData.personType }}</van-cell>
-                    <van-cell title="人员性质">{{ viewData.preparedBy || '暂无' }}</van-cell>
+                    <van-cell title="编制类别">{{ viewData.preparedBy || '暂无' }}</van-cell>
+                    <van-cell title="婚姻状况">{{ viewData.marriage || '暂无' }}</van-cell>
+                    <van-cell title="家庭住址">
+                        <template #label>
+                            <div style="white-space: pre-line">
+                                {{viewData.homeAddress}}
+                            </div>
+                        </template>
+
+                    </van-cell>
 
                     <template v-if="viewData.loginname === $store.state.user.loginnmae">
+                    </template>
                     <van-cell title="家庭成员" class="column-cell">
                         <table class="family-table">
                             <thead>
@@ -51,13 +59,20 @@ const INFO = {
                         </table>
                     </van-cell>
 
-                        <van-cell title="个人简历">
+                    <van-cell title="个人学习及工作经历">
                         <template #label>
-                                <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
+                            <div v-if="viewData.personalData" class="text-left" v-html="viewData.personalData"></div>
                             <span style="font-size: 14px" v-else>无数据</span>
                         </template>
                     </van-cell>
+
+                    <van-cell title="特长及获奖情况">
+                        <template #label>
+                            <div v-if="viewData.specialty" class="text-left" v-html="viewData.specialty"></div>
+                            <span style="font-size: 14px" v-else>无数据</span>
                         </template>
+                    </van-cell>
+
                 </van-cell-group>
 
                 <template v-for="task in doneTasks">

src/main/resources/views/platform/zhghh5/staffmanage/member/apply/submit/index.html

@@ -42,6 +42,7 @@ layout("/layouts/platform_h5.html"){
                 v-model="formData.birthday"
                 label="出生年月"
                 is-link
+                readonly
                 @click="showDatePicker = true"
                 :rules="[{ required: true, message: '请填写出生年月' }]"
             ></van-field>
@@ -59,6 +60,7 @@ layout("/layouts/platform_h5.html"){
                 name="nation"
                 label="政治面貌"
                 readonly
+                is-link
                 placeholder="请选择政治面貌"
                 @click="showPoliticalPicker = true"
                 clickable
@@ -75,6 +77,7 @@ layout("/layouts/platform_h5.html"){
                 name="education"
                 label="学历"
                 readonly
+                is-link
                 placeholder="请选择学历"
                 @click="showEducationPicker = true"
                 clickable
@@ -91,6 +94,7 @@ layout("/layouts/platform_h5.html"){
                 name="academicDegree"
                 label="学位"
                 readonly
+                is-link
                 placeholder="请选择学位"
                 @click="showAcademicDegreePicker = true"
                 clickable
@@ -114,7 +118,7 @@ layout("/layouts/platform_h5.html"){
             <van-field v-model="formData.unitName" label="工作单位" readonly></van-field>
             <van-field v-model="formData.unionName" label="所属工会" readonly></van-field>
 
-			<van-field
+            <!--<van-field
                     v-model="formData.campusName"
                     name="campusName"
                     label="所属校区"
@@ -125,16 +129,16 @@ layout("/layouts/platform_h5.html"){
             ></van-field>
             <van-popup position="bottom" round v-model:show="showCampusPicker">
                 <van-picker :columns="campusColumns" @cancel="showCampusPicker = false" @confirm="onCampusColumns" show-toolbar></van-picker>
-			</van-popup>
+            </van-popup>-->
 
-			<van-field
+            <!--<van-field
                     v-model="formData.userState"
                     name="userState"
                     label="在职状态"
                     readonly
                     placeholder="请填写在职状态"
                     clickable
-			></van-field>
+            ></van-field>-->
             <van-field
                 v-model="formData.personType"
                 name="personType"
@@ -151,6 +155,24 @@ layout("/layouts/platform_h5.html"){
                 placeholder="请填写编制类别"
                 clickable
             ></van-field>
+            <van-field
+                v-model="formData.marriage"
+                name="marriage"
+                label="婚姻状况"
+                readonly
+                is-link
+                placeholder="请选择婚姻状况"
+                @click="showMarriagePicker = true"
+                clickable
+            ></van-field>
+            <van-popup position="bottom" round v-model:show="showMarriagePicker">
+                <van-picker show-toolbar
+                            :columns="marriageColumns"
+                            @cancel="showMarriagePicker = false"
+                            @confirm="(v)=>{formData.marriage = v;showMarriagePicker = false}"
+                ></van-picker>
+            </van-popup>
+
             <van-field
                 v-model="formData.idCard"
                 disabled
@@ -171,13 +193,32 @@ layout("/layouts/platform_h5.html"){
                 maxlength="11"
             ></van-field>
             <van-field
+                v-model="formData.arrivalAtSchoolDate"
+                disabled
+                name="arrivalAtSchoolDate"
+                label="入职时间"
+                placeholder="暂无"
+            ></van-field>
+            <van-field
+                v-model="formData.homeAddress"
+                name="homeAddress"
+                :rules="[{ required: true }]"
+                label="家庭住址"
+                required
+                rows="2"
+                autosize
+                type="textarea"
+                maxlength="80"
+                placeholder="请输入家庭住址"
+            ></van-field>
+            <!--<van-field
                     v-model="formData.email"
                     name="email"
                     label="电子邮箱"
                     placeholder="请输入电子邮箱"
                     clearable
                     maxlength="25"
-			></van-field>
+            ></van-field>-->
         </van-cell-group>
 
         <van-cell-group title="家庭信息" class="form-section up_down">
@@ -188,7 +229,8 @@ layout("/layouts/platform_h5.html"){
                             <span>家庭主要成员及联系方式</span>
                         </div>
                     </div>
-					<van-button v-if="formData.families && formData.families.length>0 && formData.families.length<5" style="width: 40px"
+                    <van-button v-if="formData.families && formData.families.length>0 && formData.families.length<5"
+                                style="width: 40px"
                                 icon="plus" type="primary" round size="mini"
                                 @click="formData.families.push({})"
                                 native-type="button"></van-button>
@@ -223,10 +265,14 @@ layout("/layouts/platform_h5.html"){
             </div>
         </van-cell-group>
 
-		<van-cell-group title="个人简况" class="form-section">
+        <van-cell-group title="个人学习及工作经历" class="form-section">
             <text-editor v-model="formData.personalData"></text-editor>
         </van-cell-group>
 
+        <van-cell-group title="特长及获奖情况" class="form-section">
+            <text-editor v-model="formData.specialty"></text-editor>
+        </van-cell-group>
+
         <van-cell-group title="入会意愿" class="form-section">
             <van-checkbox style="font-size: 17px;padding: 12px" icon-size="24px"
                           v-model="formData.isVoluntary" shape="square">
@@ -251,15 +297,15 @@ layout("/layouts/platform_h5.html"){
 </div>
 <script nonce="${cspNonce!}">
     new Vue({
-        el: '#app',
+        el: "#app",
         store,
-	    dicts:['USER_NATION', 'USER_POLITICAL', 'USER_EDUCATION','USER_ACADEMIC_DEGREE', 'USER_CAMPUS'],
+        dicts: ["USER_NATION", "USER_POLITICAL", "USER_EDUCATION", "USER_ACADEMIC_DEGREE", "USER_CAMPUS", "USER_MARRIAGE"],
         data() {
             return {
                 id: GetQueryString("bizId"),
                 taskId: GetQueryString("taskId"),
                 formData: {
-                    families: [],
+                    families: []
                 },
                 // 民族
                 showNationPicker: false,
@@ -274,6 +320,8 @@ layout("/layouts/platform_h5.html"){
                 campusColumns: [],
                 // 生日
                 showDatePicker: false,
+
+                showMarriagePicker: false
             }
         },
         methods: {
@@ -292,12 +340,12 @@ layout("/layouts/platform_h5.html"){
                         overlay: true,
                         duration: 0
                     })
-			        this.$axios.post('/platform/member/apply/submit/save', {data: JSON.stringify(this.formData)}).then(res => {
+                    this.$axios.post("/platform/member/apply/submit/save", { data: JSON.stringify(this.formData) }).then(res => {
                         if (res.code === 0) {
                             this.$toast.success(res.msg)
-					        this.$pjaxReplace('/platform/member/apply/mine/h5')
+                            this.$pjaxReplace("/platform/member/apply/mine/h5")
                         } else {
-							this.$toast.fail('操作失败')
+                            this.$toast.fail("操作失败")
                             console.log(res.msg)
                         }
                     }).finally(() => {
@@ -308,6 +356,14 @@ layout("/layouts/platform_h5.html"){
 
             onSubmit() {
                 this.$refs.formRef.validate().then(() => {
+                    if (!this.formData.personalData) {
+                        this.$toast.fail("请填写个人学习及工作经历")
+                        return
+                    }
+                    if (!this.formData.specialty) {
+                        this.$toast.fail("请填写特长及获奖情况")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
@@ -318,14 +374,14 @@ layout("/layouts/platform_h5.html"){
                             overlay: true,
                             duration: 0
                         })
-				        this.$axios.post('/platform/member/apply/submit/submit', {
+                        this.$axios.post("/platform/member/apply/submit/submit", {
                             data: JSON.stringify(this.formData)
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$toast.success(res.msg)
-						        this.$pjaxReplace('/platform/member/apply/mine/h5')
+                                this.$pjaxReplace("/platform/member/apply/mine/h5")
                             } else {
-						        this.$toast.fail('操作失败')
+                                this.$toast.fail("操作失败")
                                 console.log(res.msg)
                             }
                         }).finally(() => {
@@ -337,6 +393,14 @@ layout("/layouts/platform_h5.html"){
 
             onFinishTask() {
                 this.$refs.formRef.validate().then(() => {
+                    if (!this.formData.personalData) {
+                        this.$toast.fail("请填写个人学习及工作经历")
+                        return
+                    }
+                    if (!this.formData.specialty) {
+                        this.$toast.fail("请填写特长及获奖情况")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
@@ -347,15 +411,15 @@ layout("/layouts/platform_h5.html"){
                             overlay: true,
                             duration: 0
                         })
-				        this.$axios.post('/platform/member/apply/submit/submitAgain', {
+                        this.$axios.post("/platform/member/apply/submit/submitAgain", {
                             data: JSON.stringify(this.formData),
-					        taskId: this.taskId,
+                            taskId: this.taskId
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$toast.success(res.msg)
-						        this.$pjaxReplace('/platform/member/apply/mine/h5')
+                                this.$pjaxReplace("/platform/member/apply/mine/h5")
                             } else {
-						        this.$toast.fail('操作失败')
+                                this.$toast.fail("操作失败")
                                 console.log(res.msg)
                             }
                         }).finally(() => {
@@ -366,13 +430,13 @@ layout("/layouts/platform_h5.html"){
             },
 
             onDateConfirm(value) {
-		        this.formData.birthday = value;
+                this.formData.birthday = value
-		        this.showDatePicker = false;
+                this.showDatePicker = false
             },
 
             async init() {
                 let user
-		        const resp = await $.post('/platform/member/apply/submit/getSelfUserInfo')
+                const resp = await $.post("/platform/member/apply/submit/getSelfUserInfo")
                 if (resp.code === 0) {
                     if (!resp.data) {
                         user = this.$store.state.user
@@ -410,6 +474,7 @@ layout("/layouts/platform_h5.html"){
                         campus,
                         userState,
                         personType,
+                        preparedBy,
                         idCard,
                         mobile,
                         email,
@@ -420,7 +485,7 @@ layout("/layouts/platform_h5.html"){
                     this.$set(this.formData, "userId", id)
                     this.$set(this.formData, "username", username)
                     this.$set(this.formData, "loginname", loginname)
-			        this.$set(this.formData, "birthday", birthday)
+                    this.$set(this.formData, "birthday", birthday ? this.$moment(birthday).format("YYYY-MM-DD") : "")
                     this.$set(this.formData, "sex", sex)
                     this.$set(this.formData, "idCard", idCard)
                     this.$set(this.formData, "nation", nation)
@@ -431,6 +496,7 @@ layout("/layouts/platform_h5.html"){
                     this.$set(this.formData, "campus", campus)
                     this.$set(this.formData, "userState", userState)
                     this.$set(this.formData, "personType", personType)
+                    this.$set(this.formData, "preparedBy", preparedBy)
                     this.$set(this.formData, "unitName", unit ? unit.name : unitName)
                     this.$set(this.formData, "unitId", unit ? unit.id : unitId)
                     this.$set(this.formData, "unionName", union ? union.name : unionName)
@@ -458,32 +524,32 @@ layout("/layouts/platform_h5.html"){
                 }
             },
             toChinesNum(num) {
-                let changeNum = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
+                let changeNum = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"]
-                let unit = ["", "十", "百", "千", "万"];
+                let unit = ["", "十", "百", "千", "万"]
-                num = parseInt(num);
+                num = parseInt(num)
                 let getWan = (temp) => {
-                    let strArr = temp.toString().split("").reverse();
+                    let strArr = temp.toString().split("").reverse()
-                    let newNum = "";
+                    let newNum = ""
                     for (let i = 0; i < strArr.length; i++) {
-                        newNum = (i == 0 && strArr[i] == 0 ? "" : (i > 0 && strArr[i] == 0 && strArr[i - 1] == 0 ? "" : changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i]))) + newNum;
+                        newNum = (i == 0 && strArr[i] == 0 ? "" : (i > 0 && strArr[i] == 0 && strArr[i - 1] == 0 ? "" : changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i]))) + newNum
                     }
-                    return newNum;
+                    return newNum
                 }
-                let overWan = Math.floor(num / 10000);
+                let overWan = Math.floor(num / 10000)
-                let noWan = num % 10000;
+                let noWan = num % 10000
                 if (noWan.toString().length < 4) {
-                    noWan = "0" + noWan;
+                    noWan = "0" + noWan
                 }
-                return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num);
+                return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num)
             },
             onCampusColumns(o) {
-				this.$set(this.formData, "campusName", o.text);  // 显示名称
+                this.$set(this.formData, "campusName", o.text)  // 显示名称
-				this.$set(this.formData, "campus", o.value);     // 字典值
+                this.$set(this.formData, "campus", o.value)     // 字典值
-				this.showCampusPicker = false;
+                this.showCampusPicker = false
             },
             async initDictOptions() {
                 // 初始化校区字典数据
-				const campusData = await this.$businessTool.getDictOptions('USER_CAMPUS')
+                const campusData = await this.$businessTool.getDictOptions("USER_CAMPUS")
                 this.campusColumns = campusData.map(item => {
                     return { value: item.code, text: item.name }
                 })
@@ -522,11 +588,17 @@ layout("/layouts/platform_h5.html"){
                 }
                 return []
             },
+            marriageColumns() {
+                if (this.dict && this.dict.type && this.dict.type.USER_MARRIAGE) {
+                    return this.dict.type.USER_MARRIAGE.map(v => v.name)
+                }
+                return []
+            }
         },
         created() {
-			this.initDictOptions();
+            this.initDictOptions()
             this.init()
-        },
+        }
     })
 </script>
 <!--#