Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js

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);
 

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);
 

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()
                                 }
                             })

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="经费项目">

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">

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="请选择协会"

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>

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()
         }
     })

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()
         }
     })

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

@@ -351,7 +351,16 @@ layout("/layouts/platform.html"){
         }
     })
 </script>
+<style>
+    .write-dialog .el-dialog__title {
+        font-size: 22px; /* 调整为您需要的大小 */
+        font-weight: 500;
+    }
 
+    .write-dialog .el-dialog__body {
+        padding-top: 0px;
+    }
+</style>
 
 <!--#
 }

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js

@@ -32,7 +32,7 @@ const write = {
                     <div class="info-content">
                         <i class="fa fa-info-circle info-icon"></i>
                         <div class="info-text">
-                            <h3 class="info-title">推选信息</h3>
+                            <h2 class="info-title" style="font-size: 18px;">推选信息</h2>                            
                             <p class="info-desc">您已被预选为{{ sessionName }}代表</p>
                             <div class="info-details">
                                 <p>推选单位：{{ formData.unionName }}</p>
@@ -58,7 +58,7 @@ const write = {
                                 :disabled="(formData && !['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)) || is_read"
                         >
                             <div class="form-section">
-                                <h3 class="section-title">基本信息</h3>
+                                <h2 class="section-title">基本信息</h3>
                                 <div class="form-grid custom-grid">
                                     <div class="grid-item">
                                         <el-form-item label="姓名" prop="userName">
@@ -450,7 +450,12 @@ const write = {
             justify-content: space-between;
             align-items: center;
             background-color: white;
-            margin-bottom: 20px;
+            margin-bottom: 1px;
+        }
+        
+        ::v-deep .el-tabs__item {
+            font-size: 18px;/* 填写信息 */
+            font-weight: 500;
         }
 
         .header-x .header-left {
@@ -541,6 +546,7 @@ const write = {
             background-color: white;
             border-radius: 8px;
             padding: 32px;
+            padding-top: 20px;
             margin-bottom: 20px;
         }
 
@@ -549,6 +555,7 @@ const write = {
             background-color: #ebf5ff;
             padding: 16px;
             margin-bottom: 32px;
+            margin-top: 10px;
         }
 
         .info-box ::v-deep .info-content {
@@ -569,6 +576,7 @@ const write = {
         .info-box .info-content .info-text ::v-deep .info-title {
             font-weight: 600;
             margin-bottom: 8px;
+            font-size: 18px; /* 推选信息没用 */
         }
 
         .info-box .info-content .info-text ::v-deep .info-desc {
@@ -591,7 +599,7 @@ const write = {
         }
 
         .form-section ::v-deep .section-title {
-            font-size: 18px;
+            font-size: 18px;/* 基本信息没用 */
             font-weight: 500;
             margin-bottom: 16px;
         }