From f2836973838890c2480942acc6c7f13125d82bcc Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 22 Dec 2025 15:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E9=A2=84=E7=AE=97=E7=94=B3?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActivityBudgetSchoolAuditController.java          |  1 +
 .../ActivityBudgetSchoolPrincipalController.java      |  1 +
 .../outlay/activityBudget/allocationEdit/index.html   |  1 +
 .../outlay/activityBudget/apply/index.html            |  2 +-
 .../outlay/activityBudget/applyList/index.html        |  3 +++
 .../outlay/activityBudget/applyStatistics/index.html  |  2 +-
 .../zhgh/dayofficework/outlay/activityBudget/info.js  |  2 +-
 .../outlay/activityBudget/schoolAudit/index.html      | 11 +++++++++++
 .../outlay/activityBudget/schoolPrincipal/index.html  | 11 +++++++++++
 9 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java
index f15003c..854d1b5 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java
@@ -91,6 +91,7 @@ public class ActivityBudgetSchoolAuditController {
         cnd.and("t.taskName", "=", "b6f29037-972d-4b97-8677-c3b3672ef0dc");
 //        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
         cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.clubId", "=", clubId);
         cnd.andEX("info.outlayManageSource", "=", outlayManageSource);
         cnd.andEX("info.budgetReimburseType", "=", budgetReimburseType);
 
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java
index f5471aa..e278159 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolPrincipalController.java
@@ -91,6 +91,7 @@ public class ActivityBudgetSchoolPrincipalController {
         cnd.and("t.taskName", "=", "0b6aea8c-9d24-4d6d-b10b-4c930c919093");
         cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
         cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.clubId", "=", clubId);
         cnd.andEX("info.outlayManageSource", "=", outlayManageSource);
         cnd.andEX("info.budgetReimburseType", "=", budgetReimburseType);
 
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/allocationEdit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/allocationEdit/index.html
index ad38268..0bca201 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/allocationEdit/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/allocationEdit/index.html
@@ -212,6 +212,7 @@ layout("/layouts/platform.html"){
                                         message: '提交成功!'
                                     })
                                     this.doSearch()
+                                    this.getApplyMoney()
                                     this.$refs.guava.index()
                                 }
                             })
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html
index ee23975..fd49f0e 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html
@@ -8,7 +8,7 @@ layout("/layouts/platform.html"){
         <el-form :model="formData" :rules="formRules" ref="formRef" class="flow-task-form">
             <el-descriptions :column="2" border>
                 <el-descriptions-item label="申报人姓名">{{formData.userName}}</el-descriptions-item>
-                <el-descriptions-item label="申报时间">{{formData.applyDate}}</el-descriptions-item>
+                <el-descriptions-item label="申报时间">{{$moment(formData.applyDate).format('YYYY-MM-DD')}}</el-descriptions-item>
                 <el-descriptions-item label="经费项目">
                     <el-form-item
                             prop="activityMatter" label="经费项目">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html
index ecb0eab..e8b9e60 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html
@@ -88,6 +88,9 @@ layout("/layouts/platform.html"){
                             <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
                                       size="small"></enum-tag>
                         </template>
+                        <template v-slot="{row}" v-else-if="column.prop==='applyDate'">
+                            {{ $moment(row.applyDate).format('YYYY-MM-DD') }}
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" fixed="right" header-align="center" label="操作"
                                      width="300px">
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
index 89a9e02..9d656e0 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
@@ -35,7 +35,7 @@ layout("/layouts/platform.html"){
                             </el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="协会"
+                    <search-item label="所属协会"
                                  v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
                         <el-select clearable
                                    placeholder="请选择协会"
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/info.js b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/info.js
index fd74a54..d9ff506 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/info.js
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/info.js
@@ -23,7 +23,7 @@ const ACTIVITY_BUDGET_INFO = {
                 <el-descriptions-item label="申报预算金额（元）">{{viewData.declareTotalBudgetMoney}}
                 </el-descriptions-item>
                 <el-descriptions-item label="最终预算金额（元）">{{viewData.totalBudgetMoney}}</el-descriptions-item>
-                <el-descriptions-item label="申报时间">{{viewData.applyDate}}</el-descriptions-item>
+                <el-descriptions-item label="申报时间">{{$moment(viewData.applyDate).format('YYYY-MM-DD')}}</el-descriptions-item>
                 <el-descriptions-item v-if="viewData.isSchoolBudget" label="校工会预算">{{viewData.activityMatterTwo}}
                 </el-descriptions-item>
                 <el-descriptions-item v-if="!viewData.isSchoolBudget"></el-descriptions-item>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
index b5b132a..74665a8 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
@@ -34,6 +34,16 @@ layout("/layouts/platform.html"){
                         </el-option>
                     </el-select>
                 </search-item>
+                <search-item label="所属协会"
+                             v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
+                    <el-select v-model="pageForm.clubId" filterable
+                               clearable
+                               placeholder="请选择所属工会" style="width: 100%;">
+                        <el-option v-for="item in clubOption" :label="item.clubName"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </search-item>
                 <search-item label="预算条目">
                     <dict-select v-model="pageForm.budgetReimburseType"
                                  code="ACTIVITY_BUDGET_REIMBURSE_TYPE"></dict-select>
@@ -225,6 +235,7 @@ layout("/layouts/platform.html"){
             this.budgetReimburseTypeOption = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_REIMBURSE_TYPE")
             this.budgetTypeOption.unshift({name: "全部类型", code: ""})
             this.unionList = await this.$businessTool.listUnion()
+            this.clubOption = await this.$businessTool.listClub()
             this.pageData()
         }
     })
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html
index 319f68a..105abfb 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html
@@ -34,6 +34,16 @@ layout("/layouts/platform.html"){
                         </el-option>
                     </el-select>
                 </search-item>
+                <search-item label="所属协会"
+                             v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
+                    <el-select v-model="pageForm.clubId" filterable
+                               clearable
+                               placeholder="请选择所属工会" style="width: 100%;">
+                        <el-option v-for="item in clubOption" :label="item.clubName"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </search-item>
                 <search-item label="预算条目">
                     <dict-select v-model="pageForm.budgetReimburseType"
                                  code="ACTIVITY_BUDGET_REIMBURSE_TYPE"></dict-select>
@@ -225,6 +235,7 @@ layout("/layouts/platform.html"){
             this.budgetReimburseTypeOption = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_REIMBURSE_TYPE")
             this.budgetTypeOption.unshift({name: "全部类型", code: ""})
             this.unionList = await this.$businessTool.listUnion()
+            this.clubOption = await this.$businessTool.listClub()
             this.pageData()
         }
     })