Merge remote-tracking branch 'origin/main'

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html

@@ -20,6 +20,18 @@ layout("/layouts/platform.html"){
                                 value-format="yyyy">
                         </el-date-picker>
                     </search-item>
+                    <search-item label="所属工会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">
+                        <el-select placeholder="请选择所属工会" v-model="pageForm.unionId"
+                                   style="width: 100%;"
+                                   clearable
+                                   @change="doSearch"
+                                   filterable>
+                            <el-option v-for="item in unions"
+                                       :label="item.name"
+                                       :key="item.id"
+                                       :value="item.id"></el-option>
+                        </el-select>
+                    </search-item>
                 </search>
             </el-card>
             <el-card shadow="never" class="mt10">
@@ -102,7 +114,8 @@ layout("/layouts/platform.html"){
                 pageForm: {
                     year: this.$moment().format("YYYY")
                 },
-                isAllocation: false
+                isAllocation: false,
+                unions: []
             }
         },
         components: {},
@@ -170,6 +183,7 @@ layout("/layouts/platform.html"){
             }
         },
         async created() {
+            this.unions = await this.$businessTool.listUnion()
             this.getIsAllocation()
             this.pageData()
         }

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html

@@ -555,7 +555,7 @@ layout("/layouts/platform.html"){
             this.queryCondolenceType()
             this.init()
             //社团查询
-            this.$businessTool.listClub().then((res) => (this.clubOptions = res))
+            this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res))
         }
     })
 </script>

src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html

@@ -60,7 +60,7 @@ layout("/layouts/platform.html"){
 			</el-table>
 			<!--#include("/layouts/pagination.html"){}#-->
 		</el-card>
-		
+
 		<template #edit>
 			<info ref="infoRef">
 				<div v-if="showApprovalForm">
@@ -83,7 +83,7 @@ layout("/layouts/platform.html"){
 				</div>
 			</info>
 		</template>
-		
+
 	</guava>
 </div>
 <script>
@@ -107,10 +107,10 @@ layout("/layouts/platform.html"){
                     { prop: "unionName", label: "所属工会", sortable: true },
                     { prop: "unitName", label: "所属单位", sortable: true },
 	                { prop: "sign", label: "签字" },
-	                { prop: "taskName", label: "当前节点" },
+	                { prop: "curTaskName", label: "当前节点" },
 	                { prop: "instanceState", label: "流程状态" }
                 ],
-	            
+
 	            // 审核相关
 	            showApprovalForm: false,
 	            formData: {