diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index 9f143a6fd..0025cc77f 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -1,232 +1,117 @@
 <template>
-  <div class="g-add">
-    <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-option v-for="item in gridList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="上报人"
-                        prop="name"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="cell-width-1"
-                      maxlength="10"
-                      placeholder="请输入上报人姓名"
-                      v-model="formData.name">
-            </el-input>
-            <div>
-              <el-button style="margin-top: 10px"
-                         type="primary"
-                         size="mini"
-                         @click="handleShowPersonList">居民信息中选择</el-button>
+    <div class="g-add">
+        <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-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="上报渠道" label-width="150px" prop="sourceType">
+                        <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
+                            class="cell-width-1">
+                            <el-option v-for="item in qudaoArray" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </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"
+                            placeholder="接收时间" value-format="yyyy-MM-dd HH:mm:ss">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="问题描述" prop="eventContent" label-width="150px" style="display: block">
+                        <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
+                            placeholder="请输入事件问题描述，不超过500字" v-model="formData.eventContent"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="联系人" prop="name" label-width="150px" style="display: block">
+                        <el-input class="cell-width-1" maxlength="10" placeholder="请输入联系人姓名" v-model="formData.name">
+                        </el-input>
+                        <!-- <div>
+                            <el-button style="margin-top: 10px" type="primary" size="mini"
+                                @click="handleShowPersonList">居民信息中选择</el-button>
+                        </div> -->
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="mobile" label-width="150px" style="display: block">
+                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入联系电话	" v-model="formData.mobile">
+                        </el-input>
+                    </el-form-item>
+                    <!-- 
+                    <el-form-item label="证件号" prop="idCard" label-width="150px" style="display: block">
+                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入证件号"
+                            v-model="formData.idCard"></el-input>
+                    </el-form-item> -->
+                </el-form>
             </div>
-          </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="mobile"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="cell-width-1"
-                      maxlength="30"
-                      placeholder="请输入联系电话	"
-                      v-model="formData.mobile">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="证件号"
-                        prop="idCard"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="cell-width-1"
-                      maxlength="30"
-                      placeholder="请输入证件号"
-                      v-model="formData.idCard"></el-input>
-          </el-form-item>
-
-          <el-form-item label="反应渠道"
-                        label-width="150px"
-                        prop="sourceType">
-            <el-select v-model="formData.sourceType"
-                       placeholder="请选择"
-                       size="small"
-                       clearable
-                       class="cell-width-1">
-              <el-option v-for="item in qudaoArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </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"
-                            placeholder="上报时间"
-                            value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker>
-          </el-form-item>
-
-          <el-form-item label="事件内容"
-                        prop="eventContent"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="cell-width-2"
-                      type="textarea"
-                      maxlength="500"
-                      show-word-limit
-                      :rows="5"
-                      placeholder="请输入事件内容，不超过500字"
-                      v-model="formData.eventContent"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="g-right">
-        <el-form ref="ref_form2"
-                 :inline="true"
-                 :model="formData"
-                 :rules="dataRule"
-                 class="form">
-          <el-form-item label="图片"
-                        label-width="150px"
-                        style="display: block">
-            <el-upload :headers="$getElUploadHeaders()"
-                       :class="['avatar-uploader', { hide: hideUploadBtn }]"
-                       ref="uploadPic"
-                       :action="uploadUlr"
-                       :disabled="uploadStatus"
-                       list-type="picture-card"
-                       :on-exceed="exceedPic"
-                       :on-remove="removePic"
-                       :file-list="replayImgList"
-                       :on-change="handleEditChange"
-                       :on-success="handleSuccess"
-                       :before-upload="handleBefore"
-                       :limit="3">
-              <span class="font-14" >选择图片</span>
-              <div slot="tip"
-                   class="upload_tip">
-                最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
-              </div>
-            </el-upload>
-          </el-form-item>
-
-          <el-form-item label="地图位置"
-                        prop="longitude"
-                        label-width="150px"
-                        style="display: block">
-            <div style="width: 500px">
-              <el-form-item prop="location" style="display: block">
-								<el-select
-									v-model="formData.location"
-									filterable
-									remote
-									:reserve-keyword="true"
-									placeholder="请输入关键词"
-									:remote-method="remoteMethod"
-									:loading="loading"
-									@keyup.enter.native="remoteMethod(formData.location)"
-								>
-									<el-option
-										v-for="(item, index) in searchOptions"
-										@click.native="handleClickKey(index)"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									></el-option>
-								</el-select>
-							</el-form-item>
-              <div id="app_event"
-                   class="div_map"></div>
+            <div class="g-right">
+                <el-form ref="ref_form2" :inline="true" :model="formData" :rules="dataRule" class="form">
+                    <el-form-item label="图片" label-width="150px" style="display: block">
+                        <el-upload :headers="$getElUploadHeaders()" :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                            ref="uploadPic" :action="uploadUlr" :disabled="uploadStatus" list-type="picture-card"
+                            :on-exceed="exceedPic" :on-remove="removePic" :file-list="replayImgList"
+                            :on-change="handleEditChange" :on-success="handleSuccess" :before-upload="handleBefore"
+                            :limit="3">
+                            <span class="font-14">选择图片</span>
+                            <div slot="tip" class="upload_tip">
+                                最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
+                            </div>
+                        </el-upload>
+                    </el-form-item>
+
+                    <el-form-item label="地图位置" prop="longitude" label-width="150px" style="display: block">
+                        <div style="width: 500px">
+                            <el-form-item prop="location" style="display: block">
+                                <el-select v-model="formData.location" filterable remote :reserve-keyword="true"
+                                    placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"
+                                    @keyup.enter.native="remoteMethod(formData.location)">
+                                    <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                        :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <div id="app_event" class="div_map"></div>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item label="详细地址" prop="address" label-width="150px" style="display: block">
+                        <el-input class="cell-width-1" v-model="formData.address">
+                        </el-input>
+                    </el-form-item>
+                </el-form>
             </div>
-          </el-form-item>
-
-          <el-form-item label="详细地址"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="cell-width-1"
-                      v-model="formData.address">
-            </el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <!-- 新增弹出框 -->
-    <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>
-  </div>
+
+        <!-- 新增弹出框 -->
+        <!-- <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> -->
+    </div>
 </template>
 
 <script>
@@ -242,463 +127,452 @@ var markers;
 var infoWindowList;
 var geocoder; // 新建一个正逆地址解析类
 
-function iniFmData () {
-  return {
-
-    gridId: "", //所属网格
-    reportUserId: "", //	上报人ID
-    name: "", //	上报人姓名
-    mobile: "", //	联系电话
-    idCard: "", //	证件号
-    sourceType: "", //	反映渠道
-    happenTime: "", //上报时间
-    eventContent: "", //	事件内容
-    imageList: [], //	图片集合
-    // categoryList: [],//	二类分类Id
-    address: "", //事件地址
-    latitude: "", //	经度
-    longitude: "", //维度
-    // operationType: '',//	处理方式
-    // content: '',//回复内容
-    // status: '',//	处理中：processing；已办结：closed_case
-  };
+function iniFmData() {
+    return {
+
+        gridId: "", //所属网格
+        reportUserId: "", //	上报人ID
+        name: "", //	上报人姓名
+        mobile: "", //	联系电话
+        idCard: "", //	证件号
+        sourceType: "", //	反映渠道
+        happenTime: "", //上报时间
+        eventContent: "", //	事件内容
+        imageList: [], //	图片集合
+        // categoryList: [],//	二类分类Id
+        address: "", //事件地址
+        latitude: "", //	经度
+        longitude: "", //维度
+        // operationType: '',//	处理方式
+        // content: '',//回复内容
+        // status: '',//	处理中：processing；已办结：closed_case
+    };
 }
 
 export default {
-  data () {
-    return {
-      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
-      searchOptions: [],
-      searchValue: '',
-      resultList: [],
-      loading: false,
-
-      btnDisable: false,
-      gridList: [], //所属网格list--场所区域
-
-      qudaoArray: [
-        {
-          value: "1",
-          label: "多媒体反应",
+    data() {
+        return {
+            formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            loading: false,
+
+            btnDisable: false,
+            gridList: [], //所属网格list--场所区域
+
+            qudaoArray: [
+                {
+                    value: "1",
+                    label: "多媒体反应",
+                },
+                {
+                    value: "2",
+                    label: "社区电话",
+                },
+                {
+                    value: "3",
+                    label: "12345",
+                },
+                {
+                    value: "4",
+                    label: "网络员手持终端",
+                },
+            ],
+
+            formData: iniFmData(),
+
+            //地图相关
+            keyWords: "",
+            isFirst: true, //地图是否首次加载，首次加载不给地址赋值
+
+            //图片相关  oss/file/uploadvariedfile
+            dialogImageUrl: "oss/file/uploadvariedfile",
+            uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+            //  upload_url: '', // 上传URL
+            upload_name: "", // 图片或视频名称
+            replayImgList: [],
+
+            okflag: false,
+            uploadStatus: false,
+
+            formDataSearch: {
+                gridId: "",
+                name: "",
+            },
+            personTableShow: false,
+            selGridId: "",
+            selPersonIndex: "",
+            selPerson: {},
+            demandUserList: [],
+
+            hideUploadBtn: false,
+        };
+    },
+    components: {},
+    computed: {
+        dataRule() {
+            let checkIdCard = (rule, value, callback) => {
+                if (value === "") {
+                    callback(new Error("请输入证件号"));
+                } else {
+                    if (!isCard(value)) {
+                        callback(new Error("证件号格式不正确"));
+                    }
+                    callback();
+                }
+            };
+
+            return {
+                gridId: [
+                    { required: true, message: "所属组织不能为空", trigger: "blur" },
+                ],
+                name: [
+                    { required: true, message: "联系人不能为空", trigger: "blur" }
+                ],
+                mobile: [
+                    //{ required: true, message: "联系电话不能为空", trigger: "blur" },
+                ],
+                // idCard: [
+                //   { required: true, message: "证件号不能为空", trigger: "blur" },
+                //   { required: true, validator: checkIdCard, trigger: "blur" },
+                // ],
+                sourceType: [
+                    { required: true, message: "反映渠道不能为空", trigger: "blur" },
+                ],
+                eventContent: [
+                    { required: true, message: "事件内容不能为空", trigger: "blur" },
+                ],
+                happenTime: [
+                    { required: true, message: "上报时间不能为空", trigger: "blur" },
+                ],
+                address: [
+                    { required: true, message: "事件地址不能为空", trigger: "blur" },
+                ],
+                longitude: [
+                    { required: true, message: "坐标位置不能为空", trigger: "blur" },
+                ],
+            };
         },
-        {
-          value: "2",
-          label: "社区电话",
+    },
+    props: {},
+    watch: {
+        "formData.name": function (val) {
+            this.$emit("changeName", val);
         },
-        {
-          value: "3",
-          label: "12345",
+        "formData.mobile": function (val) {
+            this.$emit("changeMobile", val);
         },
-        {
-          value: "4",
-          label: "网络员手持终端",
+        "formData.reportUserId": function (val) {
+            this.$emit("changeUserId", val);
+        },
+        "formData.gridId": function (val) {
+            this.selGridId = val;
+            this.$emit("changeGridId", val);
         },
-      ],
-
-      formData: iniFmData(),
-
-      //地图相关
-      keyWords: "",
-      isFirst: true, //地图是否首次加载，首次加载不给地址赋值
-
-      //图片相关  oss/file/uploadvariedfile
-      dialogImageUrl: "oss/file/uploadvariedfile",
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-      //  upload_url: '', // 上传URL
-      upload_name: "", // 图片或视频名称
-      replayImgList: [],
-
-      okflag: false,
-      uploadStatus:false,
-
-      formDataSearch: {
-        gridId: "",
-        name: "",
-      },
-      personTableShow: false,
-      selGridId: "",
-      selPersonIndex: "",
-      selPerson: {},
-      demandUserList: [],
-
-      hideUploadBtn: false,
-    };
-  },
-  components: {},
-  computed: {
-    dataRule () {
-      let checkIdCard = (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("请输入证件号"));
-        } else {
-          if (!isCard(value)) {
-            callback(new Error("证件号格式不正确"));
-          }
-          callback();
-        }
-      };
-
-      return {
-        gridId: [
-          { required: true, message: "所属网格不能为空", trigger: "blur" },
-        ],
-        name: [{ required: true, message: "上报人不能为空", trigger: "change" }],
-        mobile: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
-        ],
-        // idCard: [
-        //   { required: true, message: "证件号不能为空", trigger: "blur" },
-        //   { required: true, validator: checkIdCard, trigger: "blur" },
-        // ],
-        sourceType: [
-          { required: true, message: "反映渠道不能为空", trigger: "blur" },
-        ],
-        eventContent: [
-          { required: true, message: "事件内容不能为空", trigger: "blur" },
-        ],
-        happenTime: [
-          { required: true, message: "上报时间不能为空", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "事件地址不能为空", trigger: "blur" },
-        ],
-        longitude: [
-          { required: true, message: "坐标位置不能为空", trigger: "blur" },
-        ],
-      };
-    },
-  },
-  props: {},
-  watch: {
-    "formData.name": function (val) {
-      this.$emit("changeName", val);
-    },
-    "formData.mobile": function (val) {
-      this.$emit("changeMobile", val);
-    },
-    "formData.reportUserId": function (val) {
-      this.$emit("changeUserId", val);
-    },
-    "formData.gridId": function (val) {
-      this.selGridId = val;
-      this.$emit("changeGridId", val);
-    },
-  },
-
-  async mounted () {
-    const { user } = this.$store.state;
-    this.agencyId = user.agencyId;
-
-    let { latitude, longitude } = this.$store.state.user;
-    if (!latitude || latitude == "" || latitude == "0") {
-      latitude = 39.9088810666821;
-      longitude = 116.39743841556731;
-    }
-
-    this.formData.latitude = latitude;
-    this.formData.longitude = longitude;
-
-
-    this.initMap(this.formData.latitude, this.formData.longitude);
-
-
-    this.loadGrid();
-    this.getCategoryList();
-  },
-
-  methods: {
-    async handleShowPersonList () {
-      if (this.formData.gridId) {
-        await this.handleChangeGrid();
-        this.personTableShow = true;
-      } else {
-        this.$message.info("请先选择网格");
-      }
-    },
-    diaClose () {
-      this.personTableShow = false;
-    },
-    handleComfirmSelPerson () {
-      if (this.selPersonIndex === 0 || this.selPersonIndex) {
-        let selPerson = this.demandUserList[this.selPersonIndex];
-        this.formData.name = selPerson.demandUserName;
-        this.formData.mobile = selPerson.demandUserMobile;
-        this.formData.reportUserId = selPerson.demandUserId;
-        this.formData.idCard = selPerson.idCard;
-
-        this.personTableShow = false;
-      } else {
-        this.$message.info("请选择人员");
-      }
     },
 
-    async handleChangeGrid () {
-      const url = "/epmetuser/icresiuser/demandusers";
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
-      let params = {
-        agencyId: "",
-        gridId: this.selGridId,
-        name: "",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.demandUserList = data;
-      } else {
-        this.$message.error(msg);
-      }
-      this.tableLoading = false;
+    async mounted() {
+        const { user } = this.$store.state;
+        this.agencyId = user.agencyId;
+        let { latitude, longitude } = this.$store.state.user;
+        if (!latitude || latitude == "" || latitude == "0") {
+            latitude = 39.9088810666821;
+            longitude = 116.39743841556731;
+        }
+        this.formData.latitude = latitude;
+        this.formData.longitude = longitude;
+        this.initMap(this.formData.latitude, this.formData.longitude);
+        this.loadGrid();
+        this.getCategoryList();
     },
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption";
-
-      let params = {
-        agencyId: this.agencyId,
-        purpose: "addorupdate",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
+    methods: {
+        async handleShowPersonList() {
+            if (this.formData.gridId) {
+                await this.handleChangeGrid();
+                this.personTableShow = true;
+            } else {
+                this.$message.info("请先选择网格");
+            }
+        },
+        diaClose() {
+            this.personTableShow = false;
+        },
+        handleComfirmSelPerson() {
+            if (this.selPersonIndex === 0 || this.selPersonIndex) {
+                let selPerson = this.demandUserList[this.selPersonIndex];
+                this.formData.name = selPerson.demandUserName;
+                this.formData.mobile = selPerson.demandUserMobile;
+                this.formData.reportUserId = selPerson.demandUserId;
+                this.formData.idCard = selPerson.idCard;
+
+                this.personTableShow = false;
+            } else {
+                this.$message.info("请选择人员");
+            }
+        },
 
-      if (code === 0) {
-        this.gridList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getCategoryList () {
-      const url = "/governance/issueprojectcategorydict/list";
+        async handleChangeGrid() {
+            const url = "/epmetuser/icresiuser/demandusers";
+            // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+            let params = {
+                agencyId: "",
+                gridId: this.selGridId,
+                name: "",
+            };
 
-      let params = {};
+            const { data, code, msg } = await requestPost(url, params);
 
-      const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.demandUserList = data;
+            } else {
+                this.$message.error(msg);
+            }
+            this.tableLoading = false;
+        },
 
-      if (code === 0) {
-        let treeDataNew = this.filterTree(data);
-        // this.categrayList = data
-        //组织级联数据
-        ++this.iscascaderShow;
-        this.casOptions = [];
-        this.selCategoryArray = [];
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption";
+            let params = {
+                agencyId: this.agencyId,
+                purpose: "addorupdate",
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getCategoryList() {
+            const url = "/governance/issueprojectcategorydict/list";
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                let treeDataNew = this.filterTree(data);
+                // this.categrayList = data
+                //组织级联数据
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.selCategoryArray = [];
+                this.casOptions = treeDataNew;
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-        this.casOptions = treeDataNew;
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        //重构树，去除网格
+        filterTree(arr) {
+            let childs = arr;
+            for (let i = childs.length; i--; i > 0) {
+                if (childs[i].subCategory) {
+                    if (childs[i].subCategory.length) {
+                        this.filterTree(childs[i].subCategory);
+                    } else {
+                        delete childs[i].subCategory;
+                    }
+                }
+            }
+            return arr;
+        },
 
-    //重构树，去除网格
-    filterTree (arr) {
-      let childs = arr;
-      for (let i = childs.length; i--; i > 0) {
-        if (childs[i].subCategory) {
-          if (childs[i].subCategory.length) {
-            this.filterTree(childs[i].subCategory);
-          } else {
-            delete childs[i].subCategory;
-          }
-        }
-      }
-      return arr;
-    },
+        handleChangeAgency(value) {
+            // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
+            // this.orgId = this.selCategoryArray.length > 0 ? this.selCategoryArray[this.selCategoryArray.length - 1] : ''
+        },
 
-    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;
+            this.$refs["ref_form1"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    return false;
+                } else {
+                    this.$refs["ref_form2"].validate((valid, messageObj) => {
+                        if (!valid) {
+                            app.util.validateRule(messageObj);
+                            return false;
+                        } else {
+                            if (!formVltHelper.userOrMobile(this.formData.mobile)) {
+                                this.$message({
+                                    type: "error",
+                                    message: "联系电话格式有误",
+                                });
+                                return false;
+                            }
+
+                            const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+                            if (
+                                this.formData.idCard &&
+                                regCard.test(this.formData.idCard) === false
+                            ) {
+                                this.$message({
+                                    type: "warning",
+                                    message: "请输入正确的证件号码",
+                                });
+                                return false;
+                            }
+                            this.okflag = true;
+                        }
+                    });
+                }
+            });
+        },
 
-    async getEventInfo () {
-      this.okflag = false;
-      this.$refs["ref_form1"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          return false;
-        } else {
-          this.$refs["ref_form2"].validate((valid, messageObj) => {
-            if (!valid) {
-              app.util.validateRule(messageObj);
-              return false;
-            } else {
-              if (!formVltHelper.userOrMobile(this.formData.mobile)) {
-                this.$message({
-                  type: "error",
-                  message: "联系电话格式有误",
-                });
-                return false;
-              }
-
-              const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-              if (
-                this.formData.idCard &&
-                regCard.test(this.formData.idCard) === false
-              ) {
-                this.$message({
-                  type: "warning",
-                  message: "请输入正确的证件号码",
-                });
-                return false;
-              }
-              this.okflag = true;
+        removePic(file, fileList) {
+            this.formData.imageList.splice(
+                this.formData.imageList.findIndex((item) => item === file.url),
+                1
+            );
+            this.replayImgList.splice(
+                this.replayImgList.findIndex((item) => item.uid === file.uid),
+                1
+            );
+            this.hideUploadBtn = fileList.length >= 3;
+        },
+        // 最多上传3张图，超过时隐藏上传按钮
+        handleEditChange(file, fileList) {
+            this.hideUploadBtn = fileList.length >= 3;
+        },
+        exceedPic() {
+            this.$message.warning("最多上传3张预览图片");
+        },
+        handleBefore(file) {
+            if (this.uploadStatus) {
+                return false
             }
-          });
-        }
-      });
-    },
-
-    removePic (file, fileList) {
-      this.formData.imageList.splice(
-        this.formData.imageList.findIndex((item) => item === file.url),
-        1
-      );
-      this.replayImgList.splice(
-        this.replayImgList.findIndex((item) => item.uid === file.uid),
-        1
-      );
-      this.hideUploadBtn = fileList.length >= 3;
-    },
-    // 最多上传3张图，超过时隐藏上传按钮
-    handleEditChange (file, fileList) {
-      this.hideUploadBtn = fileList.length >= 3;
-    },
-    exceedPic () {
-      this.$message.warning("最多上传3张预览图片");
-    },
-    handleBefore(file){
-      if(this.uploadStatus){
-        return false
-      }
-      this.uploadStatus = true
-      return true
-    },
-    handleSuccess (response, file, fileList) {
-      this.uploadStatus = false
-      this.replayImgList.push(file);
-      this.formData.imageList.push(response.data.url);
-    },
+            this.uploadStatus = true
+            return true
+        },
+        handleSuccess(response, file, fileList) {
+            this.uploadStatus = false
+            this.replayImgList.push(file);
+            this.formData.imageList.push(response.data.url);
+        },
 
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap (latitude, longitude) {
-      this.$nextTick(()=>{
-      map = new daiMap(
-        document.getElementById("app_event"),
-        { latitude, longitude },
-        {
-          zoom: 17.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            this.$nextTick(() => {
+                map = new daiMap(
+                    document.getElementById("app_event"),
+                    { latitude, longitude },
+                    {
+                        zoom: 17.2, // 设置地图缩放级别
+                        pitch: 43.5, // 设置俯仰角
+                        rotation: 45, // 设置地图旋转角度
+                    }
+                );
+
+                // 监听地图平移结束
+                map.on("dragend", (e) => {
+                    this.handleMoveCenter(e);
+                });
 
-      // 监听地图平移结束
-      map.on("dragend", (e) => {
-        this.handleMoveCenter(e);
-      });
+                map.setCenter(latitude, longitude);
+                map.setMarker(latitude, longitude);
+            })
 
-      map.setCenter(latitude, longitude);
-      map.setMarker(latitude, longitude);
-      })
+        },
 
-    },
 
+        async handleMoveCenter() {
+            //修改地图中心点
+            const { lat, lng } = map.getCenter();
+            this.formData.latitude = lat;
+            this.formData.longitude = lng;
+            map.setMarker(lat, lng);
+            this.$EventBus.$emit('map', { lat, lng })
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == "success") {
+                this.formData.address = data.address
+                this.searchValue = data.address
+                this.searchOptions = []
 
-    async handleMoveCenter () {
-      //修改地图中心点
-      const { lat, lng } = map.getCenter();
-      this.formData.latitude = lat;
-      this.formData.longitude = lng;
-      map.setMarker(lat, lng);
-      this.$EventBus.$emit('map',{lat,lng})
-      let { msg, data } = await map.getAddress(lat, lng);
-      if (msg == "success") {
-        this.formData.address = data.address
-        this.searchValue = data.address
-        this.searchOptions = []
-
-      }
-    },
+            }
+        },
 
-    async remoteMethod (query) {
-      if (query !== '') {
-				this.loading = true;
-				const { msg, data } = await map.searchNearby(query);
-				this.loading = false;
-				this.resultList = [];
-				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-					if (data.resultList && data.resultList.length > 0) {
-						this.resultList = data.resultList;
-						this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.id}`, label: `${item.address + item.name}` };
-						});
-					}
-				} else {
-					this.searchOptions = [
-						{
-							value: '0',
-							label: '未检索到结果'
-						}
-					];
-				}
-			} else {
-				this.searchOptions = [];
-			}
-    },
+        async remoteMethod(query) {
+            if (query !== '') {
+                this.loading = true;
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = [];
+                if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList;
+                        this.searchOptions = this.resultList.map(item => {
+                            return { value: `${item.id}`, label: `${item.address + item.name}` };
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ];
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
 
-    handleClickKey (index) {
-      let selPosition = this.resultList[index]
-      let lonlat = selPosition.lonlat.split(" ")
-      map.setCenter(lonlat[1], lonlat[0]);
-      map.setMarker(lonlat[1], lonlat[0]);
-      this.formData.latitude = lonlat[1];
-      this.formData.longitude = lonlat[0];
-      this.formData.address = selPosition.address + selPosition.name
-    },
+        handleClickKey(index) {
+            let selPosition = this.resultList[index]
+            let lonlat = selPosition.lonlat.split(" ")
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.formData.latitude = lonlat[1];
+            this.formData.longitude = lonlat[0];
+            this.formData.address = selPosition.address + selPosition.name
+        },
 
-    resetData () {
-      this.formData = iniFmData();
-      this.replayImgList = [];
-      this.searchValue = ''
-      this.searchOptions = []
-      this.resultList = []
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        resetData() {
+            this.formData = iniFmData();
+            this.replayImgList = [];
+            this.searchValue = ''
+            this.searchOptions = []
+            this.resultList = []
+        },
+        // 开启加载动画
+        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>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 
 .item_width_4 {
-  width: 350px;
+    width: 350px;
 }
 
 .div_map {
-  margin-top: 10px;
+    margin-top: 10px;
 }
 </style>
 
 <style lang="scss" scoped>
 .el-dialog__body {
-  padding: 0 10px 20px !important;
+    padding: 0 10px 20px !important;
 }
 
 .hide {
-  .el-upload--picture-card {
-    display: none !important;
-  }
+    .el-upload--picture-card {
+        display: none !important;
+    }
 }
 </style>
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index e79d6c436..ff9675ffc 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -1,269 +1,143 @@
 <template>
-  <div class="">
-    <el-card
-      :style="containerStyle"
-      :class="{ 'box-card': source === 'visiual' }"
-      v-if="showType == ''"
-    >
-      <h3 v-if="source === 'manage'" class="h3-title">
-        <img
-          src="../../../../../assets/images/index/title-icon-sqzl.png"
-          width="30px"
-          height="30px"
-          alt=""
-        />
-        事件详情
-      </h3>
-      <div class="m-detail-main">
-        <div class="m-info">
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">所属网格：</span>
-            <span>{{ info.gridName }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">上报时间：</span>
-            <span>{{ info.happenTime }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">事件内容：</span>
-            <span>{{ info.eventContent }}</span>
-          </div>
-
-          <div
-            v-if="info.imageList && info.imageList.length > 0"
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">图片：</span>
-            <img
-              :src="src"
-              :key="src"
-              style="width: 150px; height: 150px; padding-right: 10px"
-              v-for="src in info.imageList"
-              @click="watchImg(src)"
-            />
-          </div>
-          <div
-            v-if="info.voiceList && info.voiceList.length > 0"
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">语音：</span>
-            <audio controls>
-              <source
-                :src="item.url"
-                type=""
-                :key="item.url"
-                v-for="item in info.voiceList"
-              />
-            </audio>
-          </div>
-
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">反映渠道：</span>
-            <span>{{ info.sourceTypeName }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">地址：</span>
-            <span>{{ info.address }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">上报人：</span>
-            <span>{{ info.name }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">联系电话：</span>
-            <span>{{ info.mobile }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">证件号：</span>
-            <span>{{ info.idCard ? info.idCard : "--" }}</span>
-          </div>
-          <div
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">标记：</span>
-            <span>{{ info.markTypeName || "--" }}</span>
-          </div>
-          <div
-            v-if="info.operationType === '1'"
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">已立项：</span>
-            <div class="line" @click="handleToProject"><i class="el-icon-view"></i> 查看项目</div>
-          </div>
-          <div
-            v-if="info.operationType === '2'"
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">已转需求：</span>
-            <div class="line" @click="handleToDemand"><i class="el-icon-view"></i>查看需求</div>
-          </div>
-          <div
-            v-if="info.operationType === '3'"
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">已转议题：</span>
-            <div class="line" @click="handleToIssue">
-              <i class="el-icon-view"></i> 查看议题
+    <div class="">
+        <el-card :style="containerStyle" :class="{ 'box-card': source === 'visiual' }" v-if="showType == ''">
+            <h3 v-if="source === 'manage'" class="h3-title">
+                <img src="../../../../../assets/images/index/title-icon-sqzl.png" width="30px" height="30px" alt="" />
+                事件详情
+            </h3>
+            <div class="m-detail-main">
+                <div class="m-info">
+                    <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                        <span class="u-info-title-2">所属组织：</span>
+                        <span>{{ info.gridName }}</span>
+                    </div>
+                    <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
+                        <span class="u-info-title-2">接收时间：</span>
+                        <span>{{ info.happenTime }}</span>
+                    </div>
+                    <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">事件内容：</span>
+                        <span>{{ info.eventContent }}</span>
+                    </div>
+
+                    <div v-if="info.imageList && info.imageList.length > 0" :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">图片：</span>
+                        <img :src="src" :key="src" style="width: 150px; height: 150px; padding-right: 10px"
+                            v-for="src in info.imageList" @click="watchImg(src)" />
+                    </div>
+                    <div v-if="info.voiceList && info.voiceList.length > 0" :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">语音：</span>
+                        <audio controls>
+                            <source :src="item.url" type="" :key="item.url" v-for="item in info.voiceList" />
+                        </audio>
+                    </div>
+
+                    <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">上报渠道：</span>
+                        <span>{{ info.sourceTypeName }}</span>
+                    </div>
+                    <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">详细地址</span>
+                        <span>{{ info.address }}</span>
+                    </div>
+                    <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">联系人：</span>
+                        <span>{{ info.name }}</span>
+                    </div>
+                    <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">联系电话：</span>
+                        <span>{{ info.mobile }}</span>
+                    </div>
+                    <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">标记：</span>
+                        <span>{{ info.markTypeName || "--" }}</span>
+                    </div>
+                    <div v-if="info.satisfactionName" :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]">
+                        <span class="u-info-title-2">满意度：</span>
+                        <div>{{ info.satisfactionName }}</div>
+                    </div>
+                </div>
             </div>
-          </div>
-          <div
-            v-if="info.satisfactionName"
-            :class="[
-              'm-info-prop',
-              { 'm-info-prop-vis': source === 'visiual' },
-            ]"
-          >
-            <span class="u-info-title-2">满意度：</span>
-            <div>{{ info.satisfactionName }}</div>
-          </div>
-        </div>
-      </div>
-      <!--
+            <!--
 显示关闭：
 1、状态=完成    (已评价)||(没评价&&不是本人)
 
 2、状态=未完成 （有操作id） -->
-      <div
-        v-if="
-          (info.status === 'processing' && info.operationId) ||
-          (info.status === 'closed_case' &&
-            (info.satisfactionName ||
-              (!info.satisfactionName && user.id != info.createdUserId)))
-        "
-        class="div-btn-info"
-      >
-        <el-button size="small" @click="handleCloseEvent">关闭</el-button>
-      </div>
-    </el-card>
-
-    <el-card
-      :class="{ 'box-card': source === 'visiual' }"
-      v-if="
-        info.status === 'closed_case' &&
-        !info.satisfactionName &&
-        user.id === info.createdUserId
-      "
-    >
-      <h3>满意度评价</h3>
-      <div class="m-detail-main">
-        <div class="m-info">
-          <div class="div-satisfy">
-            <div>
-              <img
-                :src="selBad ? badurl_light : badurl"
-                @click="clickSatisfy('bad')"
-              />
-              <div class="tip-satisfy">不满意</div>
+            <div v-if="(info.status === 'processing' && info.operationId) ||
+                (info.status === 'closed_case' &&
+                    (info.satisfactionName ||
+                        (!info.satisfactionName && user.id != info.createdUserId)))
+                " class="div-btn-info">
+                <el-button size="small" @click="handleCloseEvent">关闭</el-button>
             </div>
-            <div>
-              <img
-                :src="selGood ? goodurl_light : goodurl"
-                @click="clickSatisfy('good')"
-              />
-              <div class="tip-satisfy">满意</div>
+        </el-card>
+
+        <el-card :class="{ 'box-card': source === 'visiual' }" v-if="info.status === 'closed_case' &&
+            !info.satisfactionName &&
+            user.id === info.createdUserId
+            ">
+            <h3>满意度评价</h3>
+            <div class="m-detail-main">
+                <div class="m-info">
+                    <div class="div-satisfy">
+                        <div>
+                            <img :src="selBad ? badurl_light : badurl" @click="clickSatisfy('bad')" />
+                            <div class="tip-satisfy">不满意</div>
+                        </div>
+                        <div>
+                            <img :src="selGood ? goodurl_light : goodurl" @click="clickSatisfy('good')" />
+                            <div class="tip-satisfy">满意</div>
+                        </div>
+                        <div>
+                            <img :src="selPerfect ? perfecturl_light : perfecturl" @click="clickSatisfy('perfect')" />
+                            <div class="tip-satisfy">非常满意</div>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div>
-              <img
-                :src="selPerfect ? perfecturl_light : perfecturl"
-                @click="clickSatisfy('perfect')"
-              />
-              <div class="tip-satisfy">非常满意</div>
+
+            <div class="div-btn">
+                <el-button size="small" @click="handleCloseEvent">关闭</el-button>
+                <el-button style="margin-left: 20px" type="primary" size="small"
+                    @click="handleComfirmSatisfy">确定</el-button>
+            </div>
+        </el-card>
+        <el-dialog :visible.sync="showSatisfy" :close-on-click-modal="false" :close-on-press-escape="false" title="满意度评价"
+            width="550px" top="15vh" class="dialog-h" @closed="showSatisfy = false">
+            <div class="div-btn">
+                <el-button size="small" @click="showSatisfy = false">关闭</el-button>
+                <el-button style="margin-left: 20px" type="primary" size="small"
+                    @click="handleComfirmSatisfy">确定</el-button>
             </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="div-btn">
-        <el-button size="small" @click="handleCloseEvent">关闭</el-button>
-        <el-button
-          style="margin-left: 20px"
-          type="primary"
-          size="small"
-          @click="handleComfirmSatisfy"
-          >确定</el-button
-        >
-      </div>
-    </el-card>
-    <el-dialog
-      :visible.sync="showSatisfy"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="满意度评价"
-      width="550px"
-      top="15vh"
-      class="dialog-h"
-      @closed="showSatisfy = false"
-    >
-      <div class="div-btn">
-        <el-button size="small" @click="showSatisfy = false">关闭</el-button>
-        <el-button
-          style="margin-left: 20px"
-          type="primary"
-          size="small"
-          @click="handleComfirmSatisfy"
-          >确定</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -273,224 +147,227 @@ import projectInfo from "../../xiangmu/cpts/project-info";
 import dateFormat from "dai-js/tools/dateFormat";
 
 function iniData() {
-  return {
-    user: {},
-    projectPageType: "info",
-
-    info: {},
-    eventDetailCopy: {},
-    showType: "",
-
-    projectId: "",
-
-    demandForm: {
-      gridId: "",
-      categoryCode: "",
-      parentCode: "",
-      content: "",
-      reportType: "",
-      reportUserName: "",
-      reportUserMobile: "",
-      reportTime: "",
-      wantServiceTime: "",
-      demandUserId: "",
-      demandUserName: "",
-      demandUserMobile: "",
-    },
-
-    //满意度评价
-    showSatisfy: false,
-    selBad: false,
-    selGood: false,
-    selPerfect: false,
-    badurl: require("@/assets/img/satisfy-images/face1.png"),
-    badurl_light: require("@/assets/img/satisfy-images/face1_light.png"),
-    goodurl: require("@/assets/img/satisfy-images/face2.png"),
-    goodurl_light: require("@/assets/img/satisfy-images/face2_light.png"),
-    perfecturl: require("@/assets/img/satisfy-images/face3.png"),
-    perfecturl_light: require("@/assets/img/satisfy-images/face3_light.png"),
-  };
+    return {
+        user: {},
+        projectPageType: "info",
+
+        info: {},
+        eventDetailCopy: {},
+        showType: "",
+
+        projectId: "",
+
+        demandForm: {
+            gridId: "",
+            categoryCode: "",
+            parentCode: "",
+            content: "",
+            reportType: "",
+            reportUserName: "",
+            reportUserMobile: "",
+            reportTime: "",
+            wantServiceTime: "",
+            demandUserId: "",
+            demandUserName: "",
+            demandUserMobile: "",
+        },
+
+        //满意度评价
+        showSatisfy: false,
+        selBad: false,
+        selGood: false,
+        selPerfect: false,
+        badurl: require("@/assets/img/satisfy-images/face1.png"),
+        badurl_light: require("@/assets/img/satisfy-images/face1_light.png"),
+        goodurl: require("@/assets/img/satisfy-images/face2.png"),
+        goodurl_light: require("@/assets/img/satisfy-images/face2_light.png"),
+        perfecturl: require("@/assets/img/satisfy-images/face3.png"),
+        perfecturl_light: require("@/assets/img/satisfy-images/face3_light.png"),
+    };
 }
 
 export default {
-  name: "issueInfo",
-  props: {
-    eventId: {
-      type: String,
-      default: "",
-    },
-    type: {
-      type: String,
-      default: "info",
+    name: "issueInfo",
+    props: {
+        eventId: {
+            type: String,
+            default: "",
+        },
+        type: {
+            type: String,
+            default: "info",
+        },
+
+        eventDetailData: {
+            type: Object,
+            default() {
+                return {};
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
+        },
     },
 
-    eventDetailData: {
-      type: Object,
-      default() {
-        return {};
-      },
-    },
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
+    components: {
+        foldText,
+        projectInfo,
     },
-  },
-
-  components: {
-    foldText,
-    projectInfo,
-  },
-
-  data: iniData,
-
-
-  watch: {},
-  created() {},
-  computed: {
-  containerStyle() {
-    if (this.type === 'info') {
-      return {
-        minHeight: 'calc(88vh - 50px)',
-        overflow: 'auto',
-        position: 'relative'
-      }
-    } else {
-      return {}
-    }
-  }
-},
-  mounted() {
-    this.user = this.$store.state.user;
-    if (this.eventId) {
-      this.info = JSON.parse(JSON.stringify(this.eventDetailData));
-
-      //如果已经评价过，进行回显
-      // if (this.info.status === 'closed_case' && this.info.satisfactionName) {
-      //   this.changeSatisfyType(this.info.satisfaction)
-      // }
-    }
-    // this.getApiData();
-  },
-
-  methods: {
-    watchImg(src) {
-      window.open(src);
-    },
-
-    handleClose() {
-      this.showType = "";
-    },
-
-    handleCloseEvent() {
-      this.$emit("handleClose");
-    },
-
-    async getApiData() {},
 
-    handleToProject() {
-      this.$emit("handleToProject");
-      // if (this.info.status === 'processing') {
-      //   this.projectPageType = 'edit'
-      // } else {
-      //   this.projectPageType = 'info'
-      // }
-
-      // this.showType = 'project'
-    },
-    handleToDemand() {
-      this.$emit("handleToDemand");
-    },
-    handleToIssue() {
-      this.$emit("handleToIssue");
-    },
-
-    //满意度评价
-    handleSatisfy() {
-      this.showSatisfy = true;
-    },
-
-    clickSatisfy(type) {
-      if (this.info.satisfactionName) {
-        return false;
-      }
-
-      this.changeSatisfyType(type);
+    data: iniData,
+
+
+    watch: {},
+    created() { },
+    computed: {
+        containerStyle() {
+            if (this.type === 'info') {
+                return {
+                    minHeight: 'calc(88vh - 50px)',
+                    overflow: 'auto',
+                    position: 'relative'
+                }
+            } else {
+                return {}
+            }
+        }
     },
-    changeSatisfyType(type) {
-      if (type === "bad") {
-        this.selGood = false;
-        this.selPerfect = false;
-        this.selBad = true;
-      } else if (type === "good") {
-        this.selGood = true;
-        this.selPerfect = false;
-        this.selBad = false;
-      } else if (type === "perfect") {
-        this.selGood = false;
-        this.selPerfect = true;
-        this.selBad = false;
-      }
+    mounted() {
+        this.user = this.$store.state.user;
+        if (this.eventId) {
+            this.info = JSON.parse(JSON.stringify(this.eventDetailData));
+
+            //如果已经评价过，进行回显
+            // if (this.info.status === 'closed_case' && this.info.satisfactionName) {
+            //   this.changeSatisfyType(this.info.satisfaction)
+            // }
+        }
+        // this.getApiData();
     },
 
-    async handleComfirmSatisfy() {
-      let satisfyLevel = "";
-      if (!this.selBad && !this.selGood && !this.selPerfect) {
-        this.$message.info("请选择评价级别");
-      } else {
-        if (this.selBad) {
-          satisfyLevel = "bad";
-        } else if (this.selGood) {
-          satisfyLevel = "good";
-        } else if (this.selPerfect) {
-          satisfyLevel = "perfect";
-        }
-      }
-      const url = "/governance/icEvent/comment";
-
-      let params = {
-        icEventId: this.eventId,
-        satisfaction: satisfyLevel,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("评价成功");
-        this.info.satisfactionName =
-          satisfyLevel == "bad"
-            ? "不满意"
-            : satisfyLevel == "good"
-            ? "满意"
-            : "非常满意";
-        this.showSatisfy = false;
-      } else {
-        this.$message.error(msg);
-      }
+    methods: {
+        watchImg(src) {
+            window.open(src);
+        },
+
+        handleClose() {
+            this.showType = "";
+        },
+
+        handleCloseEvent() {
+            this.$emit("handleClose");
+        },
+
+        async getApiData() { },
+
+        handleToProject() {
+            this.$emit("handleToProject");
+            // if (this.info.status === 'processing') {
+            //   this.projectPageType = 'edit'
+            // } else {
+            //   this.projectPageType = 'info'
+            // }
+
+            // this.showType = 'project'
+        },
+        handleToDemand() {
+            this.$emit("handleToDemand");
+        },
+        handleToIssue() {
+            this.$emit("handleToIssue");
+        },
+
+        //满意度评价
+        handleSatisfy() {
+            this.showSatisfy = true;
+        },
+
+        clickSatisfy(type) {
+            if (this.info.satisfactionName) {
+                return false;
+            }
+
+            this.changeSatisfyType(type);
+        },
+        changeSatisfyType(type) {
+            if (type === "bad") {
+                this.selGood = false;
+                this.selPerfect = false;
+                this.selBad = true;
+            } else if (type === "good") {
+                this.selGood = true;
+                this.selPerfect = false;
+                this.selBad = false;
+            } else if (type === "perfect") {
+                this.selGood = false;
+                this.selPerfect = true;
+                this.selBad = false;
+            }
+        },
+
+        async handleComfirmSatisfy() {
+            let satisfyLevel = "";
+            if (!this.selBad && !this.selGood && !this.selPerfect) {
+                this.$message.info("请选择评价级别");
+            } else {
+                if (this.selBad) {
+                    satisfyLevel = "bad";
+                } else if (this.selGood) {
+                    satisfyLevel = "good";
+                } else if (this.selPerfect) {
+                    satisfyLevel = "perfect";
+                }
+            }
+            const url = "/governance/icEvent/comment";
+
+            let params = {
+                icEventId: this.eventId,
+                satisfaction: satisfyLevel,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message.success("评价成功");
+                this.info.satisfactionName =
+                    satisfyLevel == "bad"
+                        ? "不满意"
+                        : satisfyLevel == "good"
+                            ? "满意"
+                            : "非常满意";
+                this.showSatisfy = false;
+            } else {
+                this.$message.error(msg);
+            }
+        },
     },
-  },
 };
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+
 .m-info {
-  padding-left: 0px !important;
+    padding-left: 0px !important;
 }
+
 .m-info-prop {
-  margin: 25px 0 !important;
-  padding-left: 0px !important;
-  &::before {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 9px;
-    left: 0;
-    width: 7px;
-    height: 7px;
-    background: none !important;
-    border-radius: 3px;
-    margin-right: 10px;
-  }
+    margin: 25px 0 !important;
+    padding-left: 0px !important;
+
+    &::before {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 9px;
+        left: 0;
+        width: 7px;
+        height: 7px;
+        background: none !important;
+        border-radius: 3px;
+        margin-right: 10px;
+    }
 }
 </style>
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 3ad7a4c57..51f88d0ec 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -1,297 +1,145 @@
 <template>
-  <div class="">
-    <div v-if="pageTypeCopy == 'add'">
-      <el-card>
-        <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>
-      </el-card>
-
-      <div class="process-form">
-        <el-card>
-          <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt=""> 处理</h3>
-          <process-form
-            ref="ref_processinfo_add"
-            :demandUserId="demandUserId"
-            :eventDetailData="eventDetailData"
-            :demandUserName="demandUserName"
-            :demandUserMobile="demandUserMobile"
-            :gridId="gridId"
-          ></process-form>
-
-          <div class="div-btn">
-            <el-button size="small" @click="handleClose">关闭</el-button>
-            <el-button
-              style="margin-left: 20px"
-              type="primary"
-              size="small"
-              @click="handleComfirm"
-              >保存</el-button
-            >
-          </div>
-        </el-card>
-      </div>
-    </div>
-
-    <div
-      v-if="pageTypeCopy == 'dispose' || pageTypeCopy == 'info'"
-      class="g-page"
-    >
-      <!-- 面包屑放到这里-->
-      <div class="tabs" v-if="pageTypeCopy == 'info'">
-        <i class="el-icon-arrow-left"></i>
-        <el-button
-          class="diy-button--white"
-          style="height: 20px"
-          @click="handleClose"
-        >
-          查看详情</el-button
-        >
-      </div>
-      <div :class="['g-total', { 'g-left': projectProcess.length > 0,'g-left-top40':pageType =='info' }]">
-        <event-detail
-          ref="ref_detail"
-          :type="pageType"
-          :eventId="eventId"
-          :eventDetailData="eventDetailData"
-          :source="source"
-          @handleToProject="handleToProject"
-          @handleToDemand="handleToDemand"
-          @handleToIssue="handleToIssue"
-          @handleClose="handleClose"
-        ></event-detail>
-
-        <div
-          v-if="!eventDetailData.operationId && pageTypeCopy == 'dispose'"
-          class="process-form"
-        >
-          <el-card :class="{ 'box-card': source === 'visiual' }">
-            <div
-              :class="[
-                'process-title',
-                { 'process-title-vis': source === 'visiual' },
-              ]"
-            >
-            <img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt=""> 处理 
-            </div>
-            <process-form
-              ref="ref_processinfo_dispose"
-              :source="source"
-              :eventId="eventId"
-              :eventDetailData="eventDetailData"
-            ></process-form>
-
-            <div class="div-btn">
-              <el-button size="small" @click="handleClose">关闭</el-button>
-              <el-button
-                style="margin-left: 20px"
-                type="primary"
-                size="small"
-                @click="handleComfirm"
-                >保存</el-button
-              >
+    <div class="">
+        <div v-if="pageTypeCopy == 'add'">
+            <el-card>
+                <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>
+            </el-card>
+
+            <div class="process-form">
+                <el-card>
+                    <h3 class="h3-title"><img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px"
+                            height="30px" alt=""> 处理</h3>
+                    <process-form ref="ref_processinfo_add" :demandUserId="demandUserId" :eventDetailData="eventDetailData"
+                        :demandUserName="demandUserName" :demandUserMobile="demandUserMobile"
+                        :gridId="gridId"></process-form>
+
+                    <div class="div-btn">
+                        <el-button size="small" @click="handleClose">关闭</el-button>
+                        <el-button style="margin-left: 20px" type="primary" size="small"
+                            @click="handleComfirm">保存</el-button>
+                    </div>
+                </el-card>
             </div>
-          </el-card>
         </div>
-      </div>
-
-      <div v-if="projectProcess.length > 0" :class="['g-right',pageType == 'info'?'g-right-top40':'']">
-        <el-card
-          :class="{ 'box-card': source === 'visiual' }"
-          style="min-height: calc(88vh - 50px); overflow: auto"
-        >
-          <div class="m-process">
-            <div
-              :class="[
-                'process-title',
-                { 'process-title-vis': source === 'visiual' },
-              ]"
-            >
-              <img
-                src="../../../../../assets/images/index/title-icon-cljz.png"
-                width="30px"
-                height="30px"
-                alt=""
-              />
-              处理进展
-            </div>
-            <div class="list">
-              <div
-                class="item"
-                :class="[
-                  index === 0 ? 'z-on' : '',
-                  { 'item-vis': source === 'visiual' },
-                ]"
-                :key="item.processId"
-                v-for="(item, index) in projectProcess"
-              >
-                <div class="item-row">
-                  <div class="name">{{ item.processName }}</div>
-                  <div class="date">
-                    {{ item.processTime }}
-                  </div>
-                </div>
-
-                <div v-if="item.type === 'event'">
-                  <div class="detail">
-                    <div class="detail-field">回复人：</div>
-                    <div class="detail-value">{{ item.departmentName }}</div>
-                  </div>
-                  <div class="detail">
-                    <div class="detail-field">回复内容：</div>
-                    <div class="detail-value">{{ item.publicReply }}</div>
-                  </div>
-                </div>
-
-                <div v-else-if="item.type === 'project'">
-                  <div v-if="item.processName === '回复'">
-                    <div class="detail">
-                      <div class="detail-field">回复人：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
-                    </div>
-                    <div class="detail">
-                      <div class="detail-field">回复内容：</div>
-                      <div class="detail-value">{{ item.publicReply }}</div>
-                    </div>
-                  </div>
-                  <div v-else>
-                    <div class="detail">
-                      <div class="detail-field">处理部门：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
-                    </div>
 
-                    <!-- <div class="detail"
-                         v-if="item.assistanceUnitName">
-                      <div class="detail-field">协办单位：</div>
-                      <div class="detail-value">
-                        <fold-text :row="3">{{ item.assistanceUnitName }}</fold-text>
-                      </div>
-                    </div> -->
-                    <div
-                      class="detail"
-                      v-if="item.processName != '转项目' && item.publicReply"
-                    >
-                      <div class="detail-field">说 明：</div>
-                      <div class="detail-value">
-                        <fold-text :row="3">{{ item.publicReply }}</fold-text>
-                      </div>
-                    </div>
-
-                    <div
-                      class="detail"
-                      v-if="item.processName != '转项目' && item.internalRemark"
-                    >
-                      <div class="detail-field">内部备注：</div>
-                      <div class="detail-value">
-                        <fold-text :row="3">{{
-                          item.internalRemark
-                        }}</fold-text>
-                      </div>
-                    </div>
-                    <div
-                      v-if="item.internalFile && item.internalFile.length > 0"
-                      class="detail"
-                    >
-                      <div class="attachement-list">
-                        <a
-                          :href="att.url"
-                          target="_blank"
-                          :key="att.url"
-                          v-for="att in item.internalFile"
-                        >
-                          <i class="el-icon-folder-opened"></i>
-                          {{ att.name }}
-                        </a>
-                      </div>
-                    </div>
-                  </div>
+        <div v-if="pageTypeCopy == 'dispose' || pageTypeCopy == 'info'" class="g-page">
+            <!-- 面包屑放到这里-->
+            <div class="tabs" v-if="pageTypeCopy == 'info'">
+                <i class="el-icon-arrow-left"></i>
+                <el-button class="diy-button--white" style="height: 20px" @click="handleClose">
+                    查看详情</el-button>
+            </div>
+            <div :class="['g-total', { 'g-left': projectProcess.length > 0, 'g-left-top40': pageType == 'info' }]">
+                <event-detail ref="ref_detail" :type="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
+                    :source="source" @handleToProject="handleToProject" @handleToDemand="handleToDemand"
+                    @handleToIssue="handleToIssue" @handleClose="handleClose"></event-detail>
+
+                <div v-if="!eventDetailData.operationId && pageTypeCopy == 'dispose'" class="process-form">
+                    <el-card :class="{ 'box-card': source === 'visiual' }">
+                        <div :class="[
+                            'process-title',
+                            { 'process-title-vis': source === 'visiual' },
+                        ]">
+                            <img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px"
+                                alt=""> 处理
+                        </div>
+                        <process-form ref="ref_processinfo_dispose" :source="source" :eventId="eventId"
+                            :eventDetailData="eventDetailData"></process-form>
+
+                        <div class="div-btn">
+                            <el-button size="small" @click="handleClose">关闭</el-button>
+                            <el-button style="margin-left: 20px" type="primary" size="small"
+                                @click="handleComfirm">保存</el-button>
+                        </div>
+                    </el-card>
                 </div>
+            </div>
 
-                <div v-else-if="item.type === 'demand'">
-                  <div v-if="item.processName === '回复'">
-                    <div class="detail">
-                      <div class="detail-field">回复人：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
-                    </div>
-                    <div class="detail">
-                      <div class="detail-field">回复内容：</div>
-                      <div class="detail-value">{{ item.publicReply }}</div>
-                    </div>
-                  </div>
-                  <div v-if="item.processName === '需求完成'">
-                    <div class="detail">
-                      <div class="detail-field">服务方：</div>
-                      <div class="detail-value">{{ item.serviceParty }}</div>
+            <div v-if="projectProcess.length > 0" :class="['g-right', pageType == 'info' ? 'g-right-top40' : '']">
+                <el-card :class="{ 'box-card': source === 'visiual' }"
+                    style="min-height: calc(88vh - 50px); overflow: auto">
+                    <div class="m-process">
+                        <div :class="['process-title', { 'process-title-vis': source === 'visiual' },]">
+                            <img src="../../../../../assets/images/index/title-icon-cljz.png" width="30px" height="30px"
+                                alt="" />
+                            处理进展
+                        </div>
+                        <div class="list">
+                            <div class="item" :class="[
+                                index === 0 ? 'z-on' : '',
+                                { 'item-vis': source === 'visiual' },
+                            ]" :key="item.processId" v-for="(item, index) in projectProcess">
+                                <div class="item-row">
+                                    <div class="name">{{ item.processName }}</div>
+                                    <div class="date">
+                                        {{ item.processTime }}
+                                    </div>
+                                </div>
+
+                                <div v-if="item.type === 'event'">
+                                    <template v-if="item.agencyId">
+                                        <div class="detail">
+                                            <div class="detail-field">指派人：</div>
+                                            <div class="detail-value">{{ item.departmentName }}</div>
+                                        </div>
+                                        <div class="detail">
+                                            <div class="detail-field">指派部门：</div>
+                                            <div class="detail-value">{{ item.agencyName }}</div>
+                                        </div>
+                                        <div class="detail">
+                                            <div class="detail-field">转办意见：</div>
+                                            <div class="detail-value">{{ item.publicReply }}</div>
+                                        </div>
+                                        <div class="detail">
+                                            <div class="detail-field">办结时限：</div>
+                                            <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                        <div class="detail">
+                                            <div class="detail-field">回复人：</div>
+                                            <div class="detail-value">{{ item.departmentName }}</div>
+                                        </div>
+                                        <div class="detail">
+                                            <div class="detail-field">回复内容：</div>
+                                            <div class="detail-value">{{ item.publicReply }}</div>
+                                        </div>
+                                        <div class="detail" v-if="item.timeLimit">
+                                            <div class="detail-field">办结时限：</div>
+                                            <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
+                                        </div>
+                                    </template>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                    <div class="detail">
-                      <div class="detail-field">实际服务时间：</div>
-                      <div class="detail-value">
-                        {{ item.actualServiceTime }}
-                      </div>
-                    </div>
-                  </div>
-                  <div v-if="item.processName === '转服务'">
-                    <div class="detail">
-                      <div class="detail-field">服务时间：</div>
-                      <div class="detail-value">{{ item.serviceTime }}</div>
-                    </div>
-                  </div>
-                </div>
-
-                <div v-else-if="item.type === 'issue'">
-                  <div class="detail">
-                    <div class="detail-field">回复人：</div>
-                    <div class="detail-value">{{ item.departmentName }}</div>
-                  </div>
-                  <div class="detail">
-                    <div class="detail-field">回复内容：</div>
-                    <div class="detail-value">{{ item.publicReply }}</div>
-                  </div>
-                </div>
-              </div>
+                </el-card>
             </div>
-          </div>
-        </el-card>
-      </div>
-    </div>
+        </div>
 
-    <div v-if="pageTypeCopy == 'project'">
-      <project-info-origin
-        ref="eleEditForm"
-        :source="source"
-        :sourceType="sourceType"
-        :type="projectPageType"
-        :eventId="eventId"
-        :projectId="eventDetailCopy.operationId"
-        @close="handleCloseProject"
-        @afterEdit="handleCloseProject"
-      />
-    </div>
-    <div v-if="pageTypeCopy == 'demand'">
-      <demand-info-origin
-        ref="demandEditForm"
-        :source="source"
-        :demandRecId="eventDetailCopy.operationId"
-        @close="handleCloseProject"
-      />
-    </div>
-    <div v-if="pageTypeCopy == 'issue'">
-      <issue-info-origin
-        ref="eleEditForm"
-        :pageType="issuePageType"
-        :issueId="eventDetailCopy.operationId"
-        :issueDetailData="issueDetailData"
-        @handleClose="handleCloseProject"
-        @handleOk="handleCloseProject"
-        @dialogOk="handleCloseProject"
-      />
+        <!-- <div v-if="pageTypeCopy == 'project'">
+            <project-info-origin ref="eleEditForm" :source="source" :sourceType="sourceType" :type="projectPageType"
+                :eventId="eventId" :projectId="eventDetailCopy.operationId" @close="handleCloseProject"
+                @afterEdit="handleCloseProject" />
+        </div>
+        <div v-if="pageTypeCopy == 'demand'">
+            <demand-info-origin ref="demandEditForm" :source="source" :demandRecId="eventDetailCopy.operationId"
+                @close="handleCloseProject" />
+        </div>
+        <div v-if="pageTypeCopy == 'issue'">
+            <issue-info-origin ref="eleEditForm" :pageType="issuePageType" :issueId="eventDetailCopy.operationId"
+                :issueDetailData="issueDetailData" @handleClose="handleCloseProject" @handleOk="handleCloseProject"
+                @dialogOk="handleCloseProject" />
+        </div> -->
+        <!-- <div v-if="pageTypeCopy == 'issue'">
+            <issue-info-origin ref="eleEditForm" :pageType="issuePageType" :issueId="eventDetailCopy.operationId"
+                :issueDetailData="issueDetailData" @handleClose="handleCloseProject" @handleOk="handleCloseProject"
+                @dialogOk="handleCloseProject" />
+        </div> -->
     </div>
-  </div>
 </template>
 
 <script>
@@ -308,431 +156,380 @@ import processForm from "./process-form";
 
 let loading; // 加载动画
 function iniData() {
-  return {
-    formData: {
-      operationType: "",
-    },
-    eventInfoData: {},
-    replayInfo: {},
-    demand: {},
-    project: {},
-    issueInfo: {},
-
-    //新增
-    demandUserId: "",
-    demandUserName: "",
-    demandUserMobile: "",
-    gridId: "",
-
-    eventDetailCopy: {},
-
-    projectProcess: [],
-    projectPageType: "info",
-    pageTypeCopy: "",
-
-    issuePageType: "",
-    issueDetailData: {},
-
-    sourceType: "",
-  };
+    return {
+        formData: {
+            operationType: "",
+        },
+        eventInfoData: {},
+        replayInfo: {},
+        demand: {},
+        project: {},
+        issueInfo: {},
+
+        //新增
+        demandUserId: "",
+        demandUserName: "",
+        demandUserMobile: "",
+        gridId: "",
+
+        eventDetailCopy: {},
+
+        projectProcess: [],
+        projectPageType: "info",
+        pageTypeCopy: "",
+
+        issuePageType: "",
+        issueDetailData: {},
+
+        sourceType: "",
+    };
 }
 
 export default {
-  name: "projectInfo",
-  props: {
-    eventId: {
-      type: String,
-      default: "",
-    },
-    pageType: {
-      type: String,
-      default: "",
-    },
-    eventDetailData: {
-      type: Object,
-      default() {
-        return {};
-      },
-    },
-
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
-    },
-  },
-
-  components: {
-    foldText,
-
-    eventAdd,
-    eventDetail,
-    processForm,
-    projectInfoOrigin,
-    demandInfoOrigin,
-    issueInfoOrigin,
-  },
-
-  data: iniData,
-
-  computed: {},
-
-  watch: {
-    eventId() {
-      let data = iniData();
-      Object.keys(data).forEach((k) => {
-        this[k] = data[k];
-      });
-      // this.getApiData();
-    },
-  },
-  created() {},
-  mounted() {
-    this.pageTypeCopy = this.pageType;
-    if (this.pageTypeCopy !== "add") {
-      this.getProjectProcess();
-    }
-
-    if (this.eventId) {
-      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-    }
-  },
-
-  methods: {
-    changeName(val) {
-      this.demandUserName = val;
-    },
-    changeMobile(val) {
-      this.demandUserMobile = val;
-    },
-    changeUserId(val) {
-      this.demandUserId = val;
-    },
-    changeGridId(val) {
-      this.gridId = val;
+    name: "projectInfo",
+    props: {
+        eventId: {
+            type: String,
+            default: "",
+        },
+        pageType: {
+            type: String,
+            default: "",
+        },
+        eventDetailData: {
+            type: Object,
+            default() {
+                return {};
+            },
+        },
+
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
+        },
     },
 
-    //加载组织数据
-    async getProjectProcess() {
-      const url = "/governance/icEvent/process";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/process";
-
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
-      });
-
-      if (code === 0) {
-        this.projectProcess = data.map((item) => {
-          item.processTime = dateFormat(
-            new Date(item.processTime * 1000),
-            "yyyy-MM-dd hh:mm"
-          );
-          return item;
-        });
-      } else {
-        this.$message.error(msg);
-      }
+    components: {
+        foldText,
+        eventAdd,
+        eventDetail,
+        processForm,
+        projectInfoOrigin,
+        demandInfoOrigin,
+        issueInfoOrigin,
     },
 
-    getEventInfo() {
-      this.$refs.ref_add.getEventInfo();
-      if (this.$refs.ref_add.okflag) {
-        this.eventInfoData = this.$refs.ref_add.formData;
-      } else {
-        return false;
-      }
-
-      console.log("eventInfo", this.eventInfoData);
-    },
-
-    async handleComfirm() {
-      this.startLoading();
-      if (this.pageTypeCopy === "add") {
-        await this.handelAdd();
-      }
-      if (this.pageTypeCopy === "dispose") {
-        await this.handelDispose();
-      }
-      this.endLoading();
-    },
-
-    async handelAdd() {
-      this.$refs.ref_add.getEventInfo();
-      if (this.$refs.ref_add.okflag) {
-        this.eventInfoData = this.$refs.ref_add.formData;
-      } else {
-        return false;
-      }
-
-      console.log("eventInfo", this.eventInfoData);
-
-      this.$refs.ref_processinfo_add.getProcessInfo();
-      // if (this.$refs.ref_processinfo_add.okflag) {
-
-      this.formData.operationType =
-        this.$refs.ref_processinfo_add.operationType;
-      this.eventInfoData.operationType =
-        this.$refs.ref_processinfo_add.operationType;
-
-      if (this.formData.operationType === "0") {
-        this.project = {};
-        this.demand = {};
-        this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
-        console.log("replayInfo", this.replayInfo);
-
-        //回复属性赋值
-        this.eventInfoData.content = this.replayInfo.content;
-        this.eventInfoData.status = this.replayInfo.status;
-        if (this.replayInfo.categoryId) {
-          this.eventInfoData.categoryList = [];
-          this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
-        }
-      } else if (this.formData.operationType === "1") {
-        this.replayInfo = {};
-        this.demand = {};
-        this.project = this.$refs.ref_processinfo_add.project;
-        //项目的属性同事件一样
-        this.project.gridId = this.eventInfoData.gridId;
-
-        if (this.project.categoryList && this.project.categoryList.length > 0) {
-          this.eventInfoData.categoryList = [];
-          this.eventInfoData.categoryList.push(this.project.categoryList[0].id);
-        }
-
-        console.log("projectInfo", this.project);
-      } else if (this.formData.operationType === "2") {
-        this.replayInfo = {};
-        this.project = {};
-        this.demand = this.$refs.ref_processinfo_add.demand;
-        this.demand.gridId = this.eventInfoData.gridId;
-        //需求的属性同事件一样
-        // this.eventInfoData.categoryList = []
-        // this.eventInfoData.categoryList.push(this.demand.categoryId)
-        console.log("demond", this.demand);
-      } else if (this.formData.operationType === "3") {
-        this.project = {};
-        this.demand = {};
-        this.replayInfo = {};
-        this.issueInfo = this.$refs.ref_processinfo_add.issueInfo;
-
-        if (
-          this.issueInfo.categoryList &&
-          this.issueInfo.categoryList.length > 0
-        ) {
-          this.eventInfoData.categoryList = [];
-          this.eventInfoData.categoryList.push(
-            this.issueInfo.categoryList[0].id
-          );
-        }
-        console.log("issueInfo", this.issueInfo);
-      }
-
-      // }
+    data: iniData,
 
-      this.formData = {
-        ...this.eventInfoData,
-        // replayInfo: this.replayInfo,
-        project: this.project,
-        demand: this.demand,
-        issueInfo: this.issueInfo,
-      };
+    computed: {},
 
-      console.log("this.formData", this.formData);
-      await this.submit();
+    watch: {
+        eventId() {
+            let data = iniData();
+            Object.keys(data).forEach((k) => {
+                this[k] = data[k];
+            });
+            // this.getApiData();
+        },
     },
-
-    async submit() {
-      if (
-        (this.formData.operationType == 3 && this.issueInfo.issueTitle) ||
-        (this.formData.operationType == 2 && this.demand.demandUserName) ||
-        (this.formData.operationType == 1 && this.project.categoryList) ||
-        (this.formData.operationType == 0 && this.eventInfoData.content) ||
-        this.formData.operationType == 4
-      ) {
-        const url = "/governance/icEvent/add";
-        const { formData } = this;
-        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);
+    created() { },
+    mounted() {
+        this.pageTypeCopy = this.pageType;
+        if (this.pageTypeCopy !== "add") {
+            this.getProjectProcess();
         }
-      } 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;
-
-        if (this.formData.operationType === "0") {
-          this.project = {};
-          this.demand = {};
-          this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
-
-          this.replayInfo.icEventId = this.eventId;
-          console.log("replayInfo", this.replayInfo);
-          //回复属性赋值
-          let url = "/governance/icEvent/reply";
-          await this.submitDispose(url, this.replayInfo);
-        } else if (this.formData.operationType === "1") {
-          this.replayInfo = {};
-          this.demand = {};
-          this.project = this.$refs.ref_processinfo_dispose.project;
-          //项目的属性同事件一样
-          this.project.icEventId = this.eventId;
-          console.log("projectInfo", this.project);
-          let url = "/governance/icEvent/icEventToProject";
-          await this.submitDispose(url, this.project);
-        } else if (this.formData.operationType === "2") {
-          this.replayInfo = {};
-          this.project = {};
-          this.demand = this.$refs.ref_processinfo_dispose.demand;
-          //需求的属性同事件一样
-          this.demand.icEventId = this.eventId;
-          console.log("demond", this.demand);
-          let url = "/governance/icEvent/icEventToDemand";
-          await this.submitDispose(url, this.demand);
-        } else if (this.formData.operationType === "3") {
-          this.replayInfo = {};
-          this.demand = {};
-          this.project = {};
-          this.issueInfo = this.$refs.ref_processinfo_dispose.issueInfo;
-          //项目的属性同事件一样
-
-          console.log("issueInfo", this.issueInfo);
-          let url = "/governance/icEvent/icEventToIssue";
-          await this.submitDispose(url, this.issueInfo);
-        } else {
-          this.$message.info("请选择一种处理方式");
+        if (this.eventId) {
+            this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
         }
-      } 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();
-      }
-
-      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 { data, code, msg } = await requestPost(url, {
-        issueId: this.eventDetailCopy.operationId,
-      });
-
-      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";
     },
 
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+    methods: {
+        changeName(val) {
+            this.demandUserName = val;
+        },
+        changeMobile(val) {
+            this.demandUserMobile = val;
+        },
+        changeUserId(val) {
+            this.demandUserId = val;
+        },
+        changeGridId(val) {
+            this.gridId = val;
+        },
+
+        //加载组织数据
+        async getProjectProcess() {
+            const url = "/governance/icEvent/process";
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/process";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+            });
+            if (code === 0) {
+                this.projectProcess = data.map((item) => {
+                    item.processTime = dateFormat(
+                        new Date(item.processTime * 1000),
+                        "yyyy-MM-dd hh:mm"
+                    );
+                    return item;
+                });
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        formTimeLimit(val){
+            return dateFormat(
+                new Date(val * 1000),
+                "yyyy-MM-dd hh:mm"
+            );
+        },
+        getEventInfo() {
+            this.$refs.ref_add.getEventInfo();
+            if (this.$refs.ref_add.okflag) {
+                this.eventInfoData = this.$refs.ref_add.formData;
+            } else {
+                return false;
+            }
+        },
+
+        async handleComfirm() {
+            this.startLoading();
+            if (this.pageTypeCopy === "add") {
+                await this.handelAdd();
+            }
+            if (this.pageTypeCopy === "dispose") {
+                await this.handelDispose();
+            }
+            this.endLoading();
+        },
+
+        async handelAdd() {
+            this.$refs.ref_add.getEventInfo();
+            if (this.$refs.ref_add.okflag) {
+                this.eventInfoData = this.$refs.ref_add.formData;
+            } else {
+                return false;
+            }
+            this.$refs.ref_processinfo_add.getProcessInfo();
+            this.formData.operationType = this.$refs.ref_processinfo_add.operationType;
+            this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType;
+            if (this.formData.operationType === "0" || this.formData.operationType === "6") {
+                this.project = {};
+                this.demand = {};
+                this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
+                //回复属性赋值
+                this.eventInfoData.content = this.replayInfo.content;
+                this.eventInfoData.status = this.replayInfo.status;
+                if (this.replayInfo.categoryId) {
+                    this.eventInfoData.categoryList = [];
+                    this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
+                }
+            } else {
+
+            }
+            this.formData = {
+                ...this.eventInfoData,
+                project: this.project,
+                demand: this.demand,
+                issueInfo: this.issueInfo,
+            };
+            await this.submit();
+        },
+
+        async submit() {
+            if (
+                // (this.formData.operationType == 3 && this.issueInfo.issueTitle) ||
+                // (this.formData.operationType == 2 && this.demand.demandUserName) ||
+                // (this.formData.operationType == 1 && this.project.categoryList) ||
+                (this.formData.operationType == 0 && this.formData.operationType == 5)
+                || this.formData.operationType == 4) {
+                const url = "/governance/icEvent/add";
+                const { formData } = this;
+                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;
+
+                if (this.formData.operationType === "0" || this.formData.operationType === "6") {
+                    this.project = {};
+                    this.demand = {};
+                    this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
+
+                    this.replayInfo.icEventId = this.eventId;
+                    //回复属性赋值
+                    let url = "/governance/icEvent/reply";
+                    await this.submitDispose(url, this.replayInfo);
+                }
+                // else if (this.formData.operationType === "1") {
+                //     this.replayInfo = {};
+                //     this.demand = {};
+                //     this.project = this.$refs.ref_processinfo_dispose.project;
+                //     //项目的属性同事件一样
+                //     this.project.icEventId = this.eventId;
+                //     let url = "/governance/icEvent/icEventToProject";
+                //     await this.submitDispose(url, this.project);
+                // } else if (this.formData.operationType === "2") {
+                //     this.replayInfo = {};
+                //     this.project = {};
+                //     this.demand = this.$refs.ref_processinfo_dispose.demand;
+                //     //需求的属性同事件一样
+                //     this.demand.icEventId = this.eventId;
+                //     let url = "/governance/icEvent/icEventToDemand";
+                //     await this.submitDispose(url, this.demand);
+                // } else if (this.formData.operationType === "3") {
+                //     this.replayInfo = {};
+                //     this.demand = {};
+                //     this.project = {};
+                //     this.issueInfo = this.$refs.ref_processinfo_dispose.issueInfo;
+                //     //项目的属性同事件一样
+                //     let url = "/governance/icEvent/icEventToIssue";
+                //     await this.submitDispose(url, this.issueInfo);
+                // } 
+                else {
+                    this.$message.info("请选择一种处理方式");
+                }
+            } 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();
+            }
+
+            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 { data, code, msg } = await requestPost(url, {
+                issueId: this.eventDetailCopy.operationId,
+            });
+
+            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";
+        },
+
+        // 开启加载动画
+        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>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+
 .tabs {
-  position: absolute;
-  margin-left: 30px;
-  height: 50px;
-  line-height: 50px;
-  .diy-button--white {
-    border: none !important;
-    color: rgba(0, 0, 0, 0.65) !important;
-    height: 30px !important;
-    padding: 0 12px !important;
-    margin-left: 10px;
-  }
+    position: absolute;
+    margin-left: 30px;
+    height: 50px;
+    line-height: 50px;
+
+    .diy-button--white {
+        border: none !important;
+        color: rgba(0, 0, 0, 0.65) !important;
+        height: 30px !important;
+        padding: 0 12px !important;
+        margin-left: 10px;
+    }
 }
+
 .list {
-  & > :last-child {
-    border: none !important;
-  }
-  & > :first-child {
-    .name {
-      background: url("../../../../../assets/images/index/bubble.png") no-repeat;
-      color: #fff !important;
-      padding: 0px 10px 3px 13px !important;
-      background-size: 100% 100%;
-      border: none !important;
+    &> :last-child {
+        border: none !important;
+    }
+
+    &> :first-child {
+        .name {
+            background: url("../../../../../assets/images/index/bubble.png") no-repeat;
+            color: #fff !important;
+            padding: 0px 10px 3px 13px !important;
+            background-size: 100% 100%;
+            border: none !important;
+        }
     }
-  }
 }
+
 .g-left-top40 {
-  margin-top: 40px;
+    margin-top: 40px;
 }
+
 .g-right-top40 {
-  margin-top: 40px;
+    margin-top: 40px;
 }
 </style>
diff --git a/src/views/modules/shequzhili/event/cpts/myCascader.vue b/src/views/modules/shequzhili/event/cpts/myCascader.vue
index 23a084725..e5e34a7bc 100644
--- a/src/views/modules/shequzhili/event/cpts/myCascader.vue
+++ b/src/views/modules/shequzhili/event/cpts/myCascader.vue
@@ -1,62 +1,54 @@
 <template>
-  <div>
-        <el-form :model="form" >
+    <div>
+        <el-form :model="form">
             <el-form-item>
-                <el-cascader class="cell-width-2"
-                       ref="myCascader"
-                       v-model="form.selCategoryArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       clearable
-                       @change="handleChangeCate"></el-cascader>
+                <el-cascader class="cell-width-2" ref="myCascader" v-model="form.selCategoryArray" :key="iscascaderShow"
+                    :options="casOptions" :props="optionProps" :show-all-levels="false" clearable
+                    @change="handleChangeCate"></el-cascader>
             </el-form-item>
         </el-form>
-  </div>
+    </div>
 </template>
 
 <script>
 export default {
-  data() {
-    return {
-        form:{
-            selCategoryArray:{}
+    data() {
+        return {
+            form: {
+                selCategoryArray: {}
+            },
+            selCateObj: {},
+            iscascaderShow: 0
+        };
+    },
+    props: {
+        casOptions: {
+            type: Array,
+            default: () => []
         },
-        selCateObj:{},
-        iscascaderShow:0
-    };
-  },
-  props:{
-    casOptions:{
-        type:Array,
-        default:()=>[]
+        optionProps: {
+            type: Object,
+            default: () => { }
+        }
     },
-    optionProps:{
-        type:Object,
-        default:()=>{}
-    }
-  },
-  created() {},
-  methods: {
-    handleChangeCate(){
-        if(this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]){
-            this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-        }else{
-            this.selCateObj = {}
+    created() { },
+    methods: {
+        handleChangeCate() {
+            if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) {
+                this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+            } else {
+                this.selCateObj = {}
+            }
+
+            this.$emit('handleChangeCate', this.selCateObj)
         }
-       
-        this.$emit('handleChangeCate',this.selCateObj)
-    }
-  },
-  mounted(){
-    ++this.iscascaderShow;
-  },
-  components: {},
-  computed: {},
-  watch: {},
+    },
+    mounted() {
+        ++this.iscascaderShow;
+    },
+    components: {},
+    computed: {},
+    watch: {},
 };
 </script>
-<style lang="scss" scoped>
-
-</style>>
\ No newline at end of file
+<style lang="scss" scoped></style>>
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
new file mode 100644
index 000000000..a3a9c1ba8
--- /dev/null
+++ b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
@@ -0,0 +1,243 @@
+<!--
+ * @Author: yanLu xgktv007@163.com
+ * @Date: 2023-09-05 10:21:34
+ * @LastEditors: yanLu xgktv007@163.com
+ * @LastEditTime: 2023-09-05 10:21:34
+ * @Description: 事件转办表单
+ * 
+-->
+<template>
+    <div class="search">
+        <el-form ref="ref_form1" :inline="false" :model="formData" :rules="dataRule">
+            <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                prop="categoryList">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false"
+                        @change="handleChangeCate"></el-cascader>
+                </div>
+            </el-form-item>
+            <el-form-item label="处理部门" prop="agencyId" label-width="150px" :class="{ 'form-item': source === 'visiual' }">
+                <el-cascader class="cell-width-2" ref="myCascader" v-model="agencyIdArray" :options="orgOptions"
+                    :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
+            </el-form-item>
+            <el-form-item label="转办意见" prop="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                style="display: block">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
+                        placeholder="请输入转办意见，不超过500字" v-model="formData.content"></el-input>
+                </div>
+            </el-form-item>
+            <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                style="display: block">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-date-picker v-model="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
+                        value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                </div>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+let loading; // 加载动画
+export default {
+    data() {
+        return {
+            btnDisable: false,
+            formData: {
+                operationType: "5", //处理方式[0:已回复 5、指派  6、完成并回复]
+                content: "",//转办意见
+                timeLimit: "",//办结时限
+                categoryList: [],//事件分类
+                agencyId: "" //指派部门
+            },
+            orgOptions: [],
+            orgOptionProps: {
+                multiple: false,
+                value: 'agencyId',
+                label: 'agencyName',
+                children: 'subAgencyList',
+                checkStrictly: true
+            },
+            agencyIdArray: [],
+            status: false,
+            okflag: false,
+            eventDetailCopy: {},
+            selCategoryArray: [],
+            casOptions: [],
+            iscascaderShow: 0,
+            optionProps: {
+                multiple: false,
+                value: "id",
+                label: "name",
+                children: "subCategory",
+            },
+            dataRule: {
+                content: [
+                    { required: true, message: "回复内容不能为空", trigger: "blur" },
+                ],
+                categoryList: [
+                    { required: true, message: "事件分类不能为空", trigger: "blur" },
+                ],
+                agencyId: [
+                    { required: true, message: "处理部门不能为空", trigger: "blur" },
+                ],
+                timeLimit: [
+                    { required: true, message: "办结时限不能为空", trigger: "blur" },
+                ]
+            }
+        };
+    },
+    components: {},
+    computed: {},
+    props: {
+        eventId: {
+            type: String,
+            default: "",
+        },
+        eventDetailData: {
+            type: Object,
+            default() {
+                return {};
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: "manage",
+        },
+    },
+    created() {
+        
+    },
+    async mounted() {
+        const { user } = this.$store.state;
+        this.agencyId = user.agencyId;
+        this.getOrgTreeList();
+        this.getCategoryList();
+        if (this.eventId) {
+            this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+            // 这一步接收到eventDetailCopy在这里回填
+            if (
+                this.eventDetailCopy.parentCategoryId &&
+                this.eventDetailCopy.categoryId
+            ) {
+                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+            }
+
+        }
+    },
+    methods: {
+        //组织机构树
+        async getOrgTreeList() {
+            const url = "/gov/org/customeragency/agencygridtree"
+            let params = {
+                agencyId: this.agencyId,
+                purpose: "query"
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.orgOptions = []
+                this.orgOptions.push(data)
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async getCategoryList() {
+            const url = "/governance/issueprojectcategorydict/list";
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                let treeDataNew = this.filterTree(data);
+                //组织级联数据
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.casOptions = treeDataNew;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleChangeAgency(val) {
+            let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+            if (obj) {
+                this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency'
+                this.formData.orgId = obj.agencyId
+
+            } else {
+                this.form.orgType = ''
+                this.form.orgId = ''
+            }
+        },
+        handleChangeCate() {
+            if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) {
+                this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+            } else {
+                this.selCateObj = {}
+            }
+        },
+        //重构树，去除网格
+        filterTree(arr) {
+            let childs = arr;
+            for (let i = childs.length; i--; i > 0) {
+                if (childs[i].subCategory) {
+                    if (childs[i].subCategory.length) {
+                        this.filterTree(childs[i].subCategory);
+                    } else {
+                        delete childs[i].subCategory;
+                    }
+                }
+            }
+            return arr;
+        },
+        async getReplayInfo() {
+            this.okflag = false;
+            this.$refs["ref_form1"].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                } else {
+                    if (!this.selCateObj || !this.selCateObj.id) {
+                        this.$message.error("请选择事件分类");
+                        return false;
+                    }
+                    this.formData.status = "processing";
+                    this.formData.categoryId = this.selCateObj.id;
+                    this.formData.categoryList = [];
+                    this.formData.categoryList.push(this.selCateObj);
+                    this.okflag = true;
+                }
+            });
+        },
+        resetData() {
+            this.agencyIdArray = []
+        },
+        // 开启加载动画
+        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>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.el-dialog__body {
+    padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
new file mode 100644
index 000000000..62f536191
--- /dev/null
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
@@ -0,0 +1,188 @@
+<!--
+ * @Author: yanLu xgktv007@163.com
+ * @Date: 2023-09-05 10:21:34
+ * @LastEditors: yanLu xgktv007@163.com
+ * @LastEditTime: 2023-09-05 10:21:34
+ * @Description: 事件回复
+ * 
+ * 
+-->
+<template>
+    <div class="search">
+        <el-form ref="ref_form2" :inline="false" :model="formData" :rules="dataRule">
+            <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                prop="categoryList">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false"
+                        @change="handleChangeCate"></el-cascader>
+                </div>
+            </el-form-item>
+            <el-form-item label="回复内容" prop="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                style="display: block">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
+                        placeholder="请输入回复内容，不超过500字" v-model="formData.content"></el-input>
+                </div>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+let loading; // 加载动画
+
+export default {
+    data() {
+        return {
+            btnDisable: false,
+            formData: {
+                operationType: '6', //处理方式[0:已回复 5、指派  6、完成并回复]
+                content: '',
+                status: 'closed_case',
+                categoryList: [],
+            },
+            status: false,
+            okflag: false,
+            eventDetailCopy: {},
+            selCategoryArray: [],
+            casOptions: [],
+            iscascaderShow: 0,
+            optionProps: {
+                multiple: false,
+                value: 'id',
+                label: 'name',
+                children: 'subCategory',
+            },
+            dataRule: {
+                content: [
+                    { required: true, message: '回复内容不能为空', trigger: 'blur' },
+                ],
+                categoryList: [
+                    //   { required: true, message: '事件分类不能为空', trigger: 'blur' },
+                ]
+            }
+        };
+    },
+    components: {},
+    computed: {},
+    props: {
+        eventId: {
+            type: String,
+            default: '',
+        },
+        eventDetailData: {
+            type: Object,
+            default() {
+                return {};
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: 'manage',
+        },
+    },
+    watch: {},
+
+    created() {},
+
+    async mounted() {
+        this.getCategoryList();
+        if (this.eventId) {
+            this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+            // 这一步接收到eventDetailCopy在这里回填
+            if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+                this.formData.categoryId = this.eventDetailCopy.categoryId
+                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+            }
+        }
+    },
+
+    methods: {
+        async getCategoryList() {
+            const url = '/governance/issueprojectcategorydict/list';
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                let treeDataNew = this.filterTree(data);
+                //组织级联数据
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.casOptions = treeDataNew;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleChangeCate() {
+            if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
+                this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
+            } else {
+                this.selCateObj = {}
+            }
+        },
+        //重构树，去除网格
+        filterTree(arr) {
+            let childs = arr;
+            for (let i = childs.length; i--; i > 0) {
+                if (childs[i].subCategory) {
+                    if (childs[i].subCategory.length) {
+                        this.filterTree(childs[i].subCategory);
+                    } else {
+                        delete childs[i].subCategory;
+                    }
+                }
+            }
+            return arr;
+        },
+        async getReplayInfo() {
+            this.okflag = false;
+            this.$refs['ref_form2'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                } else {
+                    if (this.status) {
+                        if (!this.selCateObj || !this.selCateObj.id) {
+                            this.$message.error('请选择事件分类');
+                            return false;
+                        }
+                    }
+                    if (!this.formData.categoryId) {
+                        this.formData.categoryId = this.selCateObj.id;
+                    }
+                    this.formData.categoryList = [];
+                    this.formData.categoryList.push(this.selCateObj);
+                    this.okflag = true;
+                }
+            });
+        },
+        resetData() { },
+        // 开启加载动画
+        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>
+@import '@/assets/scss/modules/visual/a_customize.scss';
+@import '@/assets/scss/modules/shequzhili/event-info.scss';
+
+.el-dialog__body {
+    padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index 3489d7f39..99e59b87e 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -1,262 +1,204 @@
 <!--
- * @Author: mk 2403457699@qq.com
- * @Date: 2023-07-26 16:23:24
- * @LastEditors: mk 2403457699@qq.com
- * @LastEditTime: 2023-08-09 10:21:34
- * @Description: 事件分类回填
+ * @Author: yanLu xgktv007@163.com
+ * @Date: 2023-09-05 10:21:34
+ * @LastEditors: yanLu xgktv007@163.com
+ * @LastEditTime: 2023-09-05 10:21:34
+ * @Description: 事件回复
  * 
  * 
 -->
 <template>
-  <div class="search">
-    <el-form
-      ref="ref_form1"
-      :inline="false"
-      :model="formData"
-      :rules="dataRule"
-    >
-      <el-form-item
-        label="事件分类"
-        label-width="150px"
-        :class="{ 'form-item': source === 'visiual' }"
-        prop="categoryList"
-      >
-        <div :class="{ 'visiual-form': source === 'visiual' }">
-          <el-cascader class="cell-width-2"
-                       ref="myCascader"
-                       v-model="selCategoryArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeCate"></el-cascader>
-        </div>
-      </el-form-item>
-      <el-form-item
-        label="回复内容"
-        prop="content"
-        label-width="150px"
-        :class="{ 'form-item': source === 'visiual' }"
-        style="display: block"
-      >
-        <div :class="{ 'visiual-form': source === 'visiual' }">
-          <el-input
-            class="cell-width-area"
-            type="textarea"
-            maxlength="500"
-            show-word-limit
-            :rows="5"
-            placeholder="请输入回复内容，不超过500字"
-            v-model="formData.content"
-          ></el-input>
-        </div>
-      </el-form-item>
-      <el-form-item
-        label=""
-        label-width="150px"
-        :class="{ 'form-item': source === 'visiual' }"
-        style="display: block"
-      >
-        <el-checkbox
-          :class="{ 'form-item': source === 'visiual' }"
-          v-model="status"
-          @change="handleChangeStatus"
-          >已完成</el-checkbox
-        >
-      </el-form-item>
-    </el-form>
-  </div>
+    <div class="search">
+        <el-form ref="ref_form1" :inline="false" :model="formData" :rules="dataRule">
+            <el-form-item label="事件分类" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                prop="categoryList">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-cascader class="cell-width-2" ref="myCascader" v-model="selCategoryArray" :key="iscascaderShow"
+                        :options="casOptions" :props="optionProps" :show-all-levels="false"
+                        @change="handleChangeCate"></el-cascader>
+                </div>
+            </el-form-item>
+            <el-form-item label="回复内容" prop="content" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                style="display: block">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-input class="cell-width-area" type="textarea" maxlength="500" show-word-limit :rows="5"
+                        placeholder="请输入回复内容，不超过500字" v-model="formData.content"></el-input>
+                </div>
+            </el-form-item>
+            <el-form-item label="办结时限" prop="timeLimit" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                style="display: block">
+                <div :class="{ 'visiual-form': source === 'visiual' }">
+                    <el-date-picker v-model="formData.timeLimit" class="cell-width-1" type="datetime" placeholder="办结时限"
+                        value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                </div>
+            </el-form-item>
+        </el-form>
+    </div>
 </template>
 
 <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
-import formVltHelper from "dai-js/tools/formVltHelper";
-
-import { isCard } from "@/utils/validate";
 let loading; // 加载动画
 
 export default {
-  data() {
-    return {
-      btnDisable: false,
-      formData: {
-        operationType: "0", //处理方式[0:已回复 1:已转项目  2:已转需求]
-        content: "",
-        status: "",
-        categoryList: [],
-      },
-
-      status: false,
-      okflag: false,
-
-      eventDetailCopy: {},
-      selCategoryArray:[],
-      casOptions: [],
-      iscascaderShow: 0,
-      optionProps: {
-        multiple: false,
-        value: "id",
-        label: "name",
-        children: "subCategory",
-      },
-      dataRule:{
-        content: [
-          { required: true, message: "回复内容不能为空", trigger: "blur" },
-        ],
-        categoryList: [
-        //   { required: true, message: "事件分类不能为空", trigger: "blur" },
-        ],
-      }
-    };
-  },
-  components: {  },
-  computed: {},
-  props: {
-    eventId: {
-      type: String,
-      default: "",
-    },
-    eventDetailData: {
-      type: Object,
-      default() {
-        return {};
-      },
+    data() {
+        return {
+            btnDisable: false,
+            formData: {
+                operationType: '0', //处理方式[0:已回复 5、指派  6、完成并回复]
+                content: '',
+                status: 'processing',
+                timeLimit: '',//办结时限
+                categoryList: [],
+            },
+            status: false,
+            okflag: false,
+            eventDetailCopy: {},
+            selCategoryArray: [],
+            casOptions: [],
+            iscascaderShow: 0,
+            optionProps: {
+                multiple: false,
+                value: 'id',
+                label: 'name',
+                children: 'subCategory',
+            },
+            dataRule: {
+                content: [
+                    { required: true, message: '回复内容不能为空', trigger: 'blur' },
+                ],
+                categoryList: [
+                    //   { required: true, message: '事件分类不能为空', trigger: 'blur' },
+                ],
+                timeLimit: [
+                    { required: true, message: "办结时限不能为空", trigger: "blur" },
+                ]
+            }
+        };
     },
-    source: {
-      //展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: "manage",
+    components: {},
+    computed: {},
+    props: {
+        eventId: {
+            type: String,
+            default: '',
+        },
+        eventDetailData: {
+            type: Object,
+            default() {
+                return {};
+            },
+        },
+        source: {
+            //展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: 'manage',
+        },
     },
-  },
-  watch: {},
-
-  created() {
-    console.log(this.source);
-  },
-
-  async mounted() {
-    this.getCategoryList();
-    if (this.eventId) {
-      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-      // 这一步接收到eventDetailCopy在这里回填
-      if (
-        this.eventDetailCopy.parentCategoryId &&
-        this.eventDetailCopy.categoryId
-      ) {
-        this.selCategoryArray.push( this.eventDetailCopy.parentCategoryId,this.eventDetailCopy.categoryId)
-      }
+    watch: {
 
-    }
-  },
-
-  methods: {
-    async getCategoryList() {
-      const url = "/governance/issueprojectcategorydict/list";
-
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        let treeDataNew = this.filterTree(data);
+    },
 
-        //组织级联数据
-        ++this.iscascaderShow;
-        this.casOptions = [];
+    created() {
 
-        this.casOptions = treeDataNew;
-      } else {
-        this.$message.error(msg);
-      }
     },
 
-    handleChangeCate() {
-      if(this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]){
-            this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-        }else{
-            this.selCateObj = {}
+    async mounted() {
+        this.getCategoryList();
+        if (this.eventId) {
+            this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+            // 这一步接收到eventDetailCopy在这里回填
+            if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+                this.formData.categoryId = this.eventDetailCopy.categoryId
+                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+            }
         }
-        console.log(this.selCateObj);
     },
 
-    //重构树，去除网格
-    filterTree(arr) {
-      let childs = arr;
-      for (let i = childs.length; i--; i > 0) {
-        if (childs[i].subCategory) {
-          if (childs[i].subCategory.length) {
-            this.filterTree(childs[i].subCategory);
-          } else {
-            delete childs[i].subCategory;
-          }
-        }
-      }
-      return arr;
-    },
-    async getReplayInfo() {
-      this.okflag = false;
-      this.$refs["ref_form1"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-        } else {
-          if (this.status) {
-            console.log(this.selCateObj);
-            if (!this.selCateObj || !this.selCateObj.id) {
-              this.$message.error("请选择事件分类");
-              return false;
+    methods: {
+        async getCategoryList() {
+            const url = '/governance/issueprojectcategorydict/list';
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                let treeDataNew = this.filterTree(data);
+                //组织级联数据
+                ++this.iscascaderShow;
+                this.casOptions = [];
+                this.casOptions = treeDataNew;
+            } else {
+                this.$message.error(msg);
             }
-            this.formData.status = "closed_case";
-          } else {
-            this.formData.status = "processing";
-          }
-          this.formData.categoryId = this.selCateObj.id;
-          this.formData.categoryList = [];
-          this.formData.categoryList.push(this.selCateObj);
-
-          this.okflag = true;
-        }
-      });
-    },
-    handleChangeStatus(val){
-      console.log(val);
-      if(!val){
-        this.$set(this.dataRule,'categoryList',[])
-      }else{
-        this.$set(this.dataRule,'categoryList',[{ required: true, message: "事件分类不能为空", trigger: "blur" }])
-      }
-      console.log(this.dataRule);
-    },
-    resetData() {},
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        },
+        handleChangeCate() {
+            if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
+                this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
+            } else {
+                this.selCateObj = {}
+            }
+        },
+        //重构树，去除网格
+        filterTree(arr) {
+            let childs = arr;
+            for (let i = childs.length; i--; i > 0) {
+                if (childs[i].subCategory) {
+                    if (childs[i].subCategory.length) {
+                        this.filterTree(childs[i].subCategory);
+                    } else {
+                        delete childs[i].subCategory;
+                    }
+                }
+            }
+            return arr;
+        },
+        async getReplayInfo() {
+            this.okflag = false;
+            this.$refs['ref_form1'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                } else {
+                    if (this.status) {
+                        if (!this.selCateObj || !this.selCateObj.id) {
+                            this.$message.error('请选择事件分类');
+                            return false;
+                        }
+                    }
+                    if (!this.formData.categoryId) {
+                        this.formData.categoryId = this.selCateObj.id;
+                    }
+                    this.formData.categoryList = [];
+                    this.formData.categoryList.push(this.selCateObj);
+                    this.okflag = true;
+                }
+            });
+        },
+        resetData() { },
+        // 开启加载动画
+        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>
-@import "@/assets/scss/modules/visual/a_customize.scss";
-@import "@/assets/scss/modules/shequzhili/event-info.scss";
-</style>
-
-
+@import '@/assets/scss/modules/visual/a_customize.scss';
+@import '@/assets/scss/modules/shequzhili/event-info.scss';
 
-<style scoped>
 .el-dialog__body {
-  padding: 0 10px 20px !important;
+    padding: 0 10px 20px !important;
 }
 </style>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index d56fefb2f..188c410bc 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -1,281 +1,193 @@
 <template>
-  <div class="">
-    <div>
-
-      <el-form ref="ref_form1"
-               :inline="false"
-               :rules="dataRule"
-               class="form">
-
-        <el-form-item label="处理方式"
-                      label-width="150px"
-                      :class="{'form-item':source==='visiual'}"
-                      prop="operationType">
-          <el-radio-group :class="{'form-item':source==='visiual'}"
-                          v-model="operationType"
-                          @change="handleChangeOperationType">
-            <el-radio v-if="!eventId"
-                      label="4">暂不处理</el-radio>
-            <el-radio label="0">回复</el-radio>
-            <el-radio label="1">立项</el-radio>
-            <el-radio label="2">转服务</el-radio>
-            <el-radio label="3">转议题</el-radio>
-
-          </el-radio-group>
-        </el-form-item>
-
-      </el-form>
-
-      <div v-if="operationType==='0'">
-        <process-form-replay ref="ref_process_form_replay"
-                             :source="source"
-                             :eventDetailData="eventDetailData"
-                             :eventId="eventId"></process-form-replay>
-      </div>
-
-      <div v-if="operationType==='1'">
-        <process-form-project ref="ref_process_form_project"
-                              :source="source"
-                              :eventDetailData="eventDetailData"
-                              :gridId="gridId"
-                              :eventId="eventId"></process-form-project>
-      </div>
-
-      <div v-if="operationType==='2'">
-        <process-form-demand ref="ref_process_form_demond"
-                             :source="source"
-                             :eventId="eventId"
-                             :transferObj="transferObj"
-                             :demandUserId="demandUserId"
-                             :demandUserName="demandUserName"
-                             :demandUserMobile="demandUserMobile"
-                             :eventDetailData="eventDetailData"></process-form-demand>
-
-      </div>
-      <div v-if="operationType==='3'">
-        <process-form-issue ref="ref_process_form_issue"
-                            :source="source"
-                            :eventDetailData="eventDetailData"
-                            :eventId="eventId"></process-form-issue>
-
-      </div>
-
+    <div class="">
+        <div>
+            <el-form ref="ref_form1" :inline="false" :rules="dataRule" class="form">
+                <el-form-item label="处理方式" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
+                    prop="operationType">
+                    <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="operationType"
+                        @change="handleChangeOperationType">
+                        <el-radio v-if="!eventId" label="4">暂不处理</el-radio>
+                        <el-radio label="0">回复</el-radio>
+                        <el-radio label="5">指派</el-radio>
+                        <el-radio label="6">完成并回复</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+            <div v-if="operationType === '0'">
+                <process-form-replay ref="ref_process_form_replay" :source="source" :eventDetailData="eventDetailData"
+                    :eventId="eventId"></process-form-replay>
+            </div>
+            <div v-if="operationType === '6'">
+                <process-form-replay-end ref="ref_process_form_replay_end" :source="source"
+                    :eventDetailData="eventDetailData" :eventId="eventId"></process-form-replay-end>
+            </div>
+            <div v-if="operationType === '5'">
+                <process-form-designate ref="ref_process_form_designate" :source="source" :eventDetailData="eventDetailData"
+                    :eventId="eventId"></process-form-designate>
+            </div>
+        </div>
     </div>
-
-  </div>
 </template>
 
 <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import processFormReplay from "./process-form-replay";
+import processFormReplayEnd from "./process-form-replay-end";
 import processFormProject from "./process-form-project";
 import processFormDemand from "./process-form-demand";
 import processFormIssue from "./process-form-issue";
+import processFormDesignate from "./process-form-designate";
 
 
 let loading; // 加载动画
 
 export default {
-  data () {
-    return {
-
-      casOptions: [],
-      iscascaderShow: 0,
-      selCategoryArray: [],
-      selCateObj: {},
-      optionProps: {
-        multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
-      },
-
-      operationType: '',
-
-
-      replayInfo: {},
-      demand: {},
-      project: {},
-      issueInfo: {},
-      okflag: false,
-
-      eventDetailCopy: {},
-      transferObj:{
-        latitude :"",
-        longitude :""
-      }
-    };
-  },
-  components: {
-    processFormReplay,
-    processFormProject,
-    processFormDemand,
-    processFormIssue
-  },
-  computed: {
-    dataRule () {
-      return {
-
-        operationType: [
-          { required: true, message: "处理方式不能为空", trigger: "blur" },
-        ],
-
-      };
-    },
-
-
-  },
-  props: {
-    demandUserId: {
-      type: String,
-      default: "",
+    data() {
+        return {
+            casOptions: [],
+            iscascaderShow: 0,
+            selCategoryArray: [],
+            selCateObj: {},
+            optionProps: {
+                multiple: false,
+                value: 'id',
+                label: 'name',
+                children: 'subCategory',
+            },
+            operationType: '',
+            replayInfo: {},
+            demand: {},
+            project: {},
+            issueInfo: {},
+            okflag: false,
+            eventDetailCopy: {},
+            transferObj: {
+                latitude: "",
+                longitude: ""
+            }
+        };
     },
-    demandUserName: {
-      type: String,
-      default: "",
+    components: {
+        processFormReplay,
+        processFormProject,
+        processFormDemand,
+        processFormIssue,
+        processFormDesignate,
+        processFormReplayEnd
     },
-    demandUserMobile: {
-      type: String,
-      default: "",
-    },
-    gridId: {
-      type: String,
-      default: "",
-    },
-    eventId: {
-      type: String,
-      default: "",
-    },
-    eventDetailData: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: 'manage'
-    }
-  },
-
-  watch: {
-
-  },
-
-  created () {
-
-    console.log(this.source)
-
-  },
-
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-
-    if (this.eventId) {
-      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-
-    }
-    if(this.eventDetailData.operationType){
-      this.operationType = this.eventDetailCopy.operationType
-      // this.getProcessInfo()
-    }
-    this.$EventBus.$on('map',(val)=>{
-      this.transferObj.latitude = val.lat
-      this.transferObj.longitude = val.lng
-    })
-  },
-
-  methods: {
-    handleChangeOperationType (val) {
-
+    computed: {
+        dataRule() {
+            return {
+                operationType: [
+                    { required: true, message: "处理方式不能为空", trigger: "blur" },
+                ],
+            };
+        },
     },
-    async getProcessInfo () {
-      this.okflag = false
-      if (this.operationType === '0') {
-        this.$refs.ref_process_form_replay.getReplayInfo()
-        if (this.$refs.ref_process_form_replay.okflag) {
-          this.replayInfo = this.$refs.ref_process_form_replay.formData
-
-          this.okflag = true
-
-        } else {
-          return false
+    props: {
+        demandUserId: {
+            type: String,
+            default: "",
+        },
+        demandUserName: {
+            type: String,
+            default: "",
+        },
+        demandUserMobile: {
+            type: String,
+            default: "",
+        },
+        gridId: {
+            type: String,
+            default: "",
+        },
+        eventId: {
+            type: String,
+            default: "",
+        },
+        eventDetailData: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        source: {//展示来源：manage  管理平台    visiual  可视化平台
+            type: String,
+            default: 'manage'
         }
+    },
 
-      } else if (this.operationType === '1') {
-        this.$refs.ref_process_form_project.getProjectInfo()
-        if (this.$refs.ref_process_form_project.okflag) {
-
-          this.project = this.$refs.ref_process_form_project.formData
+    watch: {},
 
-          //赋值分类信息
-          this.okflag = true
+    created() {},
 
-        } else {
-          return false
+    async mounted() {
+        const { user } = this.$store.state
+        this.agencyId = user.agencyId
+        if (this.eventId) {
+            this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
         }
-      } else if (this.operationType === '2') {
-        this.$refs.ref_process_form_demond.getDemandInfo()
-        if (this.$refs.ref_process_form_demond.okflag) {
-          this.demand = this.$refs.ref_process_form_demond.formData
-
-          this.okflag = true
-
-        } else {
-          return false
+        if (this.eventDetailData.operationType) {
+            this.operationType = this.eventDetailCopy.operationType
         }
-      } else if (this.operationType === '3') {
-        this.$refs.ref_process_form_issue.getIssueInfo()
-        if (this.$refs.ref_process_form_issue.okflag) {
-          this.issueInfo = this.$refs.ref_process_form_issue.formData
-
-          this.okflag = true
-
-        } else {
-          return false
-        }
-      }
-
+        this.$EventBus.$on('map', (val) => {
+            this.transferObj.latitude = val.lat
+            this.transferObj.longitude = val.lng
+        })
     },
 
-
-    handleCancle () {
-      this.resetData();
-
+    methods: {
+        handleChangeOperationType(val) {
+            this.operationType = val;
+        },
+        async getProcessInfo() {
+            this.okflag = false
+            debugger
+            if (this.operationType === '0') {
+                this.$refs.ref_process_form_replay.getReplayInfo()
+                if (this.$refs.ref_process_form_replay.okflag) {
+                    this.replayInfo = this.$refs.ref_process_form_replay.formData;
+                    this.okflag = true;
+                }
+            } else if (this.operationType === '6') {
+                this.$refs.ref_process_form_replay_end.getReplayInfo()
+                this.replayInfo = this.$refs.ref_process_form_replay_end.formData
+                if (this.$refs.ref_process_form_replay_end.okflag) {
+                    this.replayInfo = this.$refs.ref_process_form_replay_end.formData
+                    this.okflag = true
+                } 
+            }
+        },
+        handleCancle() {
+            this.resetData();
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        resetData() {
+
+        },
+        // 结束加载动画
+        endLoading() {
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-    resetData () {
-
-    },
-    // 开启加载动画
-    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>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
-</style>
-
-
 
-<style scoped>
 .el-dialog__body {
-  padding: 0 10px 20px !important;
+    padding: 0 10px 20px !important;
 }
 </style>
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 78b0659b2..59c66d5ab 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -1,473 +1,222 @@
 <template>
-  <div class="g-main">
-    <div v-show="pageType == 'list'">
-      <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>
-            <el-form-item label="上报渠道" prop="sourceType">
-              <el-select
-                v-model="formData.sourceType"
-                placeholder="请选择"
-                size="small"
-                clearable
-                class="u-item-width-normal"
-              >
-                <el-option
-                  v-for="item in qudaoArray"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="事件内容" prop="eventContent">
-              <el-input
-                v-model="formData.eventContent"
-                class="u-item-width-normal"
-                size="small"
-                clearable
-                placeholder="请输入"
-              >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="事件类型" prop="firstIdList">
-              <el-cascader
-                ref="cascaderEvent"
-                v-model="eventTypeCheck"
-                :options="cateOptions"
-                collapse-tags
-                :show-all-levels="false"
-                :props="{
-                  multiple: true,
-                  checkStrictly: false,
-                  emitPath: false,
-                  children: 'subCategory',
-                  label: 'name',
-                  value: 'id',
-                }"
-                clearable
-                class="u-item-width-normal"
-                @change="handleEventType"
-              />
-              <!-- <template slot-scope="{ node, data }">
+    <div class="g-main">
+        <div v-show="pageType == 'list'">
+            <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>
+                        <el-form-item label="上报渠道" prop="sourceType">
+                            <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
+                                class="u-item-width-normal">
+                                <el-option v-for="item in qudaoArray" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="事件内容" prop="eventContent">
+                            <el-input v-model="formData.eventContent" class="u-item-width-normal" size="small" clearable
+                                placeholder="请输入">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="事件类型" prop="firstIdList">
+                            <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions" collapse-tags
+                                :show-all-levels="false" :props="{
+                                    multiple: true,
+                                    checkStrictly: false,
+                                    emitPath: false,
+                                    children: 'subCategory',
+                                    label: 'name',
+                                    value: 'id',
+                                }" clearable class="u-item-width-normal" @change="handleEventType" />
+                            <!-- <template slot-scope="{ node, data }">
                   <div @click="cascaderClick(node, data)">
                     <span>{{ data.name }}</span>
                   </div>
                 </template>
               </el-cascader> -->
-            </el-form-item>
-            <el-form-item label="上报人" prop="name">
-              <el-input
-                v-model="formData.name"
-                class="u-item-width-normal"
-                size="small"
-                clearable
-                placeholder="请输入"
-              >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="联系电话" prop="mobile">
-              <el-input
-                v-model="formData.mobile"
-                class="u-item-width-normal"
-                size="small"
-                clearable
-                placeholder="请输入"
-              >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="上报时间" prop="startTime">
-              <el-date-picker
-                v-model="formData.startTime"
-                :picker-options="startPickerOptions"
-                class="u-item-width-daterange"
-                size="small"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                value="yyyy-MM-dd"
-                placeholder="开始时间"
-              >
-              </el-date-picker>
-              <span class="u-data-tag">至</span>
-              <el-date-picker
-                v-model="formData.endTime"
-                :picker-options="endPickerOptions"
-                class="u-item-width-daterange u-data-tag"
-                size="small"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                value="yyyy-MM-dd"
-                placeholder="结束时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="状态" prop="status">
-              <el-select
-                class="u-item-width-normal"
-                v-model="formData.status"
-                placeholder="全部"
-                size="small"
-                clearable
-              >
-                <el-option
-                  v-for="item in statusArray"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-row>
-              <el-col :span="24" align="right">
-                <el-button
-                  style="margin-left: 30px"
-                  size="small"
-                  type="primary "
-                  @click="handleSearch"
-                  >查询</el-button
-                >
-                <el-button
-                  style="margin-left: 10px"
-                  size="small"
-                  class="diy-button--white"
-                  @click="resetSearch"
-                  >重置</el-button
-                >
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-      </div>
-
-      <div class="m-table">
-        <div class="div_btn">
-          <el-button size="small" type="primary " @click="handleAdd"
-            >新增</el-button
-          >
-
-          <el-button
-            @click="handleExport"
-            class="diy-button--white"
-            size="small"
-            >导出</el-button
-          >
-
-          <el-dropdown
-            size="small"
-            split-button
-            type="primary"
-            style="margin: 0 10px; height: 30px"
-            @command="(command) => handleMarkDiffcult(command)"
-          >
-            标记
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="1">标记为难点堵点</el-dropdown-item>
-              <el-dropdown-item command="2">标记为矛盾纠纷</el-dropdown-item>
-              <el-dropdown-item command="3">标记为自身问题</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-          <el-button
-            @click="handleCancalDiffcult"
-            class="diy-button--white"
-            size="small"
-            >取消标记</el-button
-          >
-        </div>
-
-        <el-table
-          :data="tableData"
-          border
-          class="m-table-item"
-          style="width: 100%"
-          @selection-change="handleSelectionChange"
-          :height="maxTableHeight"
-        >
-          <el-table-column
-            label=""
-            fixed="left"
-            type="selection"
-            align="center"
-            width="50"
-          />
-          <el-table-column
-            label="序号"
-            fixed="left"
-            type="index"
-            align="center"
-            width="50"
-          />
-
-          <el-table-column
-            prop="gridName"
-            align="center"
-            label="所属网格"
-            :show-overflow-tooltip="true"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="categoryName"
-            label="事件类型"
-            min-width="140"
-            align="center"
-            :show-overflow-tooltip="true"
-          />
-          <!-- <template slot-scope="scope">
+                        </el-form-item>
+                        <el-form-item label="联系人" prop="name">
+                            <el-input v-model="formData.name" class="u-item-width-normal" size="small" clearable
+                                placeholder="请输入联系人">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="联系电话" prop="mobile">
+                            <el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable
+                                placeholder="请输入联系电话">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="接收时间" prop="startTime">
+                            <el-date-picker v-model="formData.startTime" :picker-options="startPickerOptions"
+                                class="u-item-width-daterange" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                                value="yyyy-MM-dd" placeholder="开始时间">
+                            </el-date-picker>
+                            <span class="u-data-tag">至</span>
+                            <el-date-picker v-model="formData.endTime" :picker-options="endPickerOptions"
+                                class="u-item-width-daterange u-data-tag" size="small" type="date"
+                                value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
+                            </el-date-picker>
+                        </el-form-item>
+
+                        <el-form-item label="处理状态" prop="status">
+                            <el-select class="u-item-width-normal" v-model="formData.status" placeholder="全部" size="small"
+                                clearable>
+                                <el-option v-for="item in statusArray" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-row>
+                            <el-col :span="24" align="right">
+                                <el-button style="margin-left: 30px" size="small" type="primary "
+                                    @click="handleSearch">查询</el-button>
+                                <el-button style="margin-left: 10px" size="small" class="diy-button--white"
+                                    @click="resetSearch">重置</el-button>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+
+            <div class="m-table">
+                <div class="div_btn">
+                    <el-button size="small" type="primary " @click="handleAdd">新增</el-button>
+                    <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                        @command="(command) => handleMarkDiffcult(command)">
+                        标记
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item command="1">标记为难点堵点</el-dropdown-item>
+                            <el-dropdown-item command="2">标记为矛盾纠纷</el-dropdown-item>
+                            <el-dropdown-item command="3">标记为自身问题</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button @click="handleCancalDiffcult" class="diy-button--white" size="small">取消标记</el-button>
+                </div>
+
+                <el-table :data="tableData" border class="m-table-item" style="width: 100%"
+                    @selection-change="handleSelectionChange" :height="maxTableHeight">
+                    <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
+                    <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+
+                    <el-table-column prop="gridName" align="center" label="所属网格" :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <el-table-column prop="categoryName" label="事件类型" min-width="140" align="center"
+                        :show-overflow-tooltip="true" />
+                    <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
             </template>
           </el-table-column> -->
-          <el-table-column
-            prop="eventContent"
-            label="事件内容"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
-          </el-table-column>
-
-          <el-table-column
-            prop="imageList"
-            align="center"
-            width="80"
-            label="图片"
-          >
-            <template slot-scope="scope">
-              <el-image
-                v-if="scope.row.imageList && scope.row.imageList.length > 0"
-                style="width: 40px; height: 40px"
-                :src="scope.row.imageList[0]"
-                :preview-src-list="scope.row.imageList"
-              >
-              </el-image>
-              <span v-else></span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="voiceList"
-            align="center"
-            width="80"
-            label="音频"
-          >
-            <template slot-scope="scope">
-              <img
-                @click="handleShowVoice(scope.row.voiceList[0].url)"
-                class="img-voice"
-                v-if="scope.row.voiceList && scope.row.voiceList.length > 0"
-                src="@/assets/img/icon-voice.png"
-              />
-
-              <span v-else></span>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="sourceTypeName"
-            align="center"
-            width="110"
-            label="上报渠道"
-            :show-overflow-tooltip="true"
-          >
-          </el-table-column>
-
-          <el-table-column
-            prop="address"
-            align="center"
-            :show-overflow-tooltip="true"
-            label="地址"
-          >
-          </el-table-column>
-
-          <el-table-column
-            prop="name"
-            align="center"
-            width="100"
-            label="上报人"
-            :show-overflow-tooltip="true"
-          >
-          </el-table-column>
-
-          <el-table-column
-            prop="mobile"
-            align="center"
-            width="110"
-            label="联系电话"
-            :show-overflow-tooltip="true"
-          >
-          </el-table-column>
-
-          <el-table-column
-            prop="satisfactionName"
-            align="center"
-            width="100"
-            label="满意度"
-            :show-overflow-tooltip="true"
-          >
-            <!-- <template slot-scope="scope">
+                    <el-table-column prop="eventContent" label="事件内容" align="center" :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="imageList" align="center" width="80" label="图片">
+                        <template slot-scope="scope">
+                            <el-image v-if="scope.row.imageList && scope.row.imageList.length > 0"
+                                style="width: 40px; height: 40px" :src="scope.row.imageList[0]"
+                                :preview-src-list="scope.row.imageList">
+                            </el-image>
+                            <span v-else></span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="voiceList" align="center" width="80" label="音频">
+                        <template slot-scope="scope">
+                            <img @click="handleShowVoice(scope.row.voiceList[0].url)" class="img-voice"
+                                v-if="scope.row.voiceList && scope.row.voiceList.length > 0"
+                                src="@/assets/img/icon-voice.png" />
+
+                            <span v-else></span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="sourceTypeName" align="center" width="110" label="上报渠道"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="address" align="center" :show-overflow-tooltip="true" label="地址">
+                    </el-table-column>
+
+                    <el-table-column prop="name" align="center" width="100" label="上报人" :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="mobile" align="center" width="110" label="联系电话" :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="satisfactionName" align="center" width="100" label="满意度"
+                        :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
 
             <span v-if="scope.row.satisfactionName">--</span>
           </template> -->
-          </el-table-column>
-
-          <el-table-column
-            prop="happenTime"
-            align="center"
-            width="140"
-            :show-overflow-tooltip="true"
-            label="上报时间"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="operationTypeName"
-            align="center"
-            width="100"
-            :show-overflow-tooltip="true"
-            label="结点"
-          >
-          </el-table-column>
-
-          <el-table-column
-            prop="status"
-            align="center"
-            label="状态"
-            width="80"
-            :show-overflow-tooltip="true"
-          >
-            <template slot-scope="scope">
-              <span v-if="scope.row.status === 'processing'">处理中</span>
-              <span v-else-if="scope.row.status === 'closed_case'">已完成</span>
-              <span v-else>--</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="markTypeName"
-            align="center"
-            label="痛点难点"
-            width="80"
-            :show-overflow-tooltip="true"
-          >
-          </el-table-column>
-
-          <el-table-column
-            fixed="right"
-            label="操作"
-            align="center"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <el-button
-                v-if="
-                  scope.row.status === 'processing' && !scope.row.operationId
-                "
-                @click="handleDispose(scope.row)"
-                type="text"
-                size="small"
-                class=""
-                >处理</el-button
-              >
-
-              <el-button
-                v-else-if="
-                  scope.row.status === 'closed_case' &&
-                  !scope.row.satisfactionName &&
-                  user.id === scope.row.createdUserId
-                "
-                @click="handleWatch(scope.row)"
-                type="text"
-                size="small"
-                class=""
-                >去评价</el-button
-              >
-              <el-button
-                v-else
-                @click="handleWatch(scope.row)"
-                type="text"
-                size="small"
-                >查看</el-button
-              >
-              <el-button
-                @click="handleDel(scope.row)"
-                type="text"
-                size="small"
-                class=""
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div>
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page.sync="pageNo"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="parseInt(pageSize)"
-            layout="sizes, prev, pager, next, total"
-            :total="total"
-          >
-          </el-pagination>
+                    </el-table-column>
+
+                    <el-table-column prop="happenTime" align="center" width="140" :show-overflow-tooltip="true"
+                        label="上报时间">
+                    </el-table-column>
+                    <el-table-column prop="operationTypeName" align="center" width="100" :show-overflow-tooltip="true"
+                        label="结点">
+                    </el-table-column>
+
+                    <el-table-column prop="status" align="center" label="状态" width="80" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.status === 'processing'">处理中</span>
+                            <span v-else-if="scope.row.status === 'closed_case'">已完成</span>
+                            <span v-else>--</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="markTypeName" align="center" label="痛点难点" width="80"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column fixed="right" label="操作" align="center" width="100">
+                        <template slot-scope="scope">
+                            <el-button v-if="scope.row.status === 'processing' && !scope.row.operationId
+                                " @click="handleDispose(scope.row)" type="text" size="small" class="">处理</el-button>
+
+                            <el-button v-else-if="scope.row.status === 'closed_case' &&
+                                !scope.row.satisfactionName &&
+                                user.id === scope.row.createdUserId
+                                " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价</el-button>
+                            <el-button v-else @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
+                            <el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div>
+                    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)"
+                        layout="sizes, prev, pager, next, total" :total="total">
+                    </el-pagination>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-    <div
-      v-if="pageType == 'dispose' || pageType == 'info' || pageType == 'add'"
-    >
-      <event-info
-        ref="eleEditForm"
-        :pageType="pageType"
-        :eventId="eventId"
-        :eventDetailData="eventDetailData"
-        @handleClose="handleClose"
-        @handleOk="handleOk"
-        @dialogOk="handleEditSuccess"
-      />
-    </div>
-
-    <el-dialog
-      :title="'播放语音'"
-      :visible.sync="showVoice"
-      width="40%"
-      top="5vh"
-      append-to-body
-      class="dialog-h"
-      :close-on-click-modal="false"
-    >
-      <div class="dialog-h-content scroll-h">
-        <div style="display: flex; justify-content: center; margin: 50px">
-          <audio controls>
-            <source :src="selVoiceUrl" type="" />
-          </audio>
+        <div v-if="pageType == 'dispose' || pageType == 'info' || pageType == 'add'">
+            <event-info ref="eleEditForm" :pageType="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
+                @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" />
         </div>
-      </div>
 
-      <div class="resi-btns">
-        <el-button size="small" @click="showVoice = false">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <el-dialog :title="'播放语音'" :visible.sync="showVoice" width="40%" top="5vh" append-to-body class="dialog-h"
+            :close-on-click-modal="false">
+            <div class="dialog-h-content scroll-h">
+                <div style="display: flex; justify-content: center; margin: 50px">
+                    <audio controls>
+                        <source :src="selVoiceUrl" type="" />
+                    </audio>
+                </div>
+            </div>
+
+            <div class="resi-btns">
+                <el-button size="small" @click="showVoice = false">取消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -478,461 +227,421 @@ import eventInfo from "./cpts/event-info";
 import axios from "axios";
 
 export default {
-  components: { eventInfo },
-
-  data() {
-    let endDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now();
-      if (this.formData.startTime) {
-        let startTime = new Date(this.formData.startTime);
-        return (
-          time.getTime() > nowData ||
-          time.getTime() < startTime ||
-          time.getTime() === startTime
-        );
-      } else {
-        return time.getTime() > nowData;
-      }
-    };
-    let startDisabledDate = (time) => {
-      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now();
-      return time.getTime() > nowData;
-    };
-
-    return {
-      pageType: "list", // 列表list 新增add  处理dispose 详情info
-      user: {},
-      agencyId: "",
-      gridList: [], //所属网格list--场所区域
-      tableData: [],
-
-      statusArray: [
-        {
-          value: "processing",
-          label: "处理中",
-        },
-        {
-          value: "closed_case",
-          label: "已完成",
+    components: { eventInfo },
+
+    data() {
+        let endDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            if (this.formData.startTime) {
+                let startTime = new Date(this.formData.startTime);
+                return (
+                    time.getTime() > nowData ||
+                    time.getTime() < startTime ||
+                    time.getTime() === startTime
+                );
+            } else {
+                return time.getTime() > nowData;
+            }
+        };
+        let startDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            return time.getTime() > nowData;
+        };
+
+        return {
+            pageType: "list", // 列表list 新增add  处理dispose 详情info
+            user: {},
+            agencyId: "",
+            gridList: [], //所属网格list--场所区域
+            tableData: [],
+
+            statusArray: [
+                {
+                    value: "processing",
+                    label: "处理中",
+                },
+                {
+                    value: "closed_case",
+                    label: "已完成",
+                },
+            ],
+            qudaoArray: [
+                {
+                    value: "0",
+                    label: "随手拍/随时讲",
+                },
+                {
+                    value: "1",
+                    label: "多媒体反应",
+                },
+                {
+                    value: "2",
+                    label: "社区电话",
+                },
+                {
+                    value: "3",
+                    label: "12345",
+                },
+                {
+                    value: "4",
+                    label: "网络员手持终端",
+                },
+            ],
+
+            formData: {
+                gridId: "",
+                sourceType: "",
+                eventContent: "",
+                name: "",
+                mobile: "",
+                startTime: "",
+                endTime: "",
+                status: "",
+                firstIdList: [],
+                secondIdList: [],
+            },
+            cateOptions: [],
+            eventTypeCheck: [],
+            pageNo: 1,
+            pageSize: window.localStorage.getItem("pageSize") || 20,
+            total: 1,
+            endPickerOptions: {
+                disabledDate: endDisabledDate,
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate,
+            },
+            eventId: "",
+
+            searchH: 180,
+
+            eventDetailData: {},
+
+            showVoice: false,
+            selVoiceUrl: "",
+
+            multipleSelection: [],
+        };
+    },
+    computed: {
+        maxTableHeight() {
+            const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+            const _h = this.clientHeight - 275 - this.searchH;
+            return this.$store.state.inIframe ? h : _h;
         },
-      ],
-      qudaoArray: [
-        {
-          value: "0",
-          label: "随手拍/随时讲",
+        ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {
+        "formData.endTime": function (val) {
+            if (val && val != "") {
+                let arrayTemp = val.split(" ");
+                this.formData.endTime = arrayTemp[0] + " 23:59:59";
+            }
         },
-        {
-          value: "1",
-          label: "多媒体反应",
+    },
+    mounted() {
+        this.user = this.$store.state.user;
+        this.agencyId = this.user.agencyId;
+        this.loadGrid();
+        this.getTableData();
+        this.getCateOptions();
+    },
+    methods: {
+        handleEventType(val) {
+            const nodes = this.$refs.cascaderEvent.getCheckedNodes();
+            this.formData.firstIdList = [];
+            this.formData.secondIdList = [];
+            let level1 = nodes.filter((item) => item.level === 1);
+            let level2 = nodes.filter((item) => item.level === 2);
+            level1.forEach((item) => {
+                if (item.hasChildren) {
+                    for (let i = level2.length - 1; i >= 0; i--) {
+                        if (level2[i].parent.value === item.value) level2.splice(i, 1);
+                    }
+                }
+            });
+            this.formData.firstIdList = level1.map((item) => item.value);
+            this.formData.secondIdList = level2.map((item) => item.value);
         },
-        {
-          value: "2",
-          label: "社区电话",
+        handleSelectionChange(val) {
+            this.multipleSelection = [];
+            val.forEach((element) => {
+                this.multipleSelection.push(element.icEventId);
+            });
         },
-        {
-          value: "3",
-          label: "12345",
+        async handleMarkDiffcult(command) {
+            const url = "/governance/icEvent/difficultpointevent";
+            if (this.multipleSelection.length == 0) {
+                this.$message.warning('请选择需要标记的事件')
+                return
+            }
+            let params = {
+                icEventIdList: this.multipleSelection,
+                type: command,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+
+                this.$message.success("标记成功");
+                this.getTableData();
+            } else {
+                this.$message.error(msg);
+            }
         },
-        {
-          value: "4",
-          label: "网络员手持终端",
+        async handleCancalDiffcult() {
+            const url = "/governance/icEvent/difficultpointevent";
+            if (this.multipleSelection.length == 0) {
+                this.$message.warning('请选择取消标记的事件')
+                return
+            }
+            let params = {
+                icEventIdList: this.multipleSelection,
+                type: "0",
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message.success("取消标记成功");
+                this.getTableData();
+            } else {
+                this.$message.error(msg);
+            }
         },
-      ],
-
-      formData: {
-        gridId: "",
-        sourceType: "",
-        eventContent: "",
-        name: "",
-        mobile: "",
-        startTime: "",
-        endTime: "",
-        status: "",
-        firstIdList: [],
-        secondIdList: [],
-      },
-      cateOptions: [],
-      eventTypeCheck: [],
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
-      endPickerOptions: {
-        disabledDate: endDisabledDate,
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate,
-      },
-      eventId: "",
-      
-      searchH:180,
-
-      eventDetailData: {},
-
-      showVoice: false,
-      selVoiceUrl: "",
-
-      multipleSelection: [],
-    };
-  },
-  computed: {
-    maxTableHeight() {
-      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
-      const _h = this.clientHeight - 275 - this.searchH;
-      return this.$store.state.inIframe ? h : _h;
-    },
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-  },
-  watch: {
-    "formData.endTime": function (val) {
-      if (val && val != "") {
-        let arrayTemp = val.split(" ");
-        this.formData.endTime = arrayTemp[0] + " 23:59:59";
-      }
-    },
-  },
-  mounted() {
-    console.log(this.$store.state);
-    this.user = this.$store.state.user;
-
-    this.agencyId = this.user.agencyId;
-    this.loadGrid();
-    this.getTableData();
-    this.getCateOptions();
-  },
-  methods: {
-    handleEventType(val) {
-      // console.log('val-----eee', val)
-      console.log("nodes---", this.$refs.cascaderEvent.getCheckedNodes());
-      const nodes = this.$refs.cascaderEvent.getCheckedNodes();
-      this.formData.firstIdList = [];
-      this.formData.secondIdList = [];
-      let level1 = nodes.filter((item) => item.level === 1);
-      let level2 = nodes.filter((item) => item.level === 2);
-      console.log("level2----1", level2);
-      level1.forEach((item) => {
-        console.log("level2----2", level2);
-        if (item.hasChildren) {
-          for (let i = level2.length - 1; i >= 0; i--) {
-            if (level2[i].parent.value === item.value) level2.splice(i, 1);
-          }
-        }
-      });
-      this.formData.firstIdList = level1.map((item) => item.value);
-      this.formData.secondIdList = level2.map((item) => item.value);
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = [];
-      val.forEach((element) => {
-        this.multipleSelection.push(element.icEventId);
-      });
-      console.log(this.multipleSelection);
-    },
-    async handleMarkDiffcult(command) {
-      const url = "/governance/icEvent/difficultpointevent";
-      if(this.multipleSelection.length == 0) {
-        this.$message.warning('请选择需要标记的事件')
-        return
-      }
-      let params = {
-        icEventIdList: this.multipleSelection,
-        type: command,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-       
-        this.$message.success("标记成功");
-        this.getTableData();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async handleCancalDiffcult() {
-      const url = "/governance/icEvent/difficultpointevent";
-      if(this.multipleSelection.length == 0) {
-        this.$message.warning('请选择取消标记的事件')
-        return
-      }
-      let params = {
-        icEventIdList: this.multipleSelection,
-        type: "0",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("取消标记成功");
-        this.getTableData();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    handleSearch(val) {
-      console.log(this.formData);
-      this.pageNo = 1;
-      this.getTableData();
-    },
 
-    async loadGrid() {
-      const url = "/gov/org/customergrid/gridoption";
+        handleSearch(val) {
+            this.pageNo = 1;
+            this.getTableData();
+        },
 
-      let params = {
-        agencyId: this.agencyId,
-        purpose: "query",
-      };
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption";
 
-      const { data, code, msg } = await requestPost(url, params);
+            let params = {
+                agencyId: this.agencyId,
+                purpose: "query",
+            };
 
-      if (code === 0) {
-        this.gridList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
+            const { data, code, msg } = await requestPost(url, params);
 
-    async handleExport() {
-      const url = "/governance/icEvent/export";
-      const { pageSize, pageNo, formData } = this;
-      axios({
-        url: window.SITE_CONFIG["apiURL"] + url,
-        method: "post",
-        data: {
-          pageSize,
-          pageNo,
-          ...formData,
+            if (code === 0) {
+                this.gridList = data;
+            } else {
+                this.$message.error(msg);
+            }
         },
-        responseType: "blob",
-      })
-        .then((res) => {
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log("获取导出情失败", err);
-          return this.$message.error("网络错误");
-        });
-    },
 
-    async handleAdd() {
-      this.pageType = "add";
-    },
-
-    async handleWatch(row) {
-      this.eventId = row.icEventId;
-      const url = "/governance/icEvent/detail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
-
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
-      });
-
-      if (code === 0) {
-        this.eventDetailData = { ...data };
-        this.pageType = "info";
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        async handleExport() {
+            const url = "/governance/icEvent/export";
+            const { pageSize, pageNo, formData } = this;
+            axios({
+                url: window.SITE_CONFIG["apiURL"] + url,
+                method: "post",
+                data: {
+                    pageSize,
+                    pageNo,
+                    ...formData,
+                },
+                responseType: "blob",
+            })
+                .then((res) => {
+                    let fileName = window.decodeURI(
+                        res.headers["content-disposition"].split(";")[1].split("=")[1]
+                    );
+                    let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+                    var url = window.URL.createObjectURL(blob);
+                    var aLink = document.createElement("a");
+                    aLink.style.display = "none";
+                    aLink.href = url;
+                    aLink.setAttribute("download", fileName);
+                    document.body.appendChild(aLink);
+                    aLink.click();
+                    document.body.removeChild(aLink); //下载完成移除元素
+                    window.URL.revokeObjectURL(url); //释放掉blob对象
+                })
+                .catch((err) => {
+                    return this.$message.error("网络错误");
+                });
+        },
 
-    //加载组织数据
-    async handleDispose(row) {
-      this.eventId = row.icEventId;
-      const url = "/governance/icEvent/detail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
-
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: this.eventId,
-      });
-
-      if (code === 0) {
-        this.eventDetailData = { ...data };
-        this.pageType = "dispose";
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        async handleAdd() {
+            this.pageType = "add";
+        },
 
-    //显示语音窗口
-    handleShowVoice(url) {
-      this.selVoiceUrl = url;
-      this.showVoice = true;
-    },
+        async handleWatch(row) {
+            this.eventId = row.icEventId;
+            const url = "/governance/icEvent/detail";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+            });
+            if (code === 0) {
+                this.eventDetailData = { ...data };
+                this.pageType = "info";
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    handleClose() {
-      this.pageType = "list";
-      this.eventId = "";
-      this.getTableData();
-    },
-    handleOk() {
-      this.pageType = "list";
-      this.eventId = "";
-      this.pageNo = 1;
-      this.getTableData();
-    },
+        //加载组织数据
+        async handleDispose(row) {
+            this.eventId = row.icEventId;
+            const url = "/governance/icEvent/detail";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+            });
+            if (code === 0) {
+                this.eventDetailData = { ...data };
+                this.pageType = "dispose";
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    handleEditSuccess() {
-      this.handleClose();
-      this.getTableData();
-    },
+        //显示语音窗口
+        handleShowVoice(url) {
+            this.selVoiceUrl = url;
+            this.showVoice = true;
+        },
 
-    async handleDel(rowData) {
-      let message = "确认删除?";
-
-      this.$confirm(message, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.delEvent(rowData.icEventId);
-        })
-        .catch((err) => {});
-    },
-    async delEvent(eventId) {
-      const url = "/governance/icEvent/delete";
-      let idsArr = [eventId];
+        handleClose() {
+            this.pageType = "list";
+            this.eventId = "";
+            this.getTableData();
+        },
+        handleOk() {
+            this.pageType = "list";
+            this.eventId = "";
+            this.pageNo = 1;
+            this.getTableData();
+        },
 
-      const { data, code, msg } = await requestPost(url, idsArr);
+        handleEditSuccess() {
+            this.handleClose();
+            this.getTableData();
+        },
 
-      if (code === 0) {
-        this.$message.success("删除成功！");
-        this.getTableData();
-      } else {
-        this.$message.error("操作失败！");
-      }
-    },
+        async handleDel(rowData) {
+            let message = "确认删除?";
 
-    async getTableData() {
-      const url = "/governance/icEvent/list";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/list";
-      const { pageSize, pageNo, formData } = this;
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        ...formData,
-      });
-      if (code === 0) {
-        this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-              return item;
+            this.$confirm(message, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
-          : [];
-
-        // this.tableData.forEach(item => {
-        //   if (item.operationType === '2') {
-        //     item.operationTypeShow = '已转服务'
-        //   }
-        //   if (item.operationType === '1') {
-        //     item.operationTypeShow = '已立项'
-        //   }
-        //   if (item.operationType === '0') {
-        //     item.operationTypeShow = '已回复'
-        //   }
-
-        // });
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getCateOptions() {
-      const url = "/governance/issueprojectcategorydict/list";
-
-      const { data, code, msg } = await requestPost(url, {});
-
-      if (code === 0) {
-        // this.cateOptions = data.map((item) => {
-        //   item.subCategory.forEach((subitem) => {
-        //     delete subitem.subCategory;
-        //   });
-        //   return item;
-        // });
-        this.cateOptions = this.deepTree(data, "subCategory");
-      } else {
-        this.$message.error(msg);
-      }
-    },
+                .then(() => {
+                    this.delEvent(rowData.icEventId);
+                })
+                .catch((err) => { });
+        },
+        async delEvent(eventId) {
+            const url = "/governance/icEvent/delete";
+            let idsArr = [eventId];
+
+            const { data, code, msg } = await requestPost(url, idsArr);
+
+            if (code === 0) {
+                this.$message.success("删除成功！");
+                this.getTableData();
+            } else {
+                this.$message.error("操作失败！");
+            }
+        },
 
-    handleSizeChange(val) {
-      this.pageSize = val;
-      window.localStorage.setItem("pageSize", val);
-      this.getTableData();
-    },
-    handleCurrentChange(val) {
-      this.pageNo = val;
-      this.getTableData();
-    },
+        async getTableData() {
+            const url = "/governance/icEvent/list";
+            const { pageSize, pageNo, formData } = this;
+            const { data, code, msg } = await requestPost(url, {
+                pageSize,
+                pageNo,
+                ...formData,
+            });
+            if (code === 0) {
+                this.total = data.total || 0;
+                this.tableData = data.list ? data.list.map((item) => { return item; }) : [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getCateOptions() {
+            const url = "/governance/issueprojectcategorydict/list";
+            const { data, code, msg } = await requestPost(url, {});
+            if (code === 0) {
+                this.cateOptions = this.deepTree(data, "subCategory");
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    resetSearch() {
-      this.formData = {
-        gridId: "",
-        sourceType: "",
-        eventContent: "",
-        name: "",
-        mobile: "",
-        startTime: "",
-        endTime: "",
-        status: "",
-        firstIdList: [],
-        secondIdList: [],
-      };
-      this.eventTypeCheck = [];
-
-      this.pageNo = 1;
-      this.getTableData();
-      // this.loadTable()
-    },
-    deepTree(arr, child) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        return arr.map((item) => {
-          // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
-          return {
-            ...item,
-            [child]:
-              (item[child] &&
-                item[child].length > 0 &&
-                this.deepTree(item[child], child)) ||
-              null,
-          };
-        });
-      }
+        handleSizeChange(val) {
+            this.pageSize = val;
+            window.localStorage.setItem("pageSize", val);
+            this.getTableData();
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.getTableData();
+        },
+
+        resetSearch() {
+            this.formData = {
+                gridId: "",
+                sourceType: "",
+                eventContent: "",
+                name: "",
+                mobile: "",
+                startTime: "",
+                endTime: "",
+                status: "",
+                firstIdList: [],
+                secondIdList: [],
+            };
+            this.eventTypeCheck = [];
+
+            this.pageNo = 1;
+            this.getTableData();
+            // this.loadTable()
+        },
+        deepTree(arr, child) {
+            if (Array.isArray(arr) && arr.length > 0) {
+                return arr.map((item) => {
+                    return {
+                        ...item,
+                        [child]:
+                            (item[child] &&
+                                item[child].length > 0 &&
+                                this.deepTree(item[child], child)) ||
+                            null,
+                    };
+                });
+            }
+        },
     },
-  },
 };
 </script>
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
+
 .m-search {
-  .u-item-width-normal {
-    width: 200px;
-  }
+    .u-item-width-normal {
+        width: 200px;
+    }
 }
+
 ::v-deep .el-dropdown__caret-button {
-  height: 30px;
+    height: 30px;
 }
+
 ::v-deep .el-image-viewer__close {
-  top: 129px;
-  right: 129px;
-  width: 40px;
-  height: 40px;
-  font-size: 40px;
-  color: #fff;
+    top: 129px;
+    right: 129px;
+    width: 40px;
+    height: 40px;
+    font-size: 40px;
+    color: #fff;
 }
 </style>
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
index e09b4398d..fc4679587 100644
--- a/src/views/modules/shequzhili/issue/issueAuditList.vue
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -1,195 +1,115 @@
 <template>
-  <div class="g-main">
-    <div v-show="pageType == 'list'">
-      <div class="m-search">
-        <el-form :inline="true"
-                 :model="formData"
-                 ref="ref_searchform"
-                 :label-width="'100px'">
-          <div>
-
-            <el-form-item label="所属组织"
-                          prop="orgId">
-              <el-cascader class="u-item-width-normal"
-                           ref="myCascader"
-                           size="small"
-                           v-model="agencyIdArray"
-                           :options="orgOptions"
-                           :props="orgOptionProps"
-                           :show-all-levels="false"
-                           @change="handleChangeAgency"></el-cascader>
-
-            </el-form-item>
-
-            <el-form-item label="议题标题"
-                          prop="issueTitle">
-              <el-input v-model="formData.issueTitle"
-                        class="u-item-width-normal"
-                        size="small"
-                        clearable
-                        placeholder="请输入">
-              </el-input>
-            </el-form-item>
-
-            <el-form-item label="转议题时间"
-                          prop="startTime">
-              <el-date-picker v-model="formData.startTime"
-                              :picker-options="startPickerOptions"
-                              class="u-item-width-daterange"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              value="yyyy-MM-dd"
-                              placeholder="开始时间">
-              </el-date-picker>
-              <span class="u-data-tag">至</span>
-              <el-date-picker v-model="formData.endTime"
-                              :picker-options="endPickerOptions"
-                              class="u-item-width-daterange u-data-tag"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              value="yyyy-MM-dd"
-                              placeholder="结束时间">
-              </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="状态"
-                          prop="applyStatus">
-              <el-select class="u-item-width-normal"
-                         v-model="formData.applyStatus"
-                         placeholder="全部"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in statusArray"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-
-            </el-form-item>
-            <el-row>
-              <el-col :span="24" align="right">
-                <el-button style="margin-left:30px"
-                       size="small"
-                       type="primary"
-                       @click="handleSearch">查询</el-button>
-                <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--white"
-                       @click="resetSearch">重置</el-button>
-                      </el-col>
-            </el-row>
-          </div>
-        </el-form>
-      </div>
-
-      <div class="m-table">
-
-        <div class="div_btn">
-
-          <el-button @click="handleExport"
-                      type="primary"
-                      size="small">导出</el-button>
-        </div>
+    <div class="g-main">
+        <div v-show="pageType == 'list'">
+            <div class="m-search">
+                <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+                    <div>
+
+                        <el-form-item label="所属组织" prop="orgId">
+                            <el-cascader class="u-item-width-normal" ref="myCascader" size="small" v-model="agencyIdArray"
+                                :options="orgOptions" :props="orgOptionProps" :show-all-levels="false"
+                                @change="handleChangeAgency"></el-cascader>
+
+                        </el-form-item>
+
+                        <el-form-item label="议题标题" prop="issueTitle">
+                            <el-input v-model="formData.issueTitle" class="u-item-width-normal" size="small" clearable
+                                placeholder="请输入">
+                            </el-input>
+                        </el-form-item>
+
+                        <el-form-item label="转议题时间" prop="startTime">
+                            <el-date-picker v-model="formData.startTime" :picker-options="startPickerOptions"
+                                class="u-item-width-daterange" size="small" type="date" value-format="yyyyMMdd"
+                                value="yyyy-MM-dd" placeholder="开始时间">
+                            </el-date-picker>
+                            <span class="u-data-tag">至</span>
+                            <el-date-picker v-model="formData.endTime" :picker-options="endPickerOptions"
+                                class="u-item-width-daterange u-data-tag" size="small" type="date" value-format="yyyyMMdd"
+                                value="yyyy-MM-dd" placeholder="结束时间">
+                            </el-date-picker>
+                        </el-form-item>
+
+                        <el-form-item label="状态" prop="applyStatus">
+                            <el-select class="u-item-width-normal" v-model="formData.applyStatus" placeholder="全部"
+                                size="small" clearable>
+                                <el-option v-for="item in statusArray" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+
+                        </el-form-item>
+                        <el-row>
+                            <el-col :span="24" align="right">
+                                <el-button style="margin-left:30px" size="small" type="primary"
+                                    @click="handleSearch">查询</el-button>
+                                <el-button style="margin-left:10px" size="small" class="diy-button--white"
+                                    @click="resetSearch">重置</el-button>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+
+            <div class="m-table">
+
+                <div class="div_btn">
+
+                    <el-button @click="handleExport" type="primary" size="small">导出</el-button>
+                </div>
+
+                <el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="maxTableHeight">
+                    <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
+                    <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+
+                    <el-table-column prop="gridName" align="center" label="所属网格" :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="issueTitle" label="议题标题" min-width="150" align="center"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="suggestion" align="center" min-width="150" label="处理建议"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+
+                    <el-table-column prop="applyTime" align="center" width="180" :show-overflow-tooltip="true"
+                        label="提交审核时间">
+                    </el-table-column>
+
+                    <el-table-column prop="applyStatusName" align="center" label="状态" width="80"
+                        :show-overflow-tooltip="true">
+
+                    </el-table-column>
+
+                    <el-table-column fixed="right" label="操作" align="center" width="100">
+                        <template slot-scope="scope">
+
+                            <el-button v-if="scope.row.applyStatus === 'under_auditing'" @click="handleAudit(scope.row)"
+                                type="text" size="small">审核</el-button>
+
+                            <el-button @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
+
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+                <div>
+                    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)"
+                        layout="sizes, prev, pager, next, total" :total="total">
+                    </el-pagination>
+                </div>
+
+            </div>
 
-        <el-table :data="tableData"
-                  border
-                  class="m-table-item"
-                  style="width: 100%"
-                  :height="maxTableHeight">
-          <el-table-column label=""
-                           fixed="left"
-                           type="selection"
-                           align="center"
-                           width="50" />
-          <el-table-column label="序号"
-                           fixed="left"
-                           type="index"
-                           align="center"
-                           width="50" />
-
-          <el-table-column prop="gridName"
-                           align="center"
-                           label="所属网格"
-                           :show-overflow-tooltip="true">
-          </el-table-column>
-
-          <el-table-column prop="issueTitle"
-                           label="议题标题"
-                           min-width="150"
-                           align="center"
-                           :show-overflow-tooltip="true">
-          </el-table-column>
-
-          <el-table-column prop="suggestion"
-                           align="center"
-                           min-width="150"
-                           label="处理建议"
-                           :show-overflow-tooltip="true">
-          </el-table-column>
-
-          <el-table-column prop="applyTime"
-                           align="center"
-                           width="180"
-                           :show-overflow-tooltip="true"
-                           label="提交审核时间">
-          </el-table-column>
-
-          <el-table-column prop="applyStatusName"
-                           align="center"
-                           label="状态"
-                           width="80"
-                           :show-overflow-tooltip="true">
-
-          </el-table-column>
-
-          <el-table-column fixed="right"
-                           label="操作"
-                           align="center"
-                           width="100">
-            <template slot-scope="scope">
-
-              <el-button v-if="scope.row.applyStatus==='under_auditing'"
-                         @click="handleAudit(scope.row)"
-                         type="text"
-                         size="small"
-                        >审核</el-button>
-
-              <el-button @click="handleWatch(scope.row)"
-                         type="text"
-                         size="small">查看</el-button>
-
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="pageNo"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="parseInt(pageSize)"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
-          </el-pagination>
         </div>
-
-      </div>
+        <div v-if="pageType == 'dispose' || pageType == 'info'">
+            <issue-info ref="eleEditForm" :pageType="pageType" :issueId="issueId" :issueDetailData="issueDetailData"
+                @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" />
+        </div>
 
     </div>
-    <div v-if="pageType == 'dispose' || pageType == 'info'">
-      <issue-info ref="eleEditForm"
-                  :pageType="pageType"
-                  :issueId="issueId"
-                  :issueDetailData="issueDetailData"
-                  @handleClose="handleClose"
-                  @handleOk="handleOk"
-                  @dialogOk="handleEditSuccess" />
-    </div>
-
-  </div>
 </template>
 
 <script>
@@ -200,312 +120,312 @@ import issueInfo from "./cptsAudit/issue-info";
 import axios from "axios";
 
 export default {
-  components: { issueInfo },
-
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      if (this.formData.startTime) {
-        let startTime = new Date(this.formData.startTime)
-        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
-      } else {
-        return time.getTime() > nowData
-      }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
-
-    return {
-      pageType: "list", // 列表list 新增add  处理dispose 详情info
-      user: {},
-      agencyId: '',
-      gridList: [],//所属网格list--场所区域
-      tableData: [],
-
-      statusArray: [
-        {
-          value: "under_auditing",
-          label: "待审核",
-        },
-        {
-          value: "rejected",
-          label: "驳回",
+    components: { issueInfo },
+
+    data() {
+        let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now()
+            if (this.formData.startTime) {
+                let startTime = new Date(this.formData.startTime)
+                return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+            } else {
+                return time.getTime() > nowData
+            }
+
+        }
+        let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now()
+            return time.getTime() > nowData
+        }
+
+        return {
+            pageType: "list", // 列表list 新增add  处理dispose 详情info
+            user: {},
+            agencyId: '',
+            gridList: [],//所属网格list--场所区域
+            tableData: [],
+
+            statusArray: [
+                {
+                    value: "under_auditing",
+                    label: "待审核",
+                },
+                {
+                    value: "rejected",
+                    label: "驳回",
+                },
+
+            ],
+
+
+            formData: {
+                orgId: '',
+                orgType: '',
+                issueTitle: '',
+                startTime: '',
+                endTime: '',
+                applyStatus: '',
+            },
+            orgOptions: [],
+            orgOptionProps: {
+                multiple: false,
+                value: 'agencyId',
+                label: 'agencyName',
+                children: 'subAgencyList',
+                checkStrictly: true
+            },
+            agencyIdArray: [],
+
+            pageNo: 1,
+            pageSize: window.localStorage.getItem("pageSize") || 20,
+            total: 1,
+            endPickerOptions: {
+                disabledDate: endDisabledDate
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate
+            },
+            issueId: '',
+            issueDetailData: {},
+
+        };
+    },
+    computed: {
+        maxTableHeight() {
+            return this.$store.state.inIframe
+                ? this.clientHeight - 400 + this.iframeHeigh
+                : this.clientHeight - 400;
         },
-
-      ],
-
-
-      formData: {
-        orgId: '',
-        orgType: '',
-        issueTitle: '',
-        startTime: '',
-        endTime: '',
-        applyStatus: '',
-      },
-      orgOptions: [],
-      orgOptionProps: {
-        multiple: false,
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-        checkStrictly: true
-      },
-      agencyIdArray: [],
-
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
-      endPickerOptions: {
-        disabledDate: endDisabledDate
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate
-      },
-      issueId: '',
-      issueDetailData: {},
-
-    };
-  },
-  computed: {
-    maxTableHeight () {
-      return this.$store.state.inIframe
-        ? this.clientHeight - 400 + this.iframeHeigh
-        : this.clientHeight - 400;
+        ...mapGetters(["clientHeight", "iframeHeight"]),
     },
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-  },
-  watch: {
-    "formData.endTime": function (val) {
-      if (val && val != '') {
-        let arrayTemp = val.split(' ')
-        this.formData.endTime = arrayTemp[0] + ' 23:59:59'
-      }
+    watch: {
+        "formData.endTime": function (val) {
+            if (val && val != '') {
+                let arrayTemp = val.split(' ')
+                this.formData.endTime = arrayTemp[0] + ' 23:59:59'
+            }
 
+        },
     },
-  },
-  mounted () {
-    console.log(this.$store.state)
-    this.user = this.$store.state.user
-
-    this.agencyId = this.user.agencyId
-    this.getOrgTreeList();
-    this.getTableData();
-
-  },
-  methods: {
-
-    handleSearch (val) {
-      console.log(this.formData);
-      this.pageNo = 1;
-      this.getTableData();
+    mounted() {
+        console.log(this.$store.state)
+        this.user = this.$store.state.user
+
+        this.agencyId = this.user.agencyId
+        this.getOrgTreeList();
+        this.getTableData();
+
     },
+    methods: {
 
-    handleChangeAgency (val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+        handleSearch(val) {
+            console.log(this.formData);
+            this.pageNo = 1;
+            this.getTableData();
+        },
 
-      if (obj) {
-        this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency'
-        this.formData.orgId = obj.agencyId
+        handleChangeAgency(val) {
+            let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
 
-      } else {
-        this.form.orgType = ''
-        this.form.orgId = ''
-      }
+            if (obj) {
+                this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency'
+                this.formData.orgId = obj.agencyId
 
+            } else {
+                this.form.orgType = ''
+                this.form.orgId = ''
+            }
 
-    },
 
-    async getOrgTreeList () {
-      const url = "/gov/org/customeragency/agencygridtree"
+        },
 
-      let params = {
-        agencyId: this.agencyId,
-        purpose: "query"
-      }
+        async getOrgTreeList() {
+            const url = "/gov/org/customeragency/agencygridtree"
 
-      const { data, code, msg } = await requestPost(url, params)
+            let params = {
+                agencyId: this.agencyId,
+                purpose: "query"
+            }
 
-      if (code === 0) {
-        this.orgOptions = []
-        this.orgOptions.push(data)
+            const { data, code, msg } = await requestPost(url, params)
 
-      } else {
-        this.$message.error(msg)
-      }
+            if (code === 0) {
+                this.orgOptions = []
+                this.orgOptions.push(data)
 
-    },
+            } else {
+                this.$message.error(msg)
+            }
 
-    async handleExport () {
-      const url = "/governance/issueaudit/auditListExport";
-      const { pageSize, pageNo, formData } = this;
-      axios({
-        url: window.SITE_CONFIG["apiURL"] + url,
-        method: "post",
-        data: {
-          // pageSize,
-          // pageNo,
-          ...formData,
         },
-        responseType: "blob",
-      })
-        .then((res) => {
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log("获取导出情失败", err);
-          return this.$message.error("网络错误");
-        });
-    },
 
-    async handleWatch (row) {
-      this.issueId = row.issueApplicationId
+        async handleExport() {
+            const url = "/governance/issueaudit/auditListExport";
+            const { pageSize, pageNo, formData } = this;
+            axios({
+                url: window.SITE_CONFIG["apiURL"] + url,
+                method: "post",
+                data: {
+                    // pageSize,
+                    // pageNo,
+                    ...formData,
+                },
+                responseType: "blob",
+            })
+                .then((res) => {
+                    let fileName = window.decodeURI(
+                        res.headers["content-disposition"].split(";")[1].split("=")[1]
+                    );
+                    console.log("filename", fileName);
+                    let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+                    var url = window.URL.createObjectURL(blob);
+                    var aLink = document.createElement("a");
+                    aLink.style.display = "none";
+                    aLink.href = url;
+                    aLink.setAttribute("download", fileName);
+                    document.body.appendChild(aLink);
+                    aLink.click();
+                    document.body.removeChild(aLink); //下载完成移除元素
+                    window.URL.revokeObjectURL(url); //释放掉blob对象
+                })
+                .catch((err) => {
+                    console.log("获取导出情失败", err);
+                    return this.$message.error("网络错误");
+                });
+        },
 
-      const url = "/governance/issueaudit/applicationdetail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+        async handleWatch(row) {
+            this.issueId = row.issueApplicationId
 
-      const { data, code, msg } = await requestPost(url, {
-        issueApplicationId: this.issueId,
-      });
+            const url = "/governance/issueaudit/applicationdetail";
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
 
-      if (code === 0) {
+            const { data, code, msg } = await requestPost(url, {
+                issueApplicationId: this.issueId,
+            });
 
-        this.issueDetailData = { ...data };
-        this.pageType = "info";
-      } else {
-        this.$message.error(msg);
-      }
-    },
+            if (code === 0) {
 
-    //加载组织数据
-    async handleAudit (row) {
-      this.issueId = row.issueApplicationId
+                this.issueDetailData = { ...data };
+                this.pageType = "info";
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-      const url = "/governance/issueaudit/applicationdetail";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+        //加载组织数据
+        async handleAudit(row) {
+            this.issueId = row.issueApplicationId
 
-      const { data, code, msg } = await requestPost(url, {
-        issueApplicationId: this.issueId,
-      });
+            const url = "/governance/issueaudit/applicationdetail";
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
 
-      if (code === 0) {
+            const { data, code, msg } = await requestPost(url, {
+                issueApplicationId: this.issueId,
+            });
 
-        this.issueDetailData = { ...data };
-        this.pageType = "dispose";
-      } else {
-        this.$message.error(msg);
-      }
-    },
+            if (code === 0) {
 
-    handleClose () {
-      this.pageType = "list";
-      this.issueId = ""
-      this.getTableData()
+                this.issueDetailData = { ...data };
+                this.pageType = "dispose";
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    },
-    handleOk () {
-      this.pageType = "list";
-      this.issueId = ""
-      this.pageNo = 1
-      this.getTableData()
+        handleClose() {
+            this.pageType = "list";
+            this.issueId = ""
+            this.getTableData()
 
-    },
+        },
+        handleOk() {
+            this.pageType = "list";
+            this.issueId = ""
+            this.pageNo = 1
+            this.getTableData()
 
-    handleEditSuccess () {
-      this.handleClose();
-      this.getTableData();
-    },
+        },
+
+        handleEditSuccess() {
+            this.handleClose();
+            this.getTableData();
+        },
 
 
 
-    async getTableData () {
-      const url = "/governance/issueaudit/auditList";
+        async getTableData() {
+            const url = "/governance/issueaudit/auditList";
 
-      const { pageSize, pageNo, formData } = this;
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        ...formData,
-      });
-      if (code === 0) {
+            const { pageSize, pageNo, formData } = this;
+            const { data, code, msg } = await requestPost(url, {
+                pageSize,
+                pageNo,
+                ...formData,
+            });
+            if (code === 0) {
 
-        this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-            return item;
-          })
-          : [];
-      } else {
-        this.$message.error(msg);
-      }
-    },
+                this.total = data.total || 0;
+                this.tableData = data.list
+                    ? data.list.map((item) => {
+                        return item;
+                    })
+                    : [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
 
-    handleSizeChange (val) {
+        handleSizeChange(val) {
 
-      this.pageSize = val;
-      window.localStorage.setItem("pageSize", val);
-      this.getTableData();
-    },
-    handleCurrentChange (val) {
+            this.pageSize = val;
+            window.localStorage.setItem("pageSize", val);
+            this.getTableData();
+        },
+        handleCurrentChange(val) {
 
-      this.pageNo = val;
-      this.getTableData();
-    },
+            this.pageNo = val;
+            this.getTableData();
+        },
 
-    resetSearch () {
-      this.agencyIdArray = []
-      this.formData = {
-        orgId: '',
-        orgType: '',
-        issueTitle: '',
-        startTime: '',
-        endTime: '',
-        applyStatus: '',
+        resetSearch() {
+            this.agencyIdArray = []
+            this.formData = {
+                orgId: '',
+                orgType: '',
+                issueTitle: '',
+                startTime: '',
+                endTime: '',
+                applyStatus: '',
 
-      }
+            }
 
-      this.pageNo = 1
-      this.getTableData();
+            this.pageNo = 1
+            this.getTableData();
 
+        },
+        deepTree(arr, child) {
+            if (Array.isArray(arr) && arr.length > 0) {
+                return arr.map(item => {
+                    // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
+                    return {
+                        ...item,
+                        [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null
+                    }
+                })
+            }
+        }
     },
-    deepTree (arr, child) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        return arr.map(item => {
-          // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
-          return {
-            ...item,
-            [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null
-          }
-        })
-      }
-    }
-  },
 };
 </script>
 
 <style lang="scss" scoped>
- @import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 
 .m-search {
-  .u-item-width-normal {
-    width: 200px;
-  }
+    .u-item-width-normal {
+        width: 200px;
+    }
 }
 </style>