diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 1c9e5fd72..e15232812 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -38,6 +38,10 @@ .u-item-width-communitycascader{ width: 141px; } + // 查询栏人防年龄两个输入框 + .u-item-width-resiAge{ + width: 67px; + } .u-item-width-buildcascader{ width: 96px; } diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index a4df68c01..883faf13d 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1,7 +1,7 @@ - + + @@ -303,7 +303,7 @@ export default { formName:"name", rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}], opction:[ - + ], }, { @@ -311,7 +311,7 @@ export default { itemType:"input", formName:"mobile", opction:[ - + ], }, { @@ -328,7 +328,7 @@ export default { },trigger:'change' | blur } ], opction:[ - + ], },{ label:"性别", @@ -366,7 +366,7 @@ export default { itemType:"select1", formName:"cultureLevel", opction:[ - + ]}, { label:"备注", @@ -411,7 +411,7 @@ export default { itemType:"input1", formName:"religion", opction:[ - + ]}, { label:"备注", @@ -485,28 +485,28 @@ export default { itemType:"select1", formName:"illnessCode", opction:[ - + ]}, { label:"大病患病时间", itemType:"datepicker1", formName:"illnessTime", opction:[ - + ]}, { label:"所患慢性病", itemType:"select1", formName:"chronicDiseaseCode", opction:[ - + ]}, { label:"慢病患病时间", itemType:"datepicker1", formName:"chronicDiseaseTime", opction:[ - + ]}, { label:"是否参保", @@ -533,7 +533,7 @@ export default { itemType:"datepicker1", formName:"deliveranceTime", opction:[ - + ]}, { label:"享受救助明细序号", @@ -555,7 +555,7 @@ export default { itemType:"input1", formName:"workUnit", opction:[ - + ]}, { label:"职业", @@ -584,7 +584,7 @@ export default { itemType:"input1", formName:"retirementAmount", opction:[ - ]}, + ]}, { label:"月收入", itemType:"input1", @@ -600,19 +600,19 @@ export default { itemType:"input1", formName:"nativePlace", opction:[ - ]}, + ]}, { label:"户籍所在地", itemType:"input1", formName:"placeOfDomicile", opction:[ - ]}, + ]}, { label:"现居住地址", itemType:"input1", formName:"currentResidence", opction:[ - ]}, + ]}, { label:"人户状况", itemType:"select1", @@ -640,13 +640,13 @@ export default { itemType:"select1", formName:"resideSituation", opction:[ - ]}, + ]}, { label:"婚姻状况", itemType:"select1", formName:"marriage", opction:[ - ]}, + ]}, { label:"配偶情况", itemType:"select1", @@ -693,13 +693,13 @@ export default { itemType:"datepicker1", formName:"positiveTime", opction:[ - ]}, + ]}, { label:"所属支部", itemType:"cascader1", formName:"branchId", opction:[ - ]}, + ]}, { label:"流动党员", itemType:"radio1", @@ -713,7 +713,7 @@ export default { itemType:"input1", formName:"flowActNum", opction:[ - + ]}, { label:"职务", @@ -740,7 +740,7 @@ export default { itemType:"input1", formName:"joinBranchName", opction:[ - + ]},{ label:"组织关系转入社区时间", itemType:"datepicker1", @@ -758,13 +758,13 @@ export default { },{ id:'ensureHouseDto', children:[ - + { label:"住房性质", itemType:"select1", formName:"housingNature", opction:[ - ]}, + ]}, { label:"保障类型", itemType:"input1", @@ -775,13 +775,13 @@ export default { itemType:"datepicker1", formName:"certificateDate", opction:[ - ]}, + ]}, { label:"补贴编号", itemType:"input1", formName:"subsidyNum", opction:[ - + ]}, { label:"补贴金额 ", @@ -797,7 +797,7 @@ export default { label:"原工作单位", itemType:"input1", formName:"originWorkUnit", - }, + }, { label:"失业时间", itemType:"datepicker1", @@ -810,13 +810,13 @@ export default { itemType:"input1", formName:"unemploymentNum", opction:[ - ]}, + ]}, { label:"再就业优惠证号", itemType:"input1", formName:"employmentNum", opction:[ - + ]}, { label:"技术特长", @@ -850,31 +850,31 @@ export default { itemType:"datepicker1", formName:"joinArmyTime", opction:[ - ]}, + ]}, { label:"退伍时间", itemType:"datepicker1", formName:"leaveArmyTime", opction:[ - ]}, + ]}, { label:"服役单位", itemType:"input1", formName:"serviceUnit", opction:[ - ]}, + ]}, { label:"接收单位", itemType:"input1", formName:"receiveUnit ", opction:[ - ]}, + ]}, { label:"待安置补助金", itemType:"input1", formName:"settlementAmount", opction:[ - + ]}, { label:"培训状况", @@ -960,7 +960,7 @@ export default { opction:[] },] } - + ], form:{ @@ -1036,37 +1036,37 @@ export default { }, workInfoDto:{ //工作 workUnit:'',//工作单位 - occupation:'',//职业 - retireTime:'',//离退休时间 - workRemark:'',//备注 + occupation:'',//职业 + retireTime:'',//离退休时间 + workRemark:'',//备注 }, economyDto:{//经济 - retirementAmount:'',//退休金额 + retirementAmount:'',//退休金额 monthIncome:'',//月收入 }, resideInfoDto:{//居住信息 nativePlace:'',//籍贯 - placeOfDomicile:'',//户籍所在地 - currentResidence:'',//现居住地 + placeOfDomicile:'',//户籍所在地 + currentResidence:'',//现居住地 householdSituation:'',//人户情况，字典code resiRemark:'',//备注 }, familyInfoDto:{//家庭 - houseHolderRel:'',//与户主关系 - resideSituation:'',//居住情况 - marriage:'',//婚姻状况 - spouseSituation:'',//配偶情况 - elderlyFlag:null,//有无赡养人【有:1 无:0】 - elderlyRelation:'',//与赡养人关系【字典表】 - dependantMobile:'',//赡养人联系电话 - familyInfoRemark:'',//备注 + houseHolderRel:'',//与户主关系 + resideSituation:'',//居住情况 + marriage:'',//婚姻状况 + spouseSituation:'',//配偶情况 + elderlyFlag:null,//有无赡养人【有:1 无:0】 + elderlyRelation:'',//与赡养人关系【字典表】 + dependantMobile:'',//赡养人联系电话 + familyInfoRemark:'',//备注 }, parymemberInfoDto:{//党员信息 joinTime:'',//入党时间yyyy-MM-dd - positiveTime:'',//转正时间yyyy-MM-dd - branchId:'',//所属支部 - flowFlag:null,//是否流动党员：1是，0否 - flowActNum:'',//流动党员活动证号 + positiveTime:'',//转正时间yyyy-MM-dd + branchId:'',//所属支部 + flowFlag:null,//是否流动党员：1是，0否 + flowActNum:'',//流动党员活动证号 partyJob:'',//职务，字典code retiredFlag:null,//是否退休：1是，0否 centerFlag:null,//是否党员中心户：1是，0否 @@ -1076,47 +1076,47 @@ export default { }, ensureHouseDto:{//保障房信息 housingNature:'',//住房性质，字典code - securityType:'',//保障类型 + securityType:'',//保障类型 certificateDate:'',//发证日期yyyy-MM-dd - subsidyNum:'',//补贴编号 - subsidyAmount:'',//补贴金额 + subsidyNum:'',//补贴编号 + subsidyAmount:'',//补贴金额 }, unemployedDto:{//失业信息 originWorkUnit:'',//原工作单位 - unemploymentTime:'',//失业时间yyyy-MM-dd - unemploymentNum:'',//失业证号 - employmentNum:'',//再就业优惠证号 - specialSkill:'',//技术特长 - unemploymentReason:'',//失业原因【字典表】code - employmentHardFlag:null,//是否就业困难对象；1是0不是 - employmentWish:'',//劳动能力就业愿望 + unemploymentTime:'',//失业时间yyyy-MM-dd + unemploymentNum:'',//失业证号 + employmentNum:'',//再就业优惠证号 + specialSkill:'',//技术特长 + unemploymentReason:'',//失业原因【字典表】code + employmentHardFlag:null,//是否就业困难对象；1是0不是 + employmentWish:'',//劳动能力就业愿望 }, veteranDto:{//退役军人 joinArmyTime:'',//入伍时间 leaveArmyTime:'',//退伍时间 - serviceUnit:'',//服役单位 - receiveUnit:'',//接收单位 - settlementAmount:'',//待安置补助金 - trainDesc:'',//培训状况 - employmentSituation:'',//现就业情况 - joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd - joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd + serviceUnit:'',//服役单位 + receiveUnit:'',//接收单位 + settlementAmount:'',//待安置补助金 + trainDesc:'',//培训状况 + employmentSituation:'',//现就业情况 + joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd + joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否 }, unitedFrontDto:{//统战人员 duty:'',//职务 - visitation:'',//探亲情况 + visitation:'',//探亲情况 }, - volunteerDto:{//志愿者信息 + volunteerDto:{//志愿者信息 volunteerCategory:[],//志愿者类别 volunteerRemark:''//备注 }, oldPeopleDto:{ - oldSubsidy:''//高龄补助 + oldSubsidy:''//高龄补助 }, specialDto:{//特殊人群 - specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开； + specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开； } }, rulesForm: { @@ -1138,7 +1138,7 @@ export default { watch: { form:{ handler (val, val2) { - + }, deep:true, immediate:true @@ -1146,7 +1146,7 @@ export default { }, created () { this.getGridList() - + this.getAllNation() }, methods: { @@ -1156,11 +1156,12 @@ export default { this.$refs.formId.validate(v=>{ this.validateFlag = v flag = v - + }) if(flag){ return this.form } + console.log(this.form); return this.form }, @@ -1221,7 +1222,7 @@ export default { try { const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'}) this.footerInputList.forEach(c => { - + for(let i of c.children){ if(i.formName == 'disabilityCategoryCode'){ i.opction = data.data @@ -1238,7 +1239,7 @@ export default { try { const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'}) this.footerInputList.forEach(c => { - + for(let i of c.children){ if(i.formName == 'disabilityLevel'){ i.opction = data.data @@ -1265,7 +1266,7 @@ export default { } catch (error) { console.log(error,'获取所患大病字典'); } - }, + }, async getchronicNation(){ try { const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'}) @@ -1446,10 +1447,10 @@ export default { if(i != item.id){ this.tabsList = this.tabsList.filter(items=>items.id!=i) } - }) + }) } } - + }, handleChangeGrid (val) { console.log('val', val) @@ -1477,10 +1478,10 @@ export default { return this.$message.error(res.msg) } else { console.log('获取查询详情成功', res.data) - + if (res.data.isVolunteer == '1') this.form.volunteerFlag = true else this.form.volunteerFlag = false - + if (res.data.isPartyMember == '1') { this.form.partyFlag = true this.isParty = true @@ -1611,7 +1612,7 @@ export default { const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"}) this.footerInputList.forEach(c => { for(let i of c.children){ - if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){ + if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){ i.opction = data.data } } @@ -1627,7 +1628,7 @@ export default { const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"}) this.footerInputList.forEach(c => { for(let i of c.children){ - if(i.formName == 'branchId' ){ + if(i.formName == 'branchId' ){ i.opction = data.data } } @@ -1652,7 +1653,7 @@ export default { }); return arr; }, - + async getEducation(){ try { let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"}) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index f57ab28aa..c1e260710 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -3,7 +3,7 @@
- + @@ -25,6 +25,7 @@ type="date" size="small" class="u-item-width-daterange" + value-format="yyyy-MM-dd" placeholder="开始日期"> 至 @@ -32,12 +33,16 @@ v-model="form.birthdayEnd" type="date" size="small" + value-format="yyyy-MM-dd" class="u-item-width-daterange u-data-tag" placeholder="结束日期"> - + + + 至 + @@ -45,7 +50,7 @@ - + @@ -75,33 +80,33 @@ - + 所属组织: - - +
所属房屋: - - - - @@ -113,7 +118,7 @@ - +
@@ -208,31 +213,7 @@ export default { } }) 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 = { multiple: false, @@ -278,13 +259,31 @@ export default { fixedList: [], constForm, form: { - ...form, - agencyId : '', + 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: '' + villageId: '', + buildId: '', + unitId: '', + homeId: '' }, tempFormList, pickerOptions: { @@ -449,13 +448,13 @@ export default { } }, changeVDisabled() { - return !this.form.VILLAGE_ID + return !this.form.villageId }, changeBDisabled() { - return !this.form.BUILD_ID + return !this.form.buildId }, changeDDisabled() { - return !this.form.UNIT_ID + return !this.form.unitId }, }, watch: { @@ -513,17 +512,17 @@ export default { return len == 1 ? 24 : 6 }, handleClearVillage() { - this.form.BUILD_ID = '' - this.form.HOME_ID = '' + this.form.buildId = '' + this.form.homeId = '' }, handleClearBuild() { - this.form.BUILD_ID = '' - this.form.UNIT_ID = '' - this.form.HOME_ID = '' + this.form.buildId = '' + this.form.unitId = '' + this.form.homeId = '' }, handleClearDan() { - this.form.UNIT_ID = '' - this.form.HOME_ID = '' + this.form.unitId = '' + this.form.homeId = '' }, resetForm(formName) { for (const n in this.form) { @@ -545,58 +544,58 @@ export default { // this.handleSearch() // this.orgOptions = []; }, - handleSearch() { - if (this.showSmartSearchForm) { - let refObj = this.$refs['ref_rule'] - refObj.getRule() - } else { - // debugger - // console.log('formmmmm---', this.form) - const itemTypes = ['daterange', 'timerange', 'checkbox'] - let a = this.tempFormList.filter(item => item.itemType != 'inputRange') - let arr = a.filter(n => n.isChange).map((item) => { - return { - queryType: item.queryType, - tableName: item.tableName, - columnName: item.columnName, - columnValue: this.form[item.columnName] && - (itemTypes.includes(item.queryType) || - itemTypes.includes(item.itemType) || item.multiSelect == 1 - ? this.form[item.columnName] - : [this.form[item.columnName].toString()]) - } - }) - const arr2 = arr.filter(item => item.columnValue.length > 0) - let arr1 = this.fixedList - .filter((n) => n.columnValue.length > 0) - .map((item) => { - return { - ...item - } - }) - var arr4 = [] - var arr3 = [...arr1, ...arr2]; - if (this.timer.startPickerTime && this.timer.endPickerTime) { - arr4 = [{ - queryType: 'daterange', - tableName: 'ic_resi_user', - columnName: 'BIRTHDAY', - columnValue: [this.timer.startPickerTime || '', this.timer.endPickerTime || ''] - }] - arr3 = [...arr1, ...arr2, ...arr4] - } else { - let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY') - console.log(i, '标'); - arr3 = arr3.splice(i,1) - console.log(arr3); - } - this.$emit('search', arr3) - arr3 = [] - return arr3 + // handleSearch() { + // if (this.showSmartSearchForm) { + // let refObj = this.$refs['ref_rule'] + // refObj.getRule() + // } else { + // // debugger + // // console.log('formmmmm---', this.form) + // const itemTypes = ['daterange', 'timerange', 'checkbox'] + // let a = this.tempFormList.filter(item => item.itemType != 'inputRange') + // let arr = a.filter(n => n.isChange).map((item) => { + // return { + // queryType: item.queryType, + // tableName: item.tableName, + // columnName: item.columnName, + // columnValue: this.form[item.columnName] && + // (itemTypes.includes(item.queryType) || + // itemTypes.includes(item.itemType) || item.multiSelect == 1 + // ? this.form[item.columnName] + // : [this.form[item.columnName].toString()]) + // } + // }) + // const arr2 = arr.filter(item => item.columnValue.length > 0) + // let arr1 = this.fixedList + // .filter((n) => n.columnValue.length > 0) + // .map((item) => { + // return { + // ...item + // } + // }) + // var arr4 = [] + // var arr3 = [...arr1, ...arr2]; + // if (this.timer.startPickerTime && this.timer.endPickerTime) { + // arr4 = [{ + // queryType: 'daterange', + // tableName: 'ic_resi_user', + // columnName: 'BIRTHDAY', + // columnValue: [this.timer.startPickerTime || '', this.timer.endPickerTime || ''] + // }] + // arr3 = [...arr1, ...arr2, ...arr4] + // } else { + // let i = arr3.findIndex(item => item.columnName == 'BIRTHDAY') + // console.log(i, '标'); + // arr3 = arr3.splice(i,1) + // console.log(arr3); + // } + // this.$emit('search', arr3) + // arr3 = [] + // return arr3 - } + // } - }, + // }, handleOpenSearch() { this.openSearch = !this.openSearch }, @@ -617,49 +616,45 @@ export default { 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.agencyId = '' - } else { + this.form.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; - this.form.GRID_ID = '' - } + this.GRID_ID = '' } else { this.form.agencyId = '' - this.form.GRID_ID = '' + this.GRID_ID = '' } - this.form.VILLAGE_ID = '' - this.form.BUILD_ID = '' - this.form.UNIT_ID = '' - this.form.HOME_ID = '' + this.form.villageId = '' + this.form.buildId = '' + this.form.unitId = '' + this.form.homeId = '' this.getValiheList() }, handleChangeGrid(val) { console.log('val', val) - this.form.VILLAGE_ID = '' - this.form.BUILD_ID = '' - this.form.UNIT_ID = '' - this.form.HOME_ID = '' + this.form.villageId = '' + this.form.buildId = '' + this.form.unitId = '' + this.form.homeId = '' this.getValiheList() }, handleChangeV(val) { console.log('val', val) - this.form.BUILD_ID = '' - this.form.UNIT_ID = '' - this.form.HOME_ID = '' + this.form.buildId = '' + this.form.unitId = '' + this.form.homeId = '' this.getBuildList() }, handleChangeB(val) { console.log('val', val) - this.form.UNIT_ID = '' - this.form.HOME_ID = '' + this.form.unitId = '' + this.form.homeId = '' this.getUniList() }, handleChangeD(val) { console.log('val', val) - this.form.HOME_ID = '' + this.form.homeId = '' this.getHouseList() }, // 监听基础form @@ -738,7 +733,7 @@ export default { const { user } = this.$store.state this.$http .post('/gov/org/icneighborhood/neighborhoodoption', { - gridId: this.form.GRID_ID, + gridId: this.GRID_ID, agencyId: this.form.agencyId , // agencyId: user.agencyId }) @@ -757,7 +752,7 @@ export default { getBuildList() { this.$http .post('/gov/org/icbuilding/buildingoption', { - neighborHoodId: this.form.VILLAGE_ID + neighborHoodId: this.form.villageId }) .then(({ data: res }) => { if (res.code !== 0) { @@ -774,7 +769,7 @@ export default { getUniList() { this.$http .post('/gov/org/icbuildingunit/unitoption', { - buildingId: this.form.BUILD_ID + buildingId: this.form.buildId }) .then(({ data: res }) => { if (res.code !== 0) { @@ -790,7 +785,7 @@ export default { }, getHouseList() { this.$http - .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID }) + .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -935,7 +930,7 @@ export default { .resi-cell-select { max-width: 200px; box-sizing: border-box; - + &-middle { width: 130px; }