diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index b6deb8152..96323c55d 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -5,12 +5,16 @@
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
                         <el-form-item label="所属组织" prop="gridId">
-                            <el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small"
-                                clearable>
-                                <el-option v-for="item in gridList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
+        
+                            <el-cascader class="u-item-width-normal"
+                                size="small"
+                                ref="myCascader"
+                                v-model="formData.agencyId"
+                                :options="orgOptions"
+                                :props="orgOptionProps"
+                                :show-all-levels="false"
+                                @change="handleChangeAgency"
+                                clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="上报渠道" prop="sourceType">
                             <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
@@ -271,11 +275,25 @@ export default {
         //     return time.getTime() > nowData;
         // };
 
+        let orgOptionProps = {
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
+
         return {
             pageType: "list", // 列表list 新增add  处理dispose 详情info
             user: {},
+
             agencyId: "",
-            gridList: [], //所属网格list--场所区域
+            orgOptions: [],
+            orgOptionProps,
+            level: '',
+            optionsG: [],
+            sarr: [],
+
             tableData: [],
             statusArray: [
                 {
@@ -313,7 +331,7 @@ export default {
             ],
 
             formData: {
-                gridId: "",
+                agencyId: "",
                 sourceType: "",
                 eventContent: "",
                 name: "",
@@ -372,7 +390,9 @@ export default {
     mounted() {
         this.user = this.$store.state.user;
         this.agencyId = this.user.agencyId;
-        this.loadGrid();
+
+        this.getOrgTreeList()
+        this.getGridList()
         this.getTableData();
         this.getCateOptions();
     },
@@ -441,19 +461,6 @@ export default {
             this.getTableData();
         },
 
-        async loadGrid() {
-            const url = "/gov/org/customergrid/gridoption";
-            let params = {
-                agencyId: this.agencyId,
-                purpose: "query",
-            };
-            const { data, code, msg } = await requestPost(url, params);
-            if (code === 0) {
-                this.gridList = data;
-            } else {
-                this.$message.error(msg);
-            }
-        },
 
         async handleExport() {
             const url = "/governance/icEvent/export";
@@ -677,6 +684,18 @@ export default {
             if (this.eventTypeCheck) {
                 this.formData.secondIdList = this.eventTypeCheck
             }
+            // 处理 agencyId
+            if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
+                if(this.level=="grid"){
+                    this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
+                    this.formData.agencyId = "";
+                }else{
+                    this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
+                }
+            } else {
+                this.formData.agencyId = "";
+            }
+            
             const { pageSize, pageNo, formData } = this;
             const { data, code, msg } = await requestPost(url, {
                 pageSize,
@@ -710,9 +729,68 @@ export default {
             this.getTableData();
         },
 
+
+        getOrgTreeList () {
+            this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    console.log('获取组织树成功', res.data)
+                    this.orgOptions = []
+                    this.orgOptions.push(res.data)
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+        getGridList () {
+            this.$http
+                .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose: 'addorupdate' })
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    console.log('获取查询详情成功', res.data)
+                    this.optionsG = res.data
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+
+        handleChangeAgency (val) {
+
+            this.sarr = []
+            const map = new Map();
+            this.getLastItem(
+            this.orgOptions,
+            val,
+            "agencyId"
+            );
+            this.level = this.sarr[this.sarr.length - 1].level
+        },
+        getLastItem (list, vals, key) {
+            let LIST = list || [];
+            for (let item of LIST) {
+            // console.log(item[key]);
+            for (let i of vals) {
+                if (item[key] === i) {
+                this.sarr.push(item);
+                } else {
+                this.getLastItem(item.subAgencyList, vals, key);
+                }
+            }
+            }
+        },
+
+
         resetSearch() {
             this.formData = {
-                gridId: "",
+                agencyId: "",
                 sourceType: "",
                 eventContent: "",
                 name: "",
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index ddf811d51..065b544f1 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -4,13 +4,16 @@
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
-                        <el-form-item label="所属网格" prop="gridId">
-                            <el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small"
-                                clearable>
-                                <el-option v-for="item in gridList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
+                        <el-form-item label="所属网格" prop="agencyId">
+                            <el-cascader class="u-item-width-normal"
+                                size="small"
+                                ref="myCascader"
+                                v-model="formData.agencyId"
+                                :options="orgOptions"
+                                :props="orgOptionProps"
+                                :show-all-levels="false"
+                                @change="handleChangeAgency"
+                                clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="上报渠道" prop="sourceType">
                             <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
@@ -257,6 +260,14 @@ export default {
             return time.getTime() > nowData;
         };
 
+        let orgOptionProps = {
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
+
         return {
             pageType: "list", // 列表list 新增add  处理dispose 详情info
             user: {},
@@ -264,6 +275,12 @@ export default {
             gridList: [], //所属网格list--场所区域
             tableData: [],
 
+            orgOptions: [],
+            orgOptionProps,
+            level: '',
+            optionsG: [],
+            sarr: [],
+
             statusArray: [
                 {
                     value: "processing",
@@ -322,7 +339,8 @@ export default {
             ],
 
             formData: {
-                gridId: "",
+                agencyId: "",
+                gridId:"",
                 sourceType: "",
                 eventContent: "",
                 name: "",
@@ -383,7 +401,8 @@ export default {
     mounted() {
         this.user = this.$store.state.user;
         this.agencyId = this.user.agencyId;
-        this.loadGrid();
+        this.getOrgTreeList()
+        this.getGridList()
         this.getTableData();
         this.getCateOptions();
     },
@@ -588,6 +607,18 @@ export default {
             if (this.eventTypeCheck) {
                 this.formData.secondIdList = this.eventTypeCheck
             }
+            // 处理 agencyId
+            if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
+                if(this.level=="grid"){
+                    this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
+                    this.formData.agencyId = "";
+                }else{
+                    this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
+                }
+            } else {
+                this.formData.agencyId = "";
+            }
+
             const { pageSize, pageNo, formData } = this;
             const { data, code, msg } = await requestPost(url, {
                 pageSize,
@@ -665,7 +696,7 @@ export default {
         },
         resetSearch() {
             this.formData = {
-                gridId: "",
+                agencyId: "",
                 sourceType: "",
                 eventContent: "",
                 name: "",
@@ -682,6 +713,65 @@ export default {
             this.getTableData();
             // this.loadTable()
         },
+
+
+        getOrgTreeList () {
+            this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    console.log('获取组织树成功', res.data)
+                    this.orgOptions = []
+                    this.orgOptions.push(res.data)
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+        getGridList () {
+            this.$http
+                .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose: 'addorupdate' })
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    console.log('获取查询详情成功', res.data)
+                    this.optionsG = res.data
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+
+        handleChangeAgency (val) {
+
+            this.sarr = []
+            const map = new Map();
+            this.getLastItem(
+            this.orgOptions,
+            val,
+            "agencyId"
+            );
+            this.level = this.sarr[this.sarr.length - 1].level
+        },
+        getLastItem (list, vals, key) {
+            let LIST = list || [];
+            for (let item of LIST) {
+            // console.log(item[key]);
+            for (let i of vals) {
+                if (item[key] === i) {
+                this.sarr.push(item);
+                } else {
+                this.getLastItem(item.subAgencyList, vals, key);
+                }
+            }
+            }
+        },
+
         //重构树，去除网格
         deepTree(arr, children) {
             if (Array.isArray(arr) && arr.length > 0) {