diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index c1e3a2c8..1935079f 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -200,9 +200,9 @@
           <el-form-item label="所属网格"
                         label-width="150px">
             <el-select class="cell-width-1"
-                       v-model.trim="selGridId"
+                       disabled
+                       v-model.trim="formData.gridId"
                        placeholder="请选择"
-                       @change="handleChangeGrid"
                        clearable>
               <el-option v-for="item in gridList"
                          :key="item.value"
@@ -418,8 +418,14 @@ export default {
   },
 
   methods: {
-    handleShowPersonList () {
-      this.personTableShow = true;
+    async handleShowPersonList () {
+      if (this.formData.gridId) {
+        await this.handleChangeGrid()
+        this.personTableShow = true
+      } else {
+        this.$message.info("请先选择网格");
+      }
+
     },
     diaClose () {
       this.personTableShow = false;
@@ -447,12 +453,11 @@ export default {
 
     async handleChangeGrid () {
 
-
       const url = "/epmetuser/icresiuser/demandusers"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         agencyId: '',
-        gridId: this.selGridId,
+        gridId: this.formData.gridId,
         name: "",
       }
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index b36be6fd..b109b8eb 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -18,7 +18,8 @@
 
           </div>
 
-          <div class="info-prop">
+          <div v-if="info.imageList&&info.imageList.length>0"
+               class="info-prop">
             <span class="info-title-2">图片：</span>
             <img :src="src"
                  :key="src"
@@ -72,7 +73,7 @@
 
         </div>
       </div>
-      <div v-if="type==='info'"
+      <div v-if="info.operationId"
            class="div-btn ">
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
@@ -157,6 +158,7 @@ export default {
   },
 
   mounted () {
+
     if (this.eventId) {
       this.info = JSON.parse(JSON.stringify(this.eventDetailData));
     }
@@ -194,7 +196,7 @@ export default {
       // this.showType = 'project'
     },
     handleToDemand () {
-
+      this.$emit("handleToDemand")
     },
 
   },
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 25aa1db3..183a212e 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -38,6 +38,7 @@
                       :eventId="eventId"
                       :eventDetailData="eventDetailData"
                       @handleToProject="handleToProject"
+                      @handleToDemand="handleToDemand"
                       @handleClose="handleClose"></event-detail>
 
         <div v-if="!eventDetailData.operationId &&pageTypeCopy == 'dispose' "
@@ -189,14 +190,21 @@
                            @close="handleCloseProject"
                            @afterEdit="handleCloseProject" />
     </div>
+    <div v-if="pageTypeCopy == 'demand'">
+      <demand-info-origin ref="demandEditForm"
+                          :demandRecId="eventDetailCopy.operationId"
+                          @close="handleCloseProject" />
+    </div>
 
   </div>
 </template>
 
 <script>
 import { requestPost } from "@/js/dai/request";
+import { Loading } from "element-ui"; // 引入Loading服务
 import foldText from "@/views/components/foldText";
 import projectInfoOrigin from "../../xiangmu/cpts/project-info";
+import demandInfoOrigin from "@/views/modules/communityService/measure/info";
 import eventInfo from "./event-info1";
 
 import dateFormat from "dai-js/tools/dateFormat";
@@ -205,6 +213,7 @@ import eventAdd from "./add";
 import eventDetail from "./event-detail";
 import processForm from "./process-form";
 
+let loading; // 加载动画
 function iniData () {
   return {
     formData: {
@@ -255,7 +264,8 @@ export default {
     eventAdd,
     eventDetail,
     processForm,
-    projectInfoOrigin
+    projectInfoOrigin,
+    demandInfoOrigin
   },
 
   data: iniData,
@@ -332,16 +342,18 @@ export default {
       console.log('eventInfo', this.eventInfoData)
     },
 
-    handleComfirm () {
+    async handleComfirm () {
+      this.startLoading()
       if (this.pageTypeCopy === 'add') {
-        this.handelAdd()
+        await this.handelAdd()
       }
       if (this.pageTypeCopy === 'dispose') {
-        this.handelDispose()
+        await this.handelDispose()
       }
+      this.endLoading()
     },
 
-    handelAdd () {
+    async handelAdd () {
       if (this.pageTypeCopy === 'add') {
         this.$refs.ref_add.getEventInfo()
         if (this.$refs.ref_add.okflag) {
@@ -403,7 +415,7 @@ export default {
       }
 
       console.log('this.formData', this.formData)
-      this.submit()
+      await this.submit()
     },
 
     async submit () {
@@ -426,7 +438,7 @@ export default {
       }
     },
 
-    handelDispose () {
+    async handelDispose () {
       this.$refs.ref_processinfo_dispose.getProcessInfo()
       if (this.$refs.ref_processinfo_dispose.okflag) {
 
@@ -442,7 +454,7 @@ export default {
           console.log('replayInfo', this.replayInfo)
           //回复属性赋值
           let url = '/gov/project/icEvent/reply'
-          this.submitDispose(url, this.replayInfo)
+          await this.submitDispose(url, this.replayInfo)
 
         } else if (this.formData.operationType === '1') {
           this.replayInfo = {}
@@ -452,7 +464,7 @@ export default {
           this.project.icEventId = this.eventId
           console.log('projectInfo', this.project)
           let url = '/gov/project/icEvent/icEventToProject'
-          this.submitDispose(url, this.project)
+          await this.submitDispose(url, this.project)
 
         } else if (this.formData.operationType === '2') {
           this.replayInfo = {}
@@ -462,7 +474,7 @@ export default {
           this.demand.icEventId = this.eventId
           console.log('demond', this.demand)
           let url = '/gov/project/icEvent/icEventToDemand'
-          this.submitDispose(url, this.demand)
+          await this.submitDispose(url, this.demand)
         }
 
       } else {
@@ -499,11 +511,35 @@ export default {
       }
       this.pageTypeCopy = 'project'
 
+    },
+    handleToDemand () {
+      if (this.eventDetailCopy.status === 'processing') {
+        this.projectPageType = 'edit'
+      } else {
+        this.projectPageType = 'info'
+      }
+      this.pageTypeCopy = 'project'
+
     },
     handleCloseProject () {
+      this.pageTypeCopy = 'demand'
 
-      this.pageTypeCopy = 'info'
+    },
 
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
     },
   },
 };
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 1f3d602c..3e8a6632 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -34,7 +34,7 @@
 
       <el-form-item label="处理部门"
                     label-width="150px"
-                    prop="projectStaffId">
+                    prop="staffList">
         <el-popover placement="bottom"
                     width="400"
                     height="400"
@@ -260,7 +260,7 @@ export default {
         gridId: [
           { required: true, message: "所属网格不能为空", trigger: "blur" },
         ],
-        projectStaffId: [
+        staffList: [
           { required: true, message: "处理部门不能为空", trigger: "blur" },
         ],
         publicReply: [