elink-star
/
epmet-work-pc
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增福利人员模块列表与搜索栏与详情字体颜色

V1.0
马魁 3 years ago
parent
9413540934
commit
2a7a5b2d06
6 changed files with 76 additions and 38 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. 2
      src/assets/scss/people-info.scss
  2. 1
      src/views/components/deathSearch.vue
  3. 51
      src/views/components/resiForm.vue
  4. 17
      src/views/modules/base/resi.vue
  5. 10
      src/views/modules/plugins/change/resiwelfare.vue
  6. 33
      src/views/modules/shequ/cpts/people-more.vue

2
src/assets/scss/people-info.scss
View File

@ -73,7 +73,7 @@
width: 100px; width: 100px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
color: #ccc; color: #797979;
} }
&::v-deep .el-button{ &::v-deep .el-button{
padding: 0; padding: 0;

1
src/views/components/deathSearch.vue
View File

@ -526,6 +526,7 @@ export default {
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
.m-search { .m-search {
background-color: #fff;
/deep/ .el-form-item { /deep/ .el-form-item {
margin-bottom: 14px; margin-bottom: 14px;
} }

51
src/views/components/resiForm.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div :id="formId" <div :id="formId"
class="resi-container"> class="resi-container m-search">
<el-form :ref="formId" <el-form :ref="formId"
class="resi-form" class="resi-form"
:model="form" :model="form"
@ -22,10 +22,10 @@
:form-id="'baseForms' + item" /> :form-id="'baseForms' + item" />
</template> </template>
<template v-else> <template v-else>
<el-row v-if="fixed" <section v-if="fixed"
class="resi-row"> class="resi-row ">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col :span="6">
<el-form-item prop="GRID_ID" <el-form-item prop="GRID_ID"
label="所属网格"> label="所属网格">
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
@ -46,18 +46,15 @@
</div> </div>
<!-- </div> --> <!-- </div> -->
</el-form-item> </el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="所属房屋" <el-form-item label="所属房屋"
required> required>
<div class="resi-cell-value"> <div class="resi-cell-value">
<div class="resi-cell-col"> <div class="resi-cell-col">
<el-form-item prop="VILLAGE_ID"> <el-form-item prop="VILLAGE_ID" class="u-item-width-communitycascader">
<el-select v-model.trim="form.VILLAGE_ID" <el-select v-model.trim="form.VILLAGE_ID"
placeholder="请选择小区" placeholder="请选择小区"
size="small" size="small"
clearable clearable
class="item_width_communitycascader"
@change="handleChangeV"> @change="handleChangeV">
<el-option v-for="item in optionsV" <el-option v-for="item in optionsV"
:key="item.value" :key="item.value"
@ -71,7 +68,7 @@
placeholder="请选择楼号" placeholder="请选择楼号"
size="small" size="small"
clearable clearable
class="item_width_buildcascader" class="u-item-width-buildcascader"
@change="handleChangeB"> @change="handleChangeB">
<el-option v-for="item in optionsB" <el-option v-for="item in optionsB"
:key="item.value" :key="item.value"
@ -85,7 +82,7 @@
placeholder="请选择单元" placeholder="请选择单元"
size="small" size="small"
clearable clearable
class="item_width_buildcascader" class="u-item-width-buildcascader"
@change="handleChangeD"> @change="handleChangeD">
<el-option v-for="item in optionsD" <el-option v-for="item in optionsD"
:key="item.value" :key="item.value"
@ -99,7 +96,7 @@
placeholder="请选择房号" placeholder="请选择房号"
size="small" size="small"
clearable clearable
class="item_width_buildcascader" class="u-item-width-buildcascader"
@change="handleChangeH"> @change="handleChangeH">
<el-option v-for="item in optionsH" <el-option v-for="item in optionsH"
:key="item.value" :key="item.value"
@ -123,16 +120,14 @@
</el-col> --> </el-col> -->
</div> </div>
</el-form-item> </el-form-item>
</el-col> </section>
</el-row>
<el-row v-for="(item, index) in sliceList(formList, columns)" <el-row v-for="(item, index) in sliceList(formList, columns)"
:key="index" :key="index"
class="resi-row"> class="resi-row">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col v-for="n in item" <el-col v-for="n in item"
:key="n.itemId" :key="n.itemId"
:span="item.length === 1 ? 24 : (24/columns)" :span="item.length === 1 ? 24 : (24/columns)&&n.itemType === 'radio'? 4:(24/columns)"
:style="n.itemType === 'divider' && 'display: none;'"> :style="n.itemType === 'divider' && 'display: none;'">
<el-form-item :prop="n.columnName"> <el-form-item :prop="n.columnName">
<template slot="label" style="padding-right:14px"> <template slot="label" style="padding-right:14px">
@ -140,7 +135,7 @@
</template> </template>
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> --> <!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value"> <div class="resi-cell-value" :class=" n.label === '本地户籍'?'resi-cell-input':'' || n.label === '性别'?'resi-cell-input':''">
<template v-if="n.itemType === 'input' || n.itemType === 'textarea'"> <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
<el-input v-if="n.validType" <el-input v-if="n.validType"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
@ -203,7 +198,7 @@
placeholder="选择时间范围"> placeholder="选择时间范围">
</el-time-picker> </el-time-picker>
<!-- 本地户籍更改为单选按钮 --> <!-- 本地户籍更改为单选按钮 -->
<template v-else-if="n.itemType === 'select' && n.label === '本地户籍' || n.label === '性别'" > <template v-else-if="n.itemType === 'select' && n.label === '本地户籍' || n.label === '性别'" class="resi-cell-input" >
<el-radio v-for="ns in n.options" <el-radio v-for="ns in n.options"
:key="ns.value" :key="ns.value"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
@ -312,7 +307,7 @@ export default {
// 渲染一行几列 // 渲染一行几列
columns: { columns: {
type: Number, type: Number,
default: 3 default: 5
}, },
supportAdd: { // 单表多条数据 supportAdd: { // 单表多条数据
type: Boolean, type: Boolean,
@ -873,8 +868,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
.resi-cell-value .resi-cell-input {
width: 190px; .resi-cell-input{
width: 168px;
} }
.resi-cell-value { .resi-cell-value {
:deep .el-col { :deep .el-col {
@ -884,23 +880,28 @@ export default {
// width: 180px; // width: 180px;
// } // }
} }
</style>
<style lang="scss" scoped>
.resi-form .resi-row { .resi-form .resi-row {
margin-bottom: 0; margin-bottom: 0;
} }
.resi-form .resi-row:first-child{
display: flex;
}
.resi-cell-value .resi-cell-textarea { .resi-cell-value .resi-cell-textarea {
width: 300px; width: 300px;
} }
.resi-cell-col { .resi-cell-col {
display: flex; display: flex;
.el-form-item:first-child {
margin-right: 4px;
width: 141px;
}
.el-form-item { .el-form-item {
margin-right: 10px; margin-right: 4px;
width: 94px;
} }
} }
.resi-cell-select { .resi-cell-select {
width: 190px; width: 168px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px; margin-right: 10px;
&-middle { &-middle {

17
src/views/modules/base/resi.vue
View File

@ -212,8 +212,9 @@
<el-dialog :title="formName === '社区居民基本信息录入表'?'新增居民':formName" <el-dialog :title="formName === '社区居民基本信息录入表'?'新增居民':formName"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="80%" width="986px"
top="5vh" top="5vh"
height="750px"
append-to-body append-to-body
class="dialog-h" class="dialog-h"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -1477,6 +1478,20 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
.dialog-h {
.el-dialog__body {
position: relative;
max-height: 83vh;
box-sizing: border-box;
padding: 0 0 20px !important;
.dialog-h-content {
max-height: calc(83vh - 80px);
box-sizing: border-box;
padding: 0 10px 0px 79px;
overflow: auto;
}
}
}
.resi-container ::v-deep .el-row { .resi-container ::v-deep .el-row {
margin-right: 0; margin-right: 0;
} }

10
src/views/modules/plugins/change/resiwelfare.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="resi-container"> <div class="resi-container g-main">
<death-search v-if="searchList.length > 0" <death-search v-if="searchList.length > 0"
ref="deathSearch" ref="deathSearch"
:form-list="searchList" :form-list="searchList"
@ -1260,13 +1260,7 @@ export default {
background: linear-gradient(90deg, #1a5afd, #26c4ff); background: linear-gradient(90deg, #1a5afd, #26c4ff);
} }
} }
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table { .resi-table {
::v-deep .el-button--text { ::v-deep .el-button--text {
text-decoration: underline; text-decoration: underline;

33
src/views/modules/shequ/cpts/people-more.vue
View File

@ -43,7 +43,7 @@
v-for="field in fieldSubList" v-for="field in fieldSubList"
v-if="info[field.columnName]!=0" v-if="info[field.columnName]!=0"
> >
<span class="item-field">{{field.label}}<span v-if="field.itemType!='radio'"> ：</span> </span> <span :class="field.itemType=='radio'?'':'item-field'">{{field.label}}<span v-if="field.itemType!='radio'"> ：</span> </span>
<span v-if="field.columnName==='MOBILE' && info[field.columnName] != null||field.columnName==='ID_CARD' && info[field.columnName] != null"> <el-button type="text" class="div-table-button--blue" style="float: right" @click="handleTuomin(field)"> <span v-if="field.columnName==='MOBILE' && info[field.columnName] != null||field.columnName==='ID_CARD' && info[field.columnName] != null"> <el-button type="text" class="div-table-button--blue" style="float: right" @click="handleTuomin(field)">
<i class="el-icon-view"></i> 显示</el-button> <span >{{ info[field.columnName]||'--'}}</span> </span> <i class="el-icon-view"></i> 显示</el-button> <span >{{ info[field.columnName]||'--'}}</span> </span>
@ -75,7 +75,7 @@
</div> </div>
<div class="title-small f-top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}} <div class="title-small f-top40 div-mult-table "> {{index==0? '分类信息':'其他信息'}}
<section v-show="index==0 " style="position:absolute;top:41px;left: 5px;" class="f-font14">居民分类: </section> <section v-show="index==0 " class="f-font14">居民分类: </section>
</div> </div>
</div> </div>
<!-- 详情下方tab --> <!-- 详情下方tab -->
@ -739,6 +739,7 @@ export default {
width: 88%; width: 88%;
margin: 0 auto; margin: 0 auto;
} }
.wrap2{ .wrap2{
padding: 0 !important; padding: 0 !important;
} }
@ -750,7 +751,29 @@ export default {
right: 23px; right: 23px;
top: 13px; top: 13px;
} }
::v-deep .el-tabs__item.is-active {
color: #0056D6;
}
::v-deep .el-tabs__item {
// width: 50px;
box-sizing: border-box;
padding: 0 10px !important;
font-size: 14px;
font-weight: 600;
color: #666666;
border-radius: 2px;
&:hover{
color: #0056D6;
}
}
::v-deep .el-tabs__nav-next{
box-shadow: 2px 0px 9px 0px;
}
::v-deep .el-tabs__nav-prev{
box-shadow: -1px 0px 7px 0px;
}
.m-pop .wrap{ .m-pop .wrap{
width: 820px; width: 820px;
height: 848px; height: 848px;
@ -766,12 +789,16 @@ height: 848px;
} }
.m-pop .wrap .list .width-40{ .m-pop .wrap .list .width-40{
width: 17% !important; width: 17% !important;
text-align: center;
} }
.listTransform{ .listTransform{
transform: translateX(55px); transform: translateX(55px);
} }
.div-mult-table section { .div-mult-table section {
color: #ccc; color: #797979;
position:absolute;
top:41px;
left: 5px;
} }
.footer-Close-box{ .footer-Close-box{
position: relative; position: relative;

Write Preview
Loading…
Cancel
Save