Browse Source

居民信息年龄columnName空

dev
mk 2 years ago
parent
commit
6c00b46dea
  1. 9
      src/views/components/rangeInput.vue
  2. 559
      src/views/components/resiSearch.vue
  3. 6
      src/views/modules/base/resi.vue

9
src/views/components/rangeInput.vue

@ -10,7 +10,7 @@
:type="inputType"
clearable
placeholder="请输入"
@change="handleChange" />
@change="handleChange($event,'s')" />
</el-form-item>
<div class="div_middle">-</div>
<el-form-item prop="end">
@ -20,7 +20,7 @@
:type="inputType"
clearable
placeholder="请输入"
@change="handleChange"
@change="handleChange($event,'e')"
@blur="handleBlur" />
</el-form-item>
</div>
@ -87,10 +87,9 @@ export default {
},
},
methods: {
handleChange (val) {
handleChange (val,type) {
// if ()
this.$emit('change', { ...this.inputForm })
this.$emit('change', { ...this.inputForm },type)
},
handleBlur () {

559
src/views/components/resiSearch.vue

@ -7,14 +7,16 @@
<div class="resi-cell">
<div class="resi-cell-label">所属组织</div>
<div class="resi-cell-value">
<el-cascader class="customer_cascader"
<el-cascader
class="customer_cascader"
ref="myCascader"
v-model="agencyIdArray"
filterable
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
@change="handleChangeAgency"
></el-cascader>
</div>
</div>
</el-col>
@ -69,7 +71,7 @@
size="small"
filterable
clearable
style="width: 120px;"
style="width: 120px"
class="resi-cell-select"
:disabled="changeVDisabled"
@clear="handleClearBuild"
@ -90,7 +92,7 @@
size="small"
filterable
clearable
style="width: 120px;"
style="width: 120px"
class="resi-cell-select"
@click="handleClearDan"
@change="handleChangeD"
@ -110,7 +112,7 @@
size="small"
filterable
clearable
style="width: 120px;"
style="width: 120px"
class="resi-cell-select"
>
<el-option
@ -132,7 +134,12 @@
>
<el-col v-for="n in item" :key="n.id" :span="computdSpan(item.length)">
<div class="resi-cell">
<div class="resi-cell-label" :class="item.length != 4 && 'resi-cell-label1'">{{ n.label }}</div>
<div
class="resi-cell-label"
:class="item.length != 4 && 'resi-cell-label1'"
>
{{ n.label }}
</div>
<div
class="resi-cell-value"
:class="n.itemType === 'radio' && 'resi-cell-value-radio'"
@ -149,12 +156,16 @@
<template v-else-if="n.itemType == 'inputRange'">
<!-- <el-input
v-model.trim="form[n.columnName]"
class="resi-cell-input"
class="resi-cell-input"F
size="small"
clearable
placeholder="请输入内容"
/> -->
<inputRange v-model="form[n.columnName]" :type="n.validType" @change="handleAgeChange" />
<inputRange
v-model="ageObj"
:type="n.validType"
@change="handleAgeChange"
/>
</template>
<template v-else-if="n.itemType === 'datepicker'">
<el-date-picker
@ -215,7 +226,12 @@
</el-cascader>
<template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model="form[n.columnName]">
<el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
<el-checkbox
v-for="ns in n.options"
:key="ns.value"
:label="ns.value"
>{{ ns.label }}</el-checkbox
>
<!-- <el-checkbox label="n.la"></el-checkbox> -->
</el-checkbox-group>
</template>
@ -229,8 +245,12 @@
<el-button type="primary" size="mini">查询</el-button>
</el-col> -->
<el-col :span="24">
<el-button type="primary" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
<el-button type="primary" size="small" @click="handleSearch"
>查询</el-button
>
<el-button class="diy-button--reset" size="small" @click="resetForm"
>重置</el-button
>
</el-col>
</el-row>
<!-- <div v-if="isArrow" class="resi-down" @click="handleOpenSearch">
@ -242,79 +262,84 @@
</template>
<script>
import inputRange from './rangeInput.vue'
import inputRange from "./rangeInput.vue";
export default {
name: 'ResiSearch',
name: "ResiSearch",
components: {
inputRange
inputRange,
},
props: {
formList: {
type: Array,
default: () => []
default: () => [],
},
columnName: {
type: String,
default: ''
default: "",
},
showGrid: {
type: Boolean,
default: false
default: false,
},
isArrow: {
type: Boolean,
default: false
}
default: false,
},
},
data() {
let initForm = (arr, columnName) => {
let _form = {}
let _form = {};
// console.log('formInfo', obj)
// if (Object.keys(obj).length > 0) {
// _form = { ...obj }
// return _form
// }
arr.forEach((item) => {
if (item.itemType == 'checkbox') _form[item.columnName] = []
else if (item.queryType == 'resi_category' && columnName ){
_form[item.columnName] = [columnName]
} else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: ''}
else _form[item.columnName] = ''
})
return _form
}
let itemList = this.formList.map(item => {
if (item.itemType == 'inputRange' && item.funType == '') {
item.columnName = 'age'
if (item.itemType == "checkbox") _form[item.columnName] = [];
else if (item.queryType == "resi_category" && columnName) {
_form[item.columnName] = [columnName];
} else if (columnName && columnName === item.columnName)
_form[item.columnName] = "1";
else if (item.itemType == "inputRange")
_form[item.columnName] = { start: "", end: "" };
else _form[item.columnName] = "";
});
return _form;
};
let itemList = this.formList.map((item) => {
if (item.itemType == "inputRange" && item.funType == "") {
item.columnName = "age";
}
return {
...item
}
})
let form = initForm(itemList, this.columnName)
let tempFormList = itemList.map(item => {
...item,
};
});
let form = initForm(itemList, this.columnName);
let tempFormList = itemList.map((item) => {
return {
...item,
isChange:( item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
}
})
isChange:
(item.queryType == "resi_category" && this.columnName) ||
this.columnName === item.columnName
? true
: false,
};
});
let constForm = {
...form,
GRID_ID: '',
VILLAGE_ID: '',
BUILD_ID: '',
UNIT_ID: '',
HOME_ID: ''
}
GRID_ID: "",
VILLAGE_ID: "",
BUILD_ID: "",
UNIT_ID: "",
HOME_ID: "",
};
let orgOptionProps = {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
}
value: "agencyId",
label: "agencyName",
children: "subAgencyList",
checkStrictly: true,
};
return {
pageLoading: false,
@ -327,90 +352,92 @@ export default {
orgOptions: [],
orgOptionProps,
agencyIdArray: [],
value: '',
value: "",
itemList,
fixedList: [],
fixedForm: {
AGENCY_ID: '',
GRID_ID: '',
VILLAGE_ID: '',
BUILD_ID: '',
UNIT_ID: '',
HOME_ID: ''
AGENCY_ID: "",
GRID_ID: "",
VILLAGE_ID: "",
BUILD_ID: "",
UNIT_ID: "",
HOME_ID: "",
},
constForm,
form: {
...form,
AGENCY_ID: '',
GRID_ID: '',
VILLAGE_ID: '',
BUILD_ID: '',
UNIT_ID: '',
HOME_ID: ''
AGENCY_ID: "",
GRID_ID: "",
VILLAGE_ID: "",
BUILD_ID: "",
UNIT_ID: "",
HOME_ID: "",
},
tempFormList,
pickerOptions: {
shortcuts: [
{
text: '最近一周',
text: "最近一周",
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
picker.$emit('pick', [start, end])
}
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: '最近一个月',
text: "最近一个月",
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
picker.$emit('pick', [start, end])
}
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: '最近三个月',
text: "最近三个月",
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
picker.$emit('pick', [start, end])
}
}
]
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
queryType: {
'AGENCY_ID':'like'
}
}
AGENCY_ID: "like",
},
ageObj: {},
};
},
computed: {
sliceList() {
return function (data, count) {
console.log(data);
if (data !== undefined) {
let index = 0
let arrTemp = []
let index = 0;
let arrTemp = [];
for (let i = 0; i < data.length; i++) {
index = parseInt(i / count)
index = parseInt(i / count);
if (arrTemp.length <= index) {
arrTemp.push([])
}
arrTemp[index].push(data[i])
arrTemp.push([]);
}
return arrTemp
arrTemp[index].push(data[i]);
}
return arrTemp;
}
};
},
changeVDisabled() {
return !this.form.VILLAGE_ID
return !this.form.VILLAGE_ID;
},
changeBDisabled() {
return !this.form.BUILD_ID
return !this.form.BUILD_ID;
},
changeDDisabled() {
return !this.form.UNIT_ID
return !this.form.UNIT_ID;
},
},
watch: {
@ -419,310 +446,344 @@ export default {
// console.log('valpppp----', val, val2)
for (let n in val) {
if (this.constForm[n] !== val[n]) {
this.handleChangeForm(n)
console.log('nnnnnn', n)
this.handleChangeForm(n);
console.log("nnnnnn", n);
}
}
this.constForm = { ...val }
this.constForm = { ...val };
},
deep: true,
},
deep: true
}
},
created() {
// this.initForm()
// console.log('formcccc---', this.form)
this.getOrgTreeList()
this.getGridList()
this.getValiheList()
if (this.columnName) this.handleChangeForm(this.columnName)
this.getOrgTreeList();
this.getGridList();
this.getValiheList();
if (this.columnName) this.handleChangeForm(this.columnName);
},
methods: {
initForm() {
this.formList.forEach((item) => {
this.$set(this.form, item.columnName, '')
})
console.log('formcccc---', this.form)
this.$set(this.form, item.columnName, "");
});
console.log("formcccc---", this.form);
},
computdSpan(len) {
return len == 1 ? 24 : 6
return len == 1 ? 24 : 6;
},
handleClearVillage() {
this.form.BUILD_ID = ''
this.form.HOME_ID = ''
this.form.BUILD_ID = "";
this.form.HOME_ID = "";
},
handleClearBuild() {
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.form.BUILD_ID = "";
this.form.UNIT_ID = "";
this.form.HOME_ID = "";
},
handleClearDan() {
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.form.UNIT_ID = "";
this.form.HOME_ID = "";
},
resetForm(formName) {
for (const n in this.form) {
if (n == 'age') {
this.form.age = {
start: '',
end: ''
if (typeof this.form[n] == "object") this.form[n] = [];
else this.form[n] = "";
}
} else if (typeof this.form[n] == 'object') this.form[n] = []
else this.form[n] = ''
}
this. agencyIdArray=[]
this.ageObj = {};
this.agencyIdArray = [];
// let arr3 = [...arr1, ...arr]
this.$emit('search', [])
this.$emit("search", []);
// this.handleSearch()
// this.orgOptions = [];
},
handleSearch() {
// 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) => {
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: []
columnValue: this.form[item.columnName] &&
columnValue:
this.form[item.columnName] &&
(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].toString()])
}
})
const arr2 = arr.filter(item => item.columnValue.length > 0)
: [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
...item,
};
});
let arr3 = [];
var objKey = JSON.stringify(this.ageObj) == "{}";
if (objKey) {
arr3 = [...arr1, ...arr2];
this.$emit("search", arr3);
return arr3;
} else {
let temp = [];
for (let i in this.ageObj) {
temp.push(this.ageObj[i]);
}
let arr4 = [
{
columnName: "",
columnValue: temp,
queryType: "agerange",
tableName: "ic_resi_user",
},
];
arr3 = [...arr1, ...arr2, ...arr4];
this.$emit("search", arr3);
return arr3;
}
})
let arr3 = [...arr1, ...arr2]
this.$emit('search', arr3)
return arr3
},
handleOpenSearch() {
this.openSearch = !this.openSearch
this.openSearch = !this.openSearch;
},
handleAgeChange(val) {
console.log('val----age---', val)
handleAgeChange(val, type) {
console.log("val----age---", val);
if (type == "s") {
this.ageObj.start = val.start;
} else {
this.ageObj.end = val.end;
}
// const s = this.computedBirth(val.end)
// const e = this.computedBirth(val.start)
this.form.BIRTHDAY = [val.start,val.end ]
},
handleChangeAgency(val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
if (obj) {
if(obj.level === 'grid'){
this.form.GRID_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.form.AGENCY_ID=''
if (obj.level === "grid") {
this.form.GRID_ID =
this.agencyIdArray.length > 0
? this.agencyIdArray[this.agencyIdArray.length - 1]
: "";
this.form.AGENCY_ID = "";
} else {
this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.form.GRID_ID = ''
this.form.AGENCY_ID =
this.agencyIdArray.length > 0
? this.agencyIdArray[this.agencyIdArray.length - 1]
: "";
this.form.GRID_ID = "";
}
} else {
this.form.AGENCY_ID=''
this.form.GRID_ID = ''
this.form.AGENCY_ID = "";
this.form.GRID_ID = "";
}
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getValiheList()
this.form.VILLAGE_ID = "";
this.form.BUILD_ID = "";
this.form.UNIT_ID = "";
this.form.HOME_ID = "";
this.getValiheList();
},
handleChangeGrid(val) {
console.log('val', val)
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getValiheList()
console.log("val", val);
this.form.VILLAGE_ID = "";
this.form.BUILD_ID = "";
this.form.UNIT_ID = "";
this.form.HOME_ID = "";
this.getValiheList();
},
handleChangeV(val) {
console.log('val', val)
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getBuildList()
console.log("val", val);
this.form.BUILD_ID = "";
this.form.UNIT_ID = "";
this.form.HOME_ID = "";
this.getBuildList();
},
handleChangeB(val) {
console.log('val', val)
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getUniList()
console.log("val", val);
this.form.UNIT_ID = "";
this.form.HOME_ID = "";
this.getUniList();
},
handleChangeD(val) {
console.log('val', val)
this.form.HOME_ID = ''
this.getHouseList()
console.log("val", val);
this.form.HOME_ID = "";
this.getHouseList();
},
// form
handleChangeForm(val) {
for (let n in this.fixedForm) {
if (n === val) {
if (this.fixedList.length > 0) {
let _item = {}
let hasVal = false
let _item = {};
let hasVal = false;
this.fixedList.forEach((item, index) => {
if (item.columnName == val) {
hasVal = true
item.columnValue[0] = this.form[val]
if (!this.form[val]) this.fixedList.splice(index, 1)
console.log('fixedList----val', this.fixedList)
hasVal = true;
item.columnValue[0] = this.form[val];
if (!this.form[val]) this.fixedList.splice(index, 1);
console.log("fixedList----val", this.fixedList);
} else {
_item = {
queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
tableName: 'ic_resi_user',
queryType: this.queryType[val]
? this.queryType[val]
: "equal", //'equal',
tableName: "ic_resi_user",
columnName: val,
columnValue: [this.form[val]]
}
console.log('fixedList----else', _item)
columnValue: [this.form[val]],
};
console.log("fixedList----else", _item);
// this.$set(this.fixedList, index, _item)
}
})
if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
});
if (Object.keys(_item).length > 0 && !hasVal)
this.fixedList.push(_item);
} else {
this.$set(this.fixedList, 0, {
queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
tableName: 'ic_resi_user',
queryType: this.queryType[val] ? this.queryType[val] : "equal", //'equal',
tableName: "ic_resi_user",
columnName: val,
columnValue: [this.form[val]]
})
columnValue: [this.form[val]],
});
}
}
}
console.log('fixedList----999', this.fixedList)
console.log("fixedList----999", this.fixedList);
this.tempFormList.forEach((item) => {
if (item.columnName === val) item.isChange = true
})
if (item.columnName === val) item.isChange = true;
});
},
getOrgTreeList() {
const { user } = this.$store.state
const { user } = this.$store.state;
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.post("/gov/org/customeragency/agencygridtree", {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取组织树成功', res.data)
this.orgOptions=[]
this.orgOptions .push( res.data)
console.log("获取组织树成功", res.data);
this.orgOptions = [];
this.orgOptions.push(res.data);
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
getGridList() {
const { user } = this.$store.state
const { user } = this.$store.state;
this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
.post("/gov/org/customergrid/gridoption", {
agencyId: user.agencyId,
purpose: "query",
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
console.log("获取查询详情成功", res.data);
this.optionsG = res.data;
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
getValiheList() {
const { user } = this.$store.state
const { user } = this.$store.state;
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', {
.post("/gov/org/icneighborhood/neighborhoodoption", {
gridId: this.form.GRID_ID,
agencyId: this.form.AGENCY_ID,
// agencyId: user.agencyId
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data
console.log("获取查询详情成功", res.data);
this.optionsV = res.data;
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
getBuildList() {
this.$http
.post('/gov/org/icbuilding/buildingoption', {
neighborHoodId: this.form.VILLAGE_ID
.post("/gov/org/icbuilding/buildingoption", {
neighborHoodId: this.form.VILLAGE_ID,
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
console.log("获取查询详情成功", res.data);
this.optionsB = res.data;
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
getUniList() {
this.$http
.post('/gov/org/icbuildingunit/unitoption', {
buildingId: this.form.BUILD_ID
.post("/gov/org/icbuildingunit/unitoption", {
buildingId: this.form.BUILD_ID,
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
console.log("获取查询详情成功", res.data);
this.optionsD = res.data;
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
getHouseList() {
this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
.post("/gov/org/ichouse/houseoption", { unitId: this.form.UNIT_ID })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
console.log("获取查询详情成功", res.data);
this.optionsH = res.data;
}
})
.catch(() => {
return this.$message.error('网络错误')
})
return this.$message.error("网络错误");
});
},
computedBirth(age) {
let now = new Date();
let nowYear = now.getFullYear();
let nowMonth = now.getMonth() + 1;
let nowDay = now.getDate(); // daymonthmonthyearyear
let subYear = nowYear - age
let subYear = nowYear - age;
if (nowMonth < 10) {
nowMonth = '0'+ nowMonth
nowMonth = "0" + nowMonth;
}
if (nowDay < 10) {
nowDay = '0' + nowDay
}
console.log(subYear+'-'+nowMonth+'-'+nowDay);
return subYear + '-' + nowMonth + '-' + nowDay
}
}
nowDay = "0" + nowDay;
}
console.log(subYear + "-" + nowMonth + "-" + nowDay);
return subYear + "-" + nowMonth + "-" + nowDay;
},
},
};
</script>
<style lang="scss" scope>

6
src/views/modules/base/resi.vue

@ -670,11 +670,7 @@ export default {
},
handleSearch (val) {
this.currentPage = 1;
val.forEach(item=>{
if(item.columnName == "BIRTHDAY"){
item.queryType = 'agerange'
}
})
console.log(val);
this.conditions = val;
this.getTableData();
},

Loading…
Cancel
Save