Browse Source

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

# Conflicts:
#	src/views/modules/base/resi.vue
V1.0
dai 3 years ago
parent
commit
76c9ae9102
  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
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;
}

211
src/views/components/resiForm.vue

@ -1,7 +1,7 @@
<template>
<div
<div
class="g-main ">
<el-form
<el-form
class="resi-form m-search"
:model="form"
ref="formId"
@ -20,7 +20,7 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属房屋"
label-width="100px">
@ -81,8 +81,8 @@
</el-option>
</el-select>
</el-form-item>
</div>
</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" >
@ -99,7 +99,7 @@
</section>
</template>
<template v-if="item.itemType == 'input'" >
<el-input
<el-input
clearable
size="small"
:placeholder="`请输入${item.label}`"
@ -116,7 +116,7 @@
clearable
class="u-item-width-normal">
<el-option v-for="items in item.opction "
:key="items.value"
:label="items.label"
:value="items.value">
@ -133,17 +133,17 @@
resize="none"
rows="3"
v-model.trim="form[item.formName]"
>
</el-input>
</template>
<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"
v-model="form[items.formName]"
@change="val => handleChangeCheckbox(val,items)"
>
</el-checkbox>
</el-checkbox>
</template>
<template v-else-if="item.itemType == 'datepicker'" :label="item.label">
<el-date-picker
@ -157,7 +157,7 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</template>
</el-form-item>
<!-- 这里开始就是底部的input了------------------------------------------------------------------->
<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':''" >
<template v-if="itemk.itemType == 'radio1'" >
<section class="u-item-width-normal" >
<el-radio
<el-radio
v-for="ns in itemk.opction"
:key="ns.value"
size="small"
@ -187,7 +187,7 @@
v-model="form[itemj.id][itemk.formName]"
:placeholder="`请选择${itemk.label}`"
size="small"
:multiple="itemk.formName=='specialCategoryCode'"
:multiple="itemk.formName=='specialCategoryCode'"
:collapse-tags="itemk.formName=='specialCategoryCode'"
clearable
class="u-item-width-normal">
@ -195,9 +195,9 @@
:key="items.value"
:label="items.label"
:value="items.value">
</el-option>
</el-select>
</el-select>
</template>
<template v-else-if="itemk.itemType=='textarea1'" >
<el-input
@ -223,13 +223,13 @@
</el-input>
</template>
<template v-else-if="itemk.itemType=='checkbox'" >
<el-checkbox-group
<el-checkbox-group
size="small"
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-group>
</el-checkbox-group>
</template>
<template v-else-if="itemk.itemType == 'datepicker1'">
<el-date-picker
@ -257,7 +257,7 @@
</template>
</el-form-item>
</section>
</template>
</template>
</el-tab-pane>
</el-tabs>
</el-form>
@ -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,//10
flowActNum:'',//
positiveTime:'',//yyyy-MM-dd
branchId:'',//
flowFlag:null,//10
flowActNum:'',//
partyJob:'',//code
retiredFlag:null,//退10
centerFlag:null,//10
@ -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,//10
employmentWish:'',//
unemploymentTime:'',//yyyy-MM-dd
unemploymentNum:'',//
employmentNum:'',//
specialSkill:'',//
unemploymentReason:'',//code
employmentHardFlag:null,//10
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,//;10
},
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"})

251
src/views/components/resiSearch.vue

@ -3,7 +3,7 @@
<!-- <el-card class="resi-card"> -->
<div class="g-main">
<el-form :inline="true" class="header_form_box" :model="form" :label-width="'100px'">
<el-form-item label="居民姓名" >
<el-input v-model="form.name" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input>
</el-form-item>
@ -25,6 +25,7 @@
type="date"
size="small"
class="u-item-width-daterange"
value-format="yyyy-MM-dd"
placeholder="开始日期">
</el-date-picker>
<span class="u-data-tag"></span>
@ -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="结束日期">
</el-date-picker>
</el-form-item>
<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-form-item>
<el-form-item label="文化程度" >
@ -45,7 +50,7 @@
<template v-for="item in Education" >
<el-option :label='item.label' :value='item.value'> </el-option>
</template>
</el-select>
</el-form-item>
<el-form-item label="本地户籍" >
@ -75,33 +80,33 @@
</template>
</el-select>
</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>
<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>
</el-form-item>
<el-form-item prop="VILLAGE_ID" >
<el-form-item prop="villageId" >
<div class="resi-cell">
<div class="resi-cell-value">
<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">
<el-option v-for="item in optionsV" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</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"
@change="handleChangeB">
<el-option v-for="item in optionsB" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</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"
@change="handleChangeD">
<el-option v-for="item in optionsD" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</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">
<el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@ -113,7 +118,7 @@
<el-input v-model="form.remark" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input>
</el-form-item>
</el-form>
</div>
<el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
<el-col :span="24">
@ -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;
}

Loading…
Cancel
Save