Browse Source

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

feature
dai 3 years ago
parent
commit
9315f2fa5c
  1. 13
      src/App.vue
  2. 551
      src/assets/scss/modules/management/detail-main copy.scss
  3. 288
      src/assets/scss/modules/management/detail-main.scss
  4. 151
      src/assets/scss/modules/management/edit-main copy.scss
  5. 141
      src/assets/scss/modules/management/edit-main.scss
  6. 144
      src/assets/scss/modules/management/list-main.css
  7. 1
      src/assets/scss/modules/management/list-main.min.css
  8. 6
      src/assets/scss/modules/management/list-main.scss
  9. 42
      src/assets/scss/modules/visual/communityManage.css
  10. 1
      src/assets/scss/modules/visual/communityManage.min.css
  11. 9
      src/assets/scss/modules/visual/communityManage.scss
  12. 15
      src/views/components/rangeInput.vue
  13. 380
      src/views/components/resiSearch.vue
  14. 147
      src/views/modules/base/community/buildDetail.vue
  15. 67
      src/views/modules/base/community/buildForm.vue
  16. 4
      src/views/modules/base/community/buildTable.vue
  17. 99
      src/views/modules/base/community/communityDetail.vue
  18. 167
      src/views/modules/base/community/communityForm.vue
  19. 4
      src/views/modules/base/community/communityTable.vue
  20. 171
      src/views/modules/base/community/roomDetail.vue
  21. 87
      src/views/modules/base/community/roomForm.vue
  22. 2
      src/views/modules/base/community/roomTable.vue
  23. 59
      src/views/modules/base/resi.vue

13
src/App.vue

@ -115,11 +115,16 @@ export default {
}
}
//
.el-dialog__title {
font-size: 17px !important;
font-family: Source Han Serif CN !important;
font-weight: 600 !important;
color: #0043c8 !important;
font-size: 16px !important;
font-family: PingFangSC-Medium, PingFang SC !important;
font-weight: 500 !important;
color: rgba(0, 0, 0, 0.85) !important;
}
.el-dialog__header {
padding-bottom: 16px !important;
border-bottom: 1px solid #dcdee0 !important;
}
.tox-dialog__disable-scroll {

551
src/assets/scss/modules/management/detail-main copy.scss

@ -0,0 +1,551 @@
@import "@/assets/scss/c/config.scss";
@import "@/assets/scss/c/function.scss";
.m-row {
// display: flex;
// justify-content: space-between;
width:100%;
padding:20px 70px 0;
}
//一行两列
.m-row-2{
font-size: 15px;
font-family: PingFang SC;
font-weight: 400;
color: #333;
line-height: 24px;
display: flex;
justify-content: flex-start;
width:100%;
.info-prop {
position: relative;
width:50%;
margin: 10px 0;
display: flex;
padding-left: 15px;
padding-top:10px;
.info-pics {
display: flex;
margin: 20px 0;
img {
display: block;
width: 32%;
height: 90px;
margin-right: 9px;
object-fit: cover;
}
}
.line{
text-decoration:underline;
color: #3e8ef7;
}
.line:hover{
cursor:pointer
}
.info-title-2 {
flex: 0 0 100px;
}
.info-title-3{
flex: 0 0 150px;
}
> span,
> div {
display: block;
// max-width: 300px;
}
.div_map {
width:500px;
padding-top:10px
}
.div_map2 {
width:400px;
padding-top:10px
}
}
}
.m-info {
padding-left: 30px;
font-size: 15px;
font-family: PingFang SC;
font-weight: 400;
color: #333;
line-height: 24px;
// width: 500px;
.info-title {
margin-top: 30px;
font-size: 20px;
font-family: PingFang SC;
font-weight: bold;
color: #333;
line-height: 30px;
}
.info-content {
margin: 20px 0;
}
.info-prop {
position: relative;
margin: 10px 0;
display: flex;
padding-left: 15px;
padding-top:10px;
// border-bottom: 1px solid #d8d8d8;
.info-pics {
display: flex;
margin: 20px 0;
img {
display: block;
width: 32%;
height: 90px;
margin-right: 9px;
object-fit: cover;
}
}
.line{
text-decoration:underline;
color: #3e8ef7;
}
.line:hover{
cursor:pointer
}
.info-title-2 {
flex: 0 0 100px;
}
.info-title-3{
flex: 0 0 150px;
}
.info-title-4{
flex: 0 0 110px;
}
.info-title-5{
flex: 0 0 130px;
}
.info-title-6{
flex: 0 0 240px;
}
> span,
> div {
display: block;
// max-width: 300px;
}
// &::before {
// content: "";
// display: block;
// position: absolute;
// top: 19px;
// left: 0;
// width: 7px;
// height: 7px;
// background: #0c81fe;
// border-radius: 3px;
// margin-right: 10px;
// }
.div_map {
width:500px;
padding-top:10px
}
}
.info-prop-vis{
color:#fff;
}
}
.cell-width-area{
width: 450px
}
.div_searchmap {
z-index: 1000;
position: absolute;
top: 5px;
left: 5px;
}
.div-btn{
margin-top:30px;
// margin-bottom:20px;
display: flex;
justify-content: center;
.item_btn {
font-size: 14px;
padding: 8px 16px;
cursor: pointer;
color:#fff;
border: 1px dashed #0c81fe;
border-radius: 6px;
background-color: #0c81fe;
}
.mgl {
margin-left: 20px;
}
}
.cell-width-1{
width: 250px
}
.cell-width-long{
width: 450px
}
.cell-width-2{
width: 350px
}
.cell-width-map {
width: 200px;
}
.item_width_3 {
margin-left: 10px;
width: 150px;
}
.process-form{
margin-top:20px;
.process-title {
margin-bottom: 25px;
margin-left: -5px;
font-size: 16px;
font-family: PingFang SC;
font-weight: bold;
color: #333;
line-height: 18px;
}
.process-title-vis{
color: #fff;
}
}
.m-card {
overflow-x: auto;
}
.m-btns {
display: flex;
justify-content: center;
}
.m-row-info{
// padding-left: 30px;
font-size: 15px;
font-family: PingFang SC;
font-weight: 400;
color: #333;
line-height: 24px;
display: flex;
justify-content: flex-start;
width:100%;
.info-title {
margin-top: 30px;
font-size: 20px;
font-family: PingFang SC;
font-weight: bold;
color: #333;
line-height: 30px;
}
.info-content {
margin: 20px 0;
}
.info-pics {
display: flex;
margin: 20px 0;
img {
display: block;
width: 32%;
height: 90px;
margin-right: 9px;
object-fit: cover;
}
}
.info-prop {
flex:0 0 300px;
position: relative;
margin: 10px 0;
display: flex;
padding-left: 15px;
padding-top:10px;
// border-bottom: 1px solid #d8d8d8;
.line{
text-decoration:underline;
color: #3e8ef7;
}
.line:hover{
cursor:pointer
}
.info-title-2 {
// flex: 0 0 100px;
// font-size: 15px;
}
> span,
> div {
display: block;
// max-width: 300px;
}
&::before {
content: "";
display: block;
position: absolute;
top: 19px;
left: 0;
width: 7px;
height: 7px;
background: #0c81fe;
border-radius: 3px;
margin-right: 10px;
}
}
.info-prop-vis{
color:#fff;
}
}
.m-case {
height: 600px;
padding: 20px 0 20px 0;
overflow-y: auto;
}
.m-hint {
position: relative;
height: 300px;
// 暂无数据
img {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
}
}
.m-line {
min-width: 400px;
.stat {
margin: 20px 0 10px;
display: flex;
.stat-item {
width: 33%;
text-align: center;
div {
font-size: 17px;
font-family: Source Han Serif SC;
font-weight: 500;
color: rgba(#000, 0.5);
line-height: 24px;
&.z-weak {
font-size: 12px;
font-family: Source Han Serif SC;
font-weight: 500;
color: rgba(#000, 0.5);
line-height: 24px;
}
}
}
}
}
.m-process {
margin-top: 30px;
margin-left: 15px;
width: 400px;
.process-title {
margin-bottom: 25px;
margin-left: -5px;
font-size: 16px;
font-family: PingFang SC;
font-weight: bold;
color: #333;
line-height: 18px;
}
.process-title-vis{
color: #fff;
}
.list {
position: relative;
box-sizing: border-box;
margin-top: 30px/2;
margin-left: 50px/2;
padding: 0 0 0 30px/2;
width: 680px/2;
border-left: 3px solid #0c81fe;
padding-right: 10px;
&::before {
content: "";
position: absolute;
z-index: 1;
display: block;
top: -2px/2;
left: -2px/2;
width: 5px/2;
height: 20px/2;
background-color: #333;
}
.item {
position: relative;
z-index: 2;
margin-bottom: 8px;
padding-bottom: 8px;
font-size: 16px;
font-family: PingFang SC;
font-weight: 400;
color: #333;
line-height: 24px;
padding-left: 20px;
padding-top: 1px;
&::before {
content: "";
display: block;
position: absolute;
top: -5px;
left: -11px;
width: 18px;
height: 18px;
background: #0c81fe;
border: 4px solid lighten(#0c81fe, 15);
border-radius: 100%;
}
&.z-on {
&::before {
background: #e08400;
border-color: lighten(#e08400, 15);
}
}
&:last-child {
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
.item-row {
margin-top: -10px;
margin-bottom: 10px;
display: flex;
}
.name {
position: relative;
padding: 0 10px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 500;
color: #fff;
line-height: 22px;
height: 22px;
border-radius: 10px 0 10px 0;
background-color: #0c81fe;
// background-color: #e08400;
}
.date {
margin-left: 10px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 500;
color: #7ca1d2;
line-height: 25px;
}
.detail {
@include cs;
font-size: 14px;
line-height: 20px;
margin-bottom: 5px;
display: flex;
.detail-field {
flex:0 0 100px;
text-align: justify;
text-align-last: justify;
}
.detail-value {
// width: 78%;
.detail-link {
display: inline;
}
}
}
.attachement-list {
padding-left: 80px;
a {
display: block;
cursor: pointer;
color: #4df0ff;
font-size: 14px;
i {
color: #333;
}
}
}
}
.item-vis{
color:#fff
}
}
}
.m-top {
display: flex;
}
.m-chart {
min-height: 200px;
}

288
src/assets/scss/modules/management/detail-main.scss

@ -2,111 +2,112 @@
@import "@/assets/scss/c/config.scss";
@import "@/assets/scss/c/function.scss";
//新版
.d-row{
.m-row {
// display: flex;
// justify-content: space-between;
width:100%;
padding-left:23px;
padding-right:30px;
margin-top:10px;
.d-info{
.d-info-prop{
display:flex;
justify-content: flex-start;
height:38px;
border: 1px solid #D3DCE6;
margin-top:2px;
.d-title{
flex:0 0 90px;
text-align: center;
background: #D6E2F8;
font-size: 14px;
font-family: Source Han Serif CN;
font-weight: 400;
color: #333333;
line-height: 38px;
}
padding:20px 70px 0;
.d-content{
padding:5px;
background: #FFFFFF;
width:100%;
.d-content-in{
width:100%;
padding-left:16px;
background: #F6F6F6;
font-size: 14px;
font-family: Source Han Serif CN;
font-weight: 400;
color: #333333;
line-height: 27px;
}
}
}
}
//带图片的行高
.d-info-prop-pic{
height:185px;
}
//一行两列
.m-row-2row{
display: flex;
justify-content: space-between;
//带图片的行高
.d-info-prop-map{
height:360px;
}
.d-map{
height:216px;
}
.m-info-2row{
flex:0 0 1;
width:50%;
}
}
//图片带按钮目前只有房屋管理用到
.content-pic {
display: flex;
justify-content: space-between;
padding: 11px 23px;
align-items: center;
}
.pic-btn {
width: 75px;
height: 25px;
background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%);
border-radius: 3px;
font-size: 14px;
font-family: Source Han Serif CN;
font-weight: 500;
color: #ffffff;
line-height: 23px;
text-align: center;
.info-prop {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0,0,0,0.85);
margin: 10px 0;
display: flex;
padding-left: 15px;
padding-top:10px;
// border-bottom: 1px solid #d8d8d8;
//显示脱敏信息按钮
/deep/ .el-button--small, .el-button--small.is-round{
padding:0 15px;
}
.info-pics {
display: flex;
margin: 20px 0;
img {
display: block;
width: 32%;
height: 90px;
margin-right: 9px;
object-fit: cover;
}
}
}
.d-img{
height:140px;
// width:117px;
}
.line{
text-decoration:underline;
color: #3e8ef7;
}
.line:hover{
cursor:pointer
}
.info-mingan{
flex: 0 0 160px;
}
.info-title{
color: rgba(0,0,0,0.65);
text-align: right;
margin-right:8px;
}
.info-title-100 {
flex: 0 0 100px;
}
.info-title-3{
flex: 0 0 150px;
}
.info-title-4{
flex: 0 0 110px;
}
.info-title-5{
flex: 0 0 130px;
}
.info-title-6{
flex: 0 0 240px;
}
//旧版
.cell-width-area{
width: 450px
}
> span,
> div {
display: block;
// max-width: 300px;
}
.div_map {
width:500px;
padding-top:10px
}
}
.div_searchmap {
z-index: 1000;
position: absolute;
top: 5px;
left: 5px;
.info-prop-vis{
color:#fff;
}
.div-btn{
margin-top:30px;
margin-right:16px;
// margin-bottom:20px;
display: flex;
justify-content: center;
justify-content: flex-end;
.item_btn {
font-size: 14px;
@ -123,6 +124,20 @@
margin-left: 20px;
}
}
.cell-width-area{
width: 450px
}
.div_searchmap {
z-index: 1000;
position: absolute;
top: 5px;
left: 5px;
}
.cell-width-1{
width: 250px
}
@ -170,14 +185,10 @@
}
//-----旧版
.m-info {
padding-left: 30px;
font-size: 15px;
font-family: PingFang SC;
font-weight: 400;
color: #333;
line-height: 24px;
// width: 500px;
.info-title {
margin-top: 30px;
@ -190,80 +201,7 @@
.info-content {
margin: 20px 0;
}
.info-prop {
position: relative;
margin: 10px 0;
display: flex;
padding-left: 15px;
padding-top:10px;
// border-bottom: 1px solid #d8d8d8;
.info-pics {
display: flex;
margin: 20px 0;
img {
display: block;
width: 32%;
height: 90px;
margin-right: 9px;
object-fit: cover;
}
}
.line{
text-decoration:underline;
color: #3e8ef7;
}
.line:hover{
cursor:pointer
}
.info-title-2 {
flex: 0 0 100px;
}
.info-title-3{
flex: 0 0 150px;
}
.info-title-4{
flex: 0 0 110px;
}
.info-title-5{
flex: 0 0 130px;
}
.info-title-6{
flex: 0 0 240px;
}
> span,
> div {
display: block;
// max-width: 300px;
}
&::before {
content: "";
display: block;
position: absolute;
top: 19px;
left: 0;
width: 7px;
height: 7px;
background: #0c81fe;
border-radius: 3px;
margin-right: 10px;
}
.div_map {
width:500px;
padding-top:10px
}
}
.info-prop-vis{
color:#fff;
}
}
.m-row-info{
@ -309,6 +247,10 @@
padding-top:10px;
// border-bottom: 1px solid #d8d8d8;
/deep/ .el-button--small, .el-button--small.is-round{
padding:0 15px;
}
.line{
text-decoration:underline;
color: #3e8ef7;
@ -346,7 +288,7 @@
}
}
//一行两列
//一行两列------旧版
.m-row-2{
font-size: 15px;
font-family: PingFang SC;
@ -429,13 +371,7 @@
overflow-y: auto;
}
.m-row {
// display: flex;
// justify-content: space-between;
width:100%;
padding-left:50px;
padding-right:50px;
}
.m-hint {
position: relative;

151
src/assets/scss/modules/management/edit-main copy.scss

@ -0,0 +1,151 @@
@import "@/assets/scss/c/config.scss";
@import "@/assets/scss/c/function.scss";
.edit_form{
}
//编辑框-普通form宽度
.edit_item_width_normal{
width:320px;
}
.m-edit{
.m-form{
padding-left:20px;
padding-right:25px;
}
/deep/ .el-form .el-form-item{
border: 1px solid #D3DCE6;
margin-bottom: 0;
margin-top:2px;
height:47px;
// line-height: 40px;
}
.item-map{
/deep/ .el-form-item{
height:350px;
// line-height: 40px;
}
.map_line{
// height:5px;
// background-color: #ffffff;
}
.div_map{
margin-top:10px;
height:280px;
padding-bottom:10px;
}
}
.item-image{
/deep/ .el-form-item{
height:185px;
// line-height: 40px;
}
.item-imagebtn {
display: flex;
justify-content: space-between;
padding: 11px 23px;
align-items: center;
}
.d-img{
height:140px;
// width:117px;
}
.pic-btn {
width: 75px;
height: 25px;
background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%);
border-radius: 3px;
font-size: 14px;
font-family: Source Han Serif CN;
font-weight: 500;
color: #ffffff;
line-height: 23px;
text-align: center;
}
}
.item-textarea{
/deep/ .el-form-item{
height:89px;
// line-height: 40px;
}
/deep/ .el-form-item__content{
height:78px;
}
/deep/ .el-input__countx {
background:none;
}
}
/deep/ .el-form-item__label{
background: #D6E2F8;
height:100%;
line-height: 40px;
}
/deep/ .el-form-item__content{
width:760px;
margin:5px 6px;
background: #F6F6F6;
padding:0 16px;
line-height: 36px
}
/deep/ .el-input__inner{
width:95%;
background-color: #F6F6F6;
border:0px;
line-height: 26px;
padding:0px;
}
/deep/ .el-textarea__inner {
width:100%;
background-color: #F6F6F6;
border:0px;
line-height: 26px;
padding:0px;
}
/deep/ .el-input .el-input__count .el-input__count-inner {
background:none;
}
/deep/ .el-input__prefix{
left:700px;
}
}
.edit_item_width_1{
width:100%;
}
//带着按钮
.edit_item_btn_width_1{
width:650px;
}
.edit-btn-1{
float:right;
margin-right:10px;
}
.div_btn {
margin-top: 20px;
text-align: center;
}

141
src/assets/scss/modules/management/edit-main.scss

@ -2,141 +2,46 @@
@import "@/assets/scss/c/config.scss";
@import "@/assets/scss/c/function.scss";
.edit_form{
margin-top: 30px;
.m-edit{
.m-form{
padding-left:20px;
padding-right:25px;
/deep/ .el-form-item{
margin-bottom:14px;
}
/deep/ .el-form .el-form-item{
border: 1px solid #D3DCE6;
margin-bottom: 0;
margin-top:2px;
height:47px;
// line-height: 40px;
}
.item-map{
/deep/ .el-form-item{
height:350px;
// line-height: 40px;
}
.map_line{
// height:5px;
// background-color: #ffffff;
}
.div_map{
.edit_item_radio_long{
/deep/ .el-radio-group{
margin-top:10px;
height:280px;
padding-bottom:10px;
}
}
.item-image{
/deep/ .el-form-item{
height:185px;
// line-height: 40px;
}
.item-imagebtn {
display: flex;
justify-content: space-between;
padding: 11px 23px;
align-items: center;
}
.d-img{
height:140px;
// width:117px;
}
.pic-btn {
width: 75px;
height: 25px;
background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%);
border-radius: 3px;
font-size: 14px;
font-family: Source Han Serif CN;
font-weight: 500;
color: #ffffff;
line-height: 23px;
text-align: center;
line-height: 30px;
}
}
}
.item-textarea{
/deep/ .el-form-item{
height:89px;
// line-height: 40px;
}
/deep/ .el-form-item__content{
height:78px;
}
/deep/ .el-input__countx {
background:none;
}
}
//编辑框-普通form宽度
.edit_item_width_normal{
width:320px;
}
/deep/ .el-form-item__label{
background: #D6E2F8;
height:100%;
line-height: 40px;
}
/deep/ .el-form-item__content{
width:760px;
margin:5px 6px;
background: #F6F6F6;
padding:0 16px;
line-height: 36px
}
/deep/ .el-input__inner{
width:95%;
background-color: #F6F6F6;
border:0px;
line-height: 26px;
padding:0px;
}
/deep/ .el-textarea__inner {
width:100%;
background-color: #F6F6F6;
border:0px;
line-height: 26px;
padding:0px;
}
.edit_map{
/deep/ .el-input .el-input__count .el-input__count-inner {
background:none;
.edit_map_search{
margin-bottom: 10px;
}
/deep/ .el-input__prefix{
left:700px;
.edit_div_map{
margin-top:10px;
height:280px;
padding-bottom:10px;
}
}
.edit_item_width_1{
width:100%;
}
//带着按钮
.edit_item_btn_width_1{
width:650px;
}
.edit-btn-1{
float:right;
margin-right:10px;
}
.div_btn {
display: flex;
margin-top: 20px;
margin-right:16px;
justify-content: flex-end;
text-align: center;
}

144
src/assets/scss/modules/management/list-main.css

@ -0,0 +1,144 @@
.div_main {
width: 100%;
}
.div_main .marginl-20 {
margin-left: 16px;
}
.div_main .div_search {
padding: 10px;
background-color: #f6f6f6;
border: 1px solid #D3DCE6;
margin: 7px 7px;
}
.div_main .div_search .div_search_btn {
float: right;
}
.div_main .div_search .div_search_label {
line-height: 36px;
margin-left: 24px;
margin-right: 6px;
font-size: 14px;
color: #606266;
vertical-align: middle;
}
.div_main .data-tag {
margin-left: 10px;
}
.div_main .item_width_normal {
width: 138px;
}
.div_main .item_width_daterange {
width: 176px;
}
.div_main .item_width_buildcascader {
width: 151px;
}
.div_main .div_table {
margin: 15px 7px 7px;
position: relative;
}
.div_main .div_table .div_btn {
display: flex;
justify-content: space-between;
}
.div_main .div_table .div_btn .div_btn_left {
display: flex;
}
.div_main .div_table .div_btn .div_btn_left .btn_upload {
margin-left: 10px;
display: flex;
}
.div_main .div_table .div_table_item {
margin-top: 10px;
position: relative;
}
.div_main .item_width_2 {
width: 138px;
}
.div_main .item_width_1 {
width: 260px;
}
.div_main .item_width_3 {
width: 200px;
}
.div_main .list_item_width_1 {
width: 165px;
}
.div_main .list_item_width_2 {
width: 135px;
}
.div-mult-form {
margin-top: 20px;
}
.div-mult-form .div_person {
display: flex;
font-size: 14px;
padding-bottom: 20px;
}
.div-mult-form .div_person .person_title {
text-align: right;
flex: 0 0 100px;
line-height: 36px;
padding: 0 12px 0 0;
}
.div-mult-form .div_person .tag_item {
margin-right: 10px;
margin-top: 10px;
}
.div-mult-form .div_person .tag_tip {
margin-top: 10px;
color: #9c9c9c;
}
.div-mult-table {
position: relative;
padding: 0 20px;
}
.div-mult-table .div_selcount {
position: absolute;
bottom: 10px;
left: 30px;
}
.div_dialog_table {
padding: 10px;
}
.div_dialog_table .table {
margin-top: 20px;
}
.twoline {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.font_color_blue {
color: #0054d7;
}

1
src/assets/scss/modules/management/list-main.min.css

@ -0,0 +1 @@
.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background-color:#f6f6f6;border:1px solid #D3DCE6;margin:7px 7px}.div_main .div_search .div_search_btn{float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:138px}.div_main .item_width_daterange{width:176px}.div_main .item_width_buildcascader{width:151px}.div_main .div_table{margin:15px 7px 7px;position:relative}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex}.div_main .div_table .div_table_item{margin-top:10px;position:relative}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}.font_color_blue{color:#0054d7}

6
src/assets/scss/modules/management/list-main.scss

@ -44,10 +44,14 @@
.item_width_normal{
width: 168px;
}
//查询栏---日期时间范围的宽度
//查询栏---分开的日期时间范围的宽度
.item_width_daterange{
width: 206px;
}
//查询栏---合并的日期时间范围的宽度
.item_width_daterange2{
width: 445px;
}
//查询栏---小区单元楼号级联长度
.item_width_communitycascader{
width: 141px;

42
src/assets/scss/modules/visual/communityManage.css

@ -0,0 +1,42 @@
.div_del {
position: absolute;
left: 10px;
bottom: 0;
}
.div_search {
display: flex;
}
.div_search .resi-cell {
display: flex;
align-items: center;
}
.div_search .resi-cell .resi-cell-label {
width: 70px;
box-sizing: border-box;
margin-right: 15px;
text-align: right;
}
.div_search .resi-cell .resi-cell-input {
width: 180px;
}
.el-row {
/* margin-bottom: 20px; */
display: flex;
flex-wrap: wrap;
margin-top: 10px;
margin-right: 50px;
}
.setFormBoxHeight {
max-height: 99px;
overflow: hidden;
}
.setFormBoxHeightAuto {
height: auto;
}

1
src/assets/scss/modules/visual/communityManage.min.css

@ -0,0 +1 @@
.div_del{position:absolute;left:10px;bottom:0}.div_search{display:flex}.div_search .resi-cell{display:flex;align-items:center}.div_search .resi-cell .resi-cell-label{width:70px;box-sizing:border-box;margin-right:15px;text-align:right}.div_search .resi-cell .resi-cell-input{width:180px}.el-row{display:flex;flex-wrap:wrap;margin-top:10px;margin-right:50px}.setFormBoxHeight{max-height:99px;overflow:hidden}.setFormBoxHeightAuto{max-height:auto}

9
src/assets/scss/modules/visual/communityManage.scss

@ -7,7 +7,7 @@
}
.div_search {
display: flex;
.resi-cell {
display: flex;
@ -35,3 +35,10 @@
margin-top: 10px;
margin-right: 50px;
}
.setFormBoxHeight{
max-height: 99px;
overflow: hidden;
}
.setFormBoxHeightAuto{
height: auto;
}

15
src/views/components/rangeInput.vue

@ -102,12 +102,13 @@ export default {
<style lang="scss" scoped>
.flex-div {
display: flex;
align-items: center;
align-items: inherit;
max-width: 200px;
height: 37px;
}
.wd50 {
width: 79px;
}
// .wd50 {
// // width: 45%;
// }
.demo-form-inline {
::v-deep {
.el-form-item {
@ -126,6 +127,8 @@ export default {
}
.div_middle {
padding: 0 10px;
padding: 0 3px;
position: relative;
bottom: 10px;
}
</style>
</style>

380
src/views/components/resiSearch.vue

@ -1,182 +1,175 @@
<template>
<div class="resi-container">
<!-- <el-card class="resi-card"> -->
<el-row>
<el-row v-if="showGrid"
class="resi-row">
<el-col :span="6">
<div class="resi-cell">
<div class="resi-cell-label">所属组织</div>
<div class="resi-cell-value">
<el-cascader class="customer_cascader"
ref="myCascader"
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
</div>
</div>
</el-col>
<el-col :span="18">
<div class="resi-cell">
<div class="resi-cell-label">所属房屋</div>
<div class="resi-cell-value">
<el-select v-model.trim="form.VILLAGE_ID"
placeholder="请选择小区"
size="small"
filterable
clearable
class="resi-cell-select"
@clear="handleClearVillage"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.BUILD_ID"
placeholder="楼号"
size="small"
filterable
clearable
style="width: 120px;"
class="resi-cell-select"
:disabled="changeVDisabled"
@clear="handleClearBuild"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.UNIT_ID"
:disabled="changeBDisabled"
placeholder="单元"
size="small"
filterable
clearable
style="width: 120px;"
class="resi-cell-select"
@click="handleClearDan"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.HOME_ID"
:disabled="changeDDisabled"
placeholder="房号"
size="small"
filterable
clearable
style="width: 120px;"
class="resi-cell-select">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</div>
</el-col>
</el-row>
<el-row v-for="(item, index) in sliceList(itemList, 4)"
:key="index"
class="resi-row">
<el-col v-for="n in item"
:key="n.id"
:span="computdSpan(item.length)">
<div class="resi-cell">
<div class="resi-cell-label"
:class="item.length != 4 && 'resi-cell-label1'">{{ n.label }}</div>
<div class="resi-cell-value"
:class="n.itemType === 'radio' && 'resi-cell-value-radio'">
<el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'"
v-model.trim="form[n.columnName]"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入内容">
</el-input>
<template v-else-if="n.itemType == 'inputRange'">
<!-- <el-input
<div>
<el-form :inline="true"
:label-width="'100px'"
class="header_form_box"
v-for="(item, index) in sliceList(itemList, 4)"
:class="boxHeight?'setFormBoxHeightAuto':'setFormBoxHeight'"
:key="index">
<el-form-item v-for="n in item"
:key="n.id"
:span="computdSpan(item.length)"
:label="n.label"
class="margin0">
<el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'"
v-model.trim="form[n.columnName]"
class="item_width_normal"
size="small"
clearable
placeholder="请输入内容">
</el-input>
<template v-else-if="n.itemType == 'inputRange'">
<!-- <el-input
v-model.trim="form[n.columnName]"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入内容"
/> -->
<inputRange v-model="form[n.columnName]"
:type="n.validType"
@change="handleAgeChange" />
</template>
<template v-else-if="n.itemType === 'datepicker'">
<el-date-picker v-if="n.queryType === 'daterange'"
v-model.trim="form[n.columnName]"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
class="resi-cell--daterange"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-else
v-model.trim="form[n.columnName]"
class="resi-cell-input"
type="date"
size="small"
clearable
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</template>
<el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
v-model.trim="form[n.columnName]"
placeholder="请选择"
size="small"
clearable
class="resi-cell-select"
:collapse-tags="n.multiSelect == 1 ? true : false"
:multiple="n.multiSelect == 1 ? true : false">
<el-option v-for="item in n.options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-cascader v-else-if="n.itemType === 'cascader'"
v-model.trim="form[n.columnName]"
:options="n.options"
:props="{ checkStrictly: true }"
clearable
size="small"
class="resi-cell-select">
</el-cascader>
<template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model="form[n.columnName]">
<el-checkbox v-for="ns in n.options"
:key="ns.value"
:label="ns.value">{{ns.label}}</el-checkbox>
</el-checkbox-group>
</template>
</div>
</div>
</el-col>
</el-row>
</el-row>
<inputRange v-model="form[n.columnName]"
:type="n.validType"
@change="handleAgeChange" />
</template>
<template v-else-if="n.itemType === 'datepicker'">
<el-date-picker v-if="n.queryType === 'daterange'"
v-model.trim="form[n.columnName]"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
class="item_width_daterange2"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-else
v-model.trim="form[n.columnName]"
class="item_width_normal"
type="date"
size="small"
clearable
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</template>
<el-select v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
v-model.trim="form[n.columnName]"
placeholder="请选择"
size="small"
clearable
class="item_width_normal"
:collapse-tags="n.multiSelect == 1 ? true : false"
:multiple="n.multiSelect == 1 ? true : false">
<el-option v-for="item in n.options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-cascader v-else-if="n.itemType === 'cascader'"
v-model.trim="form[n.columnName]"
:options="n.options"
:props="{ checkStrictly: true }"
clearable
size="small"
class="resi-cell-select">
</el-cascader>
<template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model="form[n.columnName]">
<el-checkbox v-for="ns in n.options"
:key="ns.value"
:label="ns.value">{{ns.label}}</el-checkbox>
</el-checkbox-group>
</template>
</el-form-item>
<el-form-item label="所属组织"
prop="agencyIdArray">
<el-cascader class="item_width_normal"
ref="myCascader"
size="small"
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item label="所属房屋"
prop="VILLAGE_ID">
<el-select v-model.trim="form.VILLAGE_ID"
placeholder="请选择小区"
size="small"
filterable
clearable
class="item_width_communitycascader"
@clear="handleClearVillage"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.BUILD_ID"
placeholder="楼号"
size="small"
filterable
clearable
style="margin-left:5px"
class="item_width_buildcascader"
:disabled="changeVDisabled"
@clear="handleClearBuild"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.UNIT_ID"
:disabled="changeBDisabled"
placeholder="单元"
size="small"
filterable
clearable
style="margin-left:5px"
class="item_width_buildcascader"
@click="handleClearDan"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="form.HOME_ID"
:disabled="changeDDisabled"
placeholder="房号"
size="small"
filterable
clearable
style="margin-left:5px"
class="item_width_buildcascader">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<el-row v-if="showSmartSearchForm"
class="resi-row-more">
@ -194,23 +187,29 @@
:formType="formType"></smart-search-rule>
</el-col>
</el-row>
<el-row v-if="isArrow"
class="resi-search">
<el-col :span="24">
<el-button type="primary"
size="small"
<el-button size="small"
class="diy-button--blue"
@click="handleSearch">查询</el-button>
<el-button type="primary"
size="small"
class="diy-button--orange"
@click="handleSmartSearch">智能查询</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--gray"
class="diy-button--white"
@click="resetForm">重置</el-button>
<el-button class="diy-button--blue"
size="small"
@click="handleSearch">查询 </el-button>
<el-button style="margin-left:15px"
size="small"
class="div-table-button--blue"
type="text"
@click="boxHeight = !boxHeight">{{boxHeight?'收起':'展开'}}<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<!-- <span class="font_color_blue"
style="cursor:pointer;"
@click="boxHeight = !boxHeight">{{boxHeight?'收起':'展开'}} <i :class="boxHeight?'el-icon-arrow-up':'el-icon-arrow-down'"></i></span> -->
</el-col>
</el-row>
@ -262,6 +261,7 @@ export default {
return _form
}
let itemList = this.formList.map(item => {
console.log(item);
if (item.itemType == 'inputRange' && item.funType == 'agetoyear') {
item.columnName = 'age'
}
@ -294,6 +294,7 @@ export default {
}
return {
boxHeight: false,
pageLoading: false,
openSearch: false,
optionsV: [],
@ -362,7 +363,7 @@ export default {
'AGENCY_ID': 'like'
},
showSmartSearchForm: true,
showSmartSearchForm: false,
formType: 'add',
selBtnIndex: 1,
btnList: [
@ -380,7 +381,7 @@ export default {
nextLogicalRel: "",
nextLogicalRelName: "",
personRule: {
ruleDesc: '',//
ruleDesc: '',//
itemGroupId: '',
itemId: '',
queryType: '',
@ -466,12 +467,13 @@ export default {
let index = 0
let arrTemp = []
for (let i = 0; i < data.length; i++) {
index = parseInt(i / count)
index = parseInt(0)
if (arrTemp.length <= index) {
arrTemp.push([])
}
arrTemp[index].push(data[i])
}
console.log(arrTemp);
return arrTemp
}
}
@ -816,17 +818,11 @@ export default {
</script>
<style lang="scss" scope>
.resi-row-more {
height: max-content;
transition: height 0.5s;
width: 100%;
border-top: 1px dotted #8b8b8b;
margin-top: 5px;
padding-top: 15px;
}
.resi-row {
margin-bottom: 14px;
@import "@/assets/scss/modules/management/list-main.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
.header_form_box {
display: flex;
flex-wrap: wrap;
}
.resi-search {
// padding-right: 20px;

147
src/views/modules/base/community/buildDetail.vue

@ -3,117 +3,72 @@
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="d-row">
<div class="d-info">
<div class="d-info-prop">
<div class="d-title">所属小区</div>
<div class="d-content">
<div class="d-content-in">{{ agencyObj.agencyName }}{{ agencyObj.gridName }}{{ agencyObj.label }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">楼栋名称</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.buildingName||'--' }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">楼栋编码</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.coding||'--' }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">楼栋类型</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.typeName ||'--'}}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">单元数</div>
<div class="d-content">
<div class="d-content-in">{{dataForm.totalUnitNum?dataForm.totalUnitNum:0 }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">层数</div>
<div class="d-content">
<div class="d-content-in">{{dataForm.totalFloorNum?dataForm.totalFloorNum:0 }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">总户数</div>
<div class="d-content">
<div class="d-content-in">{{dataForm.totalHouseNum?dataForm.totalHouseNum:0 }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">人口数</div>
<div class="d-content">
<div class="d-content-in">{{dataForm.realPerson?dataForm.realPerson:0 }}</div>
</div>
</div>
class="m-row">
<div class="d-info-prop">
<div class="d-title">楼长姓名</div>
<div class="info-prop">
<span class="info-title info-title-100">所属小区</span>
<span>{{ agencyObj.agencyName }}{{ agencyObj.gridName }}{{ agencyObj.label }}</span>
</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.buildingLeaderName||'--' }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">楼长电话</div>
<div class="info-prop">
<span class="info-title info-title-100">楼栋名称</span>
<span>{{ dataForm.buildingName?dataForm.buildingName:'--' }}</span>
</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.buildingLeaderMobile||'--' }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">详细地址</div>
<div class="info-prop">
<span class="info-title info-title-100">楼栋编码</span>
<span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.coordinatePosition||'--' }}</div>
</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">楼栋类型</span>
<span>{{ dataForm.typeName?dataForm.typeName:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title info-title-100">单元数</span>
<span>{{dataForm.totalUnitNum?dataForm.totalUnitNum:0 }}</span>
</div>
<div class="info-prop">
<span class="info-title info-title-100">层数</span>
<span>{{dataForm.totalFloorNum?dataForm.totalFloorNum:0 }}</span>
</div>
<div class="info-prop">
<span class="info-title info-title-100">总户数</span>
<span>{{dataForm.totalHouseNum?dataForm.totalHouseNum:0 }}</span>
</div>
<div class="info-prop">
<span class="info-title info-title-100">人口数</span>
<span>{{dataForm.realPerson?dataForm.realPerson:0 }}</span>
</div>
<!-- <div v-show="dataForm.coordinatePosition"
class="d-info-prop">
<div class="d-title">地图位置</div>
<div class="div_map">
<div class="info-prop">
<span class="info-title info-title-100">楼长姓名</span>
<span>{{ dataForm.buildingLeaderName?dataForm.buildingLeaderName:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title info-title-100">楼长电话</span>
<span>{{ dataForm.buildingLeaderMobile?dataForm.buildingLeaderMobile:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title info-title-100">详细地址</span>
<span>{{ dataForm.coordinatePosition?dataForm.coordinatePosition:'--' }}</span>
</div>
<div id="app_detail_build"></div>
<div v-show="dataForm.coordinatePosition"
class="info-prop">
<span class="info-title info-title-100">地图位置</span>
<div class="div_map">
</div>
</div> -->
<div id="app_detail_build"></div>
<div v-show="dataForm.coordinatePosition"
class="d-info-prop d-info-prop-map">
<div class="d-title">地图位置</div>
<div class="d-content">
<div class="d-map">
<div id="app_detail_build"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
class="diy-button--blue"
@click="handleCancle"> </el-button>
</div>

67
src/views/modules/base/community/buildForm.vue

@ -1,14 +1,13 @@
<template>
<div>
<div class="dialog-h-content scroll-h m-edit">
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="dataForm"
:rules="dataRule"
label-width="90px"
:disabled="formType === 'detail'"
class="m-form">
label-width="150px"
class="edit_form">
<el-form-item label="所属小区"
style="display: block">
<span>{{ agencyObj.agencyName }}{{ agencyObj.gridName }}{{ agencyObj.label }}</span>
@ -17,7 +16,7 @@
<el-form-item label="楼栋名称"
prop="buildingName"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
maxlength="10"
placeholder="请输入楼栋名称"
v-model="dataForm.buildingName">
@ -26,16 +25,19 @@
<el-form-item label="楼栋编码"
prop="coding"
style="display: block">
<el-input class="edit_item_btn_width_1"
<el-input class="edit_item_width_normal"
maxlength="50"
placeholder="请输入楼栋编码"
v-model="dataForm.coding">
</el-input>
<el-button type="text"
<el-button style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-upload2"
size="small"
class="div-table-button--blue edit-btn-1"
@click="handleCode">生成</el-button>
</el-form-item>
<el-form-item label="楼栋类型"
prop="type"
@ -51,7 +53,7 @@
prop="sort"
style="display: block"
>
<el-input-number class="edit_item_width_1"
<el-input-number class="edit_item_width_normal"
v-model="dataForm.sort"
label="排序"></el-input-number>
</el-form-item> -->
@ -94,7 +96,7 @@
<el-form-item label="楼长姓名"
prop="buildingLeaderName"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
placeholder="请输入楼长姓名"
v-model="dataForm.buildingLeaderName">
</el-input>
@ -103,47 +105,20 @@
<el-form-item label="楼长电话"
prop="buildingLeaderMobile"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
type='number'
placeholder="请输入楼长电话"
v-model="dataForm.buildingLeaderMobile">
</el-input>
</el-form-item>
<div class="item-map">
<el-form-item label="地图位置"
prop="longitude"
style="display: block">
<div style="width: 500px">
<el-select v-model="searchValue"
filterable
style="width: 500px"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
:remote-method="remoteMethod"
:loading="loading">
<el-option v-for="(item,index) in searchOptions"
@click.native="handleClickKey(index)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<div id="app_build"
class="div_map"></div>
</div>
</el-form-item>
</div>
<!-- <el-form-item label="地图位置"
<el-form-item label="地图位置"
prop="longitude"
style="display: block">
<div style="width: 500px">
<div class="edit_item_width_normal edit_map">
<el-select v-model="searchValue"
filterable
style="width: 500px"
class="edit_item_width_normal edit_map_search"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
@ -157,14 +132,14 @@
</el-option>
</el-select>
<div id="app_build"
class="div_map"></div>
class="edit_div_map"></div>
</div>
</el-form-item> -->
</el-form-item>
<el-form-item label="楼栋地址"
prop="coordinatePosition"
style="display: block">
<!-- <span>{{ dataForm.coordinatePosition }}</span> -->
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
placeholder="请选择楼栋地址"
v-model="dataForm.coordinatePosition" />
</el-form-item>
@ -173,10 +148,10 @@
</div>
<div class="div_btn">
<el-button size="small"
class="diy-button--gray"
class="diy-button--white"
@click="handleCancle"> </el-button>
<el-button size="small"
v-if="formType != 'detail'"
type="primary"
class="diy-button--blue"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>

4
src/views/modules/base/community/buildTable.vue

@ -270,7 +270,7 @@
:close-on-press-escape="false"
:title="formTitle"
top="5vh"
width="950px"
width="670px"
class="dialog-h"
@closed="diaClose">
<build-form ref="ref_form"
@ -283,7 +283,7 @@
:close-on-press-escape="false"
:title="'楼栋详情'"
top="5vh"
width="950px"
width="670px"
class="dialog-h"
@closed="detailFormCancle">
<build-detail ref="ref_form_detail"

99
src/views/modules/base/community/communityDetail.vue

@ -3,76 +3,62 @@
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="d-row">
<div class="d-info">
<div class="d-info-prop">
<div class="d-title">所属组织</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.agencyName }}</div>
</div>
class="m-row m-row-2row">
<div class="m-info-2row">
<div class="info-prop">
<span class="info-title info-title-100">所属组织</span>
<span>{{ dataForm.agencyName }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">所属网格</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.gridName?dataForm.gridName:'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">所属网格</span>
<span>{{ dataForm.gridName?dataForm.gridName:'--' }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">小区名称</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.neighborHoodName}}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">小区名称</span>
<span>{{ dataForm.neighborHoodName}}</span>
</div>
<div class="d-info-prop ">
<div class="d-title">小区编码</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.coding?dataForm.coding:'--'}}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">关联物业</span>
<span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
</div>
<div class="d-info-prop d-info-prop-pic">
<div class="d-title">二维码</div>
<div class="d-content">
<div v-if="dataForm.qrcodeUrl"
class="content-pic">
<img class="d-img"
:src="dataForm.qrcodeUrl">
<a class="pic-btn"
style="margin-left: 80px"
:href="dataForm.qrcodeUrl"
target="_blank">下载</a>
</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">实有楼栋</span>
<span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">关联物业</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">实有楼栋</div>
<div class="d-content">
<div class="d-content-in">{{dataForm.realBuilding?dataForm.realBuilding:0 }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">详细地址</span>
<span>{{ dataForm.address }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">详细地址</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.address }}</div>
<div class="info-prop">
<span class="info-title info-title-100">地图位置</span>
<div class="div_map">
<div id="app_detail_community"></div>
</div>
</div>
<div class="d-info-prop d-info-prop-map">
<div class="d-title">地图位置</div>
<div class="d-content">
<div class="d-map">
<div id="app_detail_community"></div>
</div>
</div>
<div class="m-info-2row">
<div class="info-prop">
<span class="info-title info-title-100">小区编码</span>
<span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
</div>
<div v-if="dataForm.qrcodeUrl"
class="info-prop">
<span class="info-title info-title-100">二维码</span>
<div style="display: flex;flex-direction: column;">
<img style="margin-left: 20px;width: 150px;"
:src="dataForm.qrcodeUrl">
<a style="margin-left: 30px;margin-top:20px"
class="div-table-button--blue"
:href="dataForm.qrcodeUrl"
target="_blank"><i class="el-icon-download"></i>下载</a>
</div>
</div>
@ -82,7 +68,6 @@
</div>
<div class="div-btn">
<el-button size="small"
class="diy-button--blue"
@click="handleCancle"> </el-button>
</div>

167
src/views/modules/base/community/communityForm.vue

@ -1,14 +1,14 @@
<template>
<div>
<div class="dialog-h-content scroll-h m-edit">
<el-form ref="ref_form"
:inline="true"
:model="dataForm"
:rules="dataRule"
label-width="90px"
class="m-form">
<div v-show="!propertyFormShow">
<div class="dialog-h-content scroll-h">
<div v-show="!propertyFormShow">
<el-form ref="ref_form"
:inline="true"
:model="dataForm"
:rules="dataRule"
label-width="150px"
class="edit_form">
<el-form-item label="所属组织"
style="display: block">
<span>{{ dataForm.agencyName }}</span>
@ -16,7 +16,7 @@
<el-form-item label="所属网格"
prop="gridId"
style="display: block">
<el-select class="edit_item_width_1"
<el-select class="edit_item_width_normal"
v-model="dataForm.gridId"
placeholder="请选择"
clearable>
@ -31,48 +31,57 @@
<el-form-item label="小区名称"
prop="neighborHoodName"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
maxlength="50"
show-word-limit
placeholder="请输入小区名称"
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="小区编码"
prop="coding"
style="display: block">
<el-input class="edit_item_btn_width_1"
<el-input class="edit_item_width_normal"
maxlength="50"
placeholder="请输入楼栋编码"
v-model="dataForm.coding">
</el-input>
<el-button type="text"
<el-button style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-upload2"
size="small"
class="div-table-button--blue edit-btn-1"
@click="handleCode">生成</el-button>
</el-form-item>
<div v-if="dataForm.qrcodeUrl"
class="item-image">
<el-form-item label="二维码"
prop="coding"
style="display: block">
<div class="item-imagebtn">
<img class="d-img"
<el-form-item v-if="dataForm.qrcodeUrl"
label="二维码"
prop="coding"
style="display: block">
<div style="display: flex; align-items:center">
<div class="edit_item_width_normal">
<img style="margin-left: 30px;width: 200px;"
:src="dataForm.qrcodeUrl">
<a class="pic-btn"
:href="dataForm.qrcodeUrl"
target="_blank">下载</a>
</div>
</el-form-item>
</div>
<a style="margin-left: 10px;"
class="div-table-button--blue"
:href="dataForm.qrcodeUrl"
target="_blank"><i class="el-icon-download"></i>下载</a>
</div>
</el-form-item>
<!-- <div
style="display: flex;flex-direction: column;">
<a style="margin-left: 80px"
:href="dataForm.qrcodeUrl"
target="_blank">下载</a>
</div> -->
<el-form-item label="关联物业"
prop="propertyId"
style="display: block">
<el-select class="edit_item_btn_width_1"
<el-select class="edit_item_width_normal"
v-model="dataForm.propertyId"
placeholder="请选择"
filterable
@ -83,30 +92,31 @@
:value="item.propertyId">
</el-option>
</el-select>
<el-button type="text"
<el-button style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-plus"
size="small"
class="div-table-button--blue edit-btn-1"
@click="handleAddProperty">添加物业</el-button>
</el-form-item>
<el-form-item label="实有楼栋"
style="display: block"
prop="realBuilding">
<el-input-number class="item_width_4"
<el-input-number class="edit_item_width_normal"
v-model="dataForm.realBuilding"
:min="0"
:max="9999"
label="总户数"></el-input-number>
</el-form-item>
<div class="item-map">
<el-form-item label="地图位置"
prop="longitude"
style="display: block">
<el-form-item label="地图位置"
prop="longitude"
style="display: block">
<div class="edit_item_width_normal edit_map">
<el-select v-model="searchValue"
filterable
style="width: 500px"
class="edit_item_width_normal edit_map_search"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
@ -119,63 +129,57 @@
:value="item.value">
</el-option>
</el-select>
<div class="map_line"></div>
<div id="app_community"
style=""
class="div_map"></div>
</el-form-item>
</div>
class="edit_div_map"></div>
</div>
</el-form-item>
<el-form-item label="详细地址"
prop="address"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
maxlength="50"
show-word-limit
placeholder="请输入详细地址"
v-model="dataForm.address">
</el-input>
</el-form-item>
<!-- <div class="item-textarea"> -->
<el-form-item label="备注"
prop="remark"
style="display: block">
<!-- <el-input class="edit_item_width_1"
type="textarea"
maxlength="500"
show-word-limit
resize="none"
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="dataForm.remark"></el-input> -->
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="dataForm.remark">
v-model="dataForm.remark"></el-input>
</el-form-item>
</el-form>
</div>
<div v-show="propertyFormShow">
<el-form :inline="false"
:model="propertyForm"
:rules="propertyRule"
label-width="150px"
class="edit_form">
<el-form-item label="物业名称"
prop="name"
style="display: block">
<el-input class="edit_item_width_normal"
maxlength="10"
placeholder="请输入小区名称"
v-model="propertyForm.name">
</el-input>
</el-form-item>
<!-- </div> -->
</div>
<el-form-item v-show="propertyFormShow"
label="物业名称"
prop="name"
style="display: block">
<el-input class="edit_item_width_1"
maxlength="10"
placeholder="请输入物业名称"
v-model="propertyName">
</el-input>
</el-form-item>
</el-form>
</el-form>
</div>
</div>
<div class="div_btn">
<el-button size="small"
class="diy-button--gray"
class="diy-button--white"
@click="handleCancle"> </el-button>
<el-button size="small"
class="diy-button--blue"
@ -227,8 +231,9 @@ export default {
},
propertyFormShow: false,
propertyName: '',
propertyForm: {
name: ''
},
keyWords: '',
agencyObj: {}
@ -402,7 +407,7 @@ export default {
},
handleAddProperty () {
this.propertyName = ''
this.propertyForm.name = ''
this.propertyFormShow = true
},
@ -458,7 +463,7 @@ export default {
},
async addProperty () {
if (!this.propertyName || this.propertyName === '') {
if (!this.propertyForm.name || this.propertyForm.name === '') {
this.$message({
type: 'error',
message: '物业名称不能为空'
@ -468,7 +473,7 @@ export default {
const url = '/gov/org/propertymanagement/add'
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
let params = {
name: this.propertyName
name: this.propertyForm.name
}
const { data, code, msg } = await requestPost(url, params)
@ -479,7 +484,7 @@ export default {
message: '操作成功'
})
this.dataForm.propertyId = data.propertyId
this.propertyName = ''
this.propertyForm.name = ''
this.propertyFormShow = false
this.loadProperty()
} else {
@ -488,7 +493,7 @@ export default {
},
handleCancle () {
if (this.propertyFormShow) {
this.propertyName = ''
this.propertyForm.name = ''
this.propertyFormShow = false
} else {
this.resetData()

4
src/views/modules/base/community/communityTable.vue

@ -258,7 +258,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'小区详情'"
width="950px"
width="920px"
top="5vh"
class="dialog-h"
@closed="detailFormCancle">
@ -271,7 +271,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="950px"
width="670px"
top="5vh"
class="dialog-h"
@closed="diaClose">

171
src/views/modules/base/community/roomDetail.vue

@ -3,113 +3,85 @@
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="d-row">
<div class="d-info">
<div class="d-info-prop">
<div class="d-title">所属楼栋</div>
<div class="d-content">
<div class="d-content-in">{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</div>
</div>
class="m-row m-row-2row">
<div class="m-info-2row">
<div class="info-prop">
<span class="info-title info-title-100">所属楼栋</span>
<span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
</div>
<div class="d-info-prop">
<div class="d-title">单元号</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.unitName||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">单元号</span>
<span>{{ dataForm.unitName?dataForm.unitName:'--' }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">门牌号</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.doorName||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">门牌号</span>
<span>{{ dataForm.doorName}}</span>
</div>
<div class="d-info-prop">
<div class="d-title">房屋编码</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.coding||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">房屋类型</span>
<span>{{dataForm.houseTypeName?dataForm.houseTypeName:'--' }}</span>
</div>
<div v-if="dataForm.houseQrcodeUrl"
class="d-info-prop d-info-prop-pic">
<div class="d-title">房屋二维码</div>
<div class="d-content">
<div v-if="dataForm.houseQrcodeUrl"
class="content-pic">
<img class="d-img"
:src="dataForm.houseQrcodeUrl">
<a class="pic-btn"
style="margin-left: 80px"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">房屋用途</span>
<span>{{dataForm.purposeName?dataForm.purposeName:'--' }}</span>
</div>
<!-- <div v-if="dataForm.houseQrcodeUrl"
style="display: flex;flex-direction: column;">
<img style="margin-left: 70px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
<a style="margin-left: 80px"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div> -->
<div class="d-info-prop">
<div class="d-title">房屋类型</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.houseTypeName||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">房屋状态</span>
<span>{{dataForm.rentName?dataForm.rentName:'--' }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">房屋用途</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.purposeName||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">房主姓名</span>
<span>{{dataForm.ownerName?dataForm.ownerName:'--' }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">房屋状态</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.rentName||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">联系方式</span>
<span class="info-mingan">{{dataForm.showOwnerPhone?dataForm.showOwnerPhone:'--' }}</span>
<el-button v-if="view_real_data"
style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-view"
size="small"
@click="handleTuomin('phone')">显示</el-button>
</div>
<div class="d-info-prop">
<div class="d-title">房主姓名</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.ownerName||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">房主身份证</span>
<span class="info-mingan">{{dataForm.showOwnerIdCard?dataForm.showOwnerIdCard:'--' }}</span>
<el-button v-if="view_real_data"
style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-view"
size="small"
@click="handleTuomin('idcard')">显示</el-button>
</div>
<div class="d-info-prop">
<div class="d-title">联系方式</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.showOwnerPhone||'--' }}</div>
</div>
<div class="info-prop">
<span class="info-title info-title-100">备注</span>
<span>{{dataForm.remark?dataForm.remark:'--' }}</span>
</div>
<div class="d-info-prop">
<div class="d-title">房主身份证</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.showOwnerIdCard||'--' }}</div>
</div>
</div>
<div class="d-info-prop">
<div class="d-title">备注</div>
</div>
<div class="d-content">
<div class="d-content-in">{{ dataForm.remark||'--' }}</div>
<div class="m-info-2row">
<div class="info-prop">
<span class="info-title info-title-100">房屋编码</span>
<span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
</div>
<div v-if="dataForm.houseQrcodeUrl"
class="info-prop">
<span class="info-title info-title-100">二维码</span>
<div style="display: flex;flex-direction: column;">
<img style="margin-left: 20px;width: 150px;"
:src="dataForm.houseQrcodeUrl">
<a style="margin-left: 30px;margin-top:20px"
class="div-table-button--blue"
:href="dataForm.houseQrcodeUrl"
target="_blank"><i class="el-icon-download"></i>下载</a>
</div>
</div>
</div>
@ -117,12 +89,7 @@
</div>
<div class="div-btn">
<el-button v-if="view_real_data"
size="mini"
class="diy-button--orange"
@click="handleTuomin">显示脱敏信息</el-button>
<el-button size="small"
class="diy-button--blue"
@click="handleCancle"> </el-button>
</div>
@ -219,7 +186,7 @@ export default {
},
async handleTuomin () {
async handleTuomin (type) {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
@ -228,8 +195,14 @@ export default {
});
if (code === 0) {
this.$set(this.dataForm, 'showOwnerPhone', data.mobile)
this.$set(this.dataForm, 'showOwnerIdCard', data.idCard)
if (type === 'phone') {
this.$set(this.dataForm, 'showOwnerPhone', data.mobile)
}
if (type === 'idcard') {
this.$set(this.dataForm, 'showOwnerIdCard', data.idCard)
}
} else {
this.$message.error(msg);
}

87
src/views/modules/base/community/roomForm.vue

@ -1,13 +1,13 @@
<template>
<div>
<div class="dialog-h-content scroll-h m-edit">
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:inline="false"
:model="dataForm"
:rules="dataRule"
label-width="90px"
class="m-form">
label-width="150px"
class="edit_form">
<el-form-item label="所属楼栋"
style="display: block">
@ -17,7 +17,7 @@
<el-form-item label="单元号"
prop="buildingUnitId"
style="display: block">
<el-select class="edit_item_width_1"
<el-select class="edit_item_width_normal"
v-model="dataForm.buildingUnitId"
placeholder="请选择"
clearable>
@ -32,7 +32,7 @@
<el-form-item label="门牌号"
prop="doorName"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
placeholder="请输入门牌号"
v-model="dataForm.doorName">
</el-input>
@ -40,52 +40,55 @@
<el-form-item label="房屋编码"
prop="coding"
style="display: block">
<el-input class="edit_item_btn_width_1"
<el-input class="edit_item_width_normal"
maxlength="50"
placeholder="请输入楼栋编码"
v-model="dataForm.coding">
</el-input>
<el-button type="text"
<el-button style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-upload2"
size="small"
class="div-table-button--blue edit-btn-1"
@click="handleCode">生成</el-button>
</el-form-item>
<el-form-item label="房屋编码"
prop="houseCode"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
maxlength="30"
v-model="dataForm.houseCode">
</el-input>
</el-form-item>
<div v-if="dataForm.houseQrcodeUrl"
class="item-image">
<el-form-item label="二维码"
prop="coding"
style="display: block">
<div class="item-imagebtn">
<img class="d-img"
<el-form-item v-if="dataForm.houseQrcodeUrl"
label="二维码"
prop="coding"
style="display: block">
<div style="display: flex; align-items:center">
<div class="edit_item_width_normal">
<img style="margin-left: 30px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
<a class="pic-btn"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div>
</el-form-item>
</div>
<a style="margin-left: 10px;"
class="div-table-button--blue"
:href="dataForm.houseQrcodeUrl"
target="_blank"><i class="el-icon-download"></i>下载</a>
</div>
</el-form-item>
<!-- <div v-if="dataForm.houseQrcodeUrl"
style="display: flex;flex-direction: column;">
<img style="margin-left: 70px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
<a style="margin-left: 80px"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div> -->
style="display: flex;flex-direction: column;">
<img style="margin-left: 70px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
<a style="margin-left: 80px"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div>
-->
<!-- <el-form-item label="居住人数"
style="display: block"
prop="realPerson"
@ -109,7 +112,8 @@
<el-form-item label="房屋用途"
prop="purpose"
style="display: block">
style="display: block"
class="edit_item_radio_long">
<el-radio-group v-model="purpose">
<el-radio :label="'1'">住宅</el-radio>
@ -138,7 +142,7 @@
<el-form-item label="房主姓名"
prop="ownerName"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
maxlength="30"
placeholder="请输入房主姓名"
v-model="dataForm.ownerName">
@ -147,7 +151,7 @@
<el-form-item label="联系方式"
prop="ownerPhone"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
type='number'
placeholder="请输入联系方式"
v-model="dataForm.ownerPhone">
@ -156,7 +160,7 @@
<el-form-item label="房主身份证"
prop="ownerIdCard"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
placeholder="请输入房主身份证"
v-model="dataForm.ownerIdCard">
</el-input>
@ -164,7 +168,7 @@
<el-form-item label="备注"
prop="remark"
style="display: block">
<el-input class="edit_item_width_1"
<el-input class="edit_item_width_normal"
maxlength="30"
placeholder="请输入备注"
v-model="dataForm.remark">
@ -175,9 +179,10 @@
</div>
<div class="div_btn">
<el-button size="small"
class="diy-button--gray"
class="diy-button--white"
@click="handleCancle"> </el-button>
<el-button size="small"
type="primary"
class="diy-button--blue"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
@ -195,7 +200,7 @@ let loading // 加载动画
export default {
data () {
return {
formType: 'add', // addedit
formType: 'add', // addeditdetail
btnDisable: false,
unitList: [],
@ -468,4 +473,10 @@ export default {
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/edit-main.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
}
</style>

2
src/views/modules/base/community/roomTable.vue

@ -265,7 +265,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="950px"
width="670px"
top="5vh"
class="dialog-h"
@closed="diaClose">

59
src/views/modules/base/resi.vue

@ -27,7 +27,7 @@
<!-- </template> -->
<!-- <el-row v-if="openSearch"
class="resi-search">
<el-col :span="24">
<el-button size="small"
class="diy-button--blue"
@ -52,20 +52,21 @@
<div class="div_btn_left">
<el-button v-if="btnAuths.ic_resi_add"
size="small"
class="diy-button--purple"
@click="handleAdd">新增</el-button>
@click="handleAdd"
class="diy-button--blue"
icon="el-icon-plus"> 新增小区</el-button>
<el-button v-if="btnAuths.ic_resi_export"
style="margin-left:10px"
class="diy-button--green"
size="small"
@click="diyExport">导出</el-button>
@click="diyExport"
class="diy-button--white">导出</el-button>
<el-button v-if="btnAuths.ic_resi_import"
<!-- <el-button v-if="btnAuths.ic_resi_import"
style="margin-left:10px"
class="diy-button--blue"
size="small"
@click="handleExportModule('room')">下载模板</el-button>
<el-upload v-if="btnAuths.ic_resi_import"
@click="handleExportModule('room')">下载模板</el-button> -->
<!-- <el-upload v-if="btnAuths.ic_resi_import"
:headers="$getElUploadHeaders()"
ref="upload"
class="upload-demo"
@ -83,20 +84,21 @@
class="diy-button--yellow"
size="small"
:loading="importLoading">{{ importBtnTitle }}</el-button>
</el-upload>
</el-upload> -->
<el-button v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
style="margin-left:10px"
size="small"
@click="reportForm"
class="diy-button--white">核对</el-button>
<el-button style="margin-left:10px"
v-if="btnAuths.ic_resi_batch_del"
class="diy-button--red"
size="small"
@click="deleteBatch">批量删除</el-button>
@click="deleteBatch"
class="diy-button--white">批量删除</el-button>
<!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
<el-button v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
style="margin-left:10px"
class="diy-button--orange"
size="small"
@click="reportForm">智能填报</el-button>
</div>
</div>
@ -105,7 +107,6 @@
:data="tableData"
v-loading="tableLoading"
border
:header-cell-style="tableHeaderStyle"
style="width: 100%"
:height="tableHeight"
@select-all="selectAll"
@ -142,7 +143,7 @@
<el-table-column fixed="right"
label="操作"
align="center"
width="200">
width="260">
<template slot-scope="scope">
<!-- <el-button @click="handleLook(scope.row)"
type="text"
@ -157,9 +158,10 @@
<template v-if="filterEdit(scope.row.ORG_ID)">
<el-button v-if="btnAuths.ic_resi_update"
@click="handleEdit(scope.row)"
type="text"
class="div-table-button--blue"
size="small">修改</el-button>
size="small"
type="text"
icon="el-icon-edit">编辑</el-button>
<el-popconfirm v-if="btnAuths.ic_resi_del"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row)">
@ -172,11 +174,13 @@
<el-button @click="handleChangeTransfer(scope.row)"
type="text"
class="div-table-button--green"
class="div-table-button--blue"
icon="el-icon-tickets"
size="small">迁出登记</el-button>
<el-button @click="handleDeath(scope.row)"
class="div-table-button--blue"
type="text"
class="div-table-button--red"
icon="el-icon-tickets"
size="small">死亡登记</el-button>
</template>
</el-table-column>
@ -1456,6 +1460,7 @@ export default {
background: #ebecf1;
border-radius: 2px;
}
::v-deep .el-tabs__nav-wrap::after,
::v-deep .el-tabs__active-bar {
display: none;
@ -1478,6 +1483,16 @@ export default {
position: relative;
overflow: visible;
}
::v-deep .el-button--primary.is-plain {
color: #0055d7;
background: #ffffff;
border-color: #0055d7;
}
::v-deep .el-button--primary.is-plain:hover {
color: #fff;
background: #0055d7;
border-color: #0055d7;
}
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;

Loading…
Cancel
Save