From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001 From: odc.xiaohui <xiaohui@Q1> Date: 星期二, 21 二月 2023 17:09:07 +0800 Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0 --- src/components/seachHeader/index.vue | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/components/seachHeader/index.vue b/src/components/seachHeader/index.vue index 7ce454d..1a610b4 100644 --- a/src/components/seachHeader/index.vue +++ b/src/components/seachHeader/index.vue @@ -25,7 +25,11 @@ <el-input v-model="seachData.site" placeholder="鎶ヨ鐐逛綅"></el-input> </el-form-item> <el-form-item label="鎵�灞炲尯鍩�"> - <el-input v-model="seachData.street" placeholder="鎵�灞炲尯鍩�"></el-input> + <el-cascader + v-model="seachData.street" + :options="communityOptions" + :props="options" + @change="handleChange"></el-cascader> </el-form-item> <el-form-item label="鎶ヨ鏃堕棿"> <el-date-picker @@ -64,10 +68,16 @@ <script> import {RESOURCE_OPTIONS} from "@/utils/helper"; +import department from "@/api/system/department"; export default { data(){ return{ + options:{ + label:'regionName', + value:'id', + }, + communityOptions:[], eventSourceOptions: RESOURCE_OPTIONS, seachData:{ @@ -106,8 +116,20 @@ }, mounted() { this.getPool() + this.getCommunityOptions() }, methods:{ + handleChange(value) { + console.log(value); + }, + // 鑾峰彇绀惧尯鍜岃閬� + getCommunityOptions() { + department.getDepartmentList() + .then(res => { + this.communityOptions = res; + }) + .catch(err => this.$message.error(err)) + }, getPool(){ console.log(this.$route.name); let name = this.$route.name @@ -117,7 +139,11 @@ }, getUserList(){ - this.$emit('getUserList', {seachData:this.seachData}) + console.log(this.seachData) + // this.seachData.alarmTimeOne =this.seachData.alarmTime[0]; + // this.seachData.alarmTimeTwo = this.seachData.alarmTime[1]; + this.seachData.street=this.seachData.street?this.seachData.street[this.seachData.street.length-1]:null; + this.$emit('getUserList', {seachData:this.seachData}); }, dialogCreate(){ this.$emit('dialogCreatepro') -- Gitblit v1.8.0