Merge remote-tracking branch 'origin/main'

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html

@@ -27,13 +27,6 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="所属工会">
-                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
-                                   v-model="pageForm.unionId">
-                            <el-option :key="item.id" :label="item.name" :value="item.id"
-                                       v-for="item in unionOptions"></el-option>
-                        </el-select>
-                    </search-item>
                     <search-item label="代表团">
                         <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
@@ -41,6 +34,14 @@ layout("/layouts/platform.html"){
                                        v-for="item in delegations"></el-option>
                         </el-select>
                     </search-item>
+                    <search-item label="所属工会">
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
+                                   v-model="pageForm.unionId">
+                            <el-option :key="item.id" :label="item.name" :value="item.id"
+                                       v-for="item in unionOptions"></el-option>
+                        </el-select>
+                    </search-item>
+
                 </search>
             </el-card>
             <el-card shadow="never" class="mt10">

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html

@@ -10,8 +10,8 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
                     </el-input>
                 </search-item>
-                <search-item label="教代会">
-                    <el-select
+                    <search-item label="教代会">
+                        <el-select
                             v-model="pageForm.teacherMeetId"
                             filterable
                             placeholder="请选择教代会"
@@ -26,6 +26,13 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
+                <search-item label="所属工会" v-if="$auth.hasRoleOr('SYSADMIN')">
+                    <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
+                               v-model="pageForm.unionId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in unionOptions"></el-option>
+                    </el-select>
+                </search-item>
 
             </search>
 

src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html

@@ -10,22 +10,29 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
                     </el-input>
                 </search-item>
-                <search-item label="教代会">
-                    <el-select
-                            v-model="pageForm.teacherMeetId"
-                            filterable
-                            placeholder="请选择教代会"
-                            style="width:100%;"
-                            @change="getAllDelegation(pageForm.teacherMeetId);doSearch()"
-                    >
-                        <el-option
-                                v-for="item in teacherMeets"
-                                :key="item.id"
-                                :label="item.fullName"
-                                :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </search-item>
+                    <search-item label="教代会">
+                        <el-select
+                                v-model="pageForm.teacherMeetId"
+                                filterable
+                                placeholder="请选择教代会"
+                                style="width:100%;"
+                                @change="getAllDelegation(pageForm.teacherMeetId);doSearch()"
+                        >
+                            <el-option
+                                    v-for="item in teacherMeets"
+                                    :key="item.id"
+                                    :label="item.fullName"
+                                    :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </search-item>
+                    <search-item label="所属工会" v-if="$auth.hasRoleOr('SYSADMIN')">
+                        <el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
+                                   v-model="pageForm.unionId">
+                            <el-option :key="item.id" :label="item.name" :value="item.id"
+                                       v-for="item in unionOptions"></el-option>
+                        </el-select>
+                    </search-item>
 
             </search>
 

src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html

@@ -195,6 +195,7 @@ layout("/layouts/platform.html"){
                     {label: "提案编号", prop: "code"},
                     {label: "提案名称", prop: "name"},
                     {label: "提案人", prop: "createUserName"},
+                    {label: "提案人单位", prop: "unitName", visible: false},
                     {label: "提案类别", prop: "typeName"},
                     {label: "届次", prop: "sessionName"},
                     {label: "代表团", prop: "delegationName"},