c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-11-19 08:57:49 +08:00
parent 63b7814e71
commit e6a1721f77
10 changed files with 83 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html
+1 -1
View File
@@ -114,7 +114,7 @@ layout("/layouts/platform.html"){
},
tableColumns: [
{prop: 'unionName', label: '分工会名称', sortable: true},
{prop: 'memberCount', label: '代表人数', sortable: true},
{prop: 'dbCount', label: '代表人数', sortable: true},
{prop: 'quotaCount', label: '分配人数', sortable: true}
],
formData: {},
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+27 -23
View File
@@ -27,25 +27,28 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushFormalRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>正式代表预选
</el-button>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushAttendanceRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>列席代表预选
</el-button>
<!-- <el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>-->
<el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
</el-button>
<template v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN'])">
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushFormalRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>正式代表预选
</el-button>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushAttendanceRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>列席代表预选
</el-button>
</template>
<template v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','UNIT_PARTY_SECRETARY'])">
<el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
</el-button>
</template>
<el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>
<el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
@change="doSearch">
<el-radio-button label="全部"></el-radio-button>
@@ -163,11 +166,12 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" fixed="right" width="300">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button
v-if="row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId"
@click="onEdit(row)" size="mini"
type="primary">编辑
</el-button>
<el-button
v-if="(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)
&& $auth.hasRoleOr(['SYSADMIN'])"
@click="onEdit(row)" size="mini"
type="primary">编辑
</el-button>
<template>
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)"
size="mini" type="danger">
src/main/resources/views/platform/zhghh5/sys/home/apps.js
+5 -5
View File
@@ -46,8 +46,8 @@ const apps = {
@touchmove="onTouchMove">
<!-- 图标 -->
<div class="app-grid-icon">
<van-icon v-if="app.picIcon" :name="app.picIcon" size="64"
style="border-radius: 12px; width: 64px; height: 64px;"></van-icon>
<van-icon v-if="app.picIcon" :name="app.picIcon" size="45"
style="border-radius: 12px; width: 45px; height: 45px;"></van-icon>
<van-icon v-else-if="app.icon" :name="app.icon" size="28"></van-icon>
<van-icon v-else name="apps-o" size="28"></van-icon>
</div>
@@ -443,10 +443,10 @@ const apps = {
}
.app-grid-icon {
width: 64px;
height: 64px;
width: 45px;
height: 45px;
max-width: 64px;
max-height: 64px;
max-height: 60px;
border-radius: 12px;
background: #f2f3f5;
display: flex;