elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-heart0629' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-heart0629

master
dai 3 years ago
parent
dcd5e41641 a507c107d8
commit
4920e5759d
4 changed files with 23 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/assets/scss/modules/management/list-main.scss
  2. 8
      src/views/modules/communityParty/heart/heartAudit.vue
  3. 12
      src/views/modules/communityParty/heart/heartList.vue
  4. 14
      src/views/modules/communityParty/heart/heartPerson.vue

3
src/assets/scss/modules/management/list-main.scss
View File

@ -19,6 +19,9 @@
.item_width_1{ .item_width_1{
width: 260px; width: 260px;
} }
.item_width_3{
width: 200px;
}
.item_width_2{ .item_width_2{
width: 160px; width: 160px;
} }

8
src/views/modules/communityParty/heart/heartAudit.vue
View File

@ -32,7 +32,7 @@
align="center" align="center"
label="姓名" label="姓名"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
@ -47,7 +47,7 @@
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="身份证"
min-width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="nickName" <el-table-column prop="nickName"
@ -55,7 +55,7 @@
align="center" align="center"
label="昵称" label="昵称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="120"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="signUpActNum" <el-table-column prop="signUpActNum"
@ -90,7 +90,7 @@
header-align="center" header-align="center"
align="center" align="center"
label="状态" label="状态"
width="120"> width="90">
</el-table-column> </el-table-column>

12
src/views/modules/communityParty/heart/heartList.vue
View File

@ -10,7 +10,7 @@
prop="title"> prop="title">
<el-input v-model="formData.title" <el-input v-model="formData.title"
size="small" size="small"
class="item_width_1" class="item_width_3"
clearable clearable
placeholder="请输入活动标题"> placeholder="请输入活动标题">
</el-input> </el-input>
@ -42,7 +42,7 @@
<el-form-item label="状态" <el-form-item label="状态"
prop="status"> prop="status">
<el-select class="item_width_1" <el-select class="item_width_3"
v-model="formData.status" v-model="formData.status"
size="small" size="small"
placeholder="请选择" placeholder="请选择"
@ -88,11 +88,13 @@
header-align="center" header-align="center"
align="center" align="center"
label="活动标题" label="活动标题"
:show-overflow-tooltip="true"
min-width="180"> min-width="180">
</el-table-column> </el-table-column>
<el-table-column prop="actAddress" <el-table-column prop="actAddress"
header-align="center" header-align="center"
align="center" align="center"
:show-overflow-tooltip="true"
label="活动地址" label="活动地址"
min-width="180"> min-width="180">
</el-table-column> </el-table-column>
@ -100,6 +102,7 @@
<el-table-column prop="actStartTime" <el-table-column prop="actStartTime"
header-align="center" header-align="center"
align="center" align="center"
:show-overflow-tooltip="true"
label="活动时间" label="活动时间"
min-width="180"> min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
@ -110,6 +113,7 @@
<el-table-column prop="signUpEndTime" <el-table-column prop="signUpEndTime"
header-align="center" header-align="center"
align="center" align="center"
:show-overflow-tooltip="true"
label="报名截止时间" label="报名截止时间"
min-width="110"> min-width="110">
</el-table-column> </el-table-column>
@ -117,18 +121,20 @@
header-align="center" header-align="center"
align="center" align="center"
label="状态" label="状态"
:show-overflow-tooltip="true"
min-width="100"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="richTextFlagShow" <el-table-column prop="richTextFlagShow"
header-align="center" header-align="center"
align="center" align="center"
label="来源" label="来源"
:show-overflow-tooltip="true"
width="100"> width="100">
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column label="操作"
fixed="right" fixed="right"
width="240" width="220"
header-align="center" header-align="center"
align="center" align="center"
class="operate"> class="operate">

14
src/views/modules/communityParty/heart/heartPerson.vue
View File

@ -22,14 +22,14 @@
align="center" align="center"
label="姓名" label="姓名"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
header-align="center" header-align="center"
align="center" align="center"
label="手机" label="手机"
min-width="120"> width="120">
</el-table-column> </el-table-column>
@ -37,7 +37,7 @@
header-align="center" header-align="center"
align="center" align="center"
label="身份证" label="身份证"
min-width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="nickName" <el-table-column prop="nickName"
@ -45,7 +45,7 @@
align="center" align="center"
label="昵称" label="昵称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="120"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="signUpActNum" <el-table-column prop="signUpActNum"
@ -82,7 +82,7 @@
header-align="center" header-align="center"
align="center" align="center"
label="是否签到" label="是否签到"
width="100"> width="90">
</el-table-column> </el-table-column>
<el-table-column v-if="status==='finished'" <el-table-column v-if="status==='finished'"
@ -90,14 +90,14 @@
header-align="center" header-align="center"
align="center" align="center"
label="是否给分" label="是否给分"
width="100"> width="90">
</el-table-column> </el-table-column>
<el-table-column prop="statusShow" <el-table-column prop="statusShow"
header-align="center" header-align="center"
align="center" align="center"
label="状态" label="状态"
width="120"> width="90">
</el-table-column> </el-table-column>

Write Preview
Loading…
Cancel
Save