Merge branch 'main' of http://gitea.dd3skj.com/c-hongqw1/zhgh_cqgmy

2026-10-30 09:54:19 +08:00
parent 9c17925b60 d8e7adfe9a
commit fad8a37dfb
18 changed files with 234 additions and 124 deletions
@@ -77,13 +77,7 @@ public class SysOfficeTemplateUtil {
    public PictureRenderData createPictureRenderData(int width, int height, String url) {
        try {
            byte[] bytes = getFileBytesByUrl(url);
-//            if (StrUtil.isBlank(url)) {
-//                return null;
-//            }
-//            int startIndex = url.indexOf("id=") + "id=".length();
-//            String id = url.substring(startIndex);
-//            Sys_file sysFile = dao.fetch(Sys_file.class, id);
-//            byte[] bytes = SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+            log.info("[Office图片读取] 创建图片渲染数据，referenceLength={}, byteCount={}, width={}, height={}", StrUtil.nullToEmpty(url).length(), bytes == null ? null : bytes.length, width, height);
            ByteArrayPictureRenderData pictureRenderData = new ByteArrayPictureRenderData(bytes, PictureType.PNG);
            PictureStyle pictureStyle = new PictureStyle();
            pictureStyle.setWidth(width);
@@ -91,7 +85,7 @@ public class SysOfficeTemplateUtil {
            pictureRenderData.setPictureStyle(pictureStyle);
            return pictureRenderData;
        } catch (Exception e) {
-            log.error("文件转换PictureRenderData错误，文件路径：{},{}", url, e.getMessage());
+            log.error("[Office图片读取] 创建图片渲染数据失败，referenceLength={}", StrUtil.nullToEmpty(url).length(), e);
            return null;
        }
    }
@@ -140,13 +134,20 @@ public class SysOfficeTemplateUtil {
    public byte[] getFileBytesByUrl(String url) {
        try {
            if (StrUtil.isBlank(url)) {
+                log.warn("[Office图片读取] 图片引用为空");
                return null;
            }
            int startIndex = url.indexOf("id=") + "id=".length();
            String id = url.substring(startIndex);
+            String logFileId = url.contains("id=") ? id : "未识别id参数";
+            log.info("[Office图片读取] 解析文件引用，fileId={}, hasIdParameter={}", logFileId, url.contains("id="));
            Sys_file sysFile = dao.fetch(Sys_file.class, id);
-            return SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+            log.info("[Office图片读取] 查询文件记录，fileId={}, found={}, bucket={}, storagePathPresent={}", logFileId, sysFile != null, sysFile == null ? null : sysFile.getBucket(), sysFile != null && StrUtil.isNotBlank(sysFile.getStoragePath()));
+            byte[] bytes = SysFileMinIoUtil.getFileBytes(sysFile.getBucket(), sysFile.getStoragePath());
+            log.info("[Office图片读取] 读取存储文件完成，fileId={}, byteCount={}", logFileId, bytes == null ? null : bytes.length);
+            return bytes;
        } catch (Exception e) {
+            log.error("[Office图片读取] 读取图片失败，referenceLength={}", StrUtil.nullToEmpty(url).length(), e);
            return null;
        }
    }
@@ -32,6 +32,7 @@ import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.data.PictureRenderData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
@@ -59,6 +60,7 @@ import java.util.List;
 * @Version 1.0
 * @Description TODO
 */
+@Slf4j
@IocBean
@At("/platform/condolence/mine")
@Api("职工慰问我的")
@@ -157,6 +159,7 @@ public class CondolenceMineController {
 	@ApiOperation("导出职工慰问申请表")
 	@SaCheckPermission("condolence.mine")
 	public void doExportApply(String id, HttpServletResponse response, Boolean print) throws Exception {
+		log.info("[职工慰问导出] 开始，applyId={}, userId={}, format={}", id, SecurityUtil.getUserId(), Boolean.TRUE.equals(print) ? "PDF" : "Word");
 		Condolence condolence = condolenceService.fetch(id);
 		if (condolence == null) throw new BaseException("该条记录不存在");
 		if (!SecurityUtil.getUserId().equals(condolence.getCreatedBy())) {
@@ -167,17 +170,22 @@ public class CondolenceMineController {
 		if (instance == null || !ProcessInstanceStateEnum.FINISHED.getCode().equals(instance.getState())) {
 			throw new BaseException("只能导出已完成的申请");
 		}
+		log.info("[职工慰问导出] 流程已完成，applyId={}, instanceId={}, state={}, applicantSignPresent={}", id, instance.getId(), instance.getState(), StrUtil.isNotBlank(condolence.getSignature()));
 		NutMap docData = Lang.obj2nutmap(condolence);
 		docData.put("payUserName", StrUtil.nullToEmpty(condolence.getBankUserName()));
 		CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, condolence.getType());
 		docData.put("typeName", type == null ? "" : type.getName());
-		docData.put("signature", "");
+		docData.put("signature", null);
 		if (StrUtil.isNotBlank(condolence.getSignature())) {
 			PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, condolence.getSignature());
 			if (signature == null) throw new BaseException("申请人签字图片读取失败");
 			docData.put("signature", signature);
 		}
 		fillApplyApprovals(docData, instance);
+		for (String field : List.of("signature", "firstApprovalSign", "secondApprovalSign", "thirdApprovalSign", "fourthApprovalSign")) {
+			Object value = docData.get(field);
+			log.info("[职工慰问导出] 渲染前图片字段，applyId={}, instanceId={}, field={}, valueType={}", id, instance.getId(), field, value == null ? "null" : value.getClass().getName());
+		}
 		String fileName = "重庆工贸职业技术学院职工慰问申请表_" + StrUtil.nullToEmpty(condolence.getHelpUserName());
 		try (InputStream input = getClass().getResourceAsStream("/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc");
 			 ByteArrayOutputStream templateOutput = new ByteArrayOutputStream();
@@ -185,18 +193,24 @@ public class CondolenceMineController {
 			if (input == null) throw new BaseException("职工慰问申请表模板不存在");
 			com.aspose.words.Document document = new com.aspose.words.Document(input);
 			document.save(templateOutput, com.aspose.words.SaveFormat.DOCX);
+			log.info("[职工慰问导出] 模板转换完成，applyId={}, templateBytes={}", id, templateOutput.size());
 			try (ByteArrayInputStream templateInput = new ByteArrayInputStream(templateOutput.toByteArray())) {
 				XWPFTemplate.compile(templateInput).render(docData).writeAndClose(output);
 			}
+			log.info("[职工慰问导出] Word渲染完成，applyId={}, outputBytes={}", id, output.size());
 			if (Boolean.TRUE.equals(print)) {
 				try (ByteArrayInputStream wordInput = new ByteArrayInputStream(output.toByteArray());
 					 ByteArrayOutputStream pdfOutput = new ByteArrayOutputStream()) {
 					new com.aspose.words.Document(wordInput).save(pdfOutput, com.aspose.words.SaveFormat.PDF);
+					log.info("[职工慰问导出] PDF转换完成，applyId={}, outputBytes={}", id, pdfOutput.size());
 					CommonDownloadUtil.download(fileName + ".pdf", pdfOutput.toByteArray(), response);
 				}
 			} else {
 				CommonDownloadUtil.download(fileName + ".docx", output.toByteArray(), response);
 			}
+		} catch (Exception e) {
+			log.error("[职工慰问导出] 模板渲染或文件输出失败，applyId={}, instanceId={}, format={}", id, instance.getId(), Boolean.TRUE.equals(print) ? "PDF" : "Word", e);
+			throw e;
 		}
 	}

@@ -206,29 +220,39 @@ public class CondolenceMineController {
 		String[] fields = {"firstApproval", "secondApproval", "thirdApproval", "fourthApproval"};
 		List<String> suffixes = List.of("Opinion", "Sign", "Year", "Month", "Day");
 		for (String field : fields) {
-			for (String suffix : suffixes) docData.put(field + suffix, "");
+			for (String suffix : suffixes) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
 		}
 		List<ProcessTask> tasks = condolenceService.dao().query(ProcessTask.class,
 				Cnd.where("processInstanceId", "=", instance.getId()).asc("id"));
+		log.info("[职工慰问导出] 查询审批记录，applyId={}, instanceId={}, taskCount={}, expectedTaskKeys={}", instance.getBusinessNo(), instance.getId(), tasks.size(), List.of(taskKeys));
 		for (ProcessTask task : tasks) {
 			ProcessTaskVO taskVO = flowEngine.processTaskService().findById(task.getId());
-			if ("startTask".equals(task.getTaskName()) || (taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
+			log.info("[职工慰问导出] 审批记录，instanceId={}, taskId={}, taskKey={}, displayName={}, state={}, finishTime={}, isFirstTaskNode={}, matchedApproval={}", instance.getId(), task.getId(), task.getTaskName(), task.getDisplayName(), task.getTaskState(), task.getFinishTime(), taskVO.getExt() == null ? null : taskVO.getExt().get("isFirstTaskNode"), List.of(taskKeys).contains(task.getTaskName()));
+			if ("startTask".equals(task.getTaskName()) || (!List.of(taskKeys).contains(task.getTaskName())
+					&& taskVO.getExt() != null && Boolean.TRUE.equals(taskVO.getExt().getBool("isFirstTaskNode")))) {
+				log.info("[职工慰问导出] 申请节点重置本轮审批字段，instanceId={}, taskId={}, taskKey={}", instance.getId(), task.getId(), task.getTaskName());
 				// 重新申请后，仅导出本轮审批记录。
 				for (String field : fields) {
-					for (String suffix : suffixes) docData.put(field + suffix, "");
+					for (String suffix : suffixes) docData.put(field + suffix, "Sign".equals(suffix) ? null : "");
 				}
 				continue;
 			}
 			for (int i = 0; i < taskKeys.length; i++) {
 				if (!taskKeys[i].equals(task.getTaskName())) continue;
-				for (String suffix : suffixes) docData.put(fields[i] + suffix, "");
-				if (!ProcessTaskStateEnum.FINISHED.getCode().equals(task.getTaskState())) continue;
+				for (String suffix : suffixes) docData.put(fields[i] + suffix, "Sign".equals(suffix) ? null : "");
+				if (!ProcessTaskStateEnum.FINISHED.getCode().equals(task.getTaskState())) {
+					log.info("[职工慰问导出] 跳过未完成审批，instanceId={}, taskId={}, field={}, state={}", instance.getId(), task.getId(), fields[i], task.getTaskState());
+					continue;
+				}
 				Dict data = taskVO.getExt() == null ? Dict.create() : taskVO.getTaskFormData();
+				log.info("[职工慰问导出] 读取审批表单，instanceId={}, taskId={}, field={}, formKeys={}, signPresent={}, signReferenceLength={}", instance.getId(), task.getId(), fields[i], data.keySet(), StrUtil.isNotBlank(data.getStr("sign")), StrUtil.nullToEmpty(data.getStr("sign")).length());
+				if (StrUtil.isBlank(data.getStr("sign"))) log.warn("[职工慰问导出] 已完成审批缺少签名字段，instanceId={}, taskId={}, field={}", instance.getId(), task.getId(), fields[i]);
 				docData.put(fields[i] + "Opinion", StrUtil.nullToEmpty(data.getStr("opinion")));
 				if (StrUtil.isNotBlank(data.getStr("sign"))) {
 					PictureRenderData signature = sysOfficeTemplateUtil.createPictureRenderData(90, 40, data.getStr("sign"));
 					if (signature == null) throw new BaseException("审批签字图片读取失败");
 					docData.put(fields[i] + "Sign", signature);
+					log.info("[职工慰问导出] 审批签名填充完成，instanceId={}, taskId={}, field={}", instance.getId(), task.getId(), fields[i] + "Sign");
 				}
 				docData.put(fields[i] + "Year", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "yyyy"));
 				docData.put(fields[i] + "Month", task.getFinishTime() == null ? "" : DateUtil.format(task.getFinishTime(), "M"));
@@ -9,6 +9,7 @@
        progress
        :accept="accept"
        :max-count="upload_number"
+        :upload-text="upload_text"
        title=""
        description=""
        tip=""
@@ -50,6 +51,11 @@ module.exports = {
      default: 1,
      required: false
    },
+    upload_text: {
+      type: String,
+      default: "",
+      required: false
+    },
    // 上传返回id或url
    upload_result_type: {
      type: String,
@@ -101,6 +107,7 @@ module.exports = {
            this.fileList = val.map((v) => {
              return {
                ...v,
+                file: v.file || { name: v.name },
                status: null,
                isImage: ["jpg", "jpeg", "png", "gif", "bmp", "webp"].includes(v.name.split(".").pop().toLowerCase())
              }
@@ -118,6 +125,7 @@ module.exports = {
            this.fileList = val.map((v) => {
              return {
                ...v,
+                file: v.file || { name: v.name },
                url: v.url ? v.url : v.response?.data,
                isImage: ["jpg", "jpeg", "png", "gif", "bmp", "webp"].includes(v.name.split(".").pop().toLowerCase()),
                status: null
@@ -171,8 +179,8 @@ module.exports = {
                f.url = resp.data
                f.response = resp
                f.percentage = 100
-                f.isImage = true
-                delete f.file
+                f.isImage = ["jpg", "jpeg", "png", "gif", "bmp", "webp"].includes(f.name.split(".").pop().toLowerCase())
+                f.file = { name: f.name }
                delete f.content
              } else {
                f.status = "fail"
@@ -55,7 +55,7 @@ layout("/layouts/platform.html"){
                        </el-select>
                    </el-form-item>
                </el-descriptions-item>-->
-                <el-descriptions-item label="证明人">
+                <!-- <el-descriptions-item label="证明人">
                    <el-form-item prop="certifierUserId" label="证明人">
                        <el-select
                            style="width: 100%"
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
                            </el-option>
                        </el-select>
                    </el-form-item>
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                <el-descriptions-item label="慰问类型">
                    <el-form-item prop="type" label="慰问类型">
                        <el-select v-model="formData.type" @change="typeChange" style="width: 100%"
@@ -112,14 +112,14 @@ layout("/layouts/platform.html"){
                    </el-form-item>
                </el-descriptions-item>

-                <el-descriptions-item label="收款账户">
+                <el-descriptions-item label="收款账户" v-if="!['A', 'D'].includes(formData.typeCode)">
                    <el-form-item prop="bankCardNumber" label="收款账户">
-                        <el-input maxlength="20" v-model="formData.bankCardNumber" placeholder="请填写收款账户"
+                        <el-input maxlength="30" v-model="formData.bankCardNumber" placeholder="请填写银行卡号或对公账户号"
                        ></el-input>
                    </el-form-item>
                </el-descriptions-item>

-                <el-descriptions-item label="户名">
+                <el-descriptions-item label="户名" v-if="!['A', 'D'].includes(formData.typeCode)">
                    <el-form-item prop="bankUserName" label="户名">
                        <el-input maxlength="20" v-model="formData.bankUserName"
                                  placeholder="请填写户名"
@@ -127,7 +127,7 @@ layout("/layouts/platform.html"){
                    </el-form-item>
                </el-descriptions-item>

-                <el-descriptions-item label="开户行" >
+                <el-descriptions-item label="开户行" v-if="!['A', 'D'].includes(formData.typeCode)">
                    <el-form-item prop="bankOfDeposit" label="开户行">
                        <el-input maxlength="20" v-model="formData.bankOfDeposit"
                                  placeholder="请填写开户行"
@@ -173,10 +173,12 @@ layout("/layouts/platform.html"){
                </template>


+            </el-descriptions>
+            <el-descriptions :column="3" border>
                <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>
+                                  type="textarea" :rows="3" resize="none"></el-input>
                    </el-form-item>
                </el-descriptions-item>

@@ -238,7 +240,10 @@ layout("/layouts/platform.html"){
                    payUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    type: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    way: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    money: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    money: [
+                        { required: true, message: "请填写慰问金额", trigger: ["change", "blur"] },
+                        { validator: (rule, value, callback) => callback(this.validateMoney(value) ? undefined : new Error("慰问金额须大于0且不超过10000元，最多两位小数")), trigger: ["change", "blur"] }
+                    ],
                    occurTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    child: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    hospital: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
@@ -247,14 +252,20 @@ layout("/layouts/platform.html"){
                    hospitalBy: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    deadImmediateFamily: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    remark: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    files: [{ required: true, type: "array", min: 1, max: 5, message: "请上传1至5个附件", 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"] }],
+                    // certifierUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    bankCardNumber: [
+                        { required: true, message: "请填写银行卡号或对公账户号", trigger: ["change", "blur"] },
+                        { pattern: /^[0-9]{6,30}$/, message: "收款账户须为6至30位数字（银行卡号或对公账户号）", trigger: ["change", "blur"] }
+                    ],
                    bankUserName: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    bankOfDeposit: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    thisYearHospitalizationNum: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    thisYearHospitalizationNum: [
+                        { required: true, message: "必填", trigger: ["change", "blur"] },
+                        { type: "integer", min: 0, max: 10000, message: "住院次数须为0至10000的整数", trigger: ["change", "blur"] }
+                    ],
                    leaveHospitalTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                    hospitalizationTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                },
@@ -268,6 +279,9 @@ layout("/layouts/platform.html"){
            }
        },
        methods: {
+            validateMoney(value) {
+                return /^(0|[1-9][0-9]*)(\.[0-9]{1,2})?$/.test(String(value)) && Number(value) > 0 && Number(value) <= 10000
+            },
            createRemoteMethod(options) {
                return (keyword) => {
                    this.selectQueryUser(keyword, options)
@@ -37,12 +37,12 @@ const basicForm = {
                        <el-radio-button :label="false">不上传</el-radio-button>
                    </el-radio-group>
                </el-form-item>-->
-<!--                <el-form-item label="是否上传附件" prop="isUploadFile">-->
-<!--                    <el-radio-group v-model="formData.isUploadFile">-->
-<!--                        <el-radio-button :label="true">是</el-radio-button>-->
-<!--                        <el-radio-button :label="false">否</el-radio-button>-->
-<!--                    </el-radio-group>-->
-<!--                </el-form-item>-->
+                <el-form-item label="是否上传附件" prop="isUploadFile">
+                    <el-radio-group v-model="formData.isUploadFile">
+                        <el-radio-button :label="true">是</el-radio-button>
+                        <el-radio-button :label="false">否</el-radio-button>
+                    </el-radio-group>
+                </el-form-item>
                <el-form-item label="上传附件说明" prop="uploadFileDesc" v-if="formData.isUploadFile">
                    <el-input v-model="formData.uploadFileDesc" maxlength="50" clearable placeholder="请填写上传附件说明"></el-input>
                </el-form-item>
@@ -26,7 +26,7 @@ layout("/layouts/platform.html"){
 					</el-form-item>
 				</el-descriptions-item>
 				<el-descriptions-item label="受补助人">
-					<el-form-item prop="userName">
+					<el-form-item prop="userId">
 						<template v-if="formData.mode == 2">
 							<el-select :remote-method="queryRecipients"
 							           @change="userChange" clearable filterable
@@ -51,7 +51,7 @@ layout("/layouts/platform.html"){
 				</el-descriptions-item>
 				<el-descriptions-item label="身份证号" :span="2">
 					<el-form-item prop="idCard">
-						<el-input maxlength="20" clearable placeholder="请填写身份证号"
+						<el-input clearable placeholder="请填写身份证号"
 								  v-model="formData.idCard" maxlength="18"></el-input>
 					</el-form-item>
 				</el-descriptions-item>
@@ -84,7 +84,7 @@ layout("/layouts/platform.html"){
 				<el-descriptions-item label="手机号码">
 					<el-form-item prop="mobile">
 						<el-input maxlength="11" clearable placeholder="请填写手机号码"
-								  v-model="formData.mobile" maxlength="11"></el-input>
+								  v-model="formData.mobile"></el-input>
 					</el-form-item>
 				</el-descriptions-item>
 				<el-descriptions-item label="家庭年总收入（万元）">
@@ -103,6 +103,7 @@ layout("/layouts/platform.html"){
 						<el-input-number
 								v-model="formData.homeNumber"
 								:min="1"
+								:precision="0"
 								:step="1"
 								style="width: 100%"
 								placeholder="请填写家庭人数">
@@ -113,7 +114,7 @@ layout("/layouts/platform.html"){
 					<el-form-item prop="homeAddress">
 						<el-input clearable
 								  style="width: 100%"
-								  v-model="formData.homeAddress"
+								  v-model="formData.homeAddress" maxlength="200"
 								  placeholder="请填写家庭住址">
 						</el-input>
 					</el-form-item>
@@ -132,7 +133,7 @@ layout("/layouts/platform.html"){
 <!--				</el-descriptions-item>-->
 				<el-descriptions-item label="银行卡号" >
 					<el-form-item prop="bankCardNum">
-						<el-input maxlength="20" clearable placeholder="请填写银行卡号"
+						<el-input maxlength="19" clearable placeholder="请填写银行卡号"
 								  v-model="formData.bankCardNum"></el-input>
 					</el-form-item>
 				</el-descriptions-item>
@@ -152,7 +153,7 @@ layout("/layouts/platform.html"){
 				</el-descriptions-item>

 				<el-descriptions-item label="申请金额（元）">
-                    <el-form-item prop="applyMoney" :rules="[{required:true,type:'number',min:0.01,message:'请填写大于零的申请金额',trigger:['change','blur']}]">
+                    <el-form-item prop="applyMoney">
                        <el-input-number v-model="formData.applyMoney" :precision="2" :min="0.01" placeholder="请输入申请金额"></el-input-number>
                    </el-form-item>
                </el-descriptions-item>
@@ -198,8 +199,8 @@ layout("/layouts/platform.html"){
 								<template slot-scope="{row,$index}">
 									<el-form-item label-width="0"
 												  :prop="'familyList.'+$index+'.relation'"
-												  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-										<el-input v-model="row.relation" placeholder="请填写与本人关系" clearable></el-input>
+												  :rules="textRules('与本人关系', 50)">
+										<el-input v-model="row.relation" maxlength="50" placeholder="请填写与本人关系" clearable></el-input>
 									</el-form-item>
 								</template>
 							</el-table-column>
@@ -207,8 +208,8 @@ layout("/layouts/platform.html"){
 								<template slot-scope="{row,$index}">
 									<el-form-item label-width="0"
 												  :prop="'familyList.'+$index+'.name'"
-												  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-										<el-input v-model="row.name" placeholder="请填写姓名" clearable></el-input>
+												  :rules="textRules('姓名', 100)">
+										<el-input v-model="row.name" maxlength="100" placeholder="请填写姓名" clearable></el-input>
 									</el-form-item>
 								</template>
 							</el-table-column>
@@ -216,9 +217,9 @@ layout("/layouts/platform.html"){
 								<template slot-scope="{row,$index}">
 									<el-form-item label-width="0"
 									              :prop="'familyList.'+$index+'.age'"
-									              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+									              :rules="[{required:true,type:'integer',min:1,max:100,message:'年龄须为1至100的整数',trigger:['change','blur']}]">
 										<el-input-number v-model="row.age" placeholder="年龄" :min="1"
-										                 :max="100" :step="1" style="width: 100%" clearable></el-input-number>
+										                 :max="100" :precision="0" :step="1" style="width: 100%" clearable></el-input-number>
 									</el-form-item>
 								</template>
 							</el-table-column>
@@ -226,8 +227,8 @@ layout("/layouts/platform.html"){
 								<template slot-scope="{row,$index}">
 									<el-form-item label-width="0"
 												  :prop="'familyList.'+$index+'.homeUnit'"
-												  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-										<el-input v-model="row.homeUnit" placeholder="请填写工作单位" clearable></el-input>
+												  :rules="textRules('工作单位', 200)">
+										<el-input v-model="row.homeUnit" maxlength="200" placeholder="请填写工作单位" clearable></el-input>
 									</el-form-item>
 								</template>
 							</el-table-column>
@@ -235,9 +236,9 @@ layout("/layouts/platform.html"){
 								<template slot-scope="{row,$index}">
 									<el-form-item label-width="0"
 									              :prop="'familyList.'+$index+'.yearIncome'"
-									              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+									              :rules="[{validator:validateIncome,required:true,trigger:['change','blur']}]">
 										<el-input-number v-model="row.yearIncome" placeholder="年收入"
-										                 :min="0" :step="1" style="width: 100%" clearable></el-input-number>
+										                 :min="0" :precision="2" :step="1" style="width: 100%" clearable></el-input-number>
 									</el-form-item>
 								</template>
 							</el-table-column>
@@ -245,8 +246,8 @@ layout("/layouts/platform.html"){
 								<template slot-scope="{row,$index}">
 									<el-form-item label-width="0"
 												  :prop="'familyList.'+$index+'.remarks'"
-												  :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-										<el-input v-model="row.remarks" placeholder="请填写备注" clearable></el-input>
+												  :rules="textRules('备注', 500)">
+										<el-input v-model="row.remarks" maxlength="500" placeholder="请填写备注" clearable></el-input>
 									</el-form-item>
 								</template>
 							</el-table-column>
@@ -326,22 +327,37 @@ layout("/layouts/platform.html"){
 					applyCount: '1',
 				},
 				formRules: {
-					proxyUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
-					proxyLoginName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
-					sex: [{required: true, message: '请填写性别', trigger: ['blur', 'change']}],
-					userName: [{required: true, message: '请填写受补助人', trigger: ['blur', 'change']}],
-					unitName: [{required: true, message: '请填写所属单位', trigger: ['blur', 'change']}],
+					proxyUserName: this.textRules('填写人姓名', 100),
+					proxyLoginName: this.textRules('填写人工号', 100),
+					mode: [{required: true, type: 'enum', enum: ['1', '2'], message: '请选择申请模式', trigger: ['blur', 'change']}],
+					sex: [{required: true, type: 'enum', enum: ['男', '女'], message: '请选择性别', trigger: ['blur', 'change']}],
+					userId: [{required: true, message: '请选择受补助人', trigger: ['blur', 'change']}],
+					unitName: this.textRules('所属单位', 500),
 					unionName: [{required: true, message: '请填写所属工会', trigger: ['blur', 'change']}],
-					homeAddress: [{required: true, message: '请填写家庭住址', trigger: ['blur', 'change']}],
-					mobile: [{required: true, message: '请填写手机号码', trigger: ['blur', 'change']}],
-					idCard: [{required: true, message: '请填写身份证号', trigger: ['blur', 'change']}],
-					bankCardNum: [{required: true, message: '请填写收款账户卡号', trigger: ['blur', 'change']}],
+					homeAddress: this.textRules('家庭住址', 200),
+					mobile: [
+						{required: true, message: '请填写手机号码', trigger: ['blur', 'change']},
+						{pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号码', trigger: ['blur', 'change']}
+					],
+					idCard: [{validator: (rule, value, callback) => {
+						const result = this.isValidIdCard(value || '')
+						callback(result.status === 0 ? new Error(result.msg) : undefined)
+					}, required: true, trigger: ['blur', 'change']}],
+					bankCardNum: [{validator: (rule, value, callback) => {
+						const result = this.validateCard(value || '')
+						callback(result.status === 0 ? new Error(result.msg) : undefined)
+					}, required: true, trigger: ['blur', 'change']}],
 					bankUserName: [{required: true, message: '请填写户名', trigger: ['blur', 'change']}],
-					bankOfDeposit: [{required: true, message: '请填写开户行', trigger: ['blur', 'change']}],
-					position: [{required: true, message: '请填写职务', trigger: ['blur', 'change']}],
-					officialCapacity: [{required: true, message: '请填写职称', trigger: ['blur', 'change']}],
-					subsidyStandards: [{required: true, message: '请选择困难类型', trigger: ['blur', 'change']}],
-					reason: [{required: true, message: '请填写申请原因', trigger: ['blur', 'change']}],
+					bankOfDeposit: this.textRules('开户行', 30),
+					position: this.textRules('职务', 20),
+					officialCapacity: this.textRules('职称', 20),
+					homeIncome: [{validator: this.validateIncome, required: true, trigger: ['blur', 'change']}],
+					homeNumber: [{required: true, type: 'integer', min: 1, message: '家庭人数须为大于零的整数', trigger: ['blur', 'change']}],
+					subsidy: this.textRules('补助类型', 500),
+					subsidyStandards: this.textRules('困难类型', 500),
+					applyMoney: [{validator: this.validateMoney, required: true, trigger: ['blur', 'change']}],
+					reason: this.textRules('生活致困原因', 500),
+					sign: [{required: true, whitespace: true, message: '请完成签字', trigger: ['blur', 'change']}],
 				},

 				// 替他人申请相关
@@ -349,8 +365,21 @@ layout("/layouts/platform.html"){
 			}
 		},
 		methods: {
+			textRules(label, max) {
+				return [{required: true, whitespace: true, max, message: '请填写' + label + '，且不超过' + max + '个字符', trigger: ['blur', 'change']}]
+			},
+			validateIncome(rule, value, callback) {
+				const valid = typeof value === 'number' && Number.isFinite(value) && value >= 0 && /^\d+(\.\d{1,2})?$/.test(String(value))
+				callback(valid ? undefined : new Error('收入须为不小于零的数字，最多保留两位小数'))
+			},
+			validateMoney(rule, value, callback) {
+				const valid = typeof value === 'number' && Number.isFinite(value) && value > 0 && /^\d+(\.\d{1,2})?$/.test(String(value))
+				callback(valid ? undefined : new Error('申请金额须大于零，最多保留两位小数'))
+			},
 			// 保存
-			onSave() {
+			async onSave() {
+				const valid = await this.$refs.formRef.validate().catch(() => false)
+				if (!valid) return
 				this.$confirm("您确定保存吗？", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
@@ -367,24 +396,13 @@ layout("/layouts/platform.html"){

 			// 提交
 			async onSubmit() {
-				this.$refs.formRef.validate().then((valid) => {
+				this.$refs.formRef.validate().catch(() => false).then((valid) => {
 					if (valid) {
 						this.$confirm("您确定要提交吗？", "提示", {
 							confirmButtonText: "确定",
 							cancelButtonText: "取消",
 							type: "warning"
 						}).then(() => {
-							const result = this.isValidIdCard(this.formData.idCard)
-							if (result.status === 0) {
-								this.$message.warning(result.msg)
-								return
-							}
-							const bankRes = this.validateCard(this.formData.bankCardNum)
-							if (bankRes.status === 0) {
-								this.$message.warning(bankRes.msg)
-								return;
-							}
-
 							this.$axios.post('/platform/difficultHelp/apply/submit', {
 								data: JSON.stringify(this.formData)
 							}).then(res => {
@@ -399,7 +417,7 @@ layout("/layouts/platform.html"){
 			},

 			async onFinishTask() {
-				this.$refs.formRef.validate().then((valid) => {
+				this.$refs.formRef.validate().catch(() => false).then((valid) => {
 					if (valid) {
 						this.$confirm("您确定要提交吗？", "提示", {
 							confirmButtonText: "确定",
@@ -407,17 +425,6 @@ layout("/layouts/platform.html"){
 							type: "warning"
 						}).then(() => {

-							const result = this.isValidIdCard(this.formData.idCard)
-							if (result.status === 0) {
-								this.$message.warning(result.msg)
-								return
-							}
-							const bankRes = this.validateCard(this.formData.bankCardNum)
-							if (bankRes.status === 0) {
-								this.$message.warning(bankRes.msg)
-								return;
-							}
-
 							this.$axios.post('/platform/difficultHelp/apply/submitAgain', {
 								data: JSON.stringify(this.formData),
 								taskId: GetQueryString("taskId")
@@ -255,7 +255,7 @@ layout("/layouts/platform_h5.html"){
                <van-empty description="暂无数据" v-else></van-empty>
            </van-action-sheet>-->

-            <van-field
+            <!-- <van-field
                v-model="formData.certifierUserName"
                name="certifierUserName"
                label="证明人"
@@ -288,7 +288,7 @@ layout("/layouts/platform_h5.html"){
                    </template>
                </div>
                <van-empty description="暂无数据" v-else></van-empty>
-            </van-action-sheet>
+            </van-action-sheet> -->

            <van-field
                v-model="formData.typeName"
@@ -322,7 +322,7 @@ layout("/layouts/platform_h5.html"){
                name="money"
                label="慰问金额"
                required
-                :rules="[{ required: true }]"
+                :rules="[{ required: true, message: '请填写慰问金额' }, { validator: validateMoney, message: '慰问金额须大于0且不超过10000元，最多两位小数' }]"
                placeholder="选择慰问类型自动匹配金额"
                clickable
                type="number"
@@ -353,17 +353,19 @@ layout("/layouts/platform_h5.html"){
            </van-popup>

            <van-field
+                v-if="!['A', 'D'].includes(formData.typeCode)"
                v-model="formData.bankCardNumber"
                label="收款账户"
-                maxlength="20"
+                maxlength="30"
                clearable
                name="bankCardNumber"
-                placeholder="请填写收款账户"
-                :rules="[{ required: true }]"
+                placeholder="请填写银行卡号或对公账户号"
+                :rules="[{ required: true, message: '请填写银行卡号或对公账户号' }, { pattern: /^[0-9]{6,30}$/, message: '收款账户须为6至30位数字（银行卡号或对公账户号）' }]"
                required
            ></van-field>

            <van-field
+                v-if="!['A', 'D'].includes(formData.typeCode)"
                v-model="formData.bankUserName"
                label="户名"
                placeholder="请填写户名"
@@ -373,9 +375,10 @@ layout("/layouts/platform_h5.html"){
                name="bankUserName"
            ></van-field>
            <van-field
+                v-if="!['A', 'D'].includes(formData.typeCode)"
                v-model="formData.bankOfDeposit"
                label="开户行"
-                maxlength="30"
+                maxlength="20"
                type="textarea"
                rows="4"
                autosize
@@ -433,8 +436,8 @@ layout("/layouts/platform_h5.html"){
                    ></van-datetime-picker>
                </van-popup>

-                <van-field type="digit" label="当年第几次住院"
-                           :rules="[{ required: true }]"
+                <van-field type="digit" label="当年第几次住院" name="thisYearHospitalizationNum"
+                           :rules="[{ required: true }, { validator: value => /^[0-9]+$/.test(String(value)) && Number(value) <= 10000, message: '住院次数须为0至10000的整数' }]"
                           required
                           placeholder="请输入当年第几次住院"
                           v-model="formData.thisYearHospitalizationNum"></van-field>
@@ -443,6 +446,7 @@ layout("/layouts/platform_h5.html"){
            <van-field
                v-model="formData.remark"
                name="remark"
+                maxlength="500"
                label="申请事由"
                type="textarea"
                rows="4"
@@ -460,15 +464,18 @@ layout("/layouts/platform_h5.html"){
                {{ '附件说明：' + chooseType.uploadFileDesc }}
            </div>
            <van-cell-group :border="false">
-                <van-field class="direction-column-field" name="avatar" label="">
+                <van-field class="direction-column-field" name="files" label="附件" required
+                           :rules="[{ validator: () => Array.isArray(formData.files) && formData.files.length > 0 && formData.files.length <= 5, message: '请上传1至5个附件' }]">
                    <template #input>
                        <h5-file-upload
                            slot="input"
                            :value.sync="formData.files"
                            :upload_number="5"
+                            upload_text="上传附件"
                            upload_result_category="array"
                            complete_result
                        ></h5-file-upload>
+                        <div class="condolence-card__desc">最多上传 5 个文件</div>
                    </template>
                </van-field>
            </van-cell-group>
@@ -477,7 +484,8 @@ layout("/layouts/platform_h5.html"){
        <section class="form-section">
            <h2 class="condolence-card__title">签字确认</h2>
            <van-cell-group :border="false">
-                <van-field class="direction-column-field" name="signature" label="">
+                <van-field class="direction-column-field" name="signature" label="" :value="formData.signature"
+                           :rules="[{ required: true, message: '请填写签字' }]">
                    <template #input>
                        <h5-signature v-model="formData.signature" slot="input"></h5-signature>
                    </template>
@@ -532,6 +540,9 @@ layout("/layouts/platform_h5.html"){
            }
        },
        methods: {
+            validateMoney(value) {
+                return /^(0|[1-9][0-9]*)(\.[0-9]{1,2})?$/.test(String(value)) && Number(value) > 0 && Number(value) <= 10000
+            },
            // 选择出院时间
            showLeaveHospitalTimePickerClick() {
                if (this.formData.leaveHospitalTime) {
@@ -151,7 +151,7 @@ layout("/layouts/platform_h5.html"){
                    <h2 class="condolence-info-card__title">
                        审批签字<span class="condolence-audit-card__required">*</span>
                    </h2>
-                    <van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+                    <van-field name="tf_sign" :value="formData.tf_sign" :rules="[{required:true,message:'请完成审批签字'}]">
                        <template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
                    </van-field>
                </van-form>
@@ -158,19 +158,44 @@
 }

 .condolence-info-long-cell {
+    display: flex;
+    align-items: flex-start;
+}
+
+.condolence-info-card .condolence-attachments .empty-container {
+    height: auto;
+    justify-content: flex-start;
+    color: inherit;
+}
+
+.condolence-info-card .condolence-attachments .empty-text {
+    font-size: inherit;
+    line-height: inherit;
+}
+
+.condolence-info-opinion > :first-child {
+    margin-top: 0;
+}
+
+.condolence-info-opinion > :last-child {
+    margin-bottom: 0;
+}
+
+.condolence-signature-image,
+.condolence-approval-signature-image {
    display: block;
-}
-
-.condolence-info-long-cell .van-cell__title {
-    width: auto;
+    width: 100%;
    max-width: 100%;
+    height: 80px;
 }

-.condolence-info-long-cell .van-cell__value {
-    margin-top: 7px;
+.condolence-signature-image .van-image__img,
+.condolence-approval-signature-image {
+    object-fit: contain;
+    object-position: left center;
 }

-.condolence-signature-image {
-    display: block;
+.condolence-info-opinion img {
    max-width: 100%;
+    height: auto;
 }
@@ -25,13 +25,13 @@ 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.certifierUserName || '--' }}</van-cell>
+                                <!-- <van-cell title="证明人">{{ viewData.certifierUserName || '--' }}</van-cell> -->
                                <van-cell title="慰问类型">{{ viewData.typeName || '--' }}</van-cell>
                                <van-cell title="慰问金额">{{ viewData.money || '--' }}</van-cell>
                                <van-cell title="慰问时间">{{ viewData.occurTime || '--' }}</van-cell>
                                <van-cell title="收款账户">{{ viewData.bankCardNumber || '--' }}</van-cell>
                                <van-cell title="户名">{{ viewData.bankUserName || '--' }}</van-cell>
-                                <van-cell class="condolence-info-long-cell" title="开户行">
+                                <van-cell title="开户行">
                                    {{ viewData.bankOfDeposit || '暂无' }}
                                </van-cell>
                                <template v-if="['2'].includes(viewData.typeCode)">
@@ -39,17 +39,18 @@ const condolenceInfo = {
                                    <van-cell title="出院时间">{{ viewData.leaveHospitalTime || '--' }}</van-cell>
                                    <van-cell title="当年第几次住院（次）">{{ viewData.thisYearHospitalizationNum || '--' }}</van-cell>
                                </template>
-                                <van-cell class="condolence-info-long-cell" title="申请事由">
+                                <van-cell title="申请事由">
                                    {{ viewData.remark || '暂无' }}
                                </van-cell>
                                <van-cell class="condolence-info-long-cell" title="附件">
-                                    <file-preview :files="viewData.files" complete_result></file-preview>
+                                    <file-preview class="condolence-attachments" :files="viewData.files" complete_result></file-preview>
                                </van-cell>
                                <van-cell class="condolence-info-long-cell" title="签字">
                                    <van-image
                                        v-if="viewData.signature"
                                        :src="viewData.signature"
                                        class="condolence-signature-image"
+                                        fit="contain"
                                    ></van-image>
                                    <span v-else>暂无签字</span>
                                </van-cell>
@@ -86,10 +87,10 @@ const condolenceInfo = {
                                    ></dict-tag>
                                </van-cell>
                                <van-cell v-if="task.taskFormData && task.taskFormData.sign" title="审批签字">
-                                    <img :src="task.taskFormData.sign" style="max-width: 100%; height: 80px; object-fit: contain">
+                                    <img :src="task.taskFormData.sign" class="condolence-approval-signature-image">
                                </van-cell>
-                                <van-cell class="condolence-info-long-cell" title="办理意见">
-                                    <div v-html="task.taskFormData && task.taskFormData.tf_opinion || '暂无'"></div>
+                                <van-cell title="办理意见">
+                                    <div class="condolence-info-opinion" v-html="task.taskFormData && task.taskFormData.tf_opinion || '暂无'"></div>
                                </van-cell>
                            </van-cell-group>
                        </section>
@@ -151,7 +151,7 @@ layout("/layouts/platform_h5.html"){
                    <h2 class="condolence-info-card__title">
                        审批签字<span class="condolence-audit-card__required">*</span>
                    </h2>
-                    <van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+                    <van-field name="tf_sign" :value="formData.tf_sign" :rules="[{required:true,message:'请完成审批签字'}]">
                        <template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
                    </van-field>
                </van-form>
@@ -223,6 +223,23 @@ layout("/layouts/platform_h5.html"){
            },
            onReady() {
                this.queryCondolenceType()
+                this.openTodoTask()
+            },
+            openTodoTask() {
+                const taskId = GetQueryString("taskId")
+                const bizId = GetQueryString("bizId")
+                if (!taskId || !bizId) return
+                this.$axios.post("/flow/common/taskInfo", {taskId}).then((res) => {
+                    if (res.code !== 0 || !res.data) return
+                    const task = res.data
+                    if (task.taskName !== "cbd41337-3c87-4959-9027-809df5c7ef5e") return
+                    const row = {id: bizId, taskId: task.id, curTaskName: task.displayName}
+                    if (task.taskState === 10 && task.executable && GetQueryString("tab") === "todo") {
+                        this.onApproval(row)
+                    } else {
+                        this.onView(row)
+                    }
+                })
            },
            onView(row) {
                this.$set(this, "showApprovalForm", false)
@@ -151,7 +151,7 @@ layout("/layouts/platform_h5.html"){
                    <h2 class="condolence-info-card__title">
                        审批签字<span class="condolence-audit-card__required">*</span>
                    </h2>
-                    <van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+                    <van-field name="tf_sign" :value="formData.tf_sign" :rules="[{required:true,message:'请完成审批签字'}]">
                        <template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
                    </van-field>
                </van-form>
@@ -151,7 +151,7 @@ layout("/layouts/platform_h5.html"){
                    <h2 class="condolence-info-card__title">
                        审批签字<span class="condolence-audit-card__required">*</span>
                    </h2>
-                    <van-field name="tf_sign" :value="formData.tf_sign" required :rules="[{required:true,message:'请完成审批签字'}]">
+                    <van-field name="tf_sign" :value="formData.tf_sign" :rules="[{required:true,message:'请完成审批签字'}]">
                        <template #input><h5-signature v-model="formData.tf_sign" :key="formData.processTaskId"></h5-signature></template>
                    </van-field>
                </van-form>
@@ -281,11 +281,13 @@ const todo = {
        // 处理任务
        onView(task) {
            const {taskId, taskKey, instanceId, businessNo, formKey, h5FormKey} = task;
-            if (!h5FormKey) {
+            const mobileFormKey = h5FormKey || (taskKey === "cbd41337-3c87-4959-9027-809df5c7ef5e"
+                ? "/platform/condolence/fourthApproval/h5" : "");
+            if (!mobileFormKey) {
                this.$toast("当前流程暂不支持手机端审核，请前往PC端页面审核！");
                return;
            }
-            this.$pjaxReplace(h5FormKey + "?taskId=" + taskId + "&bizId=" + businessNo + "&taskKey=" + taskKey + "&tab=" + this.activeTab)
+            this.$pjaxReplace(mobileFormKey + "?taskId=" + taskId + "&bizId=" + businessNo + "&taskKey=" + taskKey + "&tab=" + this.activeTab)
        },

        // 根据当前列表类型统一展示流程状态，发起列表保留流程实例的实际状态。