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

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

feature
dai 3 years ago
parent
87bc798de5 b264ad0632
commit
a30a9f5d57
5 changed files with 64 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      src/views/components/resiForm.vue
  2. 3
      src/views/components/resiInfo.vue
  3. 18
      src/views/modules/base/community/communityExportInfo.vue
  4. 2
      src/views/modules/base/community/communityTable.vue
  5. 76
      src/views/modules/base/resi.vue

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

@ -1183,7 +1183,8 @@ export default {
oldSubsidy:''//高龄补助 oldSubsidy:''//高龄补助
}, },
specialDto:{//特殊人群 specialDto:{//特殊人群
specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开； id:'',//人群类别【字典表】,可多选，以英文逗号隔开；
specialCategoryCode:[]
}, },
birthRecordDTO:{ birthRecordDTO:{
birthplace: '', birthplace: '',
@ -1428,7 +1429,7 @@ export default {
}, },
async getResidentNation(){ async getResidentNation(){
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'}) const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'})
this.footerInputList.forEach(c => { this.footerInputList.forEach(c => {
for(let i of c.children){ for(let i of c.children){
if(i.formName == 'specialCategoryCode'){ if(i.formName == 'specialCategoryCode'){
@ -1617,103 +1618,106 @@ export default {
this.getHouseList() this.getHouseList()
}, },
async handleClick (tab, event) { async handleClick (tab, event) {
if (event.toElement.innerText == '教育') { console.log(tab);
console.log(event);
console.log(tab._props.label );
if (tab._props.label == '教育') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.eduInfoDto = this.form.eduInfoDto this.newForm.eduInfoDto = this.form.eduInfoDto
} else { } else {
await this.residentEduInfo(this.form.resiId) await this.residentEduInfo(this.form.resiId)
} }
} else if (event.toElement.innerText == '兴趣爱好') { } else if (tab._props.label == '兴趣爱好') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.hobbyInfoDto = this.form.hobbyInfoDto this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
} else { } else {
await this.residentHobbyInfo(this.form.resiId) await this.residentHobbyInfo(this.form.resiId)
} }
} else if (event.toElement.innerText == '宗教信仰') { } else if (tab._props.label == '宗教信仰') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.religionDto = this.form.religionDto this.newForm.religionDto = this.form.religionDto
} else { } else {
await this.residentReligion(this.form.resiId) await this.residentReligion(this.form.resiId)
} }
} else if (event.toElement.innerText == '健康') { } else if (tab._props.label == '健康') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.healthDto = this.form.healthDto this.newForm.healthDto = this.form.healthDto
} else { } else {
await this.getHealthInfoDetailById(this.form.resiId) await this.getHealthInfoDetailById(this.form.resiId)
} }
} else if (event.toElement.innerText == '工作') { } else if (tab._props.label == '工作') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.workInfoDto = this.form.workInfoDto this.newForm.workInfoDto = this.form.workInfoDto
} else { } else {
await this.residentWorkInfo(this.form.resiId) await this.residentWorkInfo(this.form.resiId)
} }
} else if (event.toElement.innerText == '经济情况') { } else if (tab._props.label == '经济情况') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.economyDto = this.form.economyDto this.newForm.economyDto = this.form.economyDto
} else { } else {
await this.getEconomyDetailById(this.form.resiId) await this.getEconomyDetailById(this.form.resiId)
} }
} else if (event.toElement.innerText == '居住') { } else if (tab._props.label == '居住') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.resideInfoDto = this.form.resideInfoDto this.newForm.resideInfoDto = this.form.resideInfoDto
} else { } else {
await this.getResideInfoDetailById(this.form.resiId) await this.getResideInfoDetailById(this.form.resiId)
} }
} else if (event.toElement.innerText == '家庭') { } else if (tab._props.label == '家庭') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.familyInfoDto = this.form.familyInfoDto this.newForm.familyInfoDto = this.form.familyInfoDto
} else { } else {
await this.getFamilyInfoDetailById(this.form.resiId) await this.getFamilyInfoDetailById(this.form.resiId)
} }
} else if (event.toElement.innerText == '出生人员') { } else if (tab._props.label == '出生人员') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.birthRecordDTO = this.form.birthRecordDTO this.newForm.birthRecordDTO = this.form.birthRecordDTO
} else { } else {
await this.residentBirthRecord(this.form.resiId) await this.residentBirthRecord(this.form.resiId)
} }
} else if (event.toElement.innerText == '党员信息') { } else if (tab._props.label == '党员信息') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.parymemberInfoDto = this.form.parymemberInfoDto this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
} else { } else {
await this.residentPartyMemberInfo(this.form.resiId) await this.residentPartyMemberInfo(this.form.resiId)
} }
} else if (event.toElement.innerText == '保障房信息') { } else if (tab._props.label == '保障房信息') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.ensureHouseDto = this.form.ensureHouseDto this.newForm.ensureHouseDto = this.form.ensureHouseDto
} else { } else {
await this.residentEnsureHouse(this.form.resiId) await this.residentEnsureHouse(this.form.resiId)
} }
} else if (event.toElement.innerText == '失业') { } else if (tab._props.label == '失业') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.unemployedDto = this.form.unemployedDto this.newForm.unemployedDto = this.form.unemployedDto
} else { } else {
await this.residentUnemployed(this.form.resiId) await this.residentUnemployed(this.form.resiId)
} }
} else if (event.toElement.innerText == '退役军人') { } else if (tab._props.label == '退役军人') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.veteranDto = this.form.veteranDto this.newForm.veteranDto = this.form.veteranDto
} else { } else {
await this.getVeteranDetailById(this.form.resiId) await this.getVeteranDetailById(this.form.resiId)
} }
} else if (event.toElement.innerText == '统战') { } else if (tab._props.label == '统战') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.unitedFrontDto = this.form.unitedFrontDto this.newForm.unitedFrontDto = this.form.unitedFrontDto
} else { } else {
await this.residentUnitedFront(this.form.resiId) await this.residentUnitedFront(this.form.resiId)
} }
} else if (event.toElement.innerText == '志愿者信息') { } else if (tab._props.label == '志愿者信息') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.volunteerDto = this.form.volunteerDto this.newForm.volunteerDto = this.form.volunteerDto
} else { } else {
await this.getVolunteerDetailById(this.form.resiId) await this.getVolunteerDetailById(this.form.resiId)
} }
} else if (event.toElement.innerText == '特殊人群') { } else if (tab._props.label == '特殊人群') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.specialDto = this.form.specialDto this.newForm.specialDto = this.form.specialDto
} else { } else {
await this.residentSpecial(this.form.resiId) await this.residentSpecial(this.form.resiId)
} }
} else if (event.toElement.innerText == '老年人') { } else if (tab._props.label == '老年人') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.oldPeopleDto = this.form.oldPeopleDto this.newForm.oldPeopleDto = this.form.oldPeopleDto
} else { } else {
@ -2311,6 +2315,8 @@ export default {
} }
this.newForm.eduInfoDto = this.form.eduInfoDto this.newForm.eduInfoDto = this.form.eduInfoDto
this.newForm.specialDto = this.form.specialDto
console.log(this.newForm.specialDto);
}, },
setJSON() { setJSON() {
this.newForm.agencyName = this.form.agencyName, this.newForm.agencyName = this.form.agencyName,
@ -2408,8 +2414,7 @@ export default {
if(this.newForm.oldPeopleDto) { if(this.newForm.oldPeopleDto) {
this.newForm.oldPeopleDto = this.form.oldPeopleDto this.newForm.oldPeopleDto = this.form.oldPeopleDto
} }
if(this.newForm.specialDto){
if(this.newForm.specialDto) {
this.newForm.specialDto = this.form.specialDto this.newForm.specialDto = this.form.specialDto
} }
} }

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

@ -1201,6 +1201,7 @@ export default {
}else if(tab.index == 14){ }else if(tab.index == 14){
this.getOldPeopleDetailById() this.getOldPeopleDetailById()
}else if(tab.index == 15){ }else if(tab.index == 15){
console.log(1);
this.getResidentNation() this.getResidentNation()
this.getresidentSpecial() this.getresidentSpecial()
}else if(tab.index == 16){ }else if(tab.index == 16){
@ -1424,7 +1425,7 @@ export default {
}}, }},
async getResidentNation(){ async getResidentNation(){
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'}) const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'})
this.specialDtoArr=data.data this.specialDtoArr=data.data
} catch (error) { } catch (error) {
console.log(error,'获取特殊人群字典'); console.log(error,'获取特殊人群字典');

18
src/views/modules/base/community/communityExportInfo.vue
View File

@ -335,7 +335,7 @@ export default {
searchForm: { ...this.search }, searchForm: { ...this.search },
exportConfig: { exportConfig: {
...this.form, ...this.form,
formCode: 'resi_base_info', formCode: 'community_info',
itemList: this.rightList.map(item => { itemList: this.rightList.map(item => {
return { return {
itemId: item.id, itemId: item.id,
@ -430,19 +430,11 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
data.forEach((item) => {
(async (id) => { return data
// item.queryItemList = await this.getExportChildList(id)
item.queryItemList = [];
})(item.id);
});
this.exportList = [...data];
this.$nextTick(() => {
this.diyDialog = true;
});
console.log("获取详情成功getExportList----", this.exportList);
} else { } else {
this.$message.error(msg); this.$message.error(msg)
} }
// if (code === 0) { // if (code === 0) {
// let dataTemp = [] // let dataTemp = []

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

@ -310,7 +310,7 @@
ref="ref_diy" ref="ref_diy"
:list="exportList" :list="exportList"
:search="{ :search="{
formCode: 'resi_base_info', formCode: 'community_info',
pageNo: pageNo, pageNo: pageNo,
pageSize: pageSize, pageSize: pageSize,
conditions: conditions, conditions: conditions,

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

@ -1,45 +1,9 @@
<template> <template>
<div class="g-main"> <div class="g-main">
<div class="m-search"> <div class="m-search">
<!-- <el-collapse v-if="openSearch" <section :class="showSercahStatus?'m-form-box-height-auto':'m-form-box-height'">
v-model="activeNames"> <resi-search ref="myResiSearch" />
<el-collapse-item v-for="item in searchList" </section>
:key="item.itemGroupId"
:name="item.itemGroupId">
<template slot="title">
<div class="collapse-title">{{ item.groupName }}</div>
</template>
<resi-search v-if="searchList.length > 0"
:ref="'resiSearch' + item.itemGroupId"
:form-list="item.queryItemList"
:column-name="defaultCategotyKey"
:show-grid="item.groupName == '基础信息'" />
</el-collapse-item>
</el-collapse> -->
<!-- <template v-else> -->
<!-- </template> -->
<!-- <el-row v-if="openSearch"
class="resi-search">
<el-col :span="24">
<el-button size="small"
class="diy-button--blue"
@click="handleSearchFrom">查询</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--gray"
@click="resetSearchForm">重置</el-button>
</el-col>
</el-row> -->
<!-- <div class="resi-down"
@click="handleOpenSearch">
<img v-if="openSearch"
src="../../../assets/img/arrow-up.png" />
<img v-else
src="../../../assets/img/arrow-down.png" />
</div> -->
<resi-search ref="myResiSearch" />
<el-row class="resi-search"> <el-row class="resi-search">
<el-col :span="24"> <el-col :span="24">
<el-button <el-button
@ -48,20 +12,29 @@
@click="handleSearchFrom" @click="handleSearchFrom"
>智能查询</el-button >智能查询</el-button
> >
<el-button
style="margin-left: 10px"
size="small"
plain
class=" f-right5"
@click="resetSearchForm"
>重置</el-button>
<el-button <el-button
size="small" size="small"
type="primary" type="primary"
@click="handleSearchFrom" @click="handleSearchFrom"
>查询</el-button >查询</el-button
> >
<!-- --> <el-button
<el-button type="text"
style="margin-left: 10px"
size="small" size="small"
plain style="margin-left: 10px"
class=" f-right5" class=" f-right5"
@click="resetSearchForm" @click="showSercahStatus = !showSercahStatus"
>重置</el-button> >
<i :class="showSercahStatus?'el-icon-arrow-up':'el-icon-arrow-down'"></i>
{{showSercahStatus?'收起':'展开'}}
</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -87,7 +60,14 @@
plain plain
>导出</el-button >导出</el-button
> >
<el-button
v-if="btnAuths.ic_resi_export"
style="margin-left: 10px"
size="small"
@click=""
plain
>核对</el-button
>
<!-- <el-button v-if="btnAuths.ic_resi_import" <!-- <el-button v-if="btnAuths.ic_resi_import"
style="margin-left:10px" style="margin-left:10px"
class="diy-button--blue" class="diy-button--blue"
@ -495,6 +475,7 @@ export default {
data() { data() {
return { return {
activeNames: [], activeNames: [],
showSercahStatus:false,
diyDialog: false, diyDialog: false,
openSearch: false, openSearch: false,
exportBtn: false, exportBtn: false,
@ -1175,6 +1156,7 @@ export default {
return return
} }
const _baseForm = JSON.parse(this.$refs.baseForm.submit_from()) const _baseForm = JSON.parse(this.$refs.baseForm.submit_from())
console.log(_baseForm);
_baseForm.partyFlag = parseInt(_baseForm.partyFlag) //党员 _baseForm.partyFlag = parseInt(_baseForm.partyFlag) //党员
_baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag) //低保 _baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag) //低保
_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag) //保障房 _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag) //保障房
@ -1234,6 +1216,7 @@ export default {
_baseForm.specialDto.specialCategoryCode = specialCategoryCode _baseForm.specialDto.specialCategoryCode = specialCategoryCode
} }
} }
console.log(_baseForm);
this.submitAdd(_baseForm); this.submitAdd(_baseForm);
}, },
handleDel(row) { handleDel(row) {
@ -1273,6 +1256,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
}, },
async submitAdd(arr) { async submitAdd(arr) {
console.log(arr);
this.btnLoading = true; this.btnLoading = true;
await this.$http await this.$http
.post(arr.resiId ? "actual/base/residentBaseInfo/update" : "/actual/base/residentBaseInfo/save", arr) .post(arr.resiId ? "actual/base/residentBaseInfo/update" : "/actual/base/residentBaseInfo/save", arr)

Write Preview
Loading…
Cancel
Save