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

bug#165小区详情中居民区类型不显示居民区类型,bug#148房屋信息下载房屋模板文件名称修改,居民信息年龄搜索不能小于起始年龄

feature
mk 2 years ago
parent
4d324e0248
commit
6188520aa3
4 changed files with 153 additions and 312 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/components/resiInfo.vue
  2. 55
      src/views/components/resiSearch.vue
  3. 9
      src/views/modules/base/community/communityDetail.vue
  4. 251
      src/views/modules/base/community/communityTable.vue

4
src/views/components/resiInfo.vue
View File

@ -946,7 +946,7 @@
</div>
</el-col>
<el-col :span="8">
<div class="f-flex f-bto16 f-top24">
<!-- <div class="f-flex f-bto16 f-top24">
<div class="f-labels">是否请长假 :</div>
<span class="f-left8 f-font-color">{{
residentPartyMemberInfoObj.longHolidayFlag == 1
@ -955,7 +955,7 @@
? "否"
: "--"
}}</span>
</div>
</div> -->
</el-col>
</el-row>
</el-tab-pane>

55
src/views/components/resiSearch.vue
View File

@ -46,7 +46,7 @@
<el-input v-model="form.ageStart" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
</el-input>
<span class="u-data-tag">至</span>
<el-input v-model="form.ageEnd" class="u-item-width-daterange u-data-tag" placeholder="请输入" clearable size="small">
<el-input v-model="form.ageEnd" @change="handleAgeChange" class="u-item-width-daterange u-data-tag" placeholder="请输入" clearable size="small">
</el-input>
</el-form-item>
<el-form-item label="文化程度" >
@ -400,15 +400,15 @@ export default {
},
pickerOptionsEnd: {
disabledDate:time=>{
let dateVal = this.form.birthdayStart
if (dateVal) {
if(time.getTime() < new Date(dateVal).getTime()){
return time.getTime();
}else {
return time.getTime() > Date.now() - 8.64e6;
}
let nowData = Date.now();
if (this.form.birthdayStart) {
let birthdayStartTime = new Date(this.form.birthdayStart);
return (
time.getTime() <birthdayStartTime- 24 * 60 * 60 * 1000 ||
time.getTime()> nowData
);
} else {
return time.getTime() > Date.now() - 8.64e6;
return (time.getTime() > nowData || time.getTime() === nowData) ;
}
}
},
@ -586,39 +586,16 @@ export default {
// }
// },
handleOpenSearch() {
this.openSearch = !this.openSearch
},
handleAgeChange(val) {
console.log('val----age---', val)
// console.log(v);
if(val.start){
const s = this.computedBirth1(val.start)
const e = this.computedBirth(val.start)
this.form.BIRTHDAY = [s, e]
}else {
this.form.BIRTHDAY = []
return
handleAgeChange() {
console.log(11>5);
console.log(11>10);
if(this.form.ageStart){
if(this.form.ageStart>this.form.ageEnd){
this.$message.warning('结束年龄不能小于开始年龄')
}
}
},
handleChangeAgency(val) {
// let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
// if (obj) {
// this.form.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
// this.GRID_ID = ''
// } else {
// this.form.agencyId = ''
// this.GRID_ID = ''
// }
// this.form.villageId = ''
// this.form.buildId = ''
// this.form.unitId = ''
// this.form.homeId = ''
this.sarr = []
const map = new Map();
this.getLastItem(

9
src/views/modules/base/community/communityDetail.vue
View File

@ -29,8 +29,8 @@
<span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
</div>
<div class="m-info-prop">
<span class="u-info-title u-info-title-100">备注：</span>
<span>{{ dataForm.remark||'--' }}</span>
<span class="u-info-title u-info-title-100">居民区类型</span>
<span>{{ dataForm.quartersType?dataForm.quartersType=='1'?'片区':dataForm.quartersType=='0'?'小区':'--':'--' }}</span>
</div>
<div class="m-info-prop">
<span class="u-info-title u-info-title-100">详细地址：</span>
@ -45,7 +45,10 @@
</div>
</div>
<div class="m-info-prop">
<span class="u-info-title u-info-title-100">备注：</span>
<span>{{ dataForm.remark||'--' }}</span>
</div>
</div>
<div class="m-info-2row">
<div class="m-info-prop">

251
src/views/modules/base/community/communityTable.vue
View File

@ -2,105 +2,56 @@
<div class="m-table">
<div class="u-table-btn2">
<div class="u-table-btn2-left">
<el-button style=""
size="small"
type="primary "
icon="el-icon-plus"
@click="handleAdd">新增小区</el-button>
<div v-if="showImportBtn"
class="u-btn-upload">
<el-popover v-if="showImportBtn"
popper-class="btn-popper"
placement="bottom"
width="20"
trigger="click">
<el-button style="" size="small" type="primary " icon="el-icon-plus" @click="handleAdd">新增小区</el-button>
<div v-if="showImportBtn" class="u-btn-upload">
<el-popover v-if="showImportBtn" popper-class="btn-popper" placement="bottom" width="20" trigger="click">
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()"
ref="upload_community"
style="text-align: center"
:multiple="false"
:show-file-list="false"
:before-upload="
(file) => {
<el-upload :headers="$getElUploadHeaders()" ref="upload_community" style="text-align: center"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'community');
}
"
action=""
accept=".xls,.xlsx"
:http-request="
() => {
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('community');
}
">
<el-button size="small"
type="text"
class="diy-button--other">导入小区数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入小区数据</el-button>
</el-upload>
</div>
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()"
style="text-align: center"
ref="upload_building"
:multiple="false"
:show-file-list="false"
:before-upload="
(file) => {
<el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_building"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'building');
}
"
action=""
accept=".xls,.xlsx"
:http-request="
() => {
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('building');
}
">
<el-button size="small"
type="text"
class="diy-button--other">导入楼栋数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入楼栋数据</el-button>
</el-upload>
</div>
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()"
style="text-align: center"
ref="upload_room"
:multiple="false"
:show-file-list="false"
:before-upload="
(file) => {
<el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_room" :multiple="false"
:show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'room');
}
"
action=""
accept=".xls,.xlsx"
:http-request="
() => {
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('room');
}
">
<el-button size="small"
type="text"
class="diy-button--other">导入房屋数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入房屋数据</el-button>
</el-upload>
</div>
<el-button size="small"
style="float: right"
class="diy-button--white"
slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<el-button size="small" style="float: right" class="diy-button--white" slot="reference">导入<i
class="el-icon-arrow-down el-icon--right"></i></el-button>
</el-popover>
</div>
<el-button style="margin-left: 10px"
class="diy-button--white"
size="small"
<el-button style="margin-left: 10px" class="diy-button--white" size="small"
@click="handleExportOpen">导出</el-button>
<el-button style="margin-left: 10px"
class="diy-button--white"
size="small"
@click="deleteBatch">批量删除</el-button>
<el-button style="margin-left: 10px" class="diy-button--white" size="small" @click="deleteBatch">批量删除</el-button>
<!-- <el-button style=";margin-left:10px"
class="diy-button--export"
@ -109,33 +60,18 @@
@click="handleExportYihuyidang()">导出一户一档</el-button> -->
</div>
<div>
<el-popover popper-class="btn-popper"
placement="bottom"
style="margin-left: 10px"
width="20"
trigger="click">
<div v-if="showImportBtn"
class="table-more-btn">
<el-button class="diy-button--other"
size="small"
type="text"
<el-popover popper-class="btn-popper" placement="bottom" style="margin-left: 10px" width="20" trigger="click">
<div v-if="showImportBtn" class="table-more-btn">
<el-button class="diy-button--other" size="small" type="text"
@click="handleExportModule('community')">下载小区模板</el-button>
</div>
<div v-if="showImportBtn"
class="table-more-btn">
<el-button :headers="$getElUploadHeaders()"
class="diy-button--other"
size="small"
type="text"
<div v-if="showImportBtn" class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportModule('building')">下载楼栋模板</el-button>
</div>
<div v-if="showImportBtn"
class="table-more-btn">
<el-button :headers="$getElUploadHeaders()"
class="diy-button--other"
size="small"
type="text"
<div v-if="showImportBtn" class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportModule('room')">下载房屋模板</el-button>
</div>
<!-- <div
@ -169,12 +105,8 @@
>补全小程序小区码</el-button
>
</div> -->
<div v-if="displayedBaobiaoBtn"
class="table-more-btn">
<el-button size="small"
type="text"
class="diy-button--other"
@click="reportForm">智能填报</el-button>
<div v-if="displayedBaobiaoBtn" class="table-more-btn">
<el-button size="small" type="text" class="diy-button--other" @click="reportForm">智能填报</el-button>
</div>
<!-- <div
v-if="agencyObj.level == 'community'"
@ -188,51 +120,27 @@
>社区二维码</el-button
>
</div> -->
<el-button size="small"
style="float: right"
class="diy-button--white"
slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多<i
class="el-icon-arrow-down el-icon--right"></i></el-button>
</el-popover>
</div>
</div>
<div class="m-table-item">
<el-table ref="ref_table"
:data="tableData"
border
:height="tableHeight"
v-loading="tableLoading"
style="width: 100%"
:show-overflow-tooltip="true"
@select-all="selectAll"
@selection-change="selectionChange">
<el-table-column type="selection"
:selectable="checkSelect"
width="55">
<el-table ref="ref_table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
style="width: 100%" :show-overflow-tooltip="true" @select-all="selectAll" @selection-change="selectionChange">
<el-table-column type="selection" :selectable="checkSelect" width="55">
</el-table-column>
<el-table-column prop="neighborHoodName"
label="小区名称"
header-align="left"
align="left"
min-width="100">
<el-table-column prop="neighborHoodName" label="小区名称" header-align="left" align="left" min-width="100">
<template slot-scope="scope">
<a class="name-a"
@click="handleToNextLevel(scope.row)">
<a class="name-a" @click="handleToNextLevel(scope.row)">
{{ scope.row.neighborHoodName }}
</a>
</template>
</el-table-column>
<el-table-column prop="agencyName"
label="所属组织"
header-align="left"
align="left"
min-width="100">
<el-table-column prop="agencyName" label="所属组织" header-align="left" align="left" min-width="100">
</el-table-column>
<el-table-column prop="gridName"
label="所属网格"
header-align="left"
align="left"
min-width="120">
<el-table-column prop="gridName" label="所属网格" header-align="left" align="left" min-width="120">
</el-table-column>
<!-- <el-table-column prop="总单元数"
label="所属网格"
@ -242,75 +150,37 @@
label="所属网格"
min-width="80">
</el-table-column> -->
<el-table-column prop="address"
label="详细地址"
header-align="left"
align="left"
min-width="180">
<el-table-column prop="address" label="详细地址" header-align="left" align="left" min-width="180">
</el-table-column>
<el-table-column label="操作"
fixed="right"
width="220"
header-align="center"
align="center"
class="operate">
<el-table-column label="操作" fixed="right" width="220" header-align="center" align="center" class="operate">
<template slot-scope="scope">
<el-button type="text"
class="div-table-button--blue"
size="small"
<el-button type="text" class="div-table-button--blue" size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
class="div-table-button--blue"
size="small"
<el-button v-if="scope.row.showBtn" type="text" class="div-table-button--blue" size="small"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
class="div-table-button--blue"
size="small"
<el-button v-if="scope.row.showBtn" type="text" class="div-table-button--blue" size="small"
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
<!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'小区详情'"
width="920px"
top="5vh"
class="dialog-h"
@closed="detailFormCancle">
<community-detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></community-detail>
<el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'小区详情'"
width="920px" top="5vh" class="dialog-h" @closed="detailFormCancle">
<community-detail ref="ref_form_detail" @diaDetailClose="detailFormCancle"></community-detail>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="formShow"
v-if="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="670px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<community-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></community-form>
<el-dialog :visible.sync="formShow" v-if="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
:title="formTitle" width="670px" top="5vh" class="dialog-h" @closed="diaClose">
<community-form ref="ref_form" @dialogCancle="addFormCancle" @dialogOk="addFormOk"></community-form>
</el-dialog>
<!-- <el-dialog title="导出"
@ -334,23 +204,14 @@
</el-dialog> -->
<el-dialog :visible.sync="diyDialog"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="1150px"
title="导出模板"
top="5vh"
class="dialog-h">
<community-export-info v-if="diyDialog"
ref="ref_diy"
:list="exportList"
:search="{
<el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
title="导出模板" top="5vh" class="dialog-h">
<community-export-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="{
formCode: 'community_info',
pageNo: pageNo,
pageSize: pageSize,
}"
@close="handleDiyClose"></community-export-info>
}" @close="handleDiyClose"></community-export-info>
</el-dialog>
<baobiao ref="baobiao" />
@ -1039,7 +900,7 @@ export default {
title = "楼栋导入模板";
url = "/gov/org/building/exporttemplate";
} else if (type === "room") {
title = "房间导入模板";
title = "房屋导入模板";
url = "/gov/org/house/exporttemplate";
}

Write Preview
Loading…
Cancel
Save