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

Merge remote-tracking branch 'origin/dev_resi_search_width' into dev

test
jianjun 3 years ago
parent
74bc6bed1c b7536b00f2
commit
a30a8d0999
2 changed files with 469 additions and 300 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. 103
      src/views/components/resiSearch.vue
  2. 666
      src/views/modules/base/collect.vue

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

@ -4,6 +4,20 @@
<el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
<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="6">
<div class="resi-cell">
<div class="resi-cell-label">所属网格</div>
<div class="resi-cell-value">
@ -25,7 +39,7 @@
</el-select>
</div>
</div>
</el-col>
</el-col>-->
<el-col :span="18">
<div class="resi-cell">
<div class="resi-cell-label">所属房屋</div>
@ -173,6 +187,7 @@
size="small"
clearable
class="resi-cell-select"
:multiple="n.multiSelect == 1 ? true : false"
>
<el-option
v-for="item in n.options"
@ -271,7 +286,7 @@ export default {
})
let form = initForm(itemList, this.columnName)
let tempFormList = itemList.map(item => {
return {
...item,
isChange: this.columnName && this.columnName === item.columnName ? true : false
@ -285,6 +300,14 @@ export default {
UNIT_ID: '',
HOME_ID: ''
}
let orgOptionProps = {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
}
return {
pageLoading: false,
openSearch: false,
@ -293,10 +316,14 @@ export default {
optionsH: [],
optionsD: [],
optionsG: [],
orgOptions: [],
orgOptionProps,
agencyIdArray:[],
value: '',
itemList,
fixedList: [],
fixedForm: {
AGENCY_ID: '',
GRID_ID: '',
VILLAGE_ID: '',
BUILD_ID: '',
@ -306,6 +333,7 @@ export default {
constForm,
form: {
...form,
AGENCY_ID: '',
GRID_ID: '',
VILLAGE_ID: '',
BUILD_ID: '',
@ -343,6 +371,10 @@ export default {
}
}
]
},
queryType:{
'AGENCY_ID':'like'
}
}
},
@ -391,7 +423,7 @@ export default {
created() {
// this.initForm()
// console.log('formcccc---', this.form)
this.getOrgTreeList()
this.getGridList()
this.getValiheList()
if (this.columnName) this.handleChangeForm(this.columnName)
@ -428,11 +460,12 @@ export default {
}
} else if (typeof this.form[n] == 'object') this.form[n] = []
else this.form[n] = ''
}
// let arr3 = [...arr1, ...arr]
this.$emit('search', [])
// this.handleSearch()
this.orgOptions = [];
},
handleSearch() {
// console.log('formmmmm---', this.form)
@ -444,9 +477,9 @@ export default {
tableName: item.tableName,
columnName: item.columnName,
// columnValue: []
columnValue: this.form[item.columnName] &&
columnValue: this.form[item.columnName] &&
(itemTypes.includes(item.queryType) ||
itemTypes.includes(item.itemType)
itemTypes.includes(item.itemType) || item.multiSelect == 1
? this.form[item.columnName]
: [this.form[item.columnName].toString()])
}
@ -474,6 +507,28 @@ export default {
this.form.BIRTHDAY = [s, e]
}
},
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
if(obj.level === 'grid'){
this.form.GRID_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.form.AGENCY_ID=''
}else{
this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.form.GRID_ID = ''
}
}else{
this.form.AGENCY_ID=''
this.form.GRID_ID = ''
}
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getValiheList()
},
handleChangeGrid(val) {
console.log('val', val)
this.form.VILLAGE_ID = ''
@ -503,6 +558,7 @@ export default {
// 监听基础form
handleChangeForm(val) {
for (let n in this.fixedForm) {
if (n === val) {
if (this.fixedList.length > 0) {
let _item = {}
@ -515,7 +571,7 @@ export default {
console.log('fixedList----val', this.fixedList)
} else {
_item = {
queryType: 'equal',
queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
tableName: 'ic_resi_user',
columnName: val,
columnValue: [this.form[val]]
@ -527,7 +583,7 @@ export default {
if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
} else {
this.$set(this.fixedList, 0, {
queryType: 'equal',
queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
tableName: 'ic_resi_user',
columnName: val,
columnValue: [this.form[val]]
@ -540,6 +596,23 @@ export default {
if (item.columnName === val) item.isChange = true
})
},
getOrgTreeList() {
const { user } = this.$store.state
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取组织树成功', res.data)
this.orgOptions=[]
this.orgOptions .push( res.data)
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getGridList() {
const { user } = this.$store.state
this.$http
@ -561,7 +634,7 @@ export default {
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', {
gridId: this.form.GRID_ID,
agencyId: ''
agencyId: this.form.AGENCY_ID,
// agencyId: user.agencyId
})
.then(({ data: res }) => {
@ -626,10 +699,10 @@ export default {
})
},
computedBirth(age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth()+1;
let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth()+1;
let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
let subYear = nowYear - age
if(nowMonth < 10){
nowMonth = '0'+ nowMonth
@ -672,7 +745,7 @@ export default {
}
}
.resi-row-box {
height: 104px;
height: 214px;
overflow: hidden;
transition: height 0.5s;
}
@ -712,7 +785,7 @@ export default {
width: 200px;
}
.resi-cell--daterange {
max-width: 260px;
max-width: 235px;
}
.resi-cell-select {
width: 200px;

666
src/views/modules/base/collect.vue
View File

@ -1,144 +1,191 @@
<template>
<div class="resi-container">
<el-card ref="searchCard"
class="search-card">
<el-form ref="searchForm"
:inline="true"
:model="fmData"
class="demo-form-inline">
<el-form-item v-if="communityList.length > 0"
label="所在社区"
prop="orgId">
<el-select v-model.trim="fmData.orgId"
placeholder="所在社区"
size="small"
clearable
class="resi-cell-input">
<el-option v-for="item in communityList"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId">
<el-card ref="searchCard" class="search-card">
<el-form
ref="searchForm"
:inline="true"
:model="fmData"
class="demo-form-inline"
>
<el-form-item
v-if="communityList.length > 0"
label="所在社区"
prop="orgId"
>
<el-select
v-model.trim="fmData.orgId"
placeholder="所在社区"
size="small"
clearable
class="resi-cell-input"
>
<el-option
v-for="item in communityList"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="居住地址"
prop="address">
<el-input v-model="fmData.address"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
<el-form-item label="居住地址" prop="address">
<el-input
v-model="fmData.address"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item label="填写时间"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
clearable
size="small"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">
<el-form-item label="填写时间" prop="startTime">
<el-date-picker
v-model="timeRange"
type="daterange"
clearable
size="small"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="户籍地址"
prop="domicilePlace">
<el-input v-model="fmData.domicilePlace"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
<el-form-item label="户籍地址" prop="domicilePlace">
<el-input
v-model="fmData.domicilePlace"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
<el-button class="diy-button--reset"
size="small"
@click="resetForm('searchForm')">重置</el-button>
<el-button
class="diy-button--search"
size="small"
@click="handleSearch"
>查询</el-button
>
<el-button
class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
</el-form-item>
</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>
<el-button @click="handleChu" class="diy-button--reset" size="small"
>导出</el-button
>
</div>
<el-table :data="tableData"
border
style="width: 100%"
class="resi-table"
:height="tableHeight"
:span-method="arraySpanMethod">
<el-table-column label="序号"
prop="desc"
align="center"
width="50" />
<el-table-column prop="houseHolderName"
width="100"
label="户主姓名"
align="center" />
<el-table-column prop="address"
align="center"
min-width="140"
label="居住地址"
:show-overflow-tooltip="true" />
<el-table-column prop="houseType"
align="center"
width="100"
label="自有/租住">
<el-table
:data="tableData"
border
style="width: 100%"
class="resi-table"
:height="tableHeight"
:span-method="arraySpanMethod"
>
<el-table-column label="序号" prop="desc" align="center" width="50" />
<el-table-column
prop="houseHolderName"
width="100"
label="户主姓名"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="address"
align="center"
min-width="140"
label="居住地址"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="houseType"
align="center"
width="100"
label="自有/租住"
>
<template slot-scope="scope">
<span>
{{ scope.row.houseType == '1' ? '自有' : '租住' }}
</span>
<span v-if="scope.row.houseType == 1">出租</span>
<span v-if="scope.row.houseType == 2">闲置</span>
<span v-if="scope.row.houseType == 3">未售出</span>
<span v-if="scope.row.houseType == 0">自住</span>
</template>
</el-table-column>
<el-table-column prop="totalResi"
width="80"
align="center"
label="居住人数" />
<el-table-column prop="memberName"
width="100"
label="成员姓名"
align="center"
:show-overflow-tooltip="true" />
<el-table-column prop="memberIdNum"
width="180"
align="center"
label="成员身份证" />
<el-table-column prop="memberMobile"
width="140"
align="center"
label="成员手机号" />
<el-table-column prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数" />
<el-table-column
prop="totalResi"
width="80"
align="center"
label="居住人数"
/>
<el-table-column
prop="memberName"
width="100"
label="成员姓名"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberIdNum"
width="180"
align="center"
label="成员身份证"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberMobile"
width="140"
align="center"
label="成员手机号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数"
/>
<el-table-column prop="ymjz"
width="140"
align="center"
label="疫苗接种情况">
<el-table-column
prop="ymjz"
width="140"
align="center"
label="疫苗接种情况"
>
<template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span>
</template>
</el-table-column>
<el-table-column prop="domicilePlace"
min-width="140"
align="center"
label="户籍所在地 " />
<el-table-column prop="workPlace"
min-width="120"
align="center"
label="单位或学校 " />
<!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
<el-table-column
prop="domicilePlace"
min-width="140"
align="center"
label="户籍所在地"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="workPlace"
min-width="120"
align="center"
label="单位或学校 "
:show-overflow-tooltip="true"
/>
<el-table-column
prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button
@ -152,115 +199,152 @@
</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="parseInt(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="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="信息详情"
width="60%"
top="5vh"
class="dialog-h"
@closed="handleClose">
<div class="scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="dataForm"
:disabled="true"
class="form">
<el-form-item label="户主姓名:"
prop="houseHolderName"
label-width="150px">
<!-- <el-input class="item_width_1"
<el-dialog
:visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="信息详情"
width="1100px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<div class="scroll-h">
<el-form
ref="ref_form"
:inline="true"
:model="dataForm"
:disabled="true"
class="form"
>
<el-form-item
label="户主姓名:"
prop="houseHolderName"
label-width="150px"
>
<!-- <el-input class="item_width_1"
v-model="dataForm.houseHolderName">
</el-input> -->
<div class="wd50">{{ dataForm.houseHolderName }}</div>
</el-form-item>
<el-form-item label="居住地址:"
prop="address"
label-width="150px">
<!-- <el-input class="wd50" v-model="dataForm.address">
<div class="wd50">{{ dataForm.houseHolderName }}</div>
</el-form-item>
<el-form-item label="居住地址:" prop="address" label-width="150px">
<!-- <el-input class="wd50" v-model="dataForm.address">
</el-input> -->
<div class="wd50"> {{ dataForm.address }}</div>
</el-form-item>
<div>
<el-form-item label="自有/租住:"
prop="houseType"
label-width="150px">
<!-- <el-input class="item_width_1"
<div class="wd50">{{ dataForm.address }}</div>
</el-form-item>
<div>
<el-form-item
label="自有/租住:"
prop="houseType"
label-width="150px"
>
<!-- <el-input class="item_width_1"
v-model="dataForm.houseType">
</el-input> -->
<div class="wd50">{{ dataForm.houseType }}</div>
</el-form-item>
<el-form-item label="居住人数:"
prop="totalResi"
label-width="150px">
<!-- <el-input class="item_width_1"
<div class="wd50">{{ dataForm.houseType }}</div>
</el-form-item>
<el-form-item
label="居住人数:"
prop="totalResi"
label-width="150px"
>
<!-- <el-input class="item_width_1"
v-model="dataForm.totalResi">
</el-input> -->
<div class="wd50">{{ dataForm.totalResi }}</div>
</el-form-item>
</div>
</el-form>
<el-table :data="dataForm.list"
border
style="width: 100%"
class="resi-table"
:height="tableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50" />
<el-table-column prop="memberName"
width="100"
label="成员姓名"
align="center"
:show-overflow-tooltip="true" />
<el-table-column prop="memberIdNum"
width="180"
align="center"
label="成员身份证" />
<el-table-column prop="memberMobile"
width="140"
align="center"
label="成员手机号" />
<el-table-column prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数" />
<div class="wd50">{{ dataForm.totalResi }}</div>
</el-form-item>
</div>
</el-form>
<el-table
:data="dataForm.list"
border
style="width: 1060px; margin: 20px"
class="resi-table"
:height="tableHeight"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column
prop="memberName"
width="100"
label="成员姓名"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberIdNum"
width="180"
align="center"
label="成员身份证"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberMobile"
width="140"
align="center"
label="成员手机号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数"
/>
<el-table-column prop="ymjz"
width="140"
align="center"
label="疫苗接种情况">
<template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span>
</template>
</el-table-column>
<el-table-column prop="domicilePlace"
min-width="140"
align="center"
label="户籍所在地 " />
<el-table-column prop="workPlace"
min-width="120"
align="center"
label="单位或学校 " />
<!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
</el-table>
</div>
<el-table-column
prop="ymjz"
width="140"
align="center"
label="疫苗接种情况"
>
<template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span>
</template>
</el-table-column>
<el-table-column
prop="domicilePlace"
min-width="140"
align="center"
label="户籍所在地 "
:show-overflow-tooltip="true"
/>
<el-table-column
prop="workPlace"
min-width="120"
align="center"
label="单位或学校 "
:show-overflow-tooltip="true"
/>
<el-table-column
prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true"
>
</el-table-column>
</el-table>
</div>
</el-dialog>
</div>
</template>
@ -272,7 +356,7 @@ import { mapGetters } from "vuex";
import axios from "axios";
export default {
data () {
data() {
return {
openSearch: false,
@ -284,13 +368,13 @@ export default {
total: 1,
tableData: [],
timeRange: '',
timeRange: "",
fmData: {
orgId: '',
orgId: "",
startTime: "",
endTime: "",
address: '',
domicilePlace: ''
address: "",
domicilePlace: "",
},
dataForm: {},
communityList: [],
@ -300,15 +384,15 @@ export default {
};
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight () {
const h = this.clientHeight - 360 + this.iframeHeigh
const _h = this.clientHeight - 360
return this.$store.state.inIframe ? h : _h
}
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() {
const h = this.clientHeight - 360 + this.iframeHeigh;
const _h = this.clientHeight - 360;
return this.$store.state.inIframe ? h : _h;
},
},
watch: {
timeRange (val) {
timeRange(val) {
if (Array.isArray(val) && val.length == 2) {
this.fmData.startTime = val[0];
this.fmData.endTime = val[1];
@ -318,32 +402,39 @@ export default {
}
},
},
mounted () {
this.getcommunityList()
mounted() {
this.getcommunityList();
this.getTableData();
},
methods: {
arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log('row-----r', row)
// console.log('column-----c', column)
if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
let index = this.spanIndex.findIndex(item => item.firstIndex === rowIndex)
if (
columnIndex === 0 ||
columnIndex === 1 ||
columnIndex === 2 ||
columnIndex === 3 ||
columnIndex === 4
) {
let index = this.spanIndex.findIndex(
(item) => item.firstIndex === rowIndex
);
if (index > -1) {
return {
rowspan: this.spanIndex[index].len,
colspan: 1
colspan: 1,
};
} else {
return {
rowspan: 0,
colspan: 0
colspan: 0,
};
}
}
},
async handleChu () {
const url =
"/epmetuser/icresicollect/export";
async handleChu() {
const url = "/epmetuser/icresicollect/export";
const { pageSize, pageNo, fmData } = this;
axios({
url: window.SITE_CONFIG["apiURL"] + url,
@ -376,33 +467,33 @@ export default {
return this.$message.error("网络错误");
});
},
handleSizeChange (val) {
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getTableData();
},
handleCurrentChange (val) {
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
handleClose () {
handleClose() {
this.formShow = false;
},
handleSearch (val) {
handleSearch(val) {
console.log(this.fmData);
this.pageNo = 1;
this.getTableData();
},
resetForm (formName) {
this.$refs[formName].resetFields()
this.timeRange = ''
this.handleSearch()
resetForm(formName) {
this.$refs[formName].resetFields();
this.timeRange = "";
this.handleSearch();
},
async handleWatch (row) {
async handleWatch(row) {
// this.formShow = true;
await nextTick();
const url = "/epmetuser/icresicollect/detail";
@ -412,8 +503,11 @@ export default {
});
if (code === 0) {
console.log('data----de', data)
this.dataForm = { ...data, houseType: data.houseType == '1' ? '自有' : '租住' }
console.log("data----de", data);
this.dataForm = {
...data,
houseType: data.houseType == "1" ? "自有" : "租住",
};
// this.getTableData();
this.formShow = true;
} else {
@ -421,17 +515,17 @@ export default {
}
},
async handleEdit (rowIndex) {
async handleEdit(rowIndex) {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
},
handleEditSuccess () {
handleEditSuccess() {
this.handleClose();
this.getTableData();
},
async handleDel (rowData, rowIndex) {
async handleDel(rowData, rowIndex) {
console.log(rowData, rowIndex);
const url =
"/heart/iccommunityselforganization/delcommunityselforganization";
@ -448,19 +542,17 @@ export default {
this.$message.success("操作失败！");
}
},
async getcommunityList () {
const url =
"/gov/org/agency/community-list";
async getcommunityList() {
const url = "/gov/org/agency/community-list";
const { data, code, msg } = await requestPost(url);
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
this.communityList = data
this.communityList = data;
} else {
}
},
async getTableData () {
const url =
"/epmetuser/icresicollect/list";
async getTableData() {
const url = "/epmetuser/icresicollect/list";
const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
@ -470,47 +562,51 @@ export default {
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
this.total = data.total || 0;
let _i = 0
let arr = []
this.spanIndex = data.list && data.list.map((item, index) => {
if (index == 0) _i = 0
else _i = _i + data.list[index - 1].list.length
arr.push(_i)
console.log('_i-----', _i, arr)
// if (index === data.list.length - 1) firstIndex = _i - item.list.length
return {
firstIndex: _i,
len: item.list.length
}
})
this.tableData = data.list && this.formatArr(data.list)
console.log('tableData----0', this.spanIndex)
let _i = 0;
let arr = [];
this.spanIndex =
data.list &&
data.list.map((item, index) => {
if (index == 0) _i = 0;
else _i = _i + data.list[index - 1].list.length;
arr.push(_i);
console.log("_i-----", _i, arr);
// if (index === data.list.length - 1) firstIndex = _i - item.list.length
return {
firstIndex: _i,
len: item.list.length,
};
});
this.tableData = data.list && this.formatArr(data.list);
console.log("tableData----0", this.spanIndex);
} else {
}
},
// 数组扁平化
formatArr (arr) {
let res = []
formatArr(arr) {
let res = [];
let arr1 = arr.map((n, index) => {
return {
...n,
list: n.list.length > 0 ? n.list.map(i => {
return {
...n,
...i,
desc: index + 1,
list: []
}
}) : []
}
})
arr1.forEach(item => {
list:
n.list.length > 0
? n.list.map((i) => {
return {
...n,
...i,
desc: index + 1,
list: [],
};
})
: [],
};
});
arr1.forEach((item) => {
if (item.list && item.list.length > 0) {
res = res.concat(this.formatArr(item.list))
} else res.push(item)
})
return res
res = res.concat(this.formatArr(item.list));
} else res.push(item);
});
return res;
},
},
};

Write Preview
Loading…
Cancel
Save