Browse Source

总之人群

feature
dai 3 years ago
parent
commit
d7dd03cec0
  1. 874
      src/views/modules/base/huji/immigration/index.vue
  2. 3
      src/views/modules/home/notice.vue
  3. 608
      src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue

874
src/views/modules/base/huji/immigration/index.vue

File diff suppressed because it is too large

3
src/views/modules/home/notice.vue

@ -97,11 +97,12 @@ export default {
async read(item, index) {
if (item && item.readFlag == 1) return;
const url = "/message/intelligentMessage/msg/clear?id=" + item.id;
const url = "/message/intelligentMessage/msg/clear";
let params = {};
if (item.id) {
params.id = item.id;
url += "?id=" + item.id;
}
const { data, code, msg } = await requestPost(url, params);

608
src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue

@ -1,43 +1,47 @@
<template>
<div class="resi-container">
<el-card ref="searchCard"
class="search-card">
<el-form ref="searchForm"
<div class="g-main">
<div ref="searchCard" class="m-search">
<el-form
ref="searchForm"
:inline="true"
:model="fmData"
:label-width="'100px'"
class="demo-form-inline">
<div>
<el-form-item prop="category"
label="居民类别">
class="demo-form-inline"
>
<el-form-item prop="categoryKey" label="居民类别">
<div class="resi-cell-value">
<el-form-item prop="category">
<el-select v-model="fmData.category"
<el-form-item prop="categoryKey">
<el-select
v-model="fmData.categoryKey"
placeholder="请选择居民类别"
size="small"
clearable
class="resi-cell-select">
<el-option v-for="(item,index) in jmlbOptions"
@click.native="handleChangeJmlb(index)"
class="u-item-width-normal"
>
<el-option
v-for="item in jmlbOptions"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</div>
</el-form-item>
<el-form-item prop="gridId"
label="所属组织">
<el-form-item prop="gridId" label="所属组织">
<div class="resi-cell-value">
<el-cascader class="customer_cascader"
<el-cascader
class="u-item-width-normal"
ref="myCascader"
clearable
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
@change="handleChangeAgency"
></el-cascader>
</div>
</el-form-item>
<!-- <el-form-item prop="gridId" label="所属网格">
@ -65,223 +69,290 @@
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select v-model.trim="fmData.villageId"
<el-select
v-model.trim="fmData.villageId"
placeholder="请选择小区"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeV">
<el-option v-for="item in optionsV"
class="u-item-width-communitycascader"
@change="handleChangeV"
>
<el-option
v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select v-model.trim="fmData.buildId"
<el-select
v-model.trim="fmData.buildId"
placeholder="楼号"
size="small"
clearable
:disabled="changeVDisabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB">
<el-option v-for="item in optionsB"
class="u-item-width-buildcascader"
@change="handleChangeB"
>
<el-option
v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select v-model.trim="fmData.unitId"
<el-select
v-model.trim="fmData.unitId"
placeholder="单元"
size="small"
clearable
:disabled="changeBDisabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD">
<el-option v-for="item in optionsD"
class="u-item-width-buildcascader"
@change="handleChangeD"
>
<el-option
v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select v-model.trim="fmData.homeId"
<el-select
v-model.trim="fmData.homeId"
placeholder="房号"
size="small"
clearable
:disabled="changeDDisabled"
class="resi-cell-select resi-cell-select-middle">
<el-option v-for="item in optionsH"
class="u-item-width-buildcascader"
>
<el-option
v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form-item>
</div>
<div>
<el-form-item label="姓名"
prop="name">
<el-input v-model="fmData.name"
class="resi-cell-input"
<el-form-item label="姓名" prop="name">
<el-input
v-model="fmData.name"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="fmData.mobile"
class="resi-cell-input"
<!-- <el-form-item label="手机号" prop="mobile">
<el-input
v-model="fmData.mobile"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
placeholder="请输入"
>
</el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="fmData.idCard"
class="resi-cell-input"
<el-form-item label="证件号" prop="idNum">
<el-input
v-model="fmData.idNum"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search"
<div class="u-search-btn">
<el-button
class="diy-button--white"
size="small"
@click="handleSearch">查询</el-button>
<el-button class="diy-button--reset"
@click="resetForm('searchForm')"
>重置</el-button
>
<el-button
class="diy-button--blue"
size="small"
@click="resetForm('searchForm')">重置</el-button>
</el-form-item>
@click="handleSearch"
>查询</el-button
>
</div>
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button @click="handleChu"
class="diy-button--reset"
size="small">导出</el-button>
</div>
<el-table :data="tableData"
<div class="m-table">
<div class="u-table-btn1">
<el-button
@click="handleChu"
class="diy-button--white"
size="small"
>导出</el-button
>
</div>
<div class="m-table-item">
<el-table
:data="tableData"
border
style="width: 100%"
class="resi-table"
:height="tableHeight">
<el-table-column label="序号"
:height="tableHeight"
>
<el-table-column
label="序号"
fixed="left"
type="index"
align="center"
width="50" />
width="50"
/>
<el-table-column prop="GRID_ID"
<el-table-column
prop="gridName"
align="center"
label="所属网格"
min-width="160"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="HOME_ID"
<el-table-column
prop="homeName"
label="所属房屋"
align="center"
min-width="160"
:show-overflow-tooltip="true" />
:show-overflow-tooltip="true"
/>
<el-table-column prop="NAME"
<el-table-column
prop="name"
align="center"
label="姓名"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="MOBILE"
<el-table-column
prop="mobile"
width="140"
align="center"
label="手机"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="GENDER"
<el-table-column
prop="gender"
align="center"
width="60"
label="性别">
label="性别"
>
<template slot-scope="scope">
<span v-if="scope.row.gender == 1"></span>
<span v-if="scope.row.gender == 2"></span>
</template>
</el-table-column>
<el-table-column prop="ID_CARD"
<el-table-column
prop="idNum"
align="center"
min-width="160"
label="证件号"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="BIRTHDAY"
<el-table-column
prop="birthday"
align="center"
label="出生日期"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="zhzlCategoryName"
<el-table-column
prop="categoryName"
align="center"
label="类别"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="REMARKS"
<el-table-column
prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column fixed="right"
<el-table-column
fixed="right"
label="操作"
align="center"
width="120">
width="120"
>
<template slot-scope="scope">
<el-button @click="handleWatch(scope.$index)"
<el-button
@click="handleWatch(scope.$index)"
type="text"
size="small">查看</el-button>
size="small"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<div>
<el-pagination @size-change="handleSizeChange"
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total">
:total="total"
>
</el-pagination>
</div>
</el-card>
</div>
<people-more v-if="showedPeopleMoreInfo && currentPepeleId"
:userId="currentPepeleId"
:gridName="currentPepeleGridName"
@close="showedPeopleMoreInfo = false" />
<resi-info
v-if="showedResiInfo && currentResiId"
:resi-id="currentResiId"
@close="showedResiInfo = false"
/>
<el-dialog :visible.sync="diyDialog"
<el-dialog
:visible.sync="diyDialog"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="1150px"
top="5vh"
class="dialog-h">
<diy-info v-if="diyDialog"
class="dialog-h"
>
<diy-info
v-if="diyDialog"
ref="ref_diy"
:list="exportList"
:search="computeQueryParams()"
@close="diyDialog = false"></diy-info>
@close="diyDialog = false"
></diy-info>
</el-dialog>
</div>
</template>
@ -290,15 +361,14 @@
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import diyInfo from "@/views/modules/base/diyInfo.vue";
import resiInfo from "@/views/modules/cpts/resi/info";
export default {
props: {
props: {},
},
components: { resiInfo, diyInfo },
components: { peopleMore, diyInfo },
data() {
return {
openSearch: false,
@ -321,10 +391,10 @@ export default {
jmlbOptions: [],
orgOptionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
value: "agencyId",
label: "agencyName",
children: "subAgencyList",
checkStrictly: true,
},
agencyIdArray: [],
@ -348,8 +418,8 @@ export default {
homeId: "",
name: "",
mobile: "",
idCard: "",
category: "",
idNum: "",
categoryKey: "",
},
rangeTime: [],
@ -357,15 +427,13 @@ export default {
tableHeight: 0,
//
showedPeopleMoreInfo: false,
showedResiInfo: false,
currentPepeleId: "",
currentResiId: "",
currentPepeleGridName: "",
diyDialog: false,
exportList: [],
elseParams: [],
};
},
computed: {
@ -415,16 +483,15 @@ export default {
this.getGridList();
this.getValiheList();
this.getTableData();
this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
this.searchH = this.$refs.searchCard.offsetHeight + 270;
console.log("searchH----", this.$refs.searchCard.offsetHeight);
},
methods: {
async handleWatch(rowIndex) {
let item = this.tableData[rowIndex];
this.currentPepeleId = item.icResiUserId;
this.currentPepeleGridName = item.GRID_ID;
this.currentResiId = item.resiId;
await nextTick();
this.showedPeopleMoreInfo = true;
this.showedResiInfo = true;
},
handleClearVillage() {
@ -466,73 +533,38 @@ export default {
this.fmData.homeId = "";
this.getHouseList();
},
handleChangeJmlb (index) {
// debugger
let selItem = this.jmlbOptions[index]
this.elseParams = []
let temp = {
queryType: selItem.queryType,
tableName: selItem.tableName,
columnName: selItem.columnName,
columnValue: [selItem.columnValue],
}
this.elseParams.push(temp)
},
async getJmlb() {
const url = '/data/aggregator/coverage/zhzl-category-option'
let params = {}
const url = "/actual/base/residentSpecial/zhzl-category-option";
let params = {};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.jmlbOptions = []
this.jmlbOptions = data
this.jmlbOptions = [];
this.jmlbOptions = data;
if (this.jmlbOptions.length > 0) {
this.fmData.category = 'anzhibangjiao'
// let temp = {
// queryType: this.jmlbOptions[0].queryType,
// tableName: this.jmlbOptions[0].tableName,
// columnName: this.jmlbOptions[0].columnName,
// columnValue: [this.jmlbOptions[0].columnValue],
// }
let temp = {
queryType: 'list_equal',
tableName: 'ic_special',
columnName: 'SPECIAL_RQLB',
columnValue: ["anzhibangjiao"],
this.fmData.categoryKey = data[0].value;
}
this.elseParams.push(temp)
}
} else {
this.$message.error(msg)
this.$message.error(msg);
}
},
getOrgTreeList() {
const { user } = this.$store.state
const { user } = this.$store.state;
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.post("/gov/org/customeragency/agencygridtree", {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取组织树成功', res.data)
this.orgOptions = []
this.orgOptions.push(res.data)
console.log("获取组织树成功", res.data);
this.orgOptions = [];
this.orgOptions.push(res.data);
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
getGridList() {
@ -610,7 +642,9 @@ export default {
},
getHouseList() {
this.$http
.post("/actual/base/communityHouse/houseoption", { unitId: this.fmData.unitId })
.post("/actual/base/communityHouse/houseoption", {
unitId: this.fmData.unitId,
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
@ -646,7 +680,7 @@ export default {
},
resetForm(formName) {
// this.$refs[formName].resetFields();
this.agencyIdArray = []
this.agencyIdArray = [];
this.fmData = {
agencyId: "",
gridId: "",
@ -656,145 +690,51 @@ export default {
homeId: "",
name: "",
mobile: "",
idCard: "",
}
this.elseParams = []
idNum: "",
};
if (this.jmlbOptions.length > 0) {
this.fmData.category = this.jmlbOptions[0].value
let temp = {
queryType: this.jmlbOptions[0].queryType,
tableName: this.jmlbOptions[0].tableName,
columnName: this.jmlbOptions[0].columnName,
columnValue: [this.jmlbOptions[0].columnValue],
}
this.elseParams.push(temp)
this.fmData.categoryKey = this.jmlbOptions[0].value;
}
this.handleSearch();
},
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
if (obj) {
if (obj.level === 'grid') {
this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.fmData.agencyId = ''
if (obj.level === "grid") {
this.fmData.gridId =
this.agencyIdArray.length > 0
? this.agencyIdArray[this.agencyIdArray.length - 1]
: "";
this.fmData.agencyId = "";
} else {
this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.fmData.gridId = ''
this.fmData.agencyId =
this.agencyIdArray.length > 0
? this.agencyIdArray[this.agencyIdArray.length - 1]
: "";
this.fmData.gridId = "";
}
} else {
this.fmData.agencyId = ''
this.fmData.gridId = ''
this.fmData.agencyId = "";
this.fmData.gridId = "";
}
this.fmData.villageId = ''
this.fmData.buildId = ''
this.fmData.unitId = ''
this.fmData.homeId = ''
this.getValiheList()
this.fmData.villageId = "";
this.fmData.buildId = "";
this.fmData.unitId = "";
this.fmData.homeId = "";
this.getValiheList();
},
computeQueryParams() {
const { pageSize, pageNo, elseParams, fmData } = this;
let conditions = []
if (fmData.agencyId) {
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "AGENCY_ID",
columnValue: [fmData.agencyId],
})
}
if (fmData.gridId) {
conditions.push(
{
queryType: "equal",
tableName: "ic_resi_user",
columnName: "GRID_ID",
columnValue: [fmData.gridId],
}
)
}
if (fmData.villageId) {
conditions.push(
{
queryType: "equal",
tableName: "ic_resi_user",
columnName: "VILLAGE_ID",
columnValue: [fmData.villageId],
}
)
}
if (fmData.buildId) {
conditions.push({
queryType: "equal",
tableName: "ic_resi_user",
columnName: "BUILD_ID",
columnValue: [fmData.buildId],
})
}
if (fmData.unitId) {
conditions.push({
queryType: "equal",
tableName: "ic_resi_user",
columnName: "UNIT_ID",
columnValue: [fmData.unitId],
})
}
if (fmData.homeId) {
conditions.push({
queryType: "equal",
tableName: "ic_resi_user",
columnName: "HOME_ID",
columnValue: [fmData.homeId],
})
}
if (fmData.name) {
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "NAME",
columnValue: [fmData.name],
})
}
if (fmData.mobile) {
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "MOBILE",
columnValue: [fmData.mobile],
})
}
if (fmData.idCard) {
conditions.push({
queryType: "like",
tableName: "ic_resi_user",
columnName: "ID_CARD",
columnValue: [fmData.idCard],
})
}
const { pageSize, pageNo, fmData } = this;
return {
formCode: "resi_base_info",
pageSize,
pageNo,
conditions: [
...conditions,
...elseParams,
],
...fmData,
};
},
@ -828,7 +768,7 @@ export default {
},
async getTableData() {
const url = "/epmetuser/icresiuser/listresi-zhzl";
const url = "/actual/base/residentSpecial/page-zongzhirenqun";
const { data, code, msg } = await requestPost(url, {
...this.computeQueryParams(),
});
@ -848,85 +788,5 @@ export default {
</script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.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 {
::v-deep .el-button--text {
text-decoration: underline;
}
}
.resi-card-table {
margin-top: 20px;
}
.resi-row-btn {
margin-bottom: 13px;
.upload-btn {
display: inline-block;
margin: 0 10px;
}
}
.resi-btns {
margin-top: 20px;
text-align: center;
}
.resi-container .resi-card {
position: relative;
overflow: visible;
}
.demo-form-inline {
// display: flex;
// align-items: center;
// margin-bottom: 20px;
.resi-cell-label {
flex-shrink: 0;
min-width: 0;
box-sizing: border-box;
margin-right: 15px;
// text-align: right;
// line-height: 32;
}
.resi-cell-label1 {
width: max-content;
}
.resi-cell-value-radio {
display: flex;
align-items: center;
min-height: 32px;
}
.resi-cell-input {
width: 200px;
}
.resi-cell--daterange {
max-width: 260px;
}
.resi-cell-select {
width: 200px;
box-sizing: border-box;
margin-right: 10px;
&-middle {
width: 120px;
}
&-small {
width: 88px;
}
}
.resi-cell-select:last-child {
margin-right: 0;
}
}
.mt10 {
margin-top: 10px;
}
@import "@/assets/scss/modules/management/list-main.scss";
</style>

Loading…
Cancel
Save