commit
This commit is contained in:
@@ -86,7 +86,7 @@ layout("/layouts/v4/baseLayout.html"){
|
||||
|
||||
</div>
|
||||
|
||||
<jcdt :list="websiteNews.grassroots"></jcdt>
|
||||
<!-- <jcdt :list="websiteNews.grassroots"></jcdt>-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -4,21 +4,23 @@ const jcdt = {
|
||||
<div class="jcdt-container">
|
||||
<div class="jcdt-title">
|
||||
<span>基层动态</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="jcdt-content">
|
||||
<div class="jcdt-list">
|
||||
<div class="jcdt-item" v-for="item in list" :key="item.title" @click="onLink(item)">
|
||||
<div class="date" v-if="item.date">{{item.date}}</div>
|
||||
<div style="display: flex; align-items: center">
|
||||
<div style="font-size: 28px">🆕</div>
|
||||
<div >
|
||||
<el-image style="width: 30px" src="/assets/platform/img/v4/xw.png" alt="流程中心"></el-image>
|
||||
</div>
|
||||
<div class="title">{{item.title}}</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!--<div class="image">
|
||||
<img v-if="item.image" :src="item.image" alt="">
|
||||
<img v-else src="/assets/platform/img/v4/not-image.png" alt="">
|
||||
</div>-->
|
||||
<!-- <div class="summary">{{item.summary}}</div>-->
|
||||
<!-- <div class="summary">{{item.summary}}</div>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -120,7 +122,7 @@ const jcdt = {
|
||||
|
||||
.jcdt-item .date {
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
/*font-weight: bold;*/
|
||||
white-space: nowrap;
|
||||
text-align: left;
|
||||
margin-bottom: 8px;
|
||||
|
||||
+1
-1
@@ -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: {},
|
||||
|
||||
+27
-23
@@ -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">
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user