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

搜索

V1.0
马魁 3 years ago
parent
1a1a49c2b8
commit
c650d900ee
4 changed files with 307 additions and 324 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. 4
      src/assets/scss/modules/management/list-main.scss
  2. 211
      src/views/components/resiForm.vue
  3. 251
      src/views/components/resiSearch.vue
  4. 165
      src/views/modules/base/resi.vue

4
src/assets/scss/modules/management/list-main.scss
View File

@ -38,6 +38,10 @@
.u-item-width-communitycascader{ .u-item-width-communitycascader{
width: 141px; width: 141px;
} }
// 查询栏人防年龄两个输入框
.u-item-width-resiAge{
width: 67px;
}
.u-item-width-buildcascader{ .u-item-width-buildcascader{
width: 96px; width: 96px;
} }

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

@ -1,7 +1,7 @@
<template> <template>
<div <div
class="g-main "> class="g-main ">
<el-form <el-form
class="resi-form m-search" class="resi-form m-search"
:model="form" :model="form"
ref="formId" ref="formId"
@ -20,7 +20,7 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属房屋" <el-form-item label="所属房屋"
label-width="100px"> label-width="100px">
@ -81,8 +81,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-for="(item,index) in basicInformation" :label-width="'100px'" :label="item.label" :key="index" :class="item.itemType=='textarea'?'textareaDidth':''" :rules="item.rules" :prop="item.formName" > <el-form-item v-for="(item,index) in basicInformation" :label-width="'100px'" :label="item.label" :key="index" :class="item.itemType=='textarea'?'textareaDidth':''" :rules="item.rules" :prop="item.formName" >
@ -99,7 +99,7 @@
</section> </section>
</template> </template>
<template v-if="item.itemType == 'input'" > <template v-if="item.itemType == 'input'" >
<el-input <el-input
clearable clearable
size="small" size="small"
:placeholder="`请输入${item.label}`" :placeholder="`请输入${item.label}`"
@ -116,7 +116,7 @@
clearable clearable
class="u-item-width-normal"> class="u-item-width-normal">
<el-option v-for="items in item.opction " <el-option v-for="items in item.opction "
:key="items.value" :key="items.value"
:label="items.label" :label="items.label"
:value="items.value"> :value="items.value">
@ -133,17 +133,17 @@
resize="none" resize="none"
rows="3" rows="3"
v-model.trim="form[item.formName]" v-model.trim="form[item.formName]"
> >
</el-input> </el-input>
</template> </template>
<template v-else-if="item.itemType == 'checkbox'" :label="item.label"> <template v-else-if="item.itemType == 'checkbox'" :label="item.label">
<el-checkbox v-for="(items,indexs) in item.opction" style="width:70px" :key="indexs" :label="items.label" :true-label="'1'" :false-label="'0'" <el-checkbox v-for="(items,indexs) in item.opction" style="width:70px" :key="indexs" :label="items.label" :true-label="'1'" :false-label="'0'"
size="small" size="small"
v-model="form[items.formName]" v-model="form[items.formName]"
@change="val => handleChangeCheckbox(val,items)" @change="val => handleChangeCheckbox(val,items)"
> >
</el-checkbox> </el-checkbox>
</template> </template>
<template v-else-if="item.itemType == 'datepicker'" :label="item.label"> <template v-else-if="item.itemType == 'datepicker'" :label="item.label">
<el-date-picker <el-date-picker
@ -157,7 +157,7 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</template> </template>
</el-form-item> </el-form-item>
<!-- 这里开始就是底部的input了-------------------------------------------------------------------> <!-- 这里开始就是底部的input了------------------------------------------------------------------->
<el-tabs v-model="activeName" <el-tabs v-model="activeName"
@ -171,7 +171,7 @@
<el-form-item v-for="(itemk,index) in itemj.children" :key="index" label-width="100px" :label="itemk.label" :class="itemk.itemType=='textarea'?'textareaDidth':''" > <el-form-item v-for="(itemk,index) in itemj.children" :key="index" label-width="100px" :label="itemk.label" :class="itemk.itemType=='textarea'?'textareaDidth':''" >
<template v-if="itemk.itemType == 'radio1'" > <template v-if="itemk.itemType == 'radio1'" >
<section class="u-item-width-normal" > <section class="u-item-width-normal" >
<el-radio <el-radio
v-for="ns in itemk.opction" v-for="ns in itemk.opction"
:key="ns.value" :key="ns.value"
size="small" size="small"
@ -187,7 +187,7 @@
v-model="form[itemj.id][itemk.formName]" v-model="form[itemj.id][itemk.formName]"
:placeholder="`请选择${itemk.label}`" :placeholder="`请选择${itemk.label}`"
size="small" size="small"
:multiple="itemk.formName=='specialCategoryCode'" :multiple="itemk.formName=='specialCategoryCode'"
:collapse-tags="itemk.formName=='specialCategoryCode'" :collapse-tags="itemk.formName=='specialCategoryCode'"
clearable clearable
class="u-item-width-normal"> class="u-item-width-normal">
@ -195,9 +195,9 @@
:key="items.value" :key="items.value"
:label="items.label" :label="items.label"
:value="items.value"> :value="items.value">
</el-option> </el-option>
</el-select> </el-select>
</template> </template>
<template v-else-if="itemk.itemType=='textarea1'" > <template v-else-if="itemk.itemType=='textarea1'" >
<el-input <el-input
@ -223,13 +223,13 @@
</el-input> </el-input>
</template> </template>
<template v-else-if="itemk.itemType=='checkbox'" > <template v-else-if="itemk.itemType=='checkbox'" >
<el-checkbox-group <el-checkbox-group
size="small" size="small"
v-model="form[itemj.id][itemk.formName]" v-model="form[itemj.id][itemk.formName]"
> >
<el-checkbox v-for="items in itemk.opction" :label="items.label != itemk.label? items.label :''" :style="{'margin-right':items.label != itemk.label? '' :'19px'}" :key="items.label" ></el-checkbox> <el-checkbox v-for="items in itemk.opction" :label="items.label != itemk.label? items.label :''" :style="{'margin-right':items.label != itemk.label? '' :'19px'}" :key="items.label" ></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</template> </template>
<template v-else-if="itemk.itemType == 'datepicker1'"> <template v-else-if="itemk.itemType == 'datepicker1'">
<el-date-picker <el-date-picker
@ -257,7 +257,7 @@
</template> </template>
</el-form-item> </el-form-item>
</section> </section>
</template> </template>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-form> </el-form>
@ -303,7 +303,7 @@ export default {
formName:"name", formName:"name",
rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}], rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
opction:[ opction:[
], ],
}, },
{ {
@ -311,7 +311,7 @@ export default {
itemType:"input", itemType:"input",
formName:"mobile", formName:"mobile",
opction:[ opction:[
], ],
}, },
{ {
@ -328,7 +328,7 @@ export default {
},trigger:'change' | blur } },trigger:'change' | blur }
], ],
opction:[ opction:[
], ],
},{ },{
label:"性别", label:"性别",
@ -366,7 +366,7 @@ export default {
itemType:"select1", itemType:"select1",
formName:"cultureLevel", formName:"cultureLevel",
opction:[ opction:[
]}, ]},
{ {
label:"备注", label:"备注",
@ -411,7 +411,7 @@ export default {
itemType:"input1", itemType:"input1",
formName:"religion", formName:"religion",
opction:[ opction:[
]}, ]},
{ {
label:"备注", label:"备注",
@ -485,28 +485,28 @@ export default {
itemType:"select1", itemType:"select1",
formName:"illnessCode", formName:"illnessCode",
opction:[ opction:[
]}, ]},
{ {
label:"大病患病时间", label:"大病患病时间",
itemType:"datepicker1", itemType:"datepicker1",
formName:"illnessTime", formName:"illnessTime",
opction:[ opction:[
]}, ]},
{ {
label:"所患慢性病", label:"所患慢性病",
itemType:"select1", itemType:"select1",
formName:"chronicDiseaseCode", formName:"chronicDiseaseCode",
opction:[ opction:[
]}, ]},
{ {
label:"慢病患病时间", label:"慢病患病时间",
itemType:"datepicker1", itemType:"datepicker1",
formName:"chronicDiseaseTime", formName:"chronicDiseaseTime",
opction:[ opction:[
]}, ]},
{ {
label:"是否参保", label:"是否参保",
@ -533,7 +533,7 @@ export default {
itemType:"datepicker1", itemType:"datepicker1",
formName:"deliveranceTime", formName:"deliveranceTime",
opction:[ opction:[
]}, ]},
{ {
label:"享受救助明细序号", label:"享受救助明细序号",
@ -555,7 +555,7 @@ export default {
itemType:"input1", itemType:"input1",
formName:"workUnit", formName:"workUnit",
opction:[ opction:[
]}, ]},
{ {
label:"职业", label:"职业",
@ -584,7 +584,7 @@ export default {
itemType:"input1", itemType:"input1",
formName:"retirementAmount", formName:"retirementAmount",
opction:[ opction:[
]}, ]},
{ {
label:"月收入", label:"月收入",
itemType:"input1", itemType:"input1",
@ -600,19 +600,19 @@ export default {
itemType:"input1", itemType:"input1",
formName:"nativePlace", formName:"nativePlace",
opction:[ opction:[
]}, ]},
{ {
label:"户籍所在地", label:"户籍所在地",
itemType:"input1", itemType:"input1",
formName:"placeOfDomicile", formName:"placeOfDomicile",
opction:[ opction:[
]}, ]},
{ {
label:"现居住地址", label:"现居住地址",
itemType:"input1", itemType:"input1",
formName:"currentResidence", formName:"currentResidence",
opction:[ opction:[
]}, ]},
{ {
label:"人户状况", label:"人户状况",
itemType:"select1", itemType:"select1",
@ -640,13 +640,13 @@ export default {
itemType:"select1", itemType:"select1",
formName:"resideSituation", formName:"resideSituation",
opction:[ opction:[
]}, ]},
{ {
label:"婚姻状况", label:"婚姻状况",
itemType:"select1", itemType:"select1",
formName:"marriage", formName:"marriage",
opction:[ opction:[
]}, ]},
{ {
label:"配偶情况", label:"配偶情况",
itemType:"select1", itemType:"select1",
@ -693,13 +693,13 @@ export default {
itemType:"datepicker1", itemType:"datepicker1",
formName:"positiveTime", formName:"positiveTime",
opction:[ opction:[
]}, ]},
{ {
label:"所属支部", label:"所属支部",
itemType:"cascader1", itemType:"cascader1",
formName:"branchId", formName:"branchId",
opction:[ opction:[
]}, ]},
{ {
label:"流动党员", label:"流动党员",
itemType:"radio1", itemType:"radio1",
@ -713,7 +713,7 @@ export default {
itemType:"input1", itemType:"input1",
formName:"flowActNum", formName:"flowActNum",
opction:[ opction:[
]}, ]},
{ {
label:"职务", label:"职务",
@ -740,7 +740,7 @@ export default {
itemType:"input1", itemType:"input1",
formName:"joinBranchName", formName:"joinBranchName",
opction:[ opction:[
]},{ ]},{
label:"组织关系转入社区时间", label:"组织关系转入社区时间",
itemType:"datepicker1", itemType:"datepicker1",
@ -758,13 +758,13 @@ export default {
},{ },{
id:'ensureHouseDto', id:'ensureHouseDto',
children:[ children:[
{ {
label:"住房性质", label:"住房性质",
itemType:"select1", itemType:"select1",
formName:"housingNature", formName:"housingNature",
opction:[ opction:[
]}, ]},
{ {
label:"保障类型", label:"保障类型",
itemType:"input1", itemType:"input1",
@ -775,13 +775,13 @@ export default {
itemType:"datepicker1", itemType:"datepicker1",
formName:"certificateDate", formName:"certificateDate",
opction:[ opction:[
]}, ]},
{ {
label:"补贴编号", label:"补贴编号",
itemType:"input1", itemType:"input1",
formName:"subsidyNum", formName:"subsidyNum",
opction:[ opction:[
]}, ]},
{ {
label:"补贴金额 ", label:"补贴金额 ",
@ -797,7 +797,7 @@ export default {
label:"原工作单位", label:"原工作单位",
itemType:"input1", itemType:"input1",
formName:"originWorkUnit", formName:"originWorkUnit",
}, },
{ {
label:"失业时间", label:"失业时间",
itemType:"datepicker1", itemType:"datepicker1",
@ -810,13 +810,13 @@ export default {
itemType:"input1", itemType:"input1",
formName:"unemploymentNum", formName:"unemploymentNum",
opction:[ opction:[
]}, ]},
{ {
label:"再就业优惠证号", label:"再就业优惠证号",
itemType:"input1", itemType:"input1",
formName:"employmentNum", formName:"employmentNum",
opction:[ opction:[
]}, ]},
{ {
label:"技术特长", label:"技术特长",
@ -850,31 +850,31 @@ export default {
itemType:"datepicker1", itemType:"datepicker1",
formName:"joinArmyTime", formName:"joinArmyTime",
opction:[ opction:[
]}, ]},
{ {
label:"退伍时间", label:"退伍时间",
itemType:"datepicker1", itemType:"datepicker1",
formName:"leaveArmyTime", formName:"leaveArmyTime",
opction:[ opction:[
]}, ]},
{ {
label:"服役单位", label:"服役单位",
itemType:"input1", itemType:"input1",
formName:"serviceUnit", formName:"serviceUnit",
opction:[ opction:[
]}, ]},
{ {
label:"接收单位", label:"接收单位",
itemType:"input1", itemType:"input1",
formName:"receiveUnit ", formName:"receiveUnit ",
opction:[ opction:[
]}, ]},
{ {
label:"待安置补助金", label:"待安置补助金",
itemType:"input1", itemType:"input1",
formName:"settlementAmount", formName:"settlementAmount",
opction:[ opction:[
]}, ]},
{ {
label:"培训状况", label:"培训状况",
@ -960,7 +960,7 @@ export default {
opction:[] opction:[]
},] },]
} }
], ],
form:{ form:{
@ -1036,37 +1036,37 @@ export default {
}, },
workInfoDto:{ //工作 workInfoDto:{ //工作
workUnit:'',//工作单位 workUnit:'',//工作单位
occupation:'',//职业 occupation:'',//职业
retireTime:'',//离退休时间 retireTime:'',//离退休时间
workRemark:'',//备注 workRemark:'',//备注
}, },
economyDto:{//经济 economyDto:{//经济
retirementAmount:'',//退休金额 retirementAmount:'',//退休金额
monthIncome:'',//月收入 monthIncome:'',//月收入
}, },
resideInfoDto:{//居住信息 resideInfoDto:{//居住信息
nativePlace:'',//籍贯 nativePlace:'',//籍贯
placeOfDomicile:'',//户籍所在地 placeOfDomicile:'',//户籍所在地
currentResidence:'',//现居住地 currentResidence:'',//现居住地
householdSituation:'',//人户情况，字典code householdSituation:'',//人户情况，字典code
resiRemark:'',//备注 resiRemark:'',//备注
}, },
familyInfoDto:{//家庭 familyInfoDto:{//家庭
houseHolderRel:'',//与户主关系 houseHolderRel:'',//与户主关系
resideSituation:'',//居住情况 resideSituation:'',//居住情况
marriage:'',//婚姻状况 marriage:'',//婚姻状况
spouseSituation:'',//配偶情况 spouseSituation:'',//配偶情况
elderlyFlag:null,//有无赡养人【有:1 无:0】 elderlyFlag:null,//有无赡养人【有:1 无:0】
elderlyRelation:'',//与赡养人关系【字典表】 elderlyRelation:'',//与赡养人关系【字典表】
dependantMobile:'',//赡养人联系电话 dependantMobile:'',//赡养人联系电话
familyInfoRemark:'',//备注 familyInfoRemark:'',//备注
}, },
parymemberInfoDto:{//党员信息 parymemberInfoDto:{//党员信息
joinTime:'',//入党时间yyyy-MM-dd joinTime:'',//入党时间yyyy-MM-dd
positiveTime:'',//转正时间yyyy-MM-dd positiveTime:'',//转正时间yyyy-MM-dd
branchId:'',//所属支部 branchId:'',//所属支部
flowFlag:null,//是否流动党员：1是，0否 flowFlag:null,//是否流动党员：1是，0否
flowActNum:'',//流动党员活动证号 flowActNum:'',//流动党员活动证号
partyJob:'',//职务，字典code partyJob:'',//职务，字典code
retiredFlag:null,//是否退休：1是，0否 retiredFlag:null,//是否退休：1是，0否
centerFlag:null,//是否党员中心户：1是，0否 centerFlag:null,//是否党员中心户：1是，0否
@ -1076,47 +1076,47 @@ export default {
}, },
ensureHouseDto:{//保障房信息 ensureHouseDto:{//保障房信息
housingNature:'',//住房性质，字典code housingNature:'',//住房性质，字典code
securityType:'',//保障类型 securityType:'',//保障类型
certificateDate:'',//发证日期yyyy-MM-dd certificateDate:'',//发证日期yyyy-MM-dd
subsidyNum:'',//补贴编号 subsidyNum:'',//补贴编号
subsidyAmount:'',//补贴金额 subsidyAmount:'',//补贴金额
}, },
unemployedDto:{//失业信息 unemployedDto:{//失业信息
originWorkUnit:'',//原工作单位 originWorkUnit:'',//原工作单位
unemploymentTime:'',//失业时间yyyy-MM-dd unemploymentTime:'',//失业时间yyyy-MM-dd
unemploymentNum:'',//失业证号 unemploymentNum:'',//失业证号
employmentNum:'',//再就业优惠证号 employmentNum:'',//再就业优惠证号
specialSkill:'',//技术特长 specialSkill:'',//技术特长
unemploymentReason:'',//失业原因【字典表】code unemploymentReason:'',//失业原因【字典表】code
employmentHardFlag:null,//是否就业困难对象；1是0不是 employmentHardFlag:null,//是否就业困难对象；1是0不是
employmentWish:'',//劳动能力就业愿望 employmentWish:'',//劳动能力就业愿望
}, },
veteranDto:{//退役军人 veteranDto:{//退役军人
joinArmyTime:'',//入伍时间 joinArmyTime:'',//入伍时间
leaveArmyTime:'',//退伍时间 leaveArmyTime:'',//退伍时间
serviceUnit:'',//服役单位 serviceUnit:'',//服役单位
receiveUnit:'',//接收单位 receiveUnit:'',//接收单位
settlementAmount:'',//待安置补助金 settlementAmount:'',//待安置补助金
trainDesc:'',//培训状况 trainDesc:'',//培训状况
employmentSituation:'',//现就业情况 employmentSituation:'',//现就业情况
joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd
joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否 pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
}, },
unitedFrontDto:{//统战人员 unitedFrontDto:{//统战人员
duty:'',//职务 duty:'',//职务
visitation:'',//探亲情况 visitation:'',//探亲情况
}, },
volunteerDto:{//志愿者信息 volunteerDto:{//志愿者信息
volunteerCategory:[],//志愿者类别 volunteerCategory:[],//志愿者类别
volunteerRemark:''//备注 volunteerRemark:''//备注
}, },
oldPeopleDto:{ oldPeopleDto:{
oldSubsidy:''//高龄补助 oldSubsidy:''//高龄补助
}, },
specialDto:{//特殊人群 specialDto:{//特殊人群
specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开； specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；
} }
}, },
rulesForm: { rulesForm: {
@ -1138,7 +1138,7 @@ export default {
watch: { watch: {
form:{ form:{
handler (val, val2) { handler (val, val2) {
}, },
deep:true, deep:true,
immediate:true immediate:true
@ -1146,7 +1146,7 @@ export default {
}, },
created () { created () {
this.getGridList() this.getGridList()
this.getAllNation() this.getAllNation()
}, },
methods: { methods: {
@ -1156,11 +1156,12 @@ export default {
this.$refs.formId.validate(v=>{ this.$refs.formId.validate(v=>{
this.validateFlag = v this.validateFlag = v
flag = v flag = v
}) })
if(flag){ if(flag){
return this.form return this.form
} }
console.log(this.form);
return this.form return this.form
}, },
@ -1221,7 +1222,7 @@ export default {
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'}) const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
this.footerInputList.forEach(c => { this.footerInputList.forEach(c => {
for(let i of c.children){ for(let i of c.children){
if(i.formName == 'disabilityCategoryCode'){ if(i.formName == 'disabilityCategoryCode'){
i.opction = data.data i.opction = data.data
@ -1238,7 +1239,7 @@ export default {
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'}) const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
this.footerInputList.forEach(c => { this.footerInputList.forEach(c => {
for(let i of c.children){ for(let i of c.children){
if(i.formName == 'disabilityLevel'){ if(i.formName == 'disabilityLevel'){
i.opction = data.data i.opction = data.data
@ -1265,7 +1266,7 @@ export default {
} catch (error) { } catch (error) {
console.log(error,'获取所患大病字典'); console.log(error,'获取所患大病字典');
} }
}, },
async getchronicNation(){ async getchronicNation(){
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'}) const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
@ -1446,10 +1447,10 @@ export default {
if(i != item.id){ if(i != item.id){
this.tabsList = this.tabsList.filter(items=>items.id!=i) this.tabsList = this.tabsList.filter(items=>items.id!=i)
} }
}) })
} }
} }
}, },
handleChangeGrid (val) { handleChangeGrid (val) {
console.log('val', val) console.log('val', val)
@ -1477,10 +1478,10 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
console.log('获取查询详情成功', res.data) console.log('获取查询详情成功', res.data)
if (res.data.isVolunteer == '1') this.form.volunteerFlag = true if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
else this.form.volunteerFlag = false else this.form.volunteerFlag = false
if (res.data.isPartyMember == '1') { if (res.data.isPartyMember == '1') {
this.form.partyFlag = true this.form.partyFlag = true
this.isParty = true this.isParty = true
@ -1611,7 +1612,7 @@ export default {
const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"}) const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
this.footerInputList.forEach(c => { this.footerInputList.forEach(c => {
for(let i of c.children){ for(let i of c.children){
if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){ if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){
i.opction = data.data i.opction = data.data
} }
} }
@ -1627,7 +1628,7 @@ export default {
const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"}) const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"})
this.footerInputList.forEach(c => { this.footerInputList.forEach(c => {
for(let i of c.children){ for(let i of c.children){
if(i.formName == 'branchId' ){ if(i.formName == 'branchId' ){
i.opction = data.data i.opction = data.data
} }
} }
@ -1652,7 +1653,7 @@ export default {
}); });
return arr; return arr;
}, },
async getEducation(){ async getEducation(){
try { try {
let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"}) let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})

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

@ -3,7 +3,7 @@
<!-- <el-card class="resi-card"> --> <!-- <el-card class="resi-card"> -->
<div class="g-main"> <div class="g-main">
<el-form :inline="true" class="header_form_box" :model="form" :label-width="'100px'"> <el-form :inline="true" class="header_form_box" :model="form" :label-width="'100px'">
<el-form-item label="居民姓名" > <el-form-item label="居民姓名" >
<el-input v-model="form.name" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input> <el-input v-model="form.name" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input>
</el-form-item> </el-form-item>
@ -25,6 +25,7 @@
type="date" type="date"
size="small" size="small"
class="u-item-width-daterange" class="u-item-width-daterange"
value-format="yyyy-MM-dd"
placeholder="开始日期"> placeholder="开始日期">
</el-date-picker> </el-date-picker>
<span class="u-data-tag">至</span> <span class="u-data-tag">至</span>
@ -32,12 +33,16 @@
v-model="form.birthdayEnd" v-model="form.birthdayEnd"
type="date" type="date"
size="small" size="small"
value-format="yyyy-MM-dd"
class="u-item-width-daterange u-data-tag" class="u-item-width-daterange u-data-tag"
placeholder="结束日期"> placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="居民年龄" > <el-form-item label="居民年龄" >
<el-input v-model="form.ageStart" class="u-item-width-normal" placeholder="请输入" clearable size="small"> <el-input v-model="form.ageStart" class="u-item-width-resiAge" placeholder="请输入" clearable size="small">
</el-input>
<span class="u-data-tag">至</span>
<el-input v-model="form.ageEnd" class="u-item-width-resiAge u-data-tag" placeholder="请输入" clearable size="small">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="文化程度" > <el-form-item label="文化程度" >
@ -45,7 +50,7 @@
<template v-for="item in Education" > <template v-for="item in Education" >
<el-option :label='item.label' :value='item.value'> </el-option> <el-option :label='item.label' :value='item.value'> </el-option>
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="本地户籍" > <el-form-item label="本地户籍" >
@ -75,33 +80,33 @@
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="agencyIdArray"> <el-form-item >
<span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属组织:</span> <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属组织:</span>
<el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model="agencyIdArray" :options="orgOptions" <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model="form.agencyId" :options="orgOptions"
:props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader> :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item prop="VILLAGE_ID" > <el-form-item prop="villageId" >
<div class="resi-cell"> <div class="resi-cell">
<div class="resi-cell-value"> <div class="resi-cell-value">
<span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属房屋:</span> <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属房屋:</span>
<el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small" filterable clearable <el-select v-model.trim="form.villageId" placeholder="请选择小区" size="small" filterable clearable
class="u-item-width-communitycascader" @clear="handleClearVillage" @change="handleChangeV"> class="u-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 v-for="item in optionsV" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="form.BUILD_ID" placeholder="楼号" size="small" filterable clearable <el-select v-model.trim="form.buildId" placeholder="楼号" size="small" filterable clearable
style="margin-left: 5px" class="u-item-width-buildcascader" :disabled="changeVDisabled" @clear="handleClearBuild" style="margin-left: 5px" class="u-item-width-buildcascader" :disabled="changeVDisabled" @clear="handleClearBuild"
@change="handleChangeB"> @change="handleChangeB">
<el-option v-for="item in optionsB" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in optionsB" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="form.UNIT_ID" :disabled="changeBDisabled" placeholder="单元" size="small" <el-select v-model.trim="form.unitId" :disabled="changeBDisabled" placeholder="单元" size="small"
filterable clearable style="margin-left: 5px" class="u-item-width-buildcascader" @click="handleClearDan" filterable clearable style="margin-left: 5px" class="u-item-width-buildcascader" @click="handleClearDan"
@change="handleChangeD"> @change="handleChangeD">
<el-option v-for="item in optionsD" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in optionsD" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="form.HOME_ID" :disabled="changeDDisabled" placeholder="房号" size="small" <el-select v-model.trim="form.homeId" :disabled="changeDDisabled" placeholder="房号" size="small"
filterable clearable style="margin-left: 5px" class="u-item-width-buildcascader"> filterable clearable style="margin-left: 5px" class="u-item-width-buildcascader">
<el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
@ -113,7 +118,7 @@
<el-input v-model="form.remark" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input> <el-input v-model="form.remark" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-row v-if="showSmartSearchForm" class="resi-row-more f-m0"> <el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
<el-col :span="24"> <el-col :span="24">
@ -208,31 +213,7 @@ export default {
} }
}) })
let constForm = { let constForm = {
name:'',
mobile:'',
idNum:'',
birthdayStart:'',
birthdayEnd:'',
ageStart:'',
ageEnd:'',
gender:'',
cultureLevel:'',
localResidenceFlag:'',
householdSituation:'',
nation:'',
agencyId:'',
buildId:'',
homeId:'',
unitId:'',
gridId:'',
villageId:'',
categoryKey:[],
remark:'',
GRID_ID: '',
VILLAGE_ID: '',
BUILD_ID: '',
UNIT_ID: '',
HOME_ID: ''
} }
let orgOptionProps = { let orgOptionProps = {
multiple: false, multiple: false,
@ -278,13 +259,31 @@ export default {
fixedList: [], fixedList: [],
constForm, constForm,
form: { form: {
...form, name:'',
agencyId : '', mobile:'',
idNum:'',
birthdayStart:'',
birthdayEnd:'',
ageStart:'',
ageEnd:'',
gender:'',
cultureLevel:'',
localResidenceFlag:'',
householdSituation:'',
nation:'',
agencyId:'',
buildId:'',
homeId:'',
unitId:'',
gridId:'',
villageId:'',
categoryKey:[],
remark:'',
GRID_ID: '', GRID_ID: '',
VILLAGE_ID: '', villageId: '',
BUILD_ID: '', buildId: '',
UNIT_ID: '', unitId: '',
HOME_ID: '' homeId: ''
}, },
tempFormList, tempFormList,
pickerOptions: { pickerOptions: {
@ -449,13 +448,13 @@ export default {
} }
}, },
changeVDisabled() { changeVDisabled() {
return !this.form.VILLAGE_ID return !this.form.villageId
}, },
changeBDisabled() { changeBDisabled() {
return !this.form.BUILD_ID return !this.form.buildId
}, },
changeDDisabled() { changeDDisabled() {
return !this.form.UNIT_ID return !this.form.unitId
}, },
}, },
watch: { watch: {
@ -513,17 +512,17 @@ export default {
return len == 1 ? 24 : 6 return len == 1 ? 24 : 6
}, },
handleClearVillage() { handleClearVillage() {
this.form.BUILD_ID = '' this.form.buildId = ''
this.form.HOME_ID = '' this.form.homeId = ''
}, },
handleClearBuild() { handleClearBuild() {
this.form.BUILD_ID = '' this.form.buildId = ''
this.form.UNIT_ID = '' this.form.unitId = ''
this.form.HOME_ID = '' this.form.homeId = ''
}, },
handleClearDan() { handleClearDan() {
this.form.UNIT_ID = '' this.form.unitId = ''
this.form.HOME_ID = '' this.form.homeId = ''
}, },
resetForm(formName) { resetForm(formName) {
for (const n in this.form) { for (const n in this.form) {
@ -545,58 +544,58 @@ export default {
// this.handleSearch() // this.handleSearch()
// this.orgOptions = []; // this.orgOptions = [];
}, },
handleSearch() { // handleSearch() {
if (this.showSmartSearchForm) { // if (this.showSmartSearchForm) {
let refObj = this.$refs['ref_rule'] // let refObj = this.$refs['ref_rule']
refObj.getRule() // refObj.getRule()
} else { // } else {
// debugger // // debugger
// console.log('formmmmm---', this.form) // // console.log('formmmmm---', this.form)
const itemTypes = ['daterange', 'timerange', 'checkbox'] // const itemTypes = ['daterange', 'timerange', 'checkbox']
let a = this.tempFormList.filter(item => item.itemType != 'inputRange') // let a = this.tempFormList.filter(item => item.itemType != 'inputRange')
let arr = a.filter(n => n.isChange).map((item) => { // let arr = a.filter(n => n.isChange).map((item) => {
return { // return {
queryType: item.queryType, // queryType: item.queryType,
tableName: item.tableName, // tableName: item.tableName,
columnName: item.columnName, // columnName: item.columnName,
columnValue: this.form[item.columnName] && // columnValue: this.form[item.columnName] &&
(itemTypes.includes(item.queryType) || // (itemTypes.includes(item.queryType) ||
itemTypes.includes(item.itemType) || item.multiSelect == 1 // itemTypes.includes(item.itemType) || item.multiSelect == 1
? this.form[item.columnName] // ? this.form[item.columnName]
: [this.form[item.columnName].toString()]) // : [this.form[item.columnName].toString()])
} // }
}) // })
const arr2 = arr.filter(item => item.columnValue.length > 0) // const arr2 = arr.filter(item => item.columnValue.length > 0)
let arr1 = this.fixedList // let arr1 = this.fixedList
.filter((n) => n.columnValue.length > 0) // .filter((n) => n.columnValue.length > 0)
.map((item) => { // .map((item) => {
return { // return {
...item // ...item
} // }
}) // })
var arr4 = [] // var arr4 = []
var arr3 = [...arr1, ...arr2]; // var arr3 = [...arr1, ...arr2];
if (this.timer.startPickerTime && this.timer.endPickerTime) { // if (this.timer.startPickerTime && this.timer.endPickerTime) {
arr4 = [{ // arr4 = [{
queryType: 'daterange', // queryType: 'daterange',
tableName: 'ic_resi_user', // tableName: 'ic_resi_user',
columnName: 'BIRTHDAY', // columnName: 'BIRTHDAY',
columnValue: [this.timer.startPickerTime || '', this.timer.endPickerTime || ''] // columnValue: [this.timer.startPickerTime || '', this.timer.endPickerTime || '']
}] // }]
arr3 = [...arr1, ...arr2, ...arr4] // arr3 = [...arr1, ...arr2, ...arr4]
} else { // } else {
let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY') // let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY')
console.log(i, '标'); // console.log(i, '标');
arr3 = arr3.splice(i,1) // arr3 = arr3.splice(i,1)
console.log(arr3); // console.log(arr3);
} // }
this.$emit('search', arr3) // this.$emit('search', arr3)
arr3 = [] // arr3 = []
return arr3 // return arr3
} // }
}, // },
handleOpenSearch() { handleOpenSearch() {
this.openSearch = !this.openSearch this.openSearch = !this.openSearch
}, },
@ -617,49 +616,45 @@ export default {
handleChangeAgency(val) { handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) { if (obj) {
if (obj.level === 'grid') {
this.form.GRID_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.form.agencyId = ''
} else {
this.form.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; this.form.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.form.GRID_ID = '' this.GRID_ID = ''
}
} else { } else {
this.form.agencyId = '' this.form.agencyId = ''
this.form.GRID_ID = '' this.GRID_ID = ''
} }
this.form.VILLAGE_ID = '' this.form.villageId = ''
this.form.BUILD_ID = '' this.form.buildId = ''
this.form.UNIT_ID = '' this.form.unitId = ''
this.form.HOME_ID = '' this.form.homeId = ''
this.getValiheList() this.getValiheList()
}, },
handleChangeGrid(val) { handleChangeGrid(val) {
console.log('val', val) console.log('val', val)
this.form.VILLAGE_ID = '' this.form.villageId = ''
this.form.BUILD_ID = '' this.form.buildId = ''
this.form.UNIT_ID = '' this.form.unitId = ''
this.form.HOME_ID = '' this.form.homeId = ''
this.getValiheList() this.getValiheList()
}, },
handleChangeV(val) { handleChangeV(val) {
console.log('val', val) console.log('val', val)
this.form.BUILD_ID = '' this.form.buildId = ''
this.form.UNIT_ID = '' this.form.unitId = ''
this.form.HOME_ID = '' this.form.homeId = ''
this.getBuildList() this.getBuildList()
}, },
handleChangeB(val) { handleChangeB(val) {
console.log('val', val) console.log('val', val)
this.form.UNIT_ID = '' this.form.unitId = ''
this.form.HOME_ID = '' this.form.homeId = ''
this.getUniList() this.getUniList()
}, },
handleChangeD(val) { handleChangeD(val) {
console.log('val', val) console.log('val', val)
this.form.HOME_ID = '' this.form.homeId = ''
this.getHouseList() this.getHouseList()
}, },
// 监听基础form // 监听基础form
@ -738,7 +733,7 @@ export default {
const { user } = this.$store.state const { user } = this.$store.state
this.$http this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', { .post('/gov/org/icneighborhood/neighborhoodoption', {
gridId: this.form.GRID_ID, gridId: this.GRID_ID,
agencyId: this.form.agencyId , agencyId: this.form.agencyId ,
// agencyId: user.agencyId // agencyId: user.agencyId
}) })
@ -757,7 +752,7 @@ export default {
getBuildList() { getBuildList() {
this.$http this.$http
.post('/gov/org/icbuilding/buildingoption', { .post('/gov/org/icbuilding/buildingoption', {
neighborHoodId: this.form.VILLAGE_ID neighborHoodId: this.form.villageId
}) })
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -774,7 +769,7 @@ export default {
getUniList() { getUniList() {
this.$http this.$http
.post('/gov/org/icbuildingunit/unitoption', { .post('/gov/org/icbuildingunit/unitoption', {
buildingId: this.form.BUILD_ID buildingId: this.form.buildId
}) })
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -790,7 +785,7 @@ export default {
}, },
getHouseList() { getHouseList() {
this.$http this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID }) .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId })
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -935,7 +930,7 @@ export default {
.resi-cell-select { .resi-cell-select {
max-width: 200px; max-width: 200px;
box-sizing: border-box; box-sizing: border-box;
&-middle { &-middle {
width: 130px; width: 130px;
} }

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

@ -40,25 +40,20 @@
src="../../../assets/img/arrow-down.png" /> src="../../../assets/img/arrow-down.png" />
</div> --> </div> -->
<resi-search ref="myResiSearch" /> <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 size="small"
size="small" class="diy-button--blue"
class="diy-button--blue" @click="handleSearchFrom">查询</el-button>
@click="handleSearchFrom" <!-- -->
>查询</el-button <el-button style="margin-left:10px"
> size="small"
<!-- --> class="diy-button--white"
<el-button @click="resetSearchForm">重置</el-button>
style="margin-left: 10px" <!-- resetSearchForm -->
size="small"
class="diy-button--white"
@click=""
>重置</el-button
>
<!-- resetSearchForm -->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="m-table"> <div class="m-table">
@ -174,20 +169,20 @@
{{ scope.row.gender == 1 ? "男" : "女" }} {{ scope.row.gender == 1 ? "男" : "女" }}
</div> </div>
<div v-else-if="item.columnName == 'birthday'"> <div v-else-if="item.columnName == 'birthday'">
{{ scope.row.birthday.substr(0, 10) }} {{ scope.row.birthday?scope.row.birthday.substr(0, 10):'' }}
</div> </div>
<div v-else-if="item.columnName == 'idNum'"> <div v-else-if="item.columnName == 'idNum'">
{{ {{scope.row.idNum?
`${scope.row.idNum.substr(0, 11)}` + `${scope.row.idNum.substr(0, 11)}` +
"******" + "******" +
`${scope.row.idNum.substr(16, 2)}` `${scope.row.idNum.substr(16, 2)}`:''
}} }}
</div> </div>
<div v-else-if="item.columnName == 'mobile'"> <div v-else-if="item.columnName == 'mobile'">
{{ {{scope.row.mobile?
`${scope.row.mobile.substr(0, 3)}` + `${scope.row.mobile.substr(0, 3)}` +
"******" + "******" +
`${scope.row.mobile.substr(7, 4)}` `${scope.row.mobile.substr(7, 4)}`:''
}} }}
</div> </div>
<span v-else>{{ handleFilterSpan(scope.row, item) }}</span> <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
@ -286,6 +281,7 @@
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="986px" width="986px"
top="5vh" top="5vh"
height="750px"
append-to-body append-to-body
class="dialog-h" class="dialog-h"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -297,7 +293,6 @@
ref="baseForm" ref="baseForm"
:fixed="true" :fixed="true"
:form-list="formList" :form-list="formList"
:resi-id="editUserId"
@changegroup="handleChangeGroup" @changegroup="handleChangeGroup"
/> />
<!-- <div v-if="dialogVisible" <!-- <div v-if="dialogVisible"
@ -332,7 +327,6 @@
>取消</el-button >取消</el-button
> >
<el-button <el-button
v-if="!editUserId"
type="primary" type="primary"
size="small" size="small"
:loading="btnLoading" :loading="btnLoading"
@ -340,15 +334,6 @@
class="diy-button--blue" class="diy-button--blue"
>保存</el-button >保存</el-button
> >
<el-button
v-else
type="primary"
size="small"
:loading="btnLoading"
@click="handleEditSUbmit"
>提交</el-button
>
</div> </div>
</el-dialog> </el-dialog>
@ -698,8 +683,15 @@ export default {
}, },
}); });
}, },
handleSearchFrom() { handleSearchFrom(){
console.log(this.$refs.myResiSearch.form); let obj = this.$refs.myResiSearch.form
obj.categoryKey = obj.categoryKey.join(',')
obj.agencyId = obj.agencyId.join(',')
this.getTableData(obj)
obj.categoryKey =[]
console.log(obj.categoryKey);
obj.agencyId = []
}, },
// 是否可以选中 // 是否可以选中
checkSelectable(row, index) { checkSelectable(row, index) {
@ -846,9 +838,10 @@ export default {
}, },
resetSearchForm(formName) { resetSearchForm(formName) {
// for(const n in this.form) { for(let n in this.$refs.myResiSearch.form) {
// this.form[n] = '' this.$refs.myResiSearch.form[n] = ''
// } }
console.log(this.$refs.myResiSearch.form);
this.searchList.forEach((item) => { this.searchList.forEach((item) => {
this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm(); this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
// console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`]) // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
@ -1051,7 +1044,6 @@ export default {
console.log(tab, event); console.log(tab, event);
}, },
async handleLook(row) { async handleLook(row) {
this.formName = "居民详情";
console.log(row); console.log(row);
this.lookInfo.userId = row.icResiUserId; this.lookInfo.userId = row.icResiUserId;
this.lookInfo.gridName = row.GRID_ID; this.lookInfo.gridName = row.GRID_ID;
@ -1067,21 +1059,17 @@ export default {
this.showedPeopleMoreInfo = false; this.showedPeopleMoreInfo = false;
}, },
async handleEdit(row) { async handleEdit(row) {
// this.disabled = false; this.disabled = false;
// this.editAgencyId = row.ORG_ID; this.editAgencyId = row.ORG_ID;
this.editUserId = row.resiId; this.editUserId = row.icResiUserId;
this.formName = "编辑居民"; await this.getFormList("edit");
this.dialogVisible = true; await this.getrowInfo(row.icResiUserId);
// await this.getFormList("edit");
// await this.getrowInfo(row.icResiUserId);
}, },
handlerReset() { handlerReset() {
this.$refs.baseForm.resetForm(); this.$refs.baseForm.resetForm();
}, },
async handleAdd() { async handleAdd() {
this.formName = "新增居民"; await this.getFormList();
// await this.getFormList();
this.editUserId = "";
this.dialogVisible = true; this.dialogVisible = true;
}, },
async handleChangeGroup(val) { async handleChangeGroup(val) {
@ -1184,56 +1172,49 @@ export default {
async handleSUbmit() { async handleSUbmit() {
const _baseForm = this.$refs.baseForm.submit_from(); const _baseForm = this.$refs.baseForm.submit_from();
(_baseForm.partyFlag = parseInt(_baseForm.partyFlag)), //党员 _baseForm.partyFlag = parseInt(_baseForm.partyFlag),//党员
(_baseForm.subsistenceAllowanceFlag = parseInt( _baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag), //低保
_baseForm.subsistenceAllowanceFlag _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag), //保障房
)), //低保 _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag),//失业
(_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag)), //保障房 _baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag), //育龄妇女
(_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag)), //失业 _baseForm.veteranFlag = parseInt(_baseForm.veteranFlag), //退役军人
(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女 _baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag),//统战人员
(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)), //退役军人 _baseForm.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag),//信访人员
(_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag)), //统战人员 _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag), //志愿者
(_baseForm.petitionOfficerFlag = parseInt( _baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag), //失独
_baseForm.petitionOfficerFlag _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag), //租户
)), //信访人员 _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag),//流动人口
(_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag)), //志愿者 _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag),//特殊人群
(_baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag)), //失独 _baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag), //老年人
(_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag)), //租户 _baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag), //空巢
(_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag)), //流动人口 _baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag), //独居老人
(_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag)), //特殊人群 _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag), //失能老人
(_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag)), //老年人 _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag), //失智老人
(_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag)), //空巢 _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag),//是否残疾
(_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag)), //独居老人 _baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag), //大病
(_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag)), //失能老人 _baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag) //慢病
(_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag)), //失智老人 if(_baseForm.hobbyInfoDto.hobbyCode = []) {
(_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag)), //是否残疾 _baseForm.hobbyInfoDto.hobbyCode = ''
(_baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag)), //大病
(_baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag)); //慢病
if ((_baseForm.hobbyInfoDto.hobbyCode = [])) {
_baseForm.hobbyInfoDto.hobbyCode = "";
} else { } else {
_baseForm.hobbyInfoDto.hobbyCode.forEach((element) => { _baseForm.hobbyInfoDto.hobbyCode.forEach(element => {
_baseForm.hobbyInfoDto.hobbyCode = _baseForm.hobbyInfoDto.hobbyCode = _baseForm.hobbyInfoDto.hobbyCode + ',' + element
_baseForm.hobbyInfoDto.hobbyCode + "," + element;
}); });
} }
if ((_baseForm.volunteerDto.volunteerCategory = [])) { if(_baseForm.volunteerDto.volunteerCategory = []) {
_baseForm.volunteerDto.volunteerCategory = ""; _baseForm.volunteerDto.volunteerCategory = ''
} else { } else {
_baseForm.volunteerDto.volunteerCategory.forEach((element) => { _baseForm.volunteerDto.volunteerCategory.forEach(element => {
_baseForm.volunteerDto.volunteerCategory = _baseForm.volunteerDto.volunteerCategory = _baseForm.volunteerDto.volunteerCategory + ',' + element
_baseForm.volunteerDto.volunteerCategory + "," + element;
}); });
} }
if ((_baseForm.specialDto.specialCategoryCode = [])) { if(_baseForm.specialDto.specialCategoryCode = []) {
_baseForm.specialDto.specialCategoryCode = ""; _baseForm.specialDto.specialCategoryCode = ''
} else { } else {
_baseForm.specialDto.specialCategoryCode.forEach((element) => { _baseForm.specialDto.specialCategoryCode.forEach(element => {
_baseForm.specialDto.specialCategoryCode = _baseForm.specialDto.specialCategoryCode = _baseForm.specialDto.specialCategoryCode + ',' + element
_baseForm.specialDto.specialCategoryCode + "," + element;
}); });
} }
this.submitAdd(_baseForm); this.submitAdd(_baseForm)
}, },
handleDel(row) { handleDel(row) {
let params = { let params = {
@ -1319,11 +1300,13 @@ export default {
this.btnLoading = false; this.btnLoading = false;
}, },
async getTableData() { async getTableData(keyWord) {
let params = { let params = {
pageNo: this.currentPage, pageNo: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
...keyWord
}; };
console.log(params);
this.tableLoading = true; this.tableLoading = true;
const { data, code, msg } = await requestPost( const { data, code, msg } = await requestPost(
"/actual/base/residentBaseInfo/page", "/actual/base/residentBaseInfo/page",
@ -1577,7 +1560,7 @@ export default {
.dialog-h-content { .dialog-h-content {
max-height: calc(83vh - 80px); max-height: calc(83vh - 80px);
box-sizing: border-box; box-sizing: border-box;
padding: 50px 80px; padding: 0 10px 0px 79px;
overflow: auto; overflow: auto;
} }
} }

Write Preview
Loading…
Cancel
Save