diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java
index 7c2dda77..05b9046b 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java
@@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -237,6 +238,9 @@ public class UnionReimburseCollectController {
                     item.setReimburseFundSource(typeDict.getName());
                 }
             }
+            if (StrUtil.isNotBlank(item.getCreateTime())) {
+                item.setCreateTime(DateUtil.format(DateUtil.parse(item.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
+            }
 
             // 拼接备注字段（仿照系统代码逻辑，使用activityName和condolenceName字段）
             if (cn.hutool.core.util.StrUtil.isNotBlank(item.getActivityName())) {
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java
index 779b5b30..55ed0437 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java
@@ -227,7 +227,7 @@ public class  UnionReimburseMineController {
 
         tempFile.deleteOnExit();
 
-        docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd"));
+        docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
         docData.put("unitName", unionReimburse.getUnitName());
         docData.put("userName", unionReimburse.getUserName());
         docData.put("loginName", unionReimburse.getLoginName());
@@ -309,7 +309,7 @@ public class  UnionReimburseMineController {
                 .create();
         docData.put("qrcode", pictureRenderData);
 
-        docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd"));
+        docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
         docData.put("unitName", unionReimburse.getUnitName());
         docData.put("userName", unionReimburse.getUserName());
         docData.put("loginName", unionReimburse.getLoginName());
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java
index 24dcb0c3..5dad4838 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java
@@ -139,10 +139,10 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl<UnionReimburse> i
         }
 
         if (oldRecord == null) {
-            unionReimburse.setCreateTime(DateUtil.date());
+            unionReimburse.setCreateTime(toSecondPrecision(DateUtil.date()));
             unionReimburse.setDocumentNo(generateDocumentNo());
         } else {
-            unionReimburse.setCreateTime(oldRecord.getCreateTime());
+            unionReimburse.setCreateTime(toSecondPrecision(oldRecord.getCreateTime()));
             unionReimburse.setDocumentNo(oldRecord.getDocumentNo());
         }
         unionReimburse.setStateId(stateId);
@@ -156,6 +156,16 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl<UnionReimburse> i
         return Result.success(stateId == 2 ? "提交成功" : "保存成功");
     }
 
+    /**
+     * 申请时间统一保存到秒，避免数据库和页面出现毫秒级时间。
+     */
+    private Date toSecondPrecision(Date date) {
+        if (date == null) {
+            return null;
+        }
+        return new Date((date.getTime() / 1000) * 1000);
+    }
+
     @Override
     public UnionReimburse getApplyForm(String id) {
         UnionReimburse unionReimburse = this.fetch(id);
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
index f80b5f3e..92b8e922 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
@@ -338,11 +338,11 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <el-descriptions-item label="报销金额" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
-                    <el-form-item label="报销金额" prop="money">
-                        <el-input v-model="formData.money" placeholder="自动汇总发票金额" readonly></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="money">-->
+<!--                        <el-input v-model="formData.money" placeholder="自动汇总发票金额" readonly></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="activityTime">
@@ -1100,7 +1100,7 @@ layout("/layouts/platform.html"){
                         this.$set(this.detailForm, "invoiceCheckCode", data.invoiceCheckCode)
                     }
                     if (this.detailForm.invoiceNo) {
-                        return this.validateInvoiceDuplicateBeforeSave()
+                        return this.validateInvoiceDuplicateBeforeSave(true)
                     }
                     return true
                 }).catch((error) => {
@@ -1113,7 +1113,7 @@ layout("/layouts/platform.html"){
                     this.recognizingInvoice = false
                 })
             },
-            async validateInvoiceDuplicateBeforeSave() {
+            async validateInvoiceDuplicateBeforeSave(checkHistory) {
                 const invoiceNo = this.detailForm.invoiceNo ? String(this.detailForm.invoiceNo).trim() : ""
                 if (!invoiceNo) {
                     return false
@@ -1133,6 +1133,9 @@ layout("/layouts/platform.html"){
                     this.$message.warning("发票号码【" + invoiceNo + "】与本次提交的第" + duplicateRows.join("、") + "条发票重复，不能保存")
                     return false
                 }
+                if (!checkHistory) {
+                    return true
+                }
                 const resp = await this.$axios.get("/platform/unionReimburse/apply/checkInvoiceDuplicate", {
                     params: {
                         invoiceNo: invoiceNo,
@@ -1150,7 +1153,7 @@ layout("/layouts/platform.html"){
                     if (!valid) {
                         return
                     }
-                    const duplicateValid = await this.validateInvoiceDuplicateBeforeSave()
+                    const duplicateValid = await this.validateInvoiceDuplicateBeforeSave(false)
                     if (!duplicateValid) {
                         return
                     }
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html
index 12c77653..f8b75217 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html
@@ -77,7 +77,11 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column prop="money" label="金额"></el-table-column>
-                <el-table-column prop="createTime" label="申请时间" sortable="custom"></el-table-column>
+                <el-table-column prop="createTime" label="申请时间" sortable="custom">
+                    <template slot-scope="{row}">
+                        {{ formatCreateTime(row.createTime) }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template slot-scope="{row}">
@@ -157,6 +161,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             onView(row) {
                 this.$refs.guava.edit(() => {
                     this.showApprovalForm = false
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html
index 1a568dc8..38082ee3 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html
@@ -55,7 +55,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会" sortable="custom"></el-table-column>
                 <el-table-column prop="unitName" label="所属单位" sortable="custom"></el-table-column>
-                <el-table-column prop="createTime" label="申请时间" sortable="custom"></el-table-column>
+                <el-table-column prop="createTime" label="申请时间" sortable="custom">
+                    <template slot-scope="{row}">
+                        {{ formatCreateTime(row.createTime) }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="reimburseProject" label="报销项目" sortable="custom">
                     <template slot-scope="{row}">
                         <span v-if="row.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">慰问</span>
@@ -150,6 +154,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             onView(row) {
                 this.$refs.guava.edit(()=>{
                     this.showApprovalForm = false
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html
index c680f117..6cbf63e8 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html
@@ -52,7 +52,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会" sortable="custom"></el-table-column>
                 <el-table-column prop="unitName" label="所属单位" sortable="custom"></el-table-column>
-                <el-table-column prop="createTime" label="申请时间" sortable="custom"></el-table-column>
+                <el-table-column prop="createTime" label="申请时间" sortable="custom">
+                    <template slot-scope="{row}">
+                        {{ formatCreateTime(row.createTime) }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="reimburseProject" label="报销项目" sortable="custom">
                     <template slot-scope="{row}">
                         <span v-if="row.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">慰问</span>
@@ -125,6 +129,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             onView(row) {
                 this.$refs.guava.view(() => {
                     this.$refs.unionReimburseInfoRef.onOpen(row)
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
index f9f49f0e..6da08cfb 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
@@ -62,7 +62,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="姓名"></el-table-column>
                 <el-table-column prop="unionName" label="所属工会" sortable="custom"></el-table-column>
                 <el-table-column prop="unitName" label="所属单位" sortable="custom"></el-table-column>
-                <el-table-column prop="createTime" label="申请时间" sortable="custom"></el-table-column>
+                <el-table-column prop="createTime" label="申请时间" sortable="custom">
+                    <template slot-scope="{row}">
+                        {{ formatCreateTime(row.createTime) }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="reimburseProject" label="报销项目" sortable="custom">
                     <template slot-scope="{row}">
                         <span v-if="row.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">慰问</span>
@@ -159,6 +163,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             onView(row) {
                 this.$refs.guava.edit(() => {
                     this.showApprovalForm = false
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html
index 210d979c..3075245b 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html
@@ -3,6 +3,77 @@ layout("/layouts/platform_h5.html"){
 #-->
 
 <style>
+    .invoice-section {
+        padding: 8px 16px 12px;
+        background: #fff;
+    }
+
+    .invoice-toolbar {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        min-height: 36px;
+        font-size: 14px;
+        color: #323233;
+    }
+
+    .invoice-tip {
+        margin-top: 4px;
+        color: #969799;
+        font-size: 12px;
+        line-height: 18px;
+    }
+
+    .invoice-detail-item {
+        margin-top: 8px;
+        padding: 10px 12px;
+        border: 1px solid #ebedf0;
+        border-radius: 6px;
+        background: #fafafa;
+    }
+
+    .invoice-detail-title {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        color: #323233;
+        font-size: 14px;
+        line-height: 22px;
+    }
+
+    .invoice-detail-line {
+        margin-top: 6px;
+        color: #646566;
+        font-size: 13px;
+        line-height: 20px;
+        word-break: break-all;
+    }
+
+    .invoice-detail-actions {
+        display: flex;
+        justify-content: flex-end;
+        gap: 8px;
+        margin-top: 8px;
+    }
+
+    .invoice-popup {
+        height: 86vh;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .invoice-popup-body {
+        flex: 1;
+        overflow-y: auto;
+        background: #f7f8fa;
+    }
+
+    .invoice-popup-actions {
+        display: flex;
+        gap: 10px;
+        padding: 10px 16px;
+        background: #fff;
+    }
 
 </style>
 <div id="app" v-cloak>
@@ -12,10 +83,93 @@ layout("/layouts/platform_h5.html"){
     <div class="form-container">
         <van-form ref="formRef">
             <van-cell-group title="信息填报" class="form-section">
-                <van-field label="经办人" v-model="formData.userName" placeholder="从信息中心获取" readonly></van-field>
                 <van-field label="工号" v-model="formData.loginName" placeholder="从信息中心获取" readonly></van-field>
+                <van-field label="经办人" v-model="formData.userName" placeholder="从信息中心获取" readonly></van-field>
+                <!-- 联系方式 -->
+                <van-field label="联系方式" v-model="formData.mobile" required placeholder="请输入联系方式"
+                           :rules="[
+                               { required: true, message: '请输入联系方式' },
+                               { pattern: /^(1[3-9]\d{9}|0\d{2,3}-?\d{7,8})$/, message: '请输入正确的联系方式' }
+                           ]"></van-field>
+                <!-- 经费来源 -->
+                <van-field
+                    v-model="formData.reimburseFundSourceName"
+                    name="reimburseFundSourceName"
+                    label="经费来源"
+                    readonly
+                    placeholder="请选择经费来源"
+                    @click="openPopup('showReimburseFundSourcePicker')"
+                    :rules="[{ required: true, message: '请选择经费来源' }]"
+                    clickable
+                    required
+                    is-link
+                ></van-field>
+                <van-popup position="bottom" round v-model:show="showReimburseFundSourcePicker">
+                    <van-picker :columns="reimburseFundSourceColumns" @cancel="closePopup('showReimburseFundSourcePicker')"
+                                @confirm="onReimburseFundSourceConfirm" show-toolbar></van-picker>
+                </van-popup>
+                <!-- 报销项目 -->
+                <van-field
+                    v-model="formData.reimburseProjectName"
+                    name="reimburseProjectName"
+                    label="报销项目"
+                    readonly
+                    placeholder="请选择报销项目"
+                    @click="openPopup('showReimburseProjectPicker')"
+                    :rules="[{ required: true, message: '请选择报销项目' }]"
+                    clickable
+                    required
+                    is-link
+                ></van-field>
+                <van-popup position="bottom" round v-model:show="showReimburseProjectPicker">
+                    <van-picker :columns="reimburseProjectColumns" @cancel="closePopup('showReimburseProjectPicker')"
+                                @confirm="onReimburseProjectConfirm" show-toolbar></van-picker>
+                </van-popup>
+                <!-- 支付方式 -->
+                <van-field
+                    v-model="formData.paymentWayName"
+                    name="paymentWayName"
+                    label="支付方式"
+                    readonly
+                    placeholder="请选择支付方式"
+                    @click="openPopup('showPaymentWayPicker')"
+                    :rules="[{ required: true, message: '请选择支付方式' }]"
+                    clickable
+                    required
+                    is-link
+                ></van-field>
+                <van-popup position="bottom" round v-model:show="showPaymentWayPicker">
+                    <van-picker :columns="paymentWayColumns" @cancel="closePopup('showPaymentWayPicker')"
+                                @confirm="onPaymentWayConfirm" show-toolbar></van-picker>
+                </van-popup>
+
+                <van-field
+                    v-if="formData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3'"
+                    v-model="formData.clubName"
+                    name="clubName"
+                    label="所属协会"
+                    readonly
+                    placeholder="请选择所属协会"
+                    @click="openPopup('showClubPicker')"
+                    :rules="[{ required: true, message: '请选择所属协会' }]"
+                    clickable
+                    required
+                    is-link
+                ></van-field>
+                <van-popup position="bottom" round v-model:show="showClubPicker">
+                    <van-picker :columns="clubColumns" @cancel="closePopup('showClubPicker')"
+                                @confirm="onClubConfirm" show-toolbar></van-picker>
+                </van-popup>
+                <van-field
+                    v-if="formData.reimburseFundSource"
+                    label="余额"
+                    v-model="formData.fundBalance"
+                    readonly
+                    placeholder="自动查询"
+                ></van-field>
 
                 <!-- 报销类别 -->
+                <!--
                 <van-field
                     v-model="formData.reimburseTypeName"
                     name="reimburseTypeName"
@@ -32,91 +186,11 @@ layout("/layouts/platform_h5.html"){
                     <van-picker :columns="reimburseTypeColumns" @cancel="showReimburseTypePicker = false"
                                 @confirm="onReimburseTypeConfirm" show-toolbar></van-picker>
                 </van-popup>
+                -->
 
-                <!-- 支付方式 -->
-                <van-field
-                    v-model="formData.paymentWayName"
-                    name="paymentWayName"
-                    label="支付方式"
-                    readonly
-                    placeholder="请选择支付方式"
-                    @click="showPaymentWayPicker = true"
-                    :rules="[{ required: true, message: '请选择支付方式' }]"
-                    clickable
-                    required
-                    is-link
-                ></van-field>
-                <van-popup position="bottom" round v-model:show="showPaymentWayPicker">
-                    <van-picker :columns="paymentWayColumns" @cancel="showPaymentWayPicker = false"
-                                @confirm="onPaymentWayConfirm" show-toolbar></van-picker>
-                </van-popup>
-
-                <!-- 报销项目 -->
-                <van-field
-                    v-model="formData.reimburseProjectName"
-                    name="reimburseProjectName"
-                    label="报销项目"
-                    readonly
-                    placeholder="请选择报销项目"
-                    @click="showReimburseProjectPicker = true"
-                    :rules="[{ required: true, message: '请选择报销项目' }]"
-                    clickable
-                    required
-                    is-link
-                ></van-field>
-                <van-popup position="bottom" round v-model:show="showReimburseProjectPicker">
-                    <van-picker :columns="reimburseProjectColumns" @cancel="showReimburseProjectPicker = false"
-                                @confirm="onReimburseProjectConfirm" show-toolbar></van-picker>
-                </van-popup>
-
-                <!-- 经费来源 -->
-                <van-field
-                    v-model="formData.reimburseFundSourceName"
-                    name="reimburseFundSourceName"
-                    label="经费来源"
-                    readonly
-                    placeholder="请选择经费来源"
-                    @click="showReimburseFundSourcePicker = true"
-                    :rules="[{ required: true, message: '请选择经费来源' }]"
-                    clickable
-                    required
-                    is-link
-                ></van-field>
-                <van-popup position="bottom" round v-model:show="showReimburseFundSourcePicker">
-                    <van-picker :columns="reimburseFundSourceColumns" @cancel="showReimburseFundSourcePicker = false"
-                                @confirm="onReimburseFundSourceConfirm" show-toolbar></van-picker>
-                </van-popup>
-
-                <van-field
-                    v-if="formData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3'"
-                    v-model="formData.clubName"
-                    name="clubName"
-                    label="所属社团"
-                    readonly
-                    placeholder="请选择所属社团"
-                    @click="showClubPicker = true"
-                    :rules="[{ required: true, message: '请选择所属社团' }]"
-                    clickable
-                    required
-                    is-link
-                ></van-field>
-                <van-popup position="bottom" round v-model:show="showClubPicker">
-                    <van-picker :columns="clubColumns" @cancel="showClubPicker = false"
-                                @confirm="onClubConfirm" show-toolbar></van-picker>
-                </van-popup>
-
-                <van-field
-                    v-if="formData.reimburseFundSource"
-                    label="余额"
-                    v-model="formData.fundBalance"
-                    readonly
-                    placeholder="自动查询"
-                ></van-field>
-
-                <!-- 联系方式 -->
-                <van-field label="联系方式" v-model="formData.mobile" required placeholder="请输入联系方式"
-                           :rules="[{ required: true, message: '请输入联系方式' }]"></van-field>
 
+                <!-- 证明人 -->
+                <!--
                 <van-field
                     v-model="formData.certifierUserName"
                     name="certifierUserName"
@@ -151,29 +225,291 @@ layout("/layouts/platform_h5.html"){
                     </div>
                     <van-empty description="暂无数据" v-else></van-empty>
                 </van-action-sheet>
+                -->
 
-                <!-- 银行信息 -->
-                <van-field label="户名"
+                <template v-if="formData.paymentWay === 'UNION_REIMBURSE_PAYMENT_WAY_2'">
+                    <van-field
+                        v-model="formData.payerName"
+                        name="payerName"
+                        label="付款人"
+                        readonly
+                        placeholder="请选择付款人"
+                        @click="openPayerSelect"
+                        :rules="[{ required: true, message: '请选择付款人' }]"
+                        clickable
+                        required
+                        is-link
+                    ></van-field>
+                    <van-action-sheet v-model="payerSelectShow" title="付款人" class="height100">
+                        <van-search
+                            v-model="payerSearchKeyword"
+                            :show-action="false"
+                            :reverse-color="false"
+                            input-align="left"
+                            placeholder="请输入工号或姓名选择付款人"
+                            @input="payerRemoteMethod"
+                            @clear="payerRemoteMethod"
+                            shape="round"
+                        ></van-search>
+                        <div class="van-action-sheet__content mt5" v-if="payerOptions && payerOptions.length>0">
+                            <template v-for="item in payerOptions">
+                                <van-button native-type="button" @click="payerUserChange(item)"
+                                            class="van-action-sheet__item van-hairline--bottom">
+                                    <span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
+                                </van-button>
+                            </template>
+                        </div>
+                        <van-empty description="暂无数据" v-else></van-empty>
+                    </van-action-sheet>
+
+                    <van-field label="户名"
                            v-model="formData.bankUserName"
                            placeholder="请输入户名"
                            :rules="[{ required: true, message: '请输入户名' }]"
                            required>
-                </van-field>
-                <van-field label="银行账号"
-                           v-model="formData.bankCardNumber"
-                           placeholder="请输入银行账号"
-                           :rules="[{ pattern:/^([1-9]{1})(\d{15}|\d{18})$/, message: '请输入正确银行账号'}]"
-                           required>
-                </van-field>
-                <van-field label="开户行"
+                    </van-field>
+                    <van-field label="开户行"
                            v-model="formData.bankOfDeposit"
                            placeholder="请输入开户行"
                            :rules="[{ required: true, message: '请输入开户行' }]"
                            required>
-                </van-field>
+                    </van-field>
+                    <van-field label="银行卡号"
+                           v-model="formData.bankCardNumber"
+                           placeholder="请输入银行卡号"
+                           :rules="[{ required: true, message: '请输入银行卡号' }, { pattern:/^([1-9]{1})(\d{15}|\d{18})$/, message: '请输入正确银行卡号'}]"
+                           required>
+                    </van-field>
+                </template>
+
+                <template v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
+                    <van-field
+                        v-model="formData.condolenceUserName"
+                        name="condolenceUserName"
+                        label="慰问对象"
+                        readonly
+                        placeholder="请选择慰问对象"
+                        @click="openCondolenceSelect"
+                        :rules="[{ required: true, message: '请选择慰问对象' }]"
+                        clickable
+                        required
+                        is-link
+                    ></van-field>
+                    <van-action-sheet v-model="showCondolenceSearch" title="慰问对象" class="height100">
+                        <van-search
+                            v-model="condolenceSearchKeyword"
+                            :show-action="false"
+                            :reverse-color="false"
+                            input-align="left"
+                            placeholder="请输入姓名或工号查询"
+                            @input="searchCondolence"
+                            @clear="searchCondolence"
+                            shape="round"
+                        ></van-search>
+                        <div class="van-action-sheet__content mt5" v-if="condolenceSearchResults && condolenceSearchResults.length>0">
+                            <template v-for="item in condolenceSearchResults">
+                                <van-button native-type="button" @click="selectCondolence(item)"
+                                            class="van-action-sheet__item van-hairline--bottom">
+                                    <span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
+                                </van-button>
+                            </template>
+                        </div>
+                        <van-empty description="暂无数据" v-else></van-empty>
+                    </van-action-sheet>
+
+                    <van-field label="性别" v-model="formData.condolenceSex" readonly placeholder="自动带出"></van-field>
+                    <van-field label="生日" :value="formatDateText(formData.condolenceBirthday)" readonly placeholder="自动带出"></van-field>
+                    <van-field label="身份证号" v-model="formData.condolenceIdCard" readonly placeholder="自动带出"></van-field>
+                    <van-field label="联系方式" v-model="formData.condolenceMobile" readonly placeholder="自动带出"></van-field>
+
+                    <van-field
+                        v-model="formData.typeName"
+                        name="typeName"
+                        label="慰问类型"
+                        readonly
+                        placeholder="请选择慰问类型"
+                        @click="openPopup('showCondolenceTypePicker')"
+                        :rules="[{ required: true, message: '请选择慰问类型' }]"
+                        clickable
+                        required
+                        is-link
+                    ></van-field>
+                    <van-popup position="bottom" round v-model:show="showCondolenceTypePicker">
+                        <van-picker :columns="condolenceTypeColumns" @cancel="closePopup('showCondolenceTypePicker')"
+                                    @confirm="onCondolenceTypeConfirm" show-toolbar></van-picker>
+                    </van-popup>
+
+                    <van-field
+                        v-model="formData.way"
+                        name="way"
+                        label="慰问方式"
+                        readonly
+                        placeholder="请选择慰问方式"
+                        @click="openPopup('showCondolenceWayPicker')"
+                        :rules="[{ required: true, message: '请选择慰问方式' }]"
+                        clickable
+                        required
+                        is-link
+                    ></van-field>
+                    <van-popup position="bottom" round v-model:show="showCondolenceWayPicker">
+                        <van-picker :columns="condolenceWayColumns" @cancel="closePopup('showCondolenceWayPicker')"
+                                    @confirm="onCondolenceWayConfirm" show-toolbar></van-picker>
+                    </van-popup>
+
+                    <van-field label="慰问金额"
+                               v-model="formData.condolenceMoney"
+                               placeholder="请输入慰问金额"
+                               type="number"
+                               :rules="[{ required: true, message: '请输入慰问金额' }]"
+                               required></van-field>
+                    <van-field
+                        v-model="formData.condolenceTime"
+                        name="condolenceTime"
+                        label="慰问时间"
+                        readonly
+                        placeholder="请选择慰问时间"
+                        @click="openDatePicker('showCondolenceTimePicker')"
+                        :rules="[{ required: true, message: '请选择慰问时间' }]"
+                        clickable
+                        required
+                        is-link
+                    ></van-field>
+                    <van-popup position="bottom" round v-model:show="showCondolenceTimePicker">
+                        <van-datetime-picker type="date" title="选择慰问时间" :min-date="minDate" :max-date="maxDate"
+                                             @cancel="closePopup('showCondolenceTimePicker')"
+                                             @confirm="onCondolenceTimeConfirm"></van-datetime-picker>
+                    </van-popup>
+
+                    <van-field
+                        v-if="formData.condolenceTypeId === 'cf4ce7af322d464f8f86d818fcc00203'"
+                        v-model="formData.marryTime"
+                        name="marryTime"
+                        label="结婚时间"
+                        readonly
+                        placeholder="请选择结婚时间"
+                        @click="openDatePicker('showMarryTimePicker')"
+                        clickable
+                        is-link
+                    ></van-field>
+                    <van-popup position="bottom" round v-model:show="showMarryTimePicker">
+                        <van-datetime-picker type="date" title="选择结婚时间" :min-date="minDate" :max-date="maxDate"
+                                             @cancel="closePopup('showMarryTimePicker')"
+                                             @confirm="onDateConfirm('marryTime', 'showMarryTimePicker', $event)"></van-datetime-picker>
+                    </van-popup>
+
+                    <van-field
+                        v-if="formData.condolenceTypeId === 'c90cb10dce6542e99ae271bee6fe8cc0'"
+                        v-model="formData.fertilityTime"
+                        name="fertilityTime"
+                        label="生育时间"
+                        readonly
+                        placeholder="请选择生育时间"
+                        @click="openDatePicker('showFertilityTimePicker')"
+                        clickable
+                        is-link
+                    ></van-field>
+                    <van-popup position="bottom" round v-model:show="showFertilityTimePicker">
+                        <van-datetime-picker type="date" title="选择生育时间" :min-date="minDate" :max-date="maxDate"
+                                             @cancel="closePopup('showFertilityTimePicker')"
+                                             @confirm="onDateConfirm('fertilityTime', 'showFertilityTimePicker', $event)"></van-datetime-picker>
+                    </van-popup>
+
+                    <template v-if="formData.condolenceTypeId === '4e316737e71047e0b01aea78524c1416'">
+                        <van-field label="住院病由"
+                                   v-model="formData.hospitalCausation"
+                                   placeholder="请输入住院病由"></van-field>
+                        <van-field
+                            v-model="formData.hospitalizationStartTime"
+                            name="hospitalizationStartTime"
+                            label="住院开始时间"
+                            readonly
+                            placeholder="请选择住院开始时间"
+                            @click="openDatePicker('showHospitalizationStartTimePicker')"
+                            clickable
+                            is-link
+                        ></van-field>
+                        <van-popup position="bottom" round v-model:show="showHospitalizationStartTimePicker">
+                            <van-datetime-picker type="date" title="选择住院开始时间" :min-date="minDate" :max-date="maxDate"
+                                                 @cancel="closePopup('showHospitalizationStartTimePicker')"
+                                                 @confirm="onDateConfirm('hospitalizationStartTime', 'showHospitalizationStartTimePicker', $event)"></van-datetime-picker>
+                        </van-popup>
+                        <van-field
+                            v-model="formData.hospitalizationEndTime"
+                            name="hospitalizationEndTime"
+                            label="住院结束时间"
+                            readonly
+                            placeholder="请选择住院结束时间"
+                            @click="openDatePicker('showHospitalizationEndTimePicker')"
+                            clickable
+                            is-link
+                        ></van-field>
+                        <van-popup position="bottom" round v-model:show="showHospitalizationEndTimePicker">
+                            <van-datetime-picker type="date" title="选择住院结束时间" :min-date="minDate" :max-date="maxDate"
+                                                 @cancel="closePopup('showHospitalizationEndTimePicker')"
+                                                 @confirm="onDateConfirm('hospitalizationEndTime', 'showHospitalizationEndTimePicker', $event)"></van-datetime-picker>
+                        </van-popup>
+                        <van-field label="入住医院" v-model="formData.hospital" placeholder="请输入入住医院"></van-field>
+                        <van-field label="当年次数" v-model="formData.hospitalCount" placeholder="请填写当年次数" type="number"></van-field>
+                    </template>
+
+                    <template v-if="formData.condolenceTypeId === '60f03a87b62b4823855814afdbf5672a'">
+                        <van-field
+                            v-model="formData.deathTime"
+                            name="deathTime"
+                            label="去逝时间"
+                            readonly
+                            placeholder="请选择去逝时间"
+                            @click="openDatePicker('showDeathTimePicker')"
+                            clickable
+                            is-link
+                        ></van-field>
+                        <van-popup position="bottom" round v-model:show="showDeathTimePicker">
+                            <van-datetime-picker type="date" title="选择去逝时间" :min-date="minDate" :max-date="maxDate"
+                                                 @cancel="closePopup('showDeathTimePicker')"
+                                                 @confirm="onDateConfirm('deathTime', 'showDeathTimePicker', $event)"></van-datetime-picker>
+                        </van-popup>
+                        <van-field
+                            v-model="formData.condolenceRelationship"
+                            name="condolenceRelationship"
+                            label="与被慰问人关系"
+                            readonly
+                            placeholder="请选择关系"
+                            @click="openPopup('showRelationshipPicker')"
+                            clickable
+                            is-link
+                        ></van-field>
+                        <van-popup position="bottom" round v-model:show="showRelationshipPicker">
+                            <van-picker :columns="relationshipColumns" @cancel="closePopup('showRelationshipPicker')"
+                                        @confirm="onRelationshipConfirm" show-toolbar></van-picker>
+                        </van-popup>
+                    </template>
+
+                    <van-field label="参加随行人员"
+                               v-model="formData.participants"
+                               placeholder="请填写参加随行人员"
+                               type="textarea"
+                               rows="2"
+                               autosize
+                               :rules="[{ required: true, message: '请填写参加随行人员' }]"
+                               required></van-field>
+                    <van-field label="报销事由"
+                               v-model="formData.paymentNotes"
+                               placeholder="请填写报销事由"
+                               type="textarea"
+                               rows="2"
+                               autosize
+                               :rules="[{ required: true, message: '请填写报销事由' }]"
+                               required></van-field>
+                    <van-field label="备注"
+                               v-model="formData.notes"
+                               placeholder="需要填写：发票编号、开具方、金额"
+                               type="textarea"
+                               rows="2"
+                               autosize></van-field>
+                </template>
 
                 <!-- 活动相关字段 (当报销项目不为慰问时显示) -->
-                <template v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                <template v-if="formData.reimburseProject && formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
                     <van-field label="活动名称"
                                v-model="formData.activityName"
                                placeholder="请输入活动名称"
@@ -181,26 +517,38 @@ layout("/layouts/platform_h5.html"){
                                required
                     ></van-field>
 
+                    <van-field label="活动人数"
+                               v-model="formData.activityNumber"
+                               placeholder="请输入活动人数"
+                               :rules="[{ required: true, message: '请输入活动人数' }]"
+                               required></van-field>
                     <van-field label="活动地点"
-                               v-model="formData.activityPlace" placeholder="请输入活动地点"></van-field>
-                    <van-field label="报销金额（元）"
-                               v-model="formData.money" placeholder="请输入报销金额" type="number" required
-                               :rules="[{ required: true, message: '请输入报销金额' }]"></van-field>
+                               v-model="formData.activityPlace"
+                               placeholder="请输入活动地点"
+                               :rules="[{ required: true, message: '请输入活动地点' }]"
+                               required></van-field>
+                    <van-field
+                        v-model="formData.activityTime"
+                        name="activityTime"
+                        label="活动时间"
+                        readonly
+                        placeholder="请选择活动时间"
+                        @click="openDatePicker('showActivityTimePicker')"
+                        :rules="[{ required: true, message: '请选择活动时间' }]"
+                        clickable
+                        required
+                        is-link
+                    ></van-field>
+                    <van-popup position="bottom" round v-model:show="showActivityTimePicker">
+                        <van-datetime-picker type="date" title="选择活动时间" :min-date="minDate" :max-date="maxDate"
+                                             @cancel="closePopup('showActivityTimePicker')"
+                                             @confirm="onActivityTimeConfirm"></van-datetime-picker>
+                    </van-popup>
                 </template>
 
-                <!-- 发票信息 (当报销类别为发票时显示) -->
-              <!--  <template>
-                    <van-field label="发票张数"
-                               v-model="formData.invoiceNumber"
-                               placeholder="请输入发票张数"
-                               type="number"
-                               :rules="[{ required: true, message: '请输入发票张数' }]"
-                               required>
-                    </van-field>
-                </template>-->
-
                 <!-- 支付内容 -->
                 <van-field
+                    v-if="formData.reimburseProject && formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'"
                     label="支付内容"
                     v-model="formData.paymentNotes"
                     placeholder="请填写支付内容"
@@ -208,7 +556,7 @@ layout("/layouts/platform_h5.html"){
                     rows="2"
                     autosize
                     required
-                    :rules="[{ required: true, message: '请输入发票张数' }]"
+                    :rules="[{ required: true, message: '请填写支付内容' }]"
                 ></van-field>
 
                 <van-field class="more-text" name="files" required
@@ -226,13 +574,56 @@ layout("/layouts/platform_h5.html"){
                     </template>
                 </van-field>
             </van-cell-group>
-            <van-cell-group title="电子签名" class="form-section">
-                <van-field class="more-text" name="userSign" label="">
-                    <template #input>
-                        <h5-signature v-model="formData.userSign" slot="input"></h5-signature>
+            <van-cell-group title="电子发票" class="form-section"
+                            v-if="formData.reimburseProject && formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                <van-field label="报销金额"
+                           v-model="formData.money"
+                           placeholder="自动汇总发票金额"
+                           readonly></van-field>
+                <van-field label="发票张数"
+                           v-model="formData.invoiceNumber"
+                           placeholder="自动统计发票数量"
+                           readonly></van-field>
+                <div class="invoice-section">
+                    <div class="invoice-toolbar">
+                        <span>发票明细列表</span>
+                        <van-button native-type="button" size="small" type="info" plain @click="openInvoiceDialog('add')">新增发票</van-button>
+                    </div>
+                    <div class="invoice-tip">每条明细对应一个发票文件，上传图片或 PDF 后自动识别发票号码、金额、销售方信息名称和项目名称。</div>
+                    <van-cell center title="自动校验">
+                        <template #right-icon>
+                            <van-switch v-model="formData.invoiceVerifyEnabled"
+                                        size="22px"
+                                        @change="handleVerifySwitchChange"></van-switch>
+                        </template>
+                    </van-cell>
+                    <template v-if="formData.invoiceDetails && formData.invoiceDetails.length > 0">
+                        <div class="invoice-detail-item" v-for="(item, index) in formData.invoiceDetails" :key="index">
+                            <div class="invoice-detail-title">
+                                <span>第{{index + 1}}张发票</span>
+                                <span>{{item.invoiceAmount || '0.00'}}元</span>
+                            </div>
+                            <div class="invoice-detail-line">发票号码：{{item.invoiceNo || '未填写'}}</div>
+                            <div class="invoice-detail-line">销售方信息名称：{{item.sellerName || '未填写'}}</div>
+                            <div class="invoice-detail-line">项目名称：{{item.itemName || '未填写'}}</div>
+                            <div class="invoice-detail-line" v-if="getInvoiceFile(item)">文件：{{getInvoiceFile(item).name || getInvoiceFile(item).filename || '已上传'}}</div>
+                            <div class="invoice-detail-actions">
+                                <van-button native-type="button" size="mini" plain type="info" @click="previewInvoiceFile(item)">预览</van-button>
+                                <van-button native-type="button" size="mini" plain type="primary" @click="openInvoiceDialog('edit', item, index)">编辑</van-button>
+                                <van-button native-type="button" size="mini" plain type="danger" @click="removeInvoiceDetail(index)">删除</van-button>
+                            </div>
+                        </div>
                     </template>
-                </van-field>
+                    <van-empty description="暂无发票明细" v-else></van-empty>
+                </div>
             </van-cell-group>
+<!--            <van-cell-group title="电子签名" class="form-section">-->
+<!--                <van-field class="more-text" name="userSign" label="">-->
+<!--                    <template #input>-->
+<!--                        <h5-signature v-model="formData.userSign" slot="input"></h5-signature>-->
+<!--                    </template>-->
+<!--                </van-field>-->
+<!--            </van-cell-group>-->
 
             <!-- 提交按钮 -->
             <div class="form-actions">
@@ -242,6 +633,59 @@ layout("/layouts/platform_h5.html"){
             </div>
         </van-form>
     </div>
+    <van-popup v-model:show="invoiceDialogVisible" position="bottom" round class="invoice-popup">
+        <van-nav-bar :title="invoiceDialogMode === 'edit' ? '编辑发票明细' : '新增发票明细'"
+                     left-text="取消"
+                     left-arrow
+                     @click-left="invoiceDialogVisible = false"></van-nav-bar>
+        <div class="invoice-popup-body">
+            <van-cell-group>
+                <van-field class="more-text" label="发票文件" required>
+                    <template #input>
+                        <h5-file-upload
+                            slot="input"
+                            :value.sync="detailForm.invoiceFiles"
+                            :upload_number="1"
+                            upload_mode="file"
+                            upload_return_id_api="/platform/sys/file/uploadDynamicReturnUrl"
+                            upload_result_category="array"
+                            upload_result_type="id"
+                            complete_result
+                            accept=".jpg,.jpeg,.png,.pdf"
+                        ></h5-file-upload>
+                    </template>
+                </van-field>
+                <van-field label="发票号码"
+                           v-model="detailForm.invoiceNo"
+                           placeholder="请输入发票号码"
+                           required></van-field>
+                <van-field label="发票金额"
+                           v-model="detailForm.invoiceAmount"
+                           placeholder="请输入发票金额"
+                           type="number"
+                           required></van-field>
+                <van-field label="销售方信息名称"
+                           v-model="detailForm.sellerName"
+                           placeholder="请输入销售方信息名称"
+                           required></van-field>
+                <van-field label="项目名称"
+                           v-model="detailForm.itemName"
+                           placeholder="请输入项目名称"
+                           required></van-field>
+                <van-field label="备注"
+                           v-model="detailForm.remark"
+                           placeholder="请输入备注"
+                           type="textarea"
+                           rows="2"
+                           autosize></van-field>
+            </van-cell-group>
+            <div class="invoice-tip" style="padding: 8px 16px;">上传发票文件后会自动识别发票信息；开启自动校验时会同步校验发票是否重复。</div>
+        </div>
+        <div class="invoice-popup-actions">
+            <van-button native-type="button" block plain @click="invoiceDialogVisible = false">取消</van-button>
+            <van-button native-type="button" block type="primary" @click="saveInvoiceDetail">保存</van-button>
+        </div>
+    </van-popup>
 </div>
 <script nonce="${cspNonce!}">
     new Vue({
@@ -272,16 +716,40 @@ layout("/layouts/platform_h5.html"){
                     clubName: "",
                     clubId: "",
                     fundBalance: "",
+                    payer: "",
+                    payerName: "",
+                    payerLoginname: "",
                     bankUserName: "",
                     bankCardNumber: "",
                     bankOfDeposit: "",
                     condolenceName: "",
                     condolenceId: "",
+                    condolenceUserId: "",
+                    condolenceUserName: "",
+                    condolenceLoginName: "",
+                    condolenceSex: "",
+                    condolenceBirthday: "",
+                    condolenceIdCard: "",
                     condolenceMobile: "",
                     condolenceType: "",
                     condolenceTypeName: "",
+                    condolenceTypeId: "",
+                    typeName: "",
+                    way: "",
+                    condolenceMoney: "",
                     money: "",
                     condolenceTime: "",
+                    marryTime: "",
+                    fertilityTime: "",
+                    hospitalCausation: "",
+                    hospitalizationTimeRange: [],
+                    hospitalizationStartTime: "",
+                    hospitalizationEndTime: "",
+                    hospital: "",
+                    hospitalCount: "",
+                    deathTime: "",
+                    condolenceRelationship: "",
+                    participants: "",
                     activityName: "",
                     activityType: "",
                     activityTypeText: "",
@@ -290,8 +758,27 @@ layout("/layouts/platform_h5.html"){
                     activityTime: "",
                     invoiceNumber: "",
                     invoice: "",
+                    invoiceDetails: [],
+                    invoiceVerifyEnabled: true,
                     paymentNotes: "",
-                    files: ""
+                    notes: "",
+                    files: []
+                },
+                invoiceDialogVisible: false,
+                invoiceDialogMode: "add",
+                detailFormIndex: -1,
+                lastRecognizedFileId: "",
+                recognizingInvoice: false,
+                detailForm: {
+                    invoiceFiles: [],
+                    invoiceNo: "",
+                    invoiceAmount: null,
+                    sellerName: "",
+                    itemName: "",
+                    remark: "",
+                    invoiceCode: "",
+                    invoiceDate: "",
+                    invoiceCheckCode: ""
                 },
                 // 报销类别
                 showReimburseTypePicker: false,
@@ -318,6 +805,19 @@ layout("/layouts/platform_h5.html"){
                 // 慰问类型
                 showCondolenceTypePicker: false,
                 condolenceTypeColumns: [],
+                showCondolenceWayPicker: false,
+                condolenceWayColumns: [
+                    {text: "慰问金（A）", value: "慰问金（A）"},
+                    {text: "提货券（B）", value: "提货券（B）"},
+                    {text: "慰问品（C）", value: "慰问品（C）"}
+                ],
+                showRelationshipPicker: false,
+                relationshipColumns: [
+                    {text: "配偶", value: "配偶"},
+                    {text: "父亲", value: "父亲"},
+                    {text: "母亲", value: "母亲"},
+                    {text: "子女", value: "子女"}
+                ],
                 // 活动类型
                 showActivityTypePicker: false,
                 activityTypeColumns: [
@@ -334,17 +834,53 @@ layout("/layouts/platform_h5.html"){
                 // 添加日期选择器相关变量
                 showCondolenceTimePicker: false,
                 showActivityTimePicker: false,
+                showMarryTimePicker: false,
+                showFertilityTimePicker: false,
+                showHospitalizationStartTimePicker: false,
+                showHospitalizationEndTimePicker: false,
+                showDeathTimePicker: false,
                 minDate: new Date(2020, 0, 1),
                 maxDate: new Date(),
 
                 certifierUserSelectShow: false,
+                payerSelectShow: false,
+                payerSearchKeyword: "",
+                payerOptions: [],
+                historyData: [],
                 searchKeyword: "",
                 userOptions: []
             }
         },
+        computed: {
+            bankHistoryUserNames() {
+                const userNameMap = {}
+                return (this.historyData || []).reduce((result, item) => {
+                    if (item.bankUserName && !userNameMap[item.bankUserName]) {
+                        userNameMap[item.bankUserName] = true
+                        result.push(item.bankUserName)
+                    }
+                    return result
+                }, [])
+            }
+        },
         // 监听报销类别发生变化，报销项目联动改变
         // 修复 watch 中的监听器
         watch: {
+            "detailForm.invoiceFiles": {
+                handler(newVal) {
+                    const file = newVal && newVal.length ? newVal[0] : null
+                    const currentFileId = this.getInvoiceFileId(file)
+                    if (!currentFileId) {
+                        this.lastRecognizedFileId = ""
+                        return
+                    }
+                    if (currentFileId === this.lastRecognizedFileId) {
+                        return
+                    }
+                    this.recognizeCurrentInvoice(false)
+                },
+                deep: true
+            },
            /* "formData.reimburseType"(newVal) {
                 // 根据报销类别过滤可选的报销项目
                 if (newVal === "UNION_REIMBURSE_TYPE_1") {
@@ -375,10 +911,405 @@ layout("/layouts/platform_h5.html"){
                 // 经费来源改变时查询余额
                 this.queryFundBalance()
             }*/
+            "formData.hospitalizationStartTime"(newVal) {
+                this.syncHospitalizationTimeRange()
+            },
+            "formData.hospitalizationEndTime"(newVal) {
+                this.syncHospitalizationTimeRange()
+            },
+            "formData.reimburseProject"(newVal) {
+                this.handleReimburseProjectChange(newVal)
+            }
         },
 
 
         methods: {
+            openPopup(key) {
+                this.$set(this, key, true)
+            },
+            closePopup(key) {
+                this.$set(this, key, false)
+            },
+            openDatePicker(key) {
+                this.openPopup(key)
+            },
+            formatDateText(value) {
+                if (!value) {
+                    return ""
+                }
+                return this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD") : value
+            },
+            onDateConfirm(fieldName, pickerName, value) {
+                this.$set(this.formData, fieldName, this.$moment(value).format("YYYY-MM-DD"))
+                this.closePopup(pickerName)
+            },
+            normalizeDateText(value) {
+                if (!value) {
+                    return ""
+                }
+                return this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD") : value
+            },
+            normalizeCondolenceDateFields() {
+                // 编辑回显和提交前统一裁剪慰问相关日期，避免后端日期类型带出 00:00:00。
+                const fields = [
+                    "condolenceTime",
+                    "marryTime",
+                    "fertilityTime",
+                    "hospitalizationStartTime",
+                    "hospitalizationEndTime",
+                    "deathTime"
+                ]
+                fields.forEach((fieldName) => {
+                    if (this.formData[fieldName]) {
+                        this.$set(this.formData, fieldName, this.normalizeDateText(this.formData[fieldName]))
+                    }
+                })
+                this.syncHospitalizationTimeRange()
+            },
+            normalizeContactFields() {
+                // 提交前裁剪联系方式空格，避免系统手机号带空格时后端格式校验失败。
+                const fields = ["mobile", "condolenceMobile"]
+                fields.forEach((fieldName) => {
+                    if (this.formData[fieldName]) {
+                        this.$set(this.formData, fieldName, String(this.formData[fieldName]).trim())
+                    }
+                })
+            },
+            getRequestErrorMessage(err, defaultMessage) {
+                // 优先展示后端业务错误信息，避免把校验失败误提示成网络错误。
+                if (err && err.msg) {
+                    return err.msg
+                }
+                if (err && err.response && err.response.data && err.response.data.msg) {
+                    return err.response.data.msg
+                }
+                return defaultMessage
+            },
+            syncHospitalizationTimeRange() {
+                if (this.formData.hospitalizationStartTime && this.formData.hospitalizationEndTime) {
+                    this.$set(this.formData, "hospitalizationTimeRange", [
+                        this.formData.hospitalizationStartTime,
+                        this.formData.hospitalizationEndTime
+                    ])
+                } else {
+                    this.$set(this.formData, "hospitalizationTimeRange", [])
+                }
+            },
+            buildDefaultDetailForm() {
+                return {
+                    invoiceFiles: [],
+                    invoiceNo: "",
+                    invoiceAmount: null,
+                    sellerName: "",
+                    itemName: "",
+                    remark: "",
+                    invoiceCode: "",
+                    invoiceDate: "",
+                    invoiceCheckCode: ""
+                }
+            },
+            ensureFormData(formData) {
+                const nextFormData = formData || {}
+                if (!Array.isArray(nextFormData.invoiceDetails)) {
+                    this.$set(nextFormData, "invoiceDetails", [])
+                }
+                if (!Array.isArray(nextFormData.files)) {
+                    this.$set(nextFormData, "files", [])
+                }
+                if (typeof nextFormData.invoiceVerifyEnabled !== "boolean") {
+                    this.$set(nextFormData, "invoiceVerifyEnabled", true)
+                }
+                return nextFormData
+            },
+            handleReimburseProjectChange(value) {
+                if (value === "UNION_REIMBURSE_PROJECT_1") {
+                    this.$set(this.formData, "invoiceDetails", [])
+                    this.$set(this.formData, "invoiceNumber", "")
+                    this.$set(this.formData, "money", "")
+                } else {
+                    this.rebuildInvoiceSummary()
+                }
+            },
+            handleVerifySwitchChange(value) {
+                this.$set(this.formData, "invoiceVerifyEnabled", !!value)
+                if (value && this.invoiceDialogVisible) {
+                    this.recognizeCurrentInvoice(true)
+                }
+            },
+            openInvoiceDialog(mode, row, index) {
+                this.$set(this, "invoiceDialogMode", mode)
+                this.$set(this, "detailFormIndex", typeof index === "number" ? index : -1)
+                this.$set(this, "lastRecognizedFileId", "")
+                if (mode === "edit" && row) {
+                    this.$set(this, "detailForm", JSON.parse(JSON.stringify(row)))
+                } else {
+                    this.$set(this, "detailForm", this.buildDefaultDetailForm())
+                }
+                this.$set(this, "invoiceDialogVisible", true)
+            },
+            getInvoiceFile(row) {
+                if (!row || !row.invoiceFiles || row.invoiceFiles.length === 0) {
+                    return null
+                }
+                return row.invoiceFiles[0]
+            },
+            /**
+             * 统一从手机端上传组件、PC 历史回显文件对象或下载地址中提取文件 id，供发票识别和预览接口使用。
+             */
+            getInvoiceFileId(file) {
+                if (!file) {
+                    return ""
+                }
+                if (file.id) {
+                    return file.id
+                }
+                if (file.response && file.response.data) {
+                    if (typeof file.response.data === "string") {
+                        const data = file.response.data
+                        const idIndex = data.indexOf("id=")
+                        if (idIndex > -1) {
+                            return data.substring(idIndex + 3)
+                        }
+                        return data
+                    }
+                    if (file.response.data.id) {
+                        return file.response.data.id
+                    }
+                }
+                if (file.downloadPath && typeof file.downloadPath === "string") {
+                    const downloadPath = file.downloadPath
+                    const idIndex = downloadPath.indexOf("id=")
+                    if (idIndex > -1) {
+                        return downloadPath.substring(idIndex + 3)
+                    }
+                }
+                if (file.url && typeof file.url === "string") {
+                    const url = file.url
+                    const idIndex = url.indexOf("id=")
+                    if (idIndex > -1) {
+                        return url.substring(idIndex + 3)
+                    }
+                }
+                if (typeof file === "string") {
+                    const idIndex = file.indexOf("id=")
+                    if (idIndex > -1) {
+                        return file.substring(idIndex + 3)
+                    }
+                    return file
+                }
+                return ""
+            },
+            previewInvoiceFile(row) {
+                const file = this.getInvoiceFile(row)
+                const fileId = this.getInvoiceFileId(file)
+                if (!fileId) {
+                    this.$toast.fail("暂无发票文件")
+                    return
+                }
+                window.open("/platform/sys/file/download?id=" + fileId)
+            },
+            recognizeCurrentInvoice(showLoading) {
+                const invoiceFile = this.getInvoiceFile(this.detailForm)
+                const invoiceFileId = this.getInvoiceFileId(invoiceFile)
+                if (!invoiceFileId) {
+                    return Promise.resolve(true)
+                }
+                this.$set(this, "lastRecognizedFileId", invoiceFileId)
+                this.$set(this, "recognizingInvoice", !!showLoading)
+                if (showLoading) {
+                    this.$toast.loading({
+                        message: "发票识别中...",
+                        forbidClick: true,
+                        duration: 0
+                    })
+                }
+                return this.$axios.get("/platform/unionReimburse/apply/recognizeInvoice", {
+                    params: {
+                        fileId: invoiceFileId,
+                        verifySwitch: this.formData.invoiceVerifyEnabled
+                    }
+                }).then((resp) => {
+                    if (resp.code !== 0) {
+                        this.$toast.fail(resp.msg || "发票识别失败")
+                        return false
+                    }
+                    const data = resp.data || {}
+                    if (data.invoiceNo) {
+                        this.$set(this.detailForm, "invoiceNo", data.invoiceNo)
+                    }
+                    if (data.invoiceAmount !== null && data.invoiceAmount !== undefined && data.invoiceAmount !== "") {
+                        this.$set(this.detailForm, "invoiceAmount", Number(data.invoiceAmount))
+                    }
+                    if (data.sellerName) {
+                        this.$set(this.detailForm, "sellerName", data.sellerName)
+                    }
+                    if (data.itemName) {
+                        this.$set(this.detailForm, "itemName", data.itemName)
+                    }
+                    if (data.invoiceCode) {
+                        this.$set(this.detailForm, "invoiceCode", data.invoiceCode)
+                    }
+                    if (data.invoiceDate) {
+                        this.$set(this.detailForm, "invoiceDate", data.invoiceDate)
+                    }
+                    if (data.invoiceCheckCode) {
+                        this.$set(this.detailForm, "invoiceCheckCode", data.invoiceCheckCode)
+                    }
+                    if (this.detailForm.invoiceNo) {
+                        return this.validateInvoiceDuplicateBeforeSave(true)
+                    }
+                    return true
+                }).catch((error) => {
+                    const errorMsg = error && error.response && error.response.data && error.response.data.msg
+                        ? error.response.data.msg
+                        : (error && error.msg ? error.msg : "发票识别请求失败，请稍后重试")
+                    this.$toast.fail(errorMsg)
+                    return false
+                }).finally(() => {
+                    this.$set(this, "recognizingInvoice", false)
+                    if (showLoading) {
+                        this.$toast.clear()
+                    }
+                })
+            },
+            validateInvoiceDuplicateBeforeSave(checkHistory) {
+                const invoiceNo = this.detailForm.invoiceNo ? String(this.detailForm.invoiceNo).trim() : ""
+                if (!invoiceNo) {
+                    return Promise.resolve(false)
+                }
+                const duplicateRows = []
+                const invoiceDetails = this.formData.invoiceDetails || []
+                for (let i = 0; i < invoiceDetails.length; i++) {
+                    if (this.detailFormIndex > -1 && i === this.detailFormIndex) {
+                        continue
+                    }
+                    const currentNo = invoiceDetails[i].invoiceNo ? String(invoiceDetails[i].invoiceNo).trim() : ""
+                    if (currentNo && currentNo === invoiceNo) {
+                        duplicateRows.push(i + 1)
+                    }
+                }
+                if (duplicateRows.length > 0) {
+                    this.$toast.fail("发票号码【" + invoiceNo + "】与本次提交的第" + duplicateRows.join("、") + "条发票重复，不能保存")
+                    return Promise.resolve(false)
+                }
+                if (!checkHistory) {
+                    return Promise.resolve(true)
+                }
+                return this.$axios.get("/platform/unionReimburse/apply/checkInvoiceDuplicate", {
+                    params: {
+                        invoiceNo: invoiceNo,
+                        reimburseId: this.formData.id || ""
+                    }
+                }).then((resp) => {
+                    if (resp.code !== 0) {
+                        this.$toast.fail(resp.msg)
+                        return false
+                    }
+                    return true
+                })
+            },
+            validateInvoiceDetailForm() {
+                if (!this.detailForm.invoiceFiles || this.detailForm.invoiceFiles.length === 0) {
+                    this.$toast.fail("请上传发票文件")
+                    return false
+                }
+                if (!this.detailForm.invoiceNo) {
+                    this.$toast.fail("请输入发票号码")
+                    return false
+                }
+                if (!this.detailForm.invoiceAmount || Number(this.detailForm.invoiceAmount) <= 0) {
+                    this.$toast.fail("请输入正确的发票金额")
+                    return false
+                }
+                if (!this.detailForm.sellerName) {
+                    this.$toast.fail("请输入销售方信息名称")
+                    return false
+                }
+                if (!this.detailForm.itemName) {
+                    this.$toast.fail("请输入项目名称")
+                    return false
+                }
+                return true
+            },
+            saveInvoiceDetail() {
+                if (!this.validateInvoiceDetailForm()) {
+                    return
+                }
+                this.validateInvoiceDuplicateBeforeSave(false).then((duplicateValid) => {
+                    if (!duplicateValid) {
+                        return
+                    }
+                    const detailData = JSON.parse(JSON.stringify(this.detailForm))
+                    if (this.detailFormIndex > -1) {
+                        this.$set(this.formData.invoiceDetails, this.detailFormIndex, detailData)
+                    } else {
+                        this.formData.invoiceDetails.push(detailData)
+                    }
+                    this.rebuildInvoiceSummary()
+                    this.$set(this, "invoiceDialogVisible", false)
+                })
+            },
+            removeInvoiceDetail(index) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "确定删除这条发票明细吗？"
+                }).then(() => {
+                    this.formData.invoiceDetails.splice(index, 1)
+                    this.rebuildInvoiceSummary()
+                })
+            },
+            rebuildInvoiceSummary() {
+                if (this.formData.reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return
+                }
+                let totalMoney = 0
+                let fileCount = 0
+                const invoiceDetails = this.formData.invoiceDetails || []
+                for (let i = 0; i < invoiceDetails.length; i++) {
+                    if (invoiceDetails[i].invoiceAmount !== null && invoiceDetails[i].invoiceAmount !== undefined && invoiceDetails[i].invoiceAmount !== "") {
+                        totalMoney = totalMoney + Number(invoiceDetails[i].invoiceAmount)
+                    }
+                    if (invoiceDetails[i].invoiceFiles && invoiceDetails[i].invoiceFiles.length > 0) {
+                        fileCount = fileCount + 1
+                    }
+                }
+                this.$set(this.formData, "money", totalMoney ? totalMoney.toFixed(2) : "0.00")
+                this.$set(this.formData, "invoiceNumber", String(fileCount))
+            },
+            validateInvoiceDetailsBeforeSubmit() {
+                if (!this.formData.reimburseProject || this.formData.reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return true
+                }
+                const invoiceDetails = this.formData.invoiceDetails || []
+                if (!invoiceDetails.length) {
+                    this.$toast.fail("请至少维护一条发票明细")
+                    return false
+                }
+                for (let i = 0; i < invoiceDetails.length; i++) {
+                    const currentDetail = invoiceDetails[i]
+                    if (!currentDetail.invoiceFiles || currentDetail.invoiceFiles.length === 0) {
+                        this.$toast.fail("第" + (i + 1) + "条发票明细请上传发票文件")
+                        return false
+                    }
+                    if (!currentDetail.invoiceNo) {
+                        this.$toast.fail("第" + (i + 1) + "条发票明细请填写发票号码")
+                        return false
+                    }
+                    if (!currentDetail.invoiceAmount || Number(currentDetail.invoiceAmount) <= 0) {
+                        this.$toast.fail("第" + (i + 1) + "条发票明细请填写正确的发票金额")
+                        return false
+                    }
+                    if (!currentDetail.sellerName) {
+                        this.$toast.fail("第" + (i + 1) + "条发票明细请填写销售方信息名称")
+                        return false
+                    }
+                    if (!currentDetail.itemName) {
+                        this.$toast.fail("第" + (i + 1) + "条发票明细请填写项目名称")
+                        return false
+                    }
+                }
+                return true
+            },
             //证明人
             certifierUserChange(user) {
                 const { id, userName, loginName, unitId, unitName, unionId, unionName } = user
@@ -389,42 +1320,139 @@ layout("/layouts/platform_h5.html"){
                 this.$set(this.formData, "certifierUnitName", unitName)
                 this.$set(this.formData, "certifierUnionId", unionId)
                 this.$set(this.formData, "certifierUnionName", unionName)
-                this.certifierUserSelectShow = false
-                this.searchKeyword = ""
-                this.userOptions = []
+                this.$set(this, "certifierUserSelectShow", false)
+                this.$set(this, "searchKeyword", "")
+                this.$set(this, "userOptions", [])
             },
             async userRemoteMethod(event) {
                 if (event) {
-                    this.userOptions = await this.selectQueryUser(event)
-                    this.certifierUserSelectShow = true
+                    const userOptions = await this.selectQueryUser(event)
+                    this.$set(this, "userOptions", userOptions)
+                    this.$set(this, "certifierUserSelectShow", true)
                 }
             },
-            async selectQueryUser(keyword) {
-                const res = await this.$axios.post("/platform/UnionReimburse/apply/listUser", { keyword: keyword })
-                return res.data
+            selectQueryUser(keyword) {
+                return this.$axios.post("/platform/UnionReimburse/apply/listUser", { keyword: keyword }).then((res) => {
+                    return res.data
+                })
+            },
+            openPayerSelect() {
+                this.$set(this, "payerSelectShow", true)
+                if (this.payerSearchKeyword) {
+                    this.payerRemoteMethod(this.payerSearchKeyword)
+                }
+            },
+            openCondolenceSelect() {
+                this.$set(this, "showCondolenceSearch", true)
+                if (this.condolenceSearchKeyword) {
+                    this.searchCondolence()
+                }
+            },
+            payerRemoteMethod(keyword) {
+                if (!keyword) {
+                    this.$set(this, "payerOptions", [])
+                    return
+                }
+                this.$axios.post("/platform/unionReimburse/apply/listUser", {keyword: keyword}).then((res) => {
+                    this.$set(this, "payerOptions", res && res.data ? res.data : [])
+                })
+            },
+            payerUserChange(user) {
+                if (!user) {
+                    return
+                }
+                this.$set(this.formData, "payer", user.id)
+                this.$set(this.formData, "payerName", user.userName)
+                this.$set(this.formData, "payerLoginname", user.loginName)
+                this.$set(this, "payerSelectShow", false)
+                this.$set(this, "payerSearchKeyword", "")
+                this.$set(this, "payerOptions", [])
+                this.getUserBankHistory()
+            },
+            getUserBankHistory() {
+                if (!this.formData.payer) {
+                    this.$set(this, "historyData", [])
+                    return
+                }
+                this.$axios.get("/platform/unionReimburse/apply/findUserBankHistory", {
+                    params: {payer: this.formData.payer}
+                }).then((res) => {
+                    const historyData = res && res.code === 0 && Array.isArray(res.data) ? res.data : []
+                    this.$set(this, "historyData", historyData)
+                    if (historyData.length === 1) {
+                        this.$set(this.formData, "bankUserName", historyData[0].bankUserName)
+                        this.$set(this.formData, "bankCardNumber", historyData[0].bankCardNumber)
+                        this.$set(this.formData, "bankOfDeposit", historyData[0].bankOfDeposit)
+                    }
+                })
+            },
+            clearPaymentBankInfo() {
+                this.$set(this.formData, "payer", "")
+                this.$set(this.formData, "payerName", "")
+                this.$set(this.formData, "payerLoginname", "")
+                this.$set(this.formData, "bankUserName", "")
+                this.$set(this.formData, "bankCardNumber", "")
+                this.$set(this.formData, "bankOfDeposit", "")
+                this.$set(this, "historyData", [])
+            },
+            normalizeLoadedFormData(originalData) {
+                const sourceData = originalData || {}
+                this.normalizeCondolenceDateFields()
+                if (!this.formData.condolenceUserId && sourceData.condolenceId) {
+                    this.$set(this.formData, "condolenceUserId", sourceData.condolenceId)
+                }
+                if (!this.formData.condolenceUserName && sourceData.condolenceName) {
+                    this.$set(this.formData, "condolenceUserName", sourceData.condolenceName)
+                }
+                if (!this.formData.condolenceTypeId && sourceData.condolenceType) {
+                    this.$set(this.formData, "condolenceTypeId", sourceData.condolenceType)
+                }
+                if (!this.formData.typeName && sourceData.condolenceTypeName) {
+                    this.$set(this.formData, "typeName", sourceData.condolenceTypeName)
+                }
+                if (Array.isArray(sourceData.hospitalizationTimeRange) && sourceData.hospitalizationTimeRange.length === 2) {
+                    this.$set(this.formData, "hospitalizationStartTime", this.normalizeDateText(sourceData.hospitalizationTimeRange[0]))
+                    this.$set(this.formData, "hospitalizationEndTime", this.normalizeDateText(sourceData.hospitalizationTimeRange[1]))
+                }
+                this.normalizeCondolenceDateFields()
+                if (this.formData.paymentWay === "UNION_REIMBURSE_PAYMENT_WAY_2" && this.formData.payer) {
+                    this.getUserBankHistory()
+                }
             },
             async onSave() {
+                this.normalizeContactFields()
+                this.normalizeCondolenceDateFields()
+                this.rebuildInvoiceSummary()
+                if (!this.validateInvoiceDetailsBeforeSubmit()) {
+                    return
+                }
                 this.$axios.post("/platform/unionReimburse/apply/save", { data: JSON.stringify(this.formData) })
                     .then((res) => {
                         this.$toast.clear()
                         if (res.code === 0) {
                             this.$toast.success(res.msg)
-                            pjaxReplace("/platform/unionReimburse/mine/h5")
+                            this.$pjaxReplace("/platform/unionReimburse/mine/h5")
                         } else {
                             this.$toast.fail(res.msg || "保存失败")
                         }
                     })
                     .catch(err => {
                         this.$toast.clear()
-                        this.$toast.fail("网络错误，请稍后重试")
+                        this.$toast.fail(this.getRequestErrorMessage(err, "保存失败"))
                     })
             },
             // 提交
             async onSubmit() {
 
+                this.normalizeContactFields()
                 this.$refs.formRef.validate().then(() => {
-                    if (!this.formData.userSign) {
-                        this.$toast.fail("请签名")
+                    // if (!this.formData.userSign) {
+                    //     this.$toast.fail("请签名")
+                    //     return
+                    // }
+                    this.normalizeCondolenceDateFields()
+                    this.rebuildInvoiceSummary()
+                    if (!this.validateInvoiceDetailsBeforeSubmit()) {
                         return
                     }
                     this.$dialog.confirm({
@@ -436,14 +1464,14 @@ layout("/layouts/platform_h5.html"){
                                 this.$toast.clear()
                                 if (res.code === 0) {
                                     this.$toast.success("提交成功")
-                                    pjaxReplace("/platform/unionReimburse/mine/h5")
+                            this.$pjaxReplace("/platform/unionReimburse/mine/h5")
                                 } else {
                                     this.$toast.fail(res.msg || "提交失败")
                                 }
                             })
                             .catch(err => {
                                 this.$toast.clear()
-                                this.$toast.fail("网络错误，请稍后重试")
+                                this.$toast.fail(this.getRequestErrorMessage(err, "提交失败"))
                             })
                     })
                 })
@@ -451,11 +1479,17 @@ layout("/layouts/platform_h5.html"){
             // 再次提交
             async onSubmitAgain() {
 
+                this.normalizeContactFields()
                 this.$refs.formRef.validate().then(() => {
                     if (!this.formData.userSign) {
                         this.$toast.fail("请签名")
                         return
                     }
+                    this.normalizeCondolenceDateFields()
+                    this.rebuildInvoiceSummary()
+                    if (!this.validateInvoiceDetailsBeforeSubmit()) {
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "温馨提示",
                         message: "您确定要提交吗？"
@@ -468,14 +1502,14 @@ layout("/layouts/platform_h5.html"){
                             if (res.code === 0) {
                                 this.$toast.success("提交成功")
                                 setTimeout(() => {
-                                    pjaxReplace("/platform/unionReimburse/mine/h5")
+                                this.$pjaxReplace("/platform/unionReimburse/mine/h5")
                                 }, 1500)
                             } else {
                                 this.$toast.fail(res.msg || "提交失败")
                             }
                         }).catch(err => {
                             this.$toast.clear()
-                            this.$toast.fail("网络错误，请稍后重试")
+                            this.$toast.fail(this.getRequestErrorMessage(err, "提交失败"))
                         })
                     })
                 })
@@ -483,17 +1517,20 @@ layout("/layouts/platform_h5.html"){
             onReimburseTypeConfirm(o) {
                 this.$set(this.formData, "reimburseTypeName", o.text)  // 显示名称
                 this.$set(this.formData, "reimburseType", o.value)     // 字典值
-                this.showReimburseTypePicker = false
+                this.closePopup("showReimburseTypePicker")
             },
             onPaymentWayConfirm(o) {
                 this.$set(this.formData, "paymentWayName", o.text)     // 显示名称
                 this.$set(this.formData, "paymentWay", o.value)        // 字典值
-                this.showPaymentWayPicker = false
+                if (o.value !== "UNION_REIMBURSE_PAYMENT_WAY_2") {
+                    this.clearPaymentBankInfo()
+                }
+                this.closePopup("showPaymentWayPicker")
             },
             onReimburseProjectConfirm(o) {
                 this.$set(this.formData, "reimburseProjectName", o.text)   // 显示名称
                 this.$set(this.formData, "reimburseProject", o.value)      // 字典值
-                this.showReimburseProjectPicker = false
+                this.closePopup("showReimburseProjectPicker")
             },
             onReimburseFundSourceConfirm(o) {
                 this.$set(this.formData, "reimburseFundSourceName", o.text) // 显示名称
@@ -511,39 +1548,53 @@ layout("/layouts/platform_h5.html"){
                     this.$set(this.formData, "clubName", "")
                     this.$set(this.formData, "fundBalance", "")
                 }
-                this.showReimburseFundSourcePicker = false
+                this.closePopup("showReimburseFundSourcePicker")
             },
             onClubConfirm(o) {
                 this.$set(this.formData, "clubName", o.text)
                 this.$set(this.formData, "clubId", o.value)
-                this.showClubPicker = false
+                this.closePopup("showClubPicker")
                 // 选择社团后查询经费余额
                 this.queryFundBalance()
             },
             onCondolenceConfirm(o) {
                 this.$set(this.formData, "condolenceName", o.text)
                 this.$set(this.formData, "condolenceId", o.value)
-                this.showCondolencePicker = false
+                this.$set(this.formData, "condolenceUserId", o.value)
+                this.closePopup("showCondolencePicker")
                 // 设置联系方式
                 const selectedUser = this.condolenceOptions.find(user => user.id === o.value)
                 if (selectedUser) {
+                    this.fillCondolenceUser(selectedUser)
                     this.$set(this.formData, "condolenceMobile", selectedUser.mobile)
                 }
             },
             onCondolenceTypeConfirm(o) {
                 this.$set(this.formData, "condolenceTypeName", o.text)
                 this.$set(this.formData, "condolenceType", o.value)
-                this.showCondolenceTypePicker = false
-                // 设置慰问金额
+                this.$set(this.formData, "condolenceTypeId", o.value)
+                this.$set(this.formData, "typeName", o.text)
+                this.closePopup("showCondolenceTypePicker")
+                // 慰问类型切换后同步 PC 端同名字段，确保条件字段和保存数据一致
                 const selectedType = this.typeOptions.find(type => type.id === o.value)
                 if (selectedType) {
-                    this.$set(this.formData, "money", selectedType.money)
+                    this.$set(this.formData, "way", selectedType.way)
+                    this.$set(this.formData, "condolenceMoney", parseFloat(selectedType.money || 0).toFixed(2))
+                    this.$set(this.formData, "condolenceFilesNotes", selectedType.uploadFileDesc)
                 }
             },
+            onCondolenceWayConfirm(o) {
+                this.$set(this.formData, "way", o.value)
+                this.closePopup("showCondolenceWayPicker")
+            },
+            onRelationshipConfirm(o) {
+                this.$set(this.formData, "condolenceRelationship", o.value)
+                this.closePopup("showRelationshipPicker")
+            },
             onActivityTypeConfirm(o) {
                 this.$set(this.formData, "activityTypeText", o.text)
                 this.$set(this.formData, "activityType", o.value)
-                this.showActivityTypePicker = false
+                this.closePopup("showActivityTypePicker")
             },
             async initDictOptions() {
                 // 报销类别
@@ -591,7 +1642,7 @@ layout("/layouts/platform_h5.html"){
             // 搜索慰问对象
             searchCondolence() {
                 if (!this.condolenceSearchKeyword) {
-                    this.condolenceSearchResults = []
+                    this.$set(this, "condolenceSearchResults", [])
                     return
                 }
 
@@ -599,21 +1650,38 @@ layout("/layouts/platform_h5.html"){
                     keyword: this.condolenceSearchKeyword
                 }).then((res) => {
                     if (res.code === 0) {
-                        this.condolenceSearchResults = res.data
+                        this.$set(this, "condolenceSearchResults", res.data)
                     }
                 })
             },
 
             // 选择慰问对象
             selectCondolence(user) {
+                this.fillCondolenceUser(user)
+                this.$set(this, "showCondolenceSearch", false)
+            },
+            fillCondolenceUser(user) {
+                if (!user) {
+                    return
+                }
                 this.$set(this.formData, "condolenceName", user.userName)
                 this.$set(this.formData, "condolenceId", user.id)
+                this.$set(this.formData, "condolenceUserId", user.id)
+                this.$set(this.formData, "condolenceUserName", user.userName)
+                this.$set(this.formData, "condolenceLoginName", user.loginName)
+                this.$set(this.formData, "condolenceUnitId", user.unitId)
+                this.$set(this.formData, "condolenceUnitName", user.unitName)
+                this.$set(this.formData, "condolenceUnionId", user.unionId)
+                this.$set(this.formData, "condolenceUnionName", user.unionName)
+                this.$set(this.formData, "condolenceUnionCode", user.unionCode)
+                this.$set(this.formData, "condolenceSex", user.sex)
+                this.$set(this.formData, "condolenceBirthday", user.birthday)
+                this.$set(this.formData, "condolenceIdCard", user.idCard)
                 this.$set(this.formData, "condolenceMobile", user.mobile)
-                this.showCondolenceSearch = false
             },
             // 查询慰问类型
             queryCondolenceType() {
-                this.$axios.post("/platform/unionReimburse/apply/queryCondolenceType")
+                return this.$axios.post("/platform/unionReimburse/apply/queryCondolenceType")
                     .then((resp) => {
                         this.typeOptions = resp.data
                         this.condolenceTypeColumns = resp.data.map(item => {
@@ -625,19 +1693,19 @@ layout("/layouts/platform_h5.html"){
             onCondolenceTimeConfirm(value) {
                 // 格式化日期为 YYYY-MM-DD 格式
                 this.$set(this.formData, "condolenceTime", this.$moment(value).format("YYYY-MM-DD"))
-                this.showCondolenceTimePicker = false
+                this.closePopup("showCondolenceTimePicker")
             },
 
             // 活动时间确认事件
             onActivityTimeConfirm(value) {
                 // 格式化日期为 YYYY-MM-DD 格式
                 this.$set(this.formData, "activityTime", this.$moment(value).format("YYYY-MM-DD"))
-                this.showActivityTimePicker = false
+                this.closePopup("showActivityTimePicker")
             },
 
             // 查询社团
             queryClubs() {
-                this.$businessTool.listClubByRole().then((res) => {
+                return this.$businessTool.listClubByRole().then((res) => {
                     this.clubOptions = res
                     this.clubColumns = res.map(item => {
                         return { text: item.clubName, value: item.id }
@@ -778,7 +1846,8 @@ layout("/layouts/platform_h5.html"){
                         if (res.code === 0) {
                             // 先保存原始数据
                             const originalData = { ...res.data }
-                            this.formData = res.data
+                            this.formData = this.ensureFormData(res.data)
+                            this.normalizeLoadedFormData(originalData)
 
                             // 处理报销类别显示
                             if (this.reimburseTypeColumns.length > 0) {
@@ -848,10 +1917,12 @@ layout("/layouts/platform_h5.html"){
                             // 处理慰问类型显示
                             if (this.condolenceTypeColumns.length > 0) {
                                 const matchedCondolenceType = this.condolenceTypeColumns.find(item =>
-                                    item.value === originalData.condolenceType
+                                    item.value === (originalData.condolenceTypeId || originalData.condolenceType)
                                 )
                                 if (matchedCondolenceType) {
                                     this.$set(this.formData, "condolenceTypeName", matchedCondolenceType.text)
+                                    this.$set(this.formData, "typeName", matchedCondolenceType.text)
+                                    this.$set(this.formData, "condolenceTypeId", matchedCondolenceType.value)
                                 }
                             }
 
@@ -859,6 +1930,8 @@ layout("/layouts/platform_h5.html"){
                             if (this.formData.reimburseFundSource) {
                                 this.queryFundBalance()
                             }
+                            this.normalizeCondolenceDateFields()
+                            this.rebuildInvoiceSummary()
                         }
                     })
                 } else {
@@ -877,9 +1950,9 @@ layout("/layouts/platform_h5.html"){
 
         async created() {
             await this.initDictOptions()
+            await this.queryCondolenceType()
+            await this.queryClubs()
             await this.init()
-            this.queryCondolenceType()
-            this.queryClubs()
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/collect/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/collect/index.html
index 41127a5a..be53964a 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/collect/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/collect/index.html
@@ -2,6 +2,19 @@
 layout("/layouts/platform_h5.html"){
 #-->
 
+<style>
+    .state-primary {
+        color: #409eff;
+    }
+
+    .state-success {
+        color: #67c23a;
+    }
+
+    .state-danger {
+        color: #f56c6c;
+    }
+</style>
 <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">
@@ -22,31 +35,26 @@ layout("/layouts/platform_h5.html"){
     <table-list api="/platform/unionReimburse/collect/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.loginName}}</table-column>
+            <table-column label="姓名">{{row.userName}}</table-column>
             <table-column label="所属工会">{{row.unionName}}</table-column>
             <table-column label="所属单位">{{row.unitName}}</table-column>
-            <table-column label="报销类别">
-                <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
-                          :value="row.reimburseType">
-                </dict-tag>
+            <table-column label="申请时间">{{formatCreateTime(row.createTime)}}</table-column>
+            <table-column label="报销项目">{{getReimburseProjectName(row.reimburseProject)}}</table-column>
+            <table-column label="备注">{{getRemarkText(row)}}</table-column>
+            <table-column label="申请状态">
+                <span :class="getStateClass(row.stateId)">{{getStateName(row.stateId)}}</span>
             </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>
-
         </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" @click="onEdit(row)" v-if="row.taskKey === 'startTask' || !row.instanceId">
-                <i class="fa fa-edit"></i>
-                <span>编辑</span>
-            </div>
+<!--            <div class="action-btn" @click="onEdit(row)" v-if="row.taskKey === 'startTask' || !row.instanceId">-->
+<!--                <i class="fa fa-edit"></i>-->
+<!--                <span>编辑</span>-->
+<!--            </div>-->
             <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(item)">
                 <i class="fa fa-undo"></i>
                 <span>撤回</span>
@@ -85,6 +93,58 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            // 手机端统计列表字段展示与我的报销列表保持一致。
+            getReimburseProjectName(reimburseProject) {
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return "慰问"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_2") {
+                    return "文体活动"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_3") {
+                    return "日常活动"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_4") {
+                    return "专项活动"
+                }
+                return reimburseProject || ""
+            },
+            getRemarkText(row) {
+                if (row.reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return "被慰问人：" + (row.condolenceUserName || "")
+                }
+                return "活动名称：" + (row.activityName || "")
+            },
+            getStateName(stateId) {
+                if (stateId == 1) {
+                    return "待提交"
+                }
+                if (stateId == 2) {
+                    return "待审核确认"
+                }
+                if (stateId == 3) {
+                    return "报销成功"
+                }
+                if (stateId == 4) {
+                    return "拒绝"
+                }
+                if (stateId == 5) {
+                    return "退回"
+                }
+                return stateId || ""
+            },
+            getStateClass(stateId) {
+                if (stateId == 3) {
+                    return "state-success"
+                }
+                if (stateId == 4) {
+                    return "state-danger"
+                }
+                return "state-primary"
+            },
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             onView(row) {
                 this.showApprovalForm = false
                 this.$refs.unionReimburseInfoRef.onOpen(row)
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js
index 07c6bd45..7c55ca88 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js
@@ -5,18 +5,12 @@ const UNION_REIMBURSE_INFO = {
             <van-action-sheet v-model="visible" title="查看详情">
                 <div class="detail-container">
                     <van-cell-group title="报销申请">
-                        <van-cell title="经办人">{{ viewData.userName }}</van-cell>
                         <van-cell title="工号">{{ viewData.loginName }}</van-cell>
-                        <van-cell title="单位">{{ viewData.unitName }}</van-cell>
-                        <van-cell title="工会">{{ viewData.unionName }}</van-cell>
-                        <van-cell title="报销类别">
-                            <dict-tag :options="dict.type.UNION_REIMBURSE_TYPE"
-                                      :value="viewData.reimburseType">
-                            </dict-tag>
-                        </van-cell>
-                        <van-cell title="支付方式">
-                            <dict-tag :options="dict.type.UNION_REIMBURSE_PAYMENT_WAY"
-                                      :value="viewData.paymentWay">
+                        <van-cell title="经办人">{{ viewData.userName }}</van-cell>
+                        <van-cell title="联系方式">{{ viewData.mobile }}</van-cell>
+                        <van-cell title="经费来源">
+                            <dict-tag :options="dict.type.UNION_REIMBURSE_FUND_SOURCE"
+                                      :value="viewData.reimburseFundSource">
                             </dict-tag>
                         </van-cell>
                         <van-cell title="报销项目">
@@ -24,34 +18,114 @@ const UNION_REIMBURSE_INFO = {
                                       :value="viewData.reimburseProject">
                             </dict-tag>
                         </van-cell>
-                        <van-cell title="联系方式">{{ viewData.mobile }}</van-cell>
-                        <van-cell title="证明人">{{viewData.certifierUserName}}({{viewData.certifierLoginName}})
+                        <van-cell title="支付方式">
+                            <dict-tag :options="dict.type.UNION_REIMBURSE_PAYMENT_WAY"
+                                      :value="viewData.paymentWay">
+                            </dict-tag>
                         </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="活动名称">{{ viewData.activityName }}</van-cell>
-                        <van-cell title="活动地点">{{ viewData.activityPlace || '暂无'}}</van-cell>
-                        <van-cell title="报销金额（元）">{{ viewData.money }}</van-cell>
-                        <van-cell title="活动时间">{{$moment(viewData.activityTime).format('YYYY-MM-DD')}}</van-cell>
-<!--                        <van-cell title="发票张数">{{ viewData.invoiceNumber }}</van-cell>-->
-                        <van-cell title="支付内容">
-                            <div style="white-space: pre-line">
-                                {{ viewData.paymentNotes }}
-                            </div>
+                        <van-cell title="所属协会" v-if="viewData.reimburseFundSource === 'UNION_REIMBURSE_FUND_SOURCE_3'">
+                            {{ viewData.clubName }}
                         </van-cell>
-                        <van-cell title="签字">
-                            <template #label>
-                                <van-image :src="viewData.userSign"
-                                           style="width: 100%;height: 150px;"></van-image>
+                        <van-cell title="余额" v-if="viewData.reimburseFundSource">{{ formatMoney(viewData.fundBalance) }}</van-cell>
+
+                        <template v-if="viewData.paymentWay === 'UNION_REIMBURSE_PAYMENT_WAY_2'">
+                            <van-cell title="付款人">{{ viewData.payerName }}</van-cell>
+                            <van-cell title="户名">{{ viewData.bankUserName }}</van-cell>
+                            <van-cell title="开户行">{{ viewData.bankOfDeposit }}</van-cell>
+                            <van-cell title="银行卡号">{{ viewData.bankCardNumber }}</van-cell>
+                        </template>
+
+                        <template v-if="viewData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'">
+                            <van-cell title="慰问对象">{{ viewData.condolenceUserName }}</van-cell>
+                            <van-cell title="性别">{{ viewData.condolenceSex }}</van-cell>
+                            <van-cell title="生日">{{ formatDateText(viewData.condolenceBirthday) }}</van-cell>
+                            <van-cell title="身份证号">{{ viewData.condolenceIdCard }}</van-cell>
+                            <van-cell title="联系方式">{{ viewData.condolenceMobile }}</van-cell>
+                            <van-cell title="慰问类型">{{ viewData.typeName || viewData.condolenceTypeName }}</van-cell>
+                            <van-cell title="慰问方式">{{ viewData.way }}</van-cell>
+                            <van-cell title="慰问金额">{{ formatMoney(viewData.condolenceMoney) }}</van-cell>
+                            <van-cell title="慰问时间">{{ formatDateText(viewData.condolenceTime) }}</van-cell>
+                            <van-cell title="结婚时间" v-if="isCondolenceType('cf4ce7af322d464f8f86d818fcc00203')">
+                                {{ formatDateText(viewData.marryTime) }}
+                            </van-cell>
+                            <van-cell title="生育时间" v-if="isCondolenceType('c90cb10dce6542e99ae271bee6fe8cc0')">
+                                {{ formatDateText(viewData.fertilityTime) }}
+                            </van-cell>
+                            <template v-if="isCondolenceType('4e316737e71047e0b01aea78524c1416')">
+                                <van-cell title="住院病由">{{ viewData.hospitalCausation }}</van-cell>
+                                <van-cell title="住院开始时间">{{ formatDateText(viewData.hospitalizationStartTime) }}</van-cell>
+                                <van-cell title="住院结束时间">{{ formatDateText(viewData.hospitalizationEndTime) }}</van-cell>
+                                <van-cell title="入住医院">{{ viewData.hospital }}</van-cell>
+                                <van-cell title="当年次数">{{ viewData.hospitalCount }}</van-cell>
                             </template>
-                        </van-cell>
+                            <template v-if="isCondolenceType('60f03a87b62b4823855814afdbf5672a')">
+                                <van-cell title="去逝时间">{{ formatDateText(viewData.deathTime) }}</van-cell>
+                                <van-cell title="与被慰问人关系">{{ viewData.condolenceRelationship }}</van-cell>
+                            </template>
+                            <van-cell title="参加随行人员">
+                                <div style="white-space: pre-line">{{ viewData.participants }}</div>
+                            </van-cell>
+                            <van-cell title="报销事由">
+                                <div style="white-space: pre-line">{{ viewData.paymentNotes }}</div>
+                            </van-cell>
+                            <van-cell title="备注">
+                                <div style="white-space: pre-line">{{ viewData.notes }}</div>
+                            </van-cell>
+                        </template>
+
+                        <template v-if="viewData.reimburseProject && viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                            <van-cell title="活动名称">{{ viewData.activityName }}</van-cell>
+                            <van-cell title="活动人数">{{ viewData.activityNumber }}</van-cell>
+                            <van-cell title="活动地点">{{ viewData.activityPlace }}</van-cell>
+                            <van-cell title="活动时间">{{ formatDateText(viewData.activityTime) }}</van-cell>
+                            <van-cell title="支付内容">
+                                <div style="white-space: pre-line">{{ viewData.paymentNotes }}</div>
+                            </van-cell>
+                        </template>
+
                         <van-cell title="附件">
                             <template #label>
-                                <file-preview :files="viewData.files" complete_result></file-preview>
+                                <file-preview :files="viewData.files" complete_result
+                                              v-if="viewData.files && viewData.files.length > 0"></file-preview>
+                                <span v-else>暂无附件</span>
                             </template>
                         </van-cell>
                     </van-cell-group>
+
+                    <van-cell-group title="电子发票" v-if="viewData.reimburseProject && viewData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
+                        <van-cell title="报销金额">{{ formatMoney(viewData.money) }}</van-cell>
+                        <van-cell title="发票张数">{{ viewData.invoiceNumber }}</van-cell>
+                        <van-cell title="发票明细列表">
+                            <template #label>
+                                <template v-if="viewData.invoiceDetails && viewData.invoiceDetails.length > 0">
+                                    <div style="margin-top: 8px; padding: 10px 12px; border: 1px solid #ebedf0; border-radius: 6px; background: #fafafa;" v-for="(item, index) in viewData.invoiceDetails" :key="index">
+                                        <div style="margin-top: 4px; color: #323233;">第{{ index + 1 }}张发票</div>
+                                        <div style="margin-top: 4px;">发票号码：{{ item.invoiceNo || '未填写' }}</div>
+                                        <div style="margin-top: 4px;">发票金额：{{ formatMoney(item.invoiceAmount) }}</div>
+                                        <div style="margin-top: 4px;">销售方信息名称：{{ item.sellerName || '未填写' }}</div>
+                                        <div style="margin-top: 4px;">项目名称：{{ item.itemName || '未填写' }}</div>
+                                        <div style="margin-top: 4px;" v-if="item.remark">备注：{{ item.remark }}</div>
+                                        <file-preview :files="item.invoiceFiles" complete_result
+                                                      v-if="item.invoiceFiles && item.invoiceFiles.length > 0"></file-preview>
+                                        <div style="margin-top: 4px;" v-else>文件：未上传</div>
+                                    </div>
+                                </template>
+                                <van-empty description="暂无发票明细" v-else></van-empty>
+                            </template>
+                        </van-cell>
+                    </van-cell-group>
+
+<!--                    <van-cell-group title="电子签名">-->
+<!--                        <van-cell title="签字">-->
+<!--                            <template #label>-->
+<!--                                <van-image :src="viewData.userSign"-->
+<!--                                           style="width: 100%;height: 150px;"-->
+<!--                                           v-if="viewData.userSign"></van-image>-->
+<!--                                <span v-else>暂无签名</span>-->
+<!--                            </template>-->
+<!--                        </van-cell>-->
+<!--                    </van-cell-group>-->
+
                     <template v-for="(task,index) in doneTasks">
                         <div class="process-title">
                             {{ task.displayName }}
@@ -61,7 +135,7 @@ const UNION_REIMBURSE_INFO = {
                                 {{ task.ext.initiatorName}}({{task.ext.initiatorAccount}})
                             </van-cell>
                             <van-cell title="申请时间">
-                                {{ task.finishTime}}
+                                {{ formatCreateTime(task.finishTime) }}
                             </van-cell>
                             <van-cell title="办理结果">
                                 <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
@@ -73,7 +147,7 @@ const UNION_REIMBURSE_INFO = {
                                 {{ task.taskFormData.userName}}({{task.taskFormData.loginName}})
                             </van-cell>
                             <van-cell title="办理时间">
-                                {{ task.finishTime}}
+                                {{ formatCreateTime(task.finishTime) }}
                             </van-cell>
                             <van-cell title="办理结果">
                                 <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
@@ -118,6 +192,22 @@ const UNION_REIMBURSE_INFO = {
         onClose() {
             this.visible = false
         },
+        formatCreateTime(value) {
+            return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+        },
+        formatDateText(value) {
+            return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD") : ""
+        },
+        formatMoney(value) {
+            if (value === null || value === undefined || value === "") {
+                return ""
+            }
+            const numberValue = Number(value)
+            return isNaN(numberValue) ? value : numberValue.toFixed(2)
+        },
+        isCondolenceType(typeId) {
+            return this.viewData.condolenceTypeId === typeId || this.viewData.condolenceType === typeId
+        },
         // 获取申请信息
         getInfo() {
             this.$axios.post("/platform/unionReimburse/apply/info", { id: this.row.id }).then((res) => {
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/mine/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/mine/index.html
index 38de8b5a..3e8ef27a 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/mine/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/mine/index.html
@@ -2,6 +2,19 @@
 layout("/layouts/platform_h5.html"){
 #-->
 
+<style>
+    .state-primary {
+        color: #409eff;
+    }
+
+    .state-success {
+        color: #67c23a;
+    }
+
+    .state-danger {
+        color: #f56c6c;
+    }
+</style>
 <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">
@@ -14,37 +27,31 @@ layout("/layouts/platform_h5.html"){
     <table-list api="/platform/unionReimburse/mine/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.loginName}}</table-column>
+            <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 label="申请时间">{{formatCreateTime(row.createTime)}}</table-column>
+            <table-column label="报销项目">{{getReimburseProjectName(row.reimburseProject)}}</table-column>
+            <table-column label="备注">{{getRemarkText(row)}}</table-column>
+            <table-column label="申请状态">
+                <span :class="getStateClass(row.stateId)">{{getStateName(row.stateId)}}</span>
             </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.taskName}}</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" @click="onEdit(row)" v-if="row.taskKey === 'startTask' || !row.instanceId">
+            <div class="action-btn" @click="onEdit(row)" v-if="row.stateId == 1 || row.stateId == 5">
                 <i class="fa fa-edit"></i>
                 <span>编辑</span>
             </div>
-            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+            <div class="action-btn delete" v-if="row.stateId == 2" @click="onRevoke(row)">
                 <i class="fa fa-undo"></i>
                 <span>撤回</span>
             </div>
-            <div class="action-btn delete" @click="onDelete(row)" v-if="row.taskKey === 'startTask' || !row.instanceId">
+            <div class="action-btn delete" @click="onDelete(row)" v-if="row.stateId == 1">
                 <i class="fa fa-trash"></i>
                 <span>删除</span>
             </div>
@@ -59,7 +66,7 @@ layout("/layouts/platform_h5.html"){
     const vue = new Vue({
         el: "#app",
         store,
-        dicts: ["UNION_REIMBURSE_TYPE","UNION_REIMBURSE_PROJECT"],
+        dicts: ["UNION_REIMBURSE_PROJECT"],
         components: {
             "union-reimburse-info":UNION_REIMBURSE_INFO
         },
@@ -78,6 +85,58 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            // 手机端列表的报销项目、备注、状态文案与 PC 端 mine 列表保持一致。
+            getReimburseProjectName(reimburseProject) {
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return "慰问"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_2") {
+                    return "文体活动"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_3") {
+                    return "日常活动"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_4") {
+                    return "专项活动"
+                }
+                return reimburseProject || ""
+            },
+            getRemarkText(row) {
+                if (row.reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return "被慰问人：" + (row.condolenceUserName || "")
+                }
+                return "活动名称：" + (row.activityName || "")
+            },
+            getStateName(stateId) {
+                if (stateId == 1) {
+                    return "待提交"
+                }
+                if (stateId == 2) {
+                    return "待审核确认"
+                }
+                if (stateId == 3) {
+                    return "报销成功"
+                }
+                if (stateId == 4) {
+                    return "拒绝"
+                }
+                if (stateId == 5) {
+                    return "退回"
+                }
+                return stateId || ""
+            },
+            getStateClass(stateId) {
+                if (stateId == 3) {
+                    return "state-success"
+                }
+                if (stateId == 4) {
+                    return "state-danger"
+                }
+                return "state-primary"
+            },
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             onView(row) {
                 this.showApprovalForm = false
                 this.$refs.unionReimburseInfoRef.onOpen(row)
@@ -93,7 +152,7 @@ layout("/layouts/platform_h5.html"){
                         message: "您确定要撤销申请吗？"
                     })
                     .then(() => {
-                        this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((resp) => {
+                        this.$axios.post("/platform/unionReimburse/mine/revokeTask", {id: row.id}).then((resp) => {
                             this.$toast.success(resp.msg)
                             this.doSearch()
                         })
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html
index f64d7f73..6798ed38 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html
@@ -2,6 +2,19 @@
 layout("/layouts/platform_h5.html"){
 #-->
 
+<style>
+    .state-primary {
+        color: #409eff;
+    }
+
+    .state-success {
+        color: #67c23a;
+    }
+
+    .state-danger {
+        color: #f56c6c;
+    }
+</style>
 <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">
@@ -24,28 +37,15 @@ layout("/layouts/platform_h5.html"){
     <table-list api="/platform/unionReimburse/review/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.loginName}}</table-column>
+            <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="申请时间">{{formatCreateTime(row.createTime)}}</table-column>
+            <table-column label="报销项目">{{getReimburseProjectName(row.reimburseProject)}}</table-column>
+            <table-column label="备注">{{getRemarkText(row)}}</table-column>
             <table-column label="申请状态">
-                <span v-if="row.stateId == 1" style="color: #409eff;">待提交</span>
-                <span v-else-if="row.stateId == 2" style="color: #409eff;">待审核确认</span>
-                <span v-else-if="row.stateId == 3" style="color: #67c23a;">报销成功</span>
-                <span v-else-if="row.stateId == 4" style="color: #f56c6c;">拒绝</span>
-                <span v-else-if="row.stateId == 5" style="color: #409eff;">退回</span>
-                <span v-else>{{row.stateId}}</span>
+                <span :class="getStateClass(row.stateId)">{{getStateName(row.stateId)}}</span>
             </table-column>
         </template>
         <template #actions="{index,row}">
@@ -79,14 +79,14 @@ layout("/layouts/platform_h5.html"){
                                    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
-                                   v-model="formData.reviewOpinion" :rules="[{ required: true,message:'请签名' }]">
-                            <template #input>
-                                <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
-                            </template>
-                        </van-field>
-                    </van-cell-group>
+<!--                    <van-cell-group title="电子签名" class="form-section">-->
+<!--                        <van-field class="more-text" name="tf_userSign" label="" required-->
+<!--                                   v-model="formData.reviewOpinion" :rules="[{ required: true,message:'请签名' }]">-->
+<!--                            <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(5)">退回到发起人</van-button>
                         <van-button type="danger" @click="handleTaskAction(4)">拒绝申请</van-button>
@@ -124,6 +124,58 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            // 手机端审核列表字段展示与我的报销列表保持一致。
+            getReimburseProjectName(reimburseProject) {
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return "慰问"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_2") {
+                    return "文体活动"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_3") {
+                    return "日常活动"
+                }
+                if (reimburseProject === "UNION_REIMBURSE_PROJECT_4") {
+                    return "专项活动"
+                }
+                return reimburseProject || ""
+            },
+            getRemarkText(row) {
+                if (row.reimburseProject === "UNION_REIMBURSE_PROJECT_1") {
+                    return "被慰问人：" + (row.condolenceUserName || "")
+                }
+                return "活动名称：" + (row.activityName || "")
+            },
+            getStateName(stateId) {
+                if (stateId == 1) {
+                    return "待提交"
+                }
+                if (stateId == 2) {
+                    return "待审核确认"
+                }
+                if (stateId == 3) {
+                    return "报销成功"
+                }
+                if (stateId == 4) {
+                    return "拒绝"
+                }
+                if (stateId == 5) {
+                    return "退回"
+                }
+                return stateId || ""
+            },
+            getStateClass(stateId) {
+                if (stateId == 3) {
+                    return "state-success"
+                }
+                if (stateId == 4) {
+                    return "state-danger"
+                }
+                return "state-primary"
+            },
+            formatCreateTime(value) {
+                return value && this.$moment(value).isValid() ? this.$moment(value).format("YYYY-MM-DD HH:mm:ss") : ""
+            },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({
@@ -131,10 +183,7 @@ layout("/layouts/platform_h5.html"){
                         message: "您确定要提交吗？"
                     }).then(() => {
                         this.$axios.post("/platform/unionReimburse/review/reviewTask", {
-                            data: JSON.stringify({
-                                id: this.formData.id,
-                                reviewOpinion: this.formData.reviewOpinion
-                            }),
+                            data: JSON.stringify(Object.assign({}, this.formData)),
                             submitType: val
                         }).then(res => {
                             if (res.code === 0) {
@@ -155,8 +204,7 @@ layout("/layouts/platform_h5.html"){
                 this.showApprovalForm = true
                 this.formData = {
                     id: row.id,
-                    reviewOpinion: null,
-                    tf_userSign: null
+                    reviewOpinion: "通过"
                 }
                 this.$refs.unionReimburseInfoRef.onOpen(row)
             },