From 3a03b4eb9f58d4d6d7652ae7a7517ca9060da06d Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Thu, 25 Jul 2024 15:11:02 +0800
Subject: [PATCH] commit

---
 .../views/platform/member/change/Records.html | 82 +++++++++++--------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/main/resources/views/platform/member/change/Records.html b/src/main/resources/views/platform/member/change/Records.html
index f216bb4..5738b13 100644
--- a/src/main/resources/views/platform/member/change/Records.html
+++ b/src/main/resources/views/platform/member/change/Records.html
@@ -53,39 +53,42 @@ layout("/layouts/platform.html"){
                     </div>
 
                     <template v-if="searchMore">
-                        <div class="search-item">
-                            <div class="search-item-label">工会小组：</div>
-                            <div class="search-item-option">
-                                <el-select v-model="pageForm.unionGroupId" style="width: 100%"
-                                           filterable
-                                           clearable
-                                           @change="getThreeUnits"
-                                           placeholder="请选择">
-                                    <el-option
-                                            v-for="item in unionGroups"
-                                            :key="item.id"
-                                            :label="item.groupName"
-                                            :value="item.id">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
 
-                        <div class="search-item">
-                            <div class="search-item-label">组成科室：</div>
-                            <div class="search-item-option">
-                                <el-select v-model="pageForm.threeUnitId" style="width: 100%" filterable
-                                           clearable
-                                           placeholder="请选择">
-                                    <el-option
-                                            v-for="item in threeUnits"
-                                            :key="item.id"
-                                            :label="item.name"
-                                            :value="item.id">
-                                    </el-option>
-                                </el-select>
+                        <template v-if="isThreeUnit">
+                            <div class="search-item">
+                                <div class="search-item-label">工会小组：</div>
+                                <div class="search-item-option">
+                                    <el-select v-model="pageForm.unionGroupId" style="width: 100%"
+                                               filterable
+                                               clearable
+                                               @change="getThreeUnits"
+                                               placeholder="请选择">
+                                        <el-option
+                                                v-for="item in unionGroups"
+                                                :key="item.id"
+                                                :label="item.groupName"
+                                                :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </div>
                             </div>
-                        </div>
+
+                            <div class="search-item">
+                                <div class="search-item-label">组成科室：</div>
+                                <div class="search-item-option">
+                                    <el-select v-model="pageForm.threeUnitId" style="width: 100%" filterable
+                                               clearable
+                                               placeholder="请选择">
+                                        <el-option
+                                                v-for="item in threeUnits"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </div>
+                            </div>
+                        </template>
 
                         <div class="search-item">
                             <div class="search-item-label">人员类型：</div>
@@ -349,13 +352,14 @@ layout("/layouts/platform.html"){
                     {prop: 'username', label: '姓名'},
                     {prop: 'unionname', label: '所属工会', sortable: true},
                     {prop: 'unitname', label: '所属单位', sortable: true},
-                    {prop: 'threeUnitName', label: '所在科室', sortable: true},
-                    {prop: 'unionGroupName', label: '工会小组', sortable: true},
+                    {prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
+                    {prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
                     {prop: 'type', label: '变更类型', sortable: true},
                     {prop: 'applyDate', label: '申请时间', sortable: true},
                     {prop: 'applyOrigin', label: '申请方式', sortable: true},
                     {prop: 'stateId', label: '状态', sortable: true}
                 ],
+                isThreeUnit
             }
         },
         components: {
@@ -417,6 +421,16 @@ layout("/layouts/platform.html"){
             },
         },
         async created() {
+
+            this.isThreeUnit = await getConfigKey('isThreeUnit') === 'true'
+            if (this.isThreeUnit) {
+                this.tableColumns.forEach(v => {
+                    if (["threeUnitName", "unionGroupName"].includes(v.prop)) {
+                        v.checked = 1
+                    }
+                })
+            }
+
             this.pageData();
             if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
                 this.unions = await getUnions(null, false)
@@ -432,4 +446,4 @@ layout("/layouts/platform.html"){
 </script>
 <!--#
 }
-#-->
\ No newline at end of file
+#-->