From 63830b9b27ca2cde90a71a79e08062bc0cabfd46 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 28 Nov 2023 11:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satisfactionProvince/index.vue            |   2 +-
 .../modules/shequzhili/event/cpts/add.vue     |  76 ++++++-
 .../shequzhili/event/cpts/event-info.vue      | 210 ++++++++++--------
 .../shequzhili/event/cpts/process-form.vue    |   8 +-
 .../modules/shequzhili/event/eventList.vue    | 111 ++++-----
 .../modules/shequzhili/eventOld/cpts/add.vue  | 120 +++++++---
 .../shequzhili/eventOld/cpts/event-info.vue   |  24 +-
 .../shequzhili/eventOld/cpts/process-form.vue |  12 +-
 8 files changed, 349 insertions(+), 214 deletions(-)

diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue
index b1e8adf82..a8ae03512 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/index.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue
@@ -97,7 +97,7 @@
               />
               <div class="left_right">
                 <div>{{ badTotal }}</div>
-                <div>综合得分</div>
+                <div>不满意总数</div>
               </div>
             </div>
             <div class="right">
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index 1a07f8af0..8257014dd 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -4,10 +4,13 @@
             <div class="g-left">
                 <el-form ref="ref_form1" :inline="true" :model="formData" :rules="dataRule" class="form">
                     <el-form-item label="所属组织" prop="gridId" label-width="150px" style="display: block">
-                        <el-select v-model.trim="formData.gridId" placeholder="请选择" clearable class="cell-width-1">
+                        <!-- <el-select v-model.trim="formData.gridId" placeholder="请选择" clearable class="cell-width-1">
                             <el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
-                        </el-select>
+                        </el-select> -->
+                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model="formData.gridId"
+                            :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
+                            @change="handleChangeAgency" clearable></el-cascader>
                     </el-form-item>
 
                     <el-form-item label="上报渠道" label-width="150px" prop="sourceType">
@@ -18,7 +21,8 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="工单号" prop="workOrderNum" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入工单号" v-model="formData.workOrderNum" />
+                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入工单号"
+                            v-model="formData.workOrderNum" />
                     </el-form-item>
                     <el-form-item label="接收时间" prop="happenTime" label-width="150px" style="display: block">
                         <el-date-picker v-model="formData.happenTime" class="cell-width-1" type="datetime"
@@ -139,7 +143,7 @@ function iniFmData() {
         address: "", //事件地址
         latitude: "", //	经度
         longitude: "", //维度
-        workOrderNum : "" //工单号
+        workOrderNum: "" //工单号
         // operationType: '0',//	处理方式
         // content: '',//回复内容
         // status: '',//	处理中：processing；已办结：closed_case
@@ -202,6 +206,18 @@ export default {
             demandUserList: [],
 
             hideUploadBtn: false,
+            orgOptions: [],
+            orgOptionProps: {
+                multiple: false,
+                value: 'agencyId',
+                label: 'agencyName',
+                children: 'subAgencyList',
+                checkStrictly: true
+            },
+            sarr:[],
+            obj:{
+                level:''
+            }
         };
     },
     components: {},
@@ -211,7 +227,7 @@ export default {
                 gridId: [
                     { required: true, message: "所属组织不能为空", trigger: "blur" },
                 ],
-                workOrderNum :[
+                workOrderNum: [
                     { required: true, message: "工单号不能为空", trigger: "blur" }
                 ],
                 name: [
@@ -250,6 +266,9 @@ export default {
             this.selGridId = val;
             this.$emit("changeGridId", val);
         },
+        "obj.level": function (val) {
+            this.$emit("changeLevel", val);
+        },
     },
 
     async mounted() {
@@ -263,11 +282,52 @@ export default {
         this.formData.latitude = latitude;
         this.formData.longitude = longitude;
         this.initMap(this.formData.latitude, this.formData.longitude);
-        this.loadGrid();
+        // this.loadGrid();
         this.getCategoryList();
+        this.getOrgTreeList()
     },
 
     methods: {
+        handleChangeAgency(val) {
+
+            this.sarr = []
+            const map = new Map();
+            this.getLastItem(
+                this.orgOptions,
+                val,
+                "agencyId"
+            );
+            this.obj.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);
+                }
+            }
+            }
+        },
+        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('网络错误')
+                })
+        },
         async handleShowPersonList() {
             if (this.formData.gridId) {
                 await this.handleChangeGrid();
@@ -358,10 +418,6 @@ export default {
             }
         },
 
-        handleChangeAgency(value) {
-            // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
-            // this.orgId = this.selCategoryArray.length > 0 ? this.selCategoryArray[this.selCategoryArray.length - 1] : ''
-        },
 
         async getEventInfo() {
             this.okflag = false;
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 288e75d76..115d72770 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -5,7 +5,7 @@
                 <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-zntb.png" width="30px"
                         height="30px" alt=""> 新增事件</h3>
                 <event-add ref="ref_add" @changeName="changeName" @changeMobile="changeMobile" @changeUserId="changeUserId"
-                    @changeGridId="changeGridId"></event-add>
+                    @changeGridId="changeGridId" @changeLevel="changeLevel"></event-add>
             </el-card>
 
             <div class="process-form">
@@ -104,7 +104,8 @@
                                             <template v-if="i.type === 'image'">
                                                 <div class="detail">
                                                     <div class="detail-field">图片：</div>
-                                                    <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                    <div
+                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                         <img :src="i.url" :key="i.url"
                                                             style="width: 50px; height: 50px; padding-right: 10px"
                                                             @click="watchImg(i.url)" />
@@ -114,7 +115,8 @@
                                             <template v-if="i.type === 'voice'">
                                                 <div class="detail">
                                                     <div class="detail-field">语音：</div>
-                                                    <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                    <div
+                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                         <audio controls>
                                                             <source :src="i.url" type="" :key="i.url" />
                                                         </audio>
@@ -124,7 +126,8 @@
                                             <template v-if="i.type === 'doc'">
                                                 <div class="detail">
                                                     <div class="detail-field">附件：</div>
-                                                    <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                                                    <div
+                                                        :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                         <a :href="i.url">{{ i.name }}</a>
                                                     </div>
                                                 </div>
@@ -242,6 +245,8 @@ function iniData() {
         issueDetailData: {},
 
         sourceType: "",
+
+        level:''
     };
 }
 
@@ -317,6 +322,9 @@ export default {
         changeGridId(val) {
             this.gridId = val;
         },
+        changeLevel(val) {
+            this.level = val;
+        },
         watchImg(src) {
             window.open(src);
         },
@@ -414,113 +422,125 @@ export default {
                 || this.formData.operationType === '6' || this.formData.operationType === '4') {
                 const url = "/governance/icEvent/add";
                 const { formData } = this;
+                if (Array.isArray(this.formData.gridId) && this.formData.gridId.length) {
+                    if (this.level == "grid") {
+                        this.formData.gridId = this.formData.gridId[this.formData.gridId.length - 1];
+                        this.formData.agencyId = "";
+                    } else {
+                        this.formData.agencyId = this.formData.gridId[this.formData.gridId.length - 1];
+                        this.formData.gridId = "";
+                    }
+                } else {
+                    this.formData.agencyId = "";
+                    this.formData.gridId = "";
+                }
+                    const { data, code, msg } = await requestPost(url, {
+                        ...formData,
+                    });
+                    if (code === 0) {
+                        this.$message.success("操作成功！");
+                        if (this.pageTypeCopy === "add") {
+                            this.eventInfo = this.$refs.ref_add.resetData();
+                        }
+                        this.$emit("handleOk");
+                    } else {
+                        this.$message.error(msg);
+                    }
+                } else if (this.formData.operationType == "") {
+                    this.$message.error("请选择一种处理方式!");
+                }
+            },
+
+        async handelDispose() {
+                this.$refs.ref_processinfo_dispose.getProcessInfo();
+                if (this.$refs.ref_processinfo_dispose.okflag) {
+                    this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
+                    this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
+                    this.replayInfo.icEventId = this.eventId;
+                    await this.submitDispose('/governance/icEvent/reply', this.replayInfo);
+                } else {
+                    return false;
+                }
+            },
+        async submitDispose(url, params) {
                 const { data, code, msg } = await requestPost(url, {
-                    ...formData,
+                    ...params,
                 });
                 if (code === 0) {
                     this.$message.success("操作成功！");
-                    if (this.pageTypeCopy === "add") {
-                        this.eventInfo = this.$refs.ref_add.resetData();
-                    }
+
                     this.$emit("handleOk");
                 } else {
                     this.$message.error(msg);
                 }
-            } else if (this.formData.operationType == "") {
-                this.$message.error("请选择一种处理方式!");
-            }
-        },
-
-        async handelDispose() {
-            this.$refs.ref_processinfo_dispose.getProcessInfo();
-            if (this.$refs.ref_processinfo_dispose.okflag) {
-                this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
-                this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
-                this.replayInfo.icEventId = this.eventId;
-                await this.submitDispose('/governance/icEvent/reply', this.replayInfo);
-            } else {
-                return false;
-            }
-        },
-        async submitDispose(url, params) {
-            const { data, code, msg } = await requestPost(url, {
-                ...params,
-            });
-            if (code === 0) {
-                this.$message.success("操作成功！");
-
-                this.$emit("handleOk");
-            } else {
-                this.$message.error(msg);
-            }
-        },
+            },
 
-        handleClose() {
-            if (this.pageTypeCopy === "add") {
-                this.eventInfo = this.$refs.ref_add.resetData();
-            }
+            handleClose() {
+                if (this.pageTypeCopy === "add") {
+                    this.eventInfo = this.$refs.ref_add.resetData();
+                }
 
-            this.$emit("handleClose");
-        },
-        handleToProject(type) {
-            if (this.eventDetailCopy.status === "processing") {
-                this.projectPageType = "edit";
-            } else {
-                this.projectPageType = "info";
-            }
-            this.sourceType = "event";
-            this.pageTypeCopy = "project";
-        },
-        handleToDemand() {
-            // if (this.eventDetailCopy.status === 'processing') {
-            //   this.projectPageType = 'edit'
-            // } else {
-            //   this.projectPageType = 'info'
-            // }
-            this.pageTypeCopy = "demand";
-        },
+                this.$emit("handleClose");
+            },
+            handleToProject(type) {
+                if (this.eventDetailCopy.status === "processing") {
+                    this.projectPageType = "edit";
+                } else {
+                    this.projectPageType = "info";
+                }
+                this.sourceType = "event";
+                this.pageTypeCopy = "project";
+            },
+            handleToDemand() {
+                // if (this.eventDetailCopy.status === 'processing') {
+                //   this.projectPageType = 'edit'
+                // } else {
+                //   this.projectPageType = 'info'
+                // }
+                this.pageTypeCopy = "demand";
+            },
         async handleToIssue() {
-            const url = "/governance/manage/votingissuedetail";
+                const url = "/governance/manage/votingissuedetail";
 
-            const { data, code, msg } = await requestPost(url, {
-                issueId: this.eventDetailCopy.operationId,
-            });
+                const { data, code, msg } = await requestPost(url, {
+                    issueId: this.eventDetailCopy.operationId,
+                });
 
-            if (code === 0) {
-                this.issueDetailData = { ...data };
-            } else {
-                this.$message.error(msg);
-            }
+                if (code === 0) {
+                    this.issueDetailData = { ...data };
+                } else {
+                    this.$message.error(msg);
+                }
 
-            if (this.issueDetailData.issueStatus === "voting") {
-                this.issuePageType = "dispose";
-            } else {
-                this.issuePageType = "info";
-            }
-            this.pageTypeCopy = "issue";
-        },
-        handleCloseProject() {
-            this.getProjectProcess();
-            this.pageTypeCopy = "info";
-        },
+                if (this.issueDetailData.issueStatus === "voting") {
+                    this.issuePageType = "dispose";
+                } else {
+                    this.issuePageType = "info";
+                }
+                this.pageTypeCopy = "issue";
+            },
+            handleCloseProject() {
+                this.getProjectProcess();
+                this.pageTypeCopy = "info";
+            },
 
-        // 开启加载动画
-        startLoading() {
-            loading = Loading.service({
-                lock: true, // 是否锁定
-                text: "正在加载……", // 加载中需要显示的文字
-                background: "rgba(0,0,0,.7)", // 背景颜色
-            });
-        },
-        // 结束加载动画
-        endLoading() {
-            // clearTimeout(timer);
-            if (loading) {
-                loading.close();
-            }
+            // 开启加载动画
+            startLoading() {
+                loading = Loading.service({
+                    lock: true, // 是否锁定
+                    text: "正在加载……", // 加载中需要显示的文字
+                    background: "rgba(0,0,0,.7)", // 背景颜色
+                });
+            },
+            // 结束加载动画
+            endLoading() {
+                // clearTimeout(timer);
+                if (loading) {
+                    loading.close();
+                }
+            },
         },
-    },
-};
+    };
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index d95b20496..17adcc7a7 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -99,10 +99,10 @@ export default {
             type: String,
             default: "",
         },
-        gridId: {
-            type: String,
-            default: "",
-        },
+        // gridId: {
+        //     type: String,
+        //     default: "",
+        // },
         eventId: {
             type: String,
             default: "",
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 023e6852c..3707d0a00 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -5,16 +5,9 @@
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
                         <el-form-item label="所属组织" prop="gridId">
-        
-                            <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-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
@@ -91,19 +84,10 @@
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="标记" prop="type">
-                            <el-select
-                                class="u-item-width-normal"
-                                v-model="formData.type"
-                                placeholder="全部"
-                                size="small"
-                                clearable
-                            >
-                                <el-option
-                                v-for="item in typeArray"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                                >
+                            <el-select class="u-item-width-normal" v-model="formData.type" placeholder="全部" size="small"
+                                clearable>
+                                <el-option v-for="item in typeArray" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -307,20 +291,20 @@ export default {
             ],
             typeArray: [
                 {
-                value: "1",
-                label: "难点痛点",
+                    value: "1",
+                    label: "难点痛点",
                 },
                 {
-                value: "2",
-                label: "矛盾纠纷",
+                    value: "2",
+                    label: "矛盾纠纷",
                 },
                 {
-                value: "3",
-                label: "自身问题",
+                    value: "3",
+                    label: "自身问题",
                 },
                 {
-                value: "4",
-                label: "超出服务范围",
+                    value: "4",
+                    label: "超出服务范围",
                 },
             ],
             qudaoArray: [
@@ -686,10 +670,10 @@ export default {
             }
             // 处理 agencyId
             if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
-                if(this.level=="grid"){
+                if (this.level == "grid") {
                     this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
                     this.formData.agencyId = "";
-                }else{
+                } else {
                     this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
                     this.formData.gridId = "";
                 }
@@ -697,7 +681,7 @@ export default {
                 this.formData.agencyId = "";
                 this.formData.gridId = "";
             }
-            
+
             const { pageSize, pageNo, formData } = this;
             const { data, code, msg } = await requestPost(url, {
                 pageSize,
@@ -732,64 +716,63 @@ export default {
         },
 
 
-        getOrgTreeList () {
+        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)
-                }
+                    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('网络错误')
+                    return this.$message.error('网络错误')
                 })
         },
-        getGridList () {
+        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
-                }
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsG = res.data
+                    }
                 })
                 .catch(() => {
-                return this.$message.error('网络错误')
+                    return this.$message.error('网络错误')
                 })
         },
 
-        handleChangeAgency (val) {
+        handleChangeAgency(val) {
 
             this.sarr = []
             const map = new Map();
             this.getLastItem(
-            this.orgOptions,
-            val,
-            "agencyId"
+                this.orgOptions,
+                val,
+                "agencyId"
             );
             this.level = this.sarr[this.sarr.length - 1].level
         },
-        getLastItem (list, vals, key) {
+        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);
+                // 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 = {
                 agencyId: "",
diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue
index 30ab7ab5e..df48df6c5 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/add.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue
@@ -3,11 +3,14 @@
         <div class="g-add-page">
             <div class="g-left">
                 <el-form ref="ref_form1" :inline="true" :model="formData" :rules="dataRule" class="form">
-                    <el-form-item label="所属网格" prop="gridId" label-width="150px" style="display: block">
-                        <el-select v-model.trim="formData.gridId" placeholder="请选择" clearable class="cell-width-1">
+                    <el-form-item label="所属组织" prop="gridId" label-width="150px" style="display: block">
+                        <!-- <el-select v-model.trim="formData.gridId" placeholder="请选择" clearable class="cell-width-1">
                             <el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
-                        </el-select>
+                        </el-select> -->
+                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model="formData.gridId"
+                            :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
+                            @change="handleChangeAgency" clearable></el-cascader>
                     </el-form-item>
 
                     <el-form-item label="上报人" prop="name" label-width="150px" style="display: block">
@@ -87,30 +90,30 @@
 
         <!-- 新增弹出框 -->
         <el-dialog :visible.sync="personTableShow" :close-on-click-modal="false" :close-on-press-escape="false"
-          :destroy-on-close="true" title="选择居民" width="550px" top="5vh" class="dialog-h" @closed="diaClose">
-          <div style="padding: 10px 30px">
-              <el-form :inline="false" ref="ref_formSearch" :label-width="'90px'">
-                  <el-form-item label="所属网格" label-width="150px">
-                      <el-select class="cell-width-1" v-model.trim="selGridId" placeholder="请选择" clearable>
-                          <el-option v-for="item in gridList" @click.native="handleChangeGrid" :key="`abc-${value}`"
-                              :label="item.label" :value="item.value">
-                          </el-option>
-                      </el-select>
-                  </el-form-item>
-                  <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
-                      <el-select v-model="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
-                          <el-option v-for="(item, index) in demandUserList" :key="item.demandUserId" :label="item.label"
-                              :value="index">
-                          </el-option>
-                      </el-select>
-                  </el-form-item>
-              </el-form>
-              <div class="div-btn">
-                  <el-button style="margin-left: 20px" type="primary" size="small"
-                      @click="handleComfirmSelPerson">确定</el-button>
-              </div>
-          </div>
-      </el-dialog>
+            :destroy-on-close="true" title="选择居民" width="550px" top="5vh" class="dialog-h" @closed="diaClose">
+            <div style="padding: 10px 30px">
+                <el-form :inline="false" ref="ref_formSearch" :label-width="'90px'">
+                    <el-form-item label="所属网格" label-width="150px">
+                        <el-select class="cell-width-1" v-model.trim="selGridId" placeholder="请选择" clearable>
+                            <el-option v-for="item in gridList" @click.native="handleChangeGrid" :key="`abc-${value}`"
+                                :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
+                        <el-select v-model="selPersonIndex" class="cell-width-1" filterable placeholder="请选择" clearable>
+                            <el-option v-for="(item, index) in demandUserList" :key="item.demandUserId" :label="item.label"
+                                :value="index">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <div class="div-btn">
+                    <el-button style="margin-left: 20px" type="primary" size="small"
+                        @click="handleComfirmSelPerson">确定</el-button>
+                </div>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -204,6 +207,19 @@ export default {
             demandUserList: [],
 
             hideUploadBtn: false,
+
+            orgOptions: [],
+            orgOptionProps: {
+                multiple: false,
+                value: 'agencyId',
+                label: 'agencyName',
+                children: 'subAgencyList',
+                checkStrictly: true
+            },
+            sarr: [],
+            obj: {
+                level: ''
+            }
         };
     },
     components: {},
@@ -251,9 +267,12 @@ export default {
             this.$emit("changeUserId", val);
         },
         "formData.gridId": function (val) {
-            this.selGridId = val;
+            this.selGridId = val[val.length - 1];
             this.$emit("changeGridId", val);
         },
+        "obj.level": function (val) {
+            this.$emit("changeLevel", val);
+        },
     },
 
     async mounted() {
@@ -269,9 +288,50 @@ export default {
         this.initMap(this.formData.latitude, this.formData.longitude);
         this.loadGrid();
         this.getCategoryList();
+        this.getOrgTreeList()
     },
 
     methods: {
+        handleChangeAgency(val) {
+
+            this.sarr = []
+            const map = new Map();
+            this.getLastItem(
+                this.orgOptions,
+                val,
+                "agencyId"
+            );
+            this.obj.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);
+                    }
+                }
+            }
+        },
+        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('网络错误')
+                })
+        },
         async handleShowPersonList() {
             if (this.formData.gridId) {
                 await this.handleChangeGrid();
@@ -359,10 +419,6 @@ export default {
             }
         },
 
-        handleChangeAgency(value) {
-            // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
-            // this.orgId = this.selCategoryArray.length > 0 ? this.selCategoryArray[this.selCategoryArray.length - 1] : ''
-        },
 
         async getEventInfo() {
             this.okflag = false;
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index f813b1105..bd47b311b 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -7,7 +7,7 @@
                     新增事件
                 </h3>
                 <event-add ref="ref_add" @changeName="changeName" @changeMobile="changeMobile" @changeUserId="changeUserId"
-                    @changeGridId="changeGridId"></event-add>
+                    @changeGridId="changeGridId" @changeLevel="changeLevel"></event-add>
             </el-card>
 
             <div class="process-form">
@@ -313,6 +313,8 @@ function iniData() {
         issueDetailData: {},
 
         sourceType: "",
+
+        level: ''
     };
 }
 
@@ -388,6 +390,9 @@ export default {
         changeGridId(val) {
             this.gridId = val;
         },
+        changeLevel(val) {
+            this.level = val;
+        },
         //加载组织数据
         async getProjectProcess() {
             const url = "/governance/icEventOld/process";
@@ -435,6 +440,7 @@ export default {
             this.$refs.ref_processinfo_add.getProcessInfo();
             if (this.$refs.ref_processinfo_add.okflag) {
                 this.formData.operationType = this.$refs.ref_processinfo_add.operationType;
+                console.log(this.formData.operationType);
                 this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType;
                 if (this.formData.operationType === "0" || this.formData.operationType === "6") {
                     this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
@@ -465,7 +471,6 @@ export default {
                     this.replayInfo = {};
                 }
             }
-            
             this.formData = {
                 ...this.eventInfoData,
                 replayInfo: this.replayInfo,
@@ -477,6 +482,7 @@ export default {
         },
 
         async submit() {
+            console.log(this.formData.operationType);
             //  (this.formData.operationType == 2 && this.demand.demandUserName) ||(this.formData.operationType == 3 && this.issueInfo.issueTitle) || (this.formData.operationType == 1 && this.project.categoryList) ||(this.formData.operationType == 0 && this.eventInfoData.content) ||
             if (
                 this.formData.operationType == "4" ||
@@ -485,6 +491,18 @@ export default {
                 this.formData.operationType == "0" ||
                 (this.formData.operationType == 2 && this.demand.demandUserName)
             ) {
+                if (Array.isArray(this.formData.gridId) && this.formData.gridId.length) {
+                    if (this.level == "grid") {
+                        this.formData.gridId = this.formData.gridId[this.formData.gridId.length - 1];
+                        this.formData.agencyId = "";
+                    } else {
+                        this.formData.agencyId = this.formData.gridId[this.formData.gridId.length - 1];
+                        this.formData.gridId = "";
+                    }
+                } else {
+                    this.formData.agencyId = "";
+                    this.formData.gridId = "";
+                }
                 const url = "/governance/icEventOld/add";
                 const { formData } = this;
                 const { data, code, msg } = await requestPost(url, {
@@ -513,7 +531,7 @@ export default {
                     || this.formData.operationType === '6') {
                     this.project = {};
                     this.demand = {};
-                    if(this.$refs.ref_processinfo_dispose.replayInfo.okflag){
+                    if (this.$refs.ref_processinfo_dispose.replayInfo.okflag) {
                         this.endLoading();
                         return false
                     }
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
index 6ebc1ab9c..935aa2ab1 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
@@ -103,10 +103,10 @@ export default {
             type: String,
             default: "",
         },
-        gridId: {
-            type: String,
-            default: "",
-        },
+        // gridId: {
+        //     type: String,
+        //     default: "",
+        // },
         eventId: {
             type: String,
             default: "",
@@ -175,7 +175,9 @@ export default {
                     this.replayInfo = this.$refs.ref_process_form_replay_end.formData
                     this.okflag = true
                 }
-            } else {
+            } else if(this.operationType === '4')  {
+                this.okflag = true
+            }else {
                 return false
             }
         },