Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/sys/controller/SysUnionController.java

@@ -373,7 +373,7 @@ public class SysUnionController {
     @SaCheckPermission("sys.manager.union.partUnit")
     public Result branchUnionPartUnitTransferData(String unionId) {
 //        List<Sys_unit> units = dao.query(Sys_unit.class, Cnd.where("unitLevel", "=", 2).asc("unitcode"));
-        List<Sys_unit> units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").asc("unitcode"));
+        List<Sys_unit> units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").and("LENGTH(unitcode)", "=", 7).asc("unitcode"));
         List<String> selectUnitIds = units.stream().filter(unit -> StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId)).map(Sys_unit::getId).toList();
         List<Sys_unit> matchUnits = units.stream().filter(unit -> StrUtil.isBlank(unit.getUnionId()) || (StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId))).toList();
         NutMap transferData = NutMap.NEW().addv("selectUnitIds", selectUnitIds).addv("allUnits", matchUnits);

src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java

@@ -136,6 +136,7 @@ public class CommonController {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("unit.unionId", "=", unionId);
         cnd.and("unit.unitTypeCode", "=", "1");
+        cnd.and("unit.unionId", "is not", null);
         cnd.asc("unit.unitcode");
         sql.setCondition(cnd);
         List<NutMap> unitList = sysUserService.listMap(sql);

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java

@@ -114,7 +114,8 @@ public class ProposalConfigUnitController {
     @SLog(tag = "提案", msg = "承办单位同步系统单位")
     public Result syncSysUnit() {
         Sql sql = Sqls.create("select code from proposal_undertake");
-        List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql).and(Sys_unit::getUnitTypeCode, "=", 1));
+        List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql)
+                .and(Sys_unit::getUnitTypeCode, "=", 1).and("unionId", "is not", null));
         List<ProposalUndertake> proposalUndertakes = sysUnits.stream().map(unit -> {
             ProposalUndertake proposalUndertake = new ProposalUndertake();
             proposalUndertake.setId(unit.getId());

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java

@@ -179,7 +179,7 @@ public class TeacherCongressDelegationController {
         seg.orEX("id", "in", selectUnitIds);
 
 //        Cnd cnd = Cnd.where("unitLevel", "=", 2);
-        Cnd cnd = Cnd.where("unitTypeCode", "=", "1");
+        Cnd cnd = Cnd.where("unitTypeCode", "=", "1").and("unionId","is not",null);
         if (!seg.isEmpty()) {
             cnd.and(seg);
         }

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

@@ -9,11 +9,13 @@ import com.budwk.app.base.constant.RoleConstant;
 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.CommonDownloadUtil;
 import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType;
 import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
@@ -21,8 +23,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.FieldFilter;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.Daos;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -33,6 +37,11 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
 /**
  * @ClassName CondolenceApplyController
  * @Author JyuHsin
@@ -138,4 +147,16 @@ public class CondolenceMineController {
 		nutMap.put("typeName", type.getName());
 		return Result.success(nutMap);
 	}
+
+	@At
+	@ApiOperation("导出单个慰问申请信息")
+	@SaCheckPermission("condolence")
+	public void onExport(@Valid String id, HttpServletResponse response){
+		Condolence condolence = condolenceService.fetch(id);
+
+		String fileName;
+
+
+
+	}
 }

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

@@ -45,12 +45,14 @@ public class CondolenceSchoolUnionApprovalController {
     @At("/")
     @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html")
     @SaCheckPermission("condolence.schoolUnionApproval")
-	public void index() {}
+    public void index() {
+    }
 
     @At("/h5")
     @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html")
     @SaCheckPermission("h5.condolence.schoolUnionApproval")
-	public void h5Index() {}
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("分页查询")

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
 
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -185,4 +186,9 @@ public class Condolence extends BaseModel {
 	@ColDefine(type = ColType.VARCHAR, width = 30)
 	private String createTime;
 
+	@Column
+	@Comment("职务")
+	@ColDefine(type = ColType.VARCHAR, width = 50)
+	private String position;
+
 }

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/info.js

@@ -31,7 +31,7 @@ const GRASSROOTS_CONGRESS_MEETING_INFO = {
                 <el-descriptions-item label="备注" span="2">
                     {{viewData.meetingRemark}}
                 </el-descriptions-item>
-                <el-descriptions-item label="请示附件" span="2">
+                <el-descriptions-item label="附件" span="2">
                     <file-preview :files="viewData.files" complete_result></file-preview>
                 </el-descriptions-item>
             </el-descriptions>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html

@@ -135,6 +135,8 @@ layout("/layouts/platform.html"){
                         <el-form-item label="协办单位"
                                       v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
                                       prop="tf_slaveUnitIds"
+                                      :rules="[{required:['CONFIRM_FILING'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
+
                         >
                             <el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
                                        style="width: 100%">

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js

@@ -64,8 +64,8 @@ const HEAD_FORM_TEMPLATE = {
                 name: [{required: true, message: "必填", trigger: ["change", "blur"]}],
                 code: [{required: true, message: "必填", trigger: ["change", "blur"]}],
                 userId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
-                viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                // viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
-                contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}]
+                // contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}]
             }
         }
     },

src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html

@@ -224,14 +224,14 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.onDelete(id)
-                }).catch(() => {
                     this.$axios.post("/platform/teacherCongress/meetings/delete", { id }).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.doSearch()
                         }
                     })
+                }).catch(() => {
+
                 })
             }
         },

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

@@ -12,6 +12,12 @@ layout("/layouts/platform.html"){
                 <el-descriptions-item label="申请人工号">{{formData.applyLoginName}}</el-descriptions-item>
                 <el-descriptions-item label="申请人单位">{{formData.applyUnitName}}</el-descriptions-item>
                 <el-descriptions-item label="申请人工会">{{formData.applyUnionName}}</el-descriptions-item>
+                <el-descriptions-item label="职务">
+                    <el-form-item prop="position" label="职务">
+                        <el-input v-model="formData.position"
+                                  placeholder="请填写职务"></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
 
                 <el-descriptions-item label="慰问对象">
                     <el-form-item prop="helpUserId" label="慰问对象">
@@ -65,7 +71,7 @@ layout("/layouts/platform.html"){
                                    :label="item.name"></el-option>
                     </el-select>
                 </el-descriptions-item>
-                <el-descriptions-item label="慰问方式">
+           <!--     <el-descriptions-item label="慰问方式">
                     <el-form-item prop="way" label="慰问方式">
                         <el-select v-model="formData.way"
                                    placeholder="选择慰问类型自动匹配慰问方式"
@@ -77,7 +83,7 @@ layout("/layouts/platform.html"){
                             <el-option label="慰问品 (C)" value="3"></el-option>
                         </el-select>
                     </el-form-item>
-                </el-descriptions-item>
+                </el-descriptions-item>-->
                 <el-descriptions-item label="慰问金额">
                     <el-form-item prop="money" label="慰问金额">
                         <el-input style="width: 100%" v-model="formData.money"
@@ -156,9 +162,9 @@ layout("/layouts/platform.html"){
                     </el-descriptions-item>
                 </template>
 
-                <el-descriptions-item label="申请事由" :span="2">
+                <el-descriptions-item label="情况说明" :span="2">
-                    <el-form-item prop="remark" label="申请事由">
+                    <el-form-item prop="remark" label="情况说明">
-                        <el-input maxlength="500" v-model="formData.remark" placeholder="请填写申请事由"
+                        <el-input maxlength="500" v-model="formData.remark" placeholder="请填写情况说明"
                                   type="textarea" :autosize="{ minRows: 4, maxRows: 8}"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
@@ -222,7 +228,8 @@ 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"]}],
+                    position: [{required: true, message: "必填", trigger: ["change", "blur"]}]
                 },
                 chooseType: {},
                 payUserOptions: [],
@@ -337,7 +344,7 @@ layout("/layouts/platform.html"){
                         }
                     })
                 } else {
-                    const { username, loginname, id, unit, union, mobile } = this.$store.state.user
+                    const {username, loginname, id, unit, union, mobile,position} = this.$store.state.user
                     this.formData = {
                         applyUserName: username,
                         applyLoginName: loginname,
@@ -345,7 +352,8 @@ layout("/layouts/platform.html"){
                         applyUnitId: unit?.id,
                         applyUnitName: unit?.name,
                         applyUnionId: union?.id,
-                        applyUnionName: union?.name
+                        applyUnionName: union?.name,
+                        position: position
                     }
                 }
             },

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

@@ -81,6 +81,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>

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

@@ -10,10 +10,11 @@ const condolenceInfo = {
                 <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.position }}</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.typeName }}</el-descriptions-item>
-                <el-descriptions-item label="慰问方式">{{ viewData.way }}</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>
@@ -22,7 +23,11 @@ const condolenceInfo = {
                 <el-descriptions-item v-if="['3','4'].includes(viewData.type)" label="床号">{{ viewData.hospitalHouseBedNum }}</el-descriptions-item>
                 <el-descriptions-item v-if="['4'].includes(viewData.type)" label="患病病种">{{ viewData.hospitalBy }}</el-descriptions-item>
                 <el-descriptions-item v-if="['6'].includes(viewData.type)" label="直系亲属">{{ viewData.deadImmediateFamily }}</el-descriptions-item>
-                <el-descriptions-item label="申请事由" :span="2">{{ viewData.remark }}</el-descriptions-item>
+                <el-descriptions-item label="情况说明" :span="2">
+                    <div style="white-space: pre-line">
+                        {{ viewData.remark }}
+                    </div>
+                </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>
                     <span v-else>暂无附件</span>
@@ -59,9 +64,13 @@ const condolenceInfo = {
                             <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="签字" v-if="!task.ext.isFirstTaskNode" :span="3">
+                            <el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
+                                      v-if="task.ext.tf_userSign"></el-image>
+                        </el-descriptions-item>
                     </el-descriptions>
                 </div>
             </template>

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

@@ -54,17 +54,25 @@ layout("/layouts/platform.html"){
                         v-for="column in tableColumns"
                 >
                     <template v-slot="{ row }" v-if="column.prop === 'instanceState'">
-                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
+                        <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="300">
                     <template slot-scope="{row}">
                         <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
-                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)"
-                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
+                                   size="mini" type="primary">编辑
-                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
+                        </el-button>
+                        <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
+                        </el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)"
+                                   size="mini" type="danger">
                             删除
                         </el-button>
+                        <el-button v-if="row.instanceState === 20" @click="onExport(row.id)" size="mini" type="primary">
+                            导出
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -102,6 +110,12 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            onExport(id) {
+                this.$downLoad('/platform/condolence/mine/onExport', {
+                    id: id
+                })
+
+            },
             onAdd() {
                 commonUtil.pjaxPush('/platform/condolence/apply')
             },

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

@@ -101,6 +101,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>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html

@@ -36,7 +36,7 @@ layout("/layouts/platform.html"){
                         <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
                         </el-button>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
-                        <el-button @click="doExportApply(row)" size="mini" type="primary">申请表导出</el-button>
+                        <el-button @click="doExportApply(row)" size="mini" type="primary"v-if="row.instanceState === 20">申请表导出</el-button>
                     </template>
                 </el-table-column>
             </el-table>

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">
@@ -25,6 +26,15 @@ layout("/layouts/platform_h5.html"){
                        required name="applyUnitName"></van-field>
             <van-field label="申请人工会" :rules="[{ required: true }]" v-model="formData.applyUnionName" readonly
                        required name="applyUnionName"></van-field>
+            <van-field
+                    v-model="formData.position"
+                    name="position"
+                    label="职务"
+                    required
+                    :rules="[{ required: true }]"
+                    placeholder="请选择职务"
+                    clickable
+            ></van-field>
 
             <van-field
                     v-model="formData.helpUserName"
@@ -51,7 +61,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>
@@ -84,7 +95,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="payUserChange(item)" class="van-action-sheet__item van-hairline--bottom">
+                            <van-button native-type="button" @click="payUserChange(item)"
+                                        class="van-action-sheet__item van-hairline--bottom">
                                 <span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
                             </van-button>
                         </template>
@@ -106,10 +118,11 @@ layout("/layouts/platform_h5.html"){
                     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></van-picker>
             </van-popup>
 
-            <van-field
+            <!--   <van-field
                    v-model="formData.way"
                    name="way"
                    label="慰问方式"
@@ -118,7 +131,7 @@ layout("/layouts/platform_h5.html"){
                    :rules="[{ required: true }]"
                    placeholder="请选择慰问类型"
                    clickable
-            ></van-field>
+               ></van-field>-->
             <van-field
                     v-model="formData.money"
                     name="money"
@@ -238,11 +251,11 @@ layout("/layouts/platform_h5.html"){
             <van-field
                     v-model="formData.remark"
                     name="remark"
-                label="申请事由"
+                    label="情况说明"
                     type="textarea"
                     rows="4"
                     autosize
-                placeholder="请输入申请事由"
+                    placeholder="请输入情况说明"
                     :rules="[{ required: true }]"
                     required
             ></van-field>
@@ -414,7 +427,7 @@ layout("/layouts/platform_h5.html"){
                         }
                     })
                 } else {
-                    const { username, loginname, id, unit, union, mobile } = this.$store.state.user
+                    const {username, loginname, id, unit, union, mobile, position} = this.$store.state.user
                     this.formData = {
                         applyUserName: username,
                         applyLoginName: loginname,
@@ -423,6 +436,7 @@ layout("/layouts/platform_h5.html"){
                         applyUnitName: unit?.name,
                         applyUnionId: union?.id,
                         applyUnionName: union?.name,
+                        position: position,
                     }
                 }
             },

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

@@ -7,7 +7,8 @@ layout("/layouts/platform_h5.html"){
 </style>
 
 <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-sticky offset-top="46px">
         <van-search
@@ -30,7 +31,8 @@ layout("/layouts/platform_h5.html"){
         </van-tabs>
     </van-sticky>
 
-    <table-list api="/platform/condolence/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" @ready="onReady">
+    <table-list api="/platform/condolence/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
+                @ready="onReady">
         <template v-slot="{index,row}">
             <table-column label="慰问对象">{{row.helpUserName}}</table-column>
             <table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
@@ -70,6 +72,11 @@ layout("/layouts/platform_h5.html"){
                         maxlength="100"
                         show-word-limit
                 ></van-field>
+                <van-field class="direction-column-field" name="tf_userSign" label="签字" required>
+                    <template #input>
+                        <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
+                    </template>
+                </van-field>
             </van-form>
             <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
@@ -134,6 +141,10 @@ layout("/layouts/platform_h5.html"){
             async handleTaskAction(val) {
                 try {
                     await this.$refs.formRef.validate();
+                    if (!this.formData.tf_userSign){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"

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

@@ -21,8 +21,10 @@ const condolenceInfo = {
                         <van-cell v-if="['3','4'].includes(viewData.type)" title="床号">{{ viewData.hospitalHouseBedNum }}</van-cell>
                         <van-cell v-if="['4'].includes(viewData.type)" title="患病病种">{{ viewData.hospitalBy }}</van-cell>
                         <van-cell v-if="['6'].includes(viewData.type)" title="直系亲属">{{ viewData.deadImmediateFamily }}</van-cell>
-                        <van-cell class="direction-column-cell" title="申请事由">
+                        <van-cell class="direction-column-cell" title="情况说明">
+                            <div style="white-space: pre-line">
                                 {{ viewData.remark || '暂无' }}
+                            </div>
                         </van-cell>
                         <van-cell class="direction-column-cell" title="附件">
                             <file-preview :files="viewData.files" complete_result></file-preview>
@@ -53,6 +55,10 @@ const condolenceInfo = {
                             <van-cell title="办理意见" v-if="!task.ext.isFirstTaskNode" class="direction-column-cell">
                                 <div v-html="task.taskFormData.tf_opinion"></div>
                             </van-cell>
+                            <van-cell class="direction-column-cell" title="签字">
+                                <van-image :src="task.ext.tf_userSign" v-if="task.ext.tf_userSign" class="signature-image"></van-image>
+                                <span v-else>暂无签字</span>
+                            </van-cell>
                         </van-cell-group>
                     </template>
                 </div>

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

@@ -7,7 +7,8 @@ layout("/layouts/platform_h5.html"){
 </style>
 
 <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-sticky offset-top="46px">
         <van-search
@@ -30,7 +31,8 @@ layout("/layouts/platform_h5.html"){
         </van-tabs>
     </van-sticky>
 
-    <table-list api="/platform/condolence/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" @ready="onReady">
+    <table-list api="/platform/condolence/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
+                @ready="onReady">
         <template v-slot="{index,row}">
             <table-column label="慰问对象">{{row.helpUserName}}</table-column>
             <table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
@@ -70,6 +72,11 @@ layout("/layouts/platform_h5.html"){
                         maxlength="100"
                         show-word-limit
                 ></van-field>
+                <van-field class="direction-column-field" name="tf_userSign" label="签字" required>
+                    <template #input>
+                        <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
+                    </template>
+                </van-field>
             </van-form>
             <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
@@ -134,6 +141,10 @@ layout("/layouts/platform_h5.html"){
             async handleTaskAction(val) {
                 try {
                     await this.$refs.formRef.validate();
+                    if (!this.formData.tf_userSign) {
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"