From eae8e788c987209b26b1add902c70a6e4f17e9ac Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 20 May 2022 09:54:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A3=9E=E9=A3=9E=E9=A3=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/shequzhili/project-info.scss |  4 ++
 src/views/components/dateShow.vue             | 48 +++++++++++++++++
 src/views/components/selectStaff.vue          | 12 +++--
 .../shequzhili/xiangmu/cpts/event-info.vue    |  3 +-
 .../shequzhili/xiangmu/cpts/issue-info.vue    | 53 +++++++++++++++++--
 .../shequzhili/xiangmu/cpts/project-info.vue  | 20 +++++--
 6 files changed, 125 insertions(+), 15 deletions(-)
 create mode 100644 src/views/components/dateShow.vue

diff --git a/src/assets/scss/modules/shequzhili/project-info.scss b/src/assets/scss/modules/shequzhili/project-info.scss
index 656180803..7f2b67434 100644
--- a/src/assets/scss/modules/shequzhili/project-info.scss
+++ b/src/assets/scss/modules/shequzhili/project-info.scss
@@ -81,12 +81,16 @@
     .info-pics {
         display: flex;
         margin: 20px 0;
+        min-width: 200px;
+        padding-left: 15px;
+
         img {
             display: block;
             width: 32%;
             height: 90px;
             margin-right: 9px;
             object-fit: cover;
+            cursor: pointer;
         }
     }
 
diff --git a/src/views/components/dateShow.vue b/src/views/components/dateShow.vue
new file mode 100644
index 000000000..81739e351
--- /dev/null
+++ b/src/views/components/dateShow.vue
@@ -0,0 +1,48 @@
+<template>
+  <span>{{ showText }}</span>
+</template>
+
+<script>
+import dateFormat from "dai-js/tools/dateFormat";
+
+export default {
+  name: "dateShow",
+  props: {
+    format: {
+      type: String,
+      default: "yyyy-MM-dd hh:mm:ss",
+    },
+    timestamp: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      showText: "",
+    };
+  },
+  computed: {},
+  watch: {
+    timestamp(val) {
+      this.computeShowText();
+    },
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      this.computeShowText();
+    },
+
+    computeShowText() {
+      const { timestamp, format } = this;
+      if (!timestamp) return;
+      const showText = dateFormat(new Date(timestamp * 1000), format);
+
+      this.showText = showText;
+    },
+  },
+};
+</script>
diff --git a/src/views/components/selectStaff.vue b/src/views/components/selectStaff.vue
index f6bd9db4b..c7478383b 100644
--- a/src/views/components/selectStaff.vue
+++ b/src/views/components/selectStaff.vue
@@ -1307,7 +1307,7 @@ export default {
       .name {
         @include toe;
         width: 70%;
-        font-size: 18px;
+        font-size: 16px;
         font-family: PingFang SC;
         font-weight: 500;
         color: rgba(51, 51, 51, 1);
@@ -1316,11 +1316,13 @@ export default {
           position: relative;
           display: inline-block;
           vertical-align: middle;
-          padding: 0 5px * 0.5;
-          height: 24px * 0.5;
-          line-height: 24px * 0.5;
+          box-sizing: content-box;
+          top: -2px;
+          padding: 0 4px;
+          height: 16px;
+          line-height: 16px;
           border: 1px * 0.5 solid rgba(187, 19, 19, 1);
-          border-radius: 12px * 0.5;
+          border-radius: 16px;
           font-size: 10px;
           font-family: PingFang SC;
           font-weight: 500;
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/event-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/event-info.vue
index 372b36016..d25b8b1dc 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/event-info.vue
@@ -7,7 +7,7 @@
             <div class="m-info">
               <div class="info-title">事件内容</div>
               <div class="info-content">{{ info.eventContent }}</div>
-              <div class="info-audio" v-if="info.voiceList.length>0">
+              <div class="info-audio" v-if="info.voiceList.length > 0">
                 <audio controls>
                   <source
                     :src="item.url"
@@ -80,6 +80,7 @@ function iniData() {
       eventPerson: [],
       eventOrg: [],
       eventPeopleName: "",
+      voiceList: [],
       projectInfo: {
         projectId: "",
         operationName: "",
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/issue-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/issue-info.vue
index 2be1ffeb9..619701105 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/issue-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/issue-info.vue
@@ -12,17 +12,40 @@
                 <span>{{ issueInfo.issueTitle }}</span>
               </div>
               <div class="info-prop">
-                <span>议题建议：</span>
+                <span>处理建议：</span>
                 <span>{{ issueInfo.issueSuggestion }}</span>
               </div>
+              <div class="info-prop" v-if="issueInfo.topicInfo">
+                <span>话题内容：</span>
+                <span>{{ issueInfo.topicInfo.topicContent }}</span>
+              </div>
+              <div class="info-pics" v-if="issueInfo.topicInfo">
+                <img
+                  :src="src"
+                  :key="src"
+                  v-for="src in issueInfo.topicInfo.topicImgs"
+                  @click="watchImg(src)"
+                />
+              </div>
+              <div
+                class="info-audio"
+                v-if="issueInfo.topicInfo && issueInfo.topicInfo.voiceList"
+              >
+                <audio controls>
+                  <source
+                    :src="item.url"
+                    type=""
+                    :key="item.url"
+                    v-for="item in issueInfo.topicInfo.voiceList"
+                  />
+                </audio>
+              </div>
+
               <div class="info-prop">
                 <span>所属网格：</span>
                 <span>{{ issueInfo.belongsGridName || "--" }}</span>
               </div>
-              <div class="info-prop">
-                <span>议题发起人：</span>
-                <span>{{ issueInfo.issueInitiator }}</span>
-              </div>
+
               <div
                 v-if="issueInfo.topicInfo && issueInfo.topicInfo.groupName"
                 class="info-prop"
@@ -30,10 +53,28 @@
                 <span>议题来源：</span>
                 <span>{{ issueInfo.topicInfo.groupName }}</span>
               </div>
+
+              <div class="info-prop">
+                <span>议题发起人：</span>
+                <span>{{ issueInfo.issueInitiator }}</span>
+              </div>
+
+              <div class="info-prop" v-if="issueInfo.topicInfo">
+                <span>话题发表人：</span>
+                <span>{{ issueInfo.topicInfo.publishedUser }}</span>
+              </div>
+
               <div class="info-prop">
                 <span>转议题时间：</span>
                 <span>{{ issueInfo.shiftIssueTime }}</span>
               </div>
+
+              <div class="info-prop" v-if="issueInfo.topicInfo">
+                <span>话题发表时间：</span>
+                <date-show
+                  :timestamp="issueInfo.topicInfo.publishedTime"
+                ></date-show>
+              </div>
             </div>
 
             <div class="m-line">
@@ -134,6 +175,7 @@
 <script>
 import { requestPost } from "@/js/dai/request";
 import foldText from "@/views/components/foldText";
+import dateShow from "@/views/components/dateShow";
 import dateFormat from "dai-js/tools/dateFormat";
 import lineChart from "@/views/modules/visual/cpts/line-chart";
 
@@ -178,6 +220,7 @@ export default {
   components: {
     foldText,
     lineChart,
+    dateShow,
   },
 
   data: iniData,
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 52933d801..b42dab135 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -53,13 +53,19 @@
 
             <div class="info-prop">
               <span>分类：</span>
-              <fold-text style="width: 300px" :row="3">
+              <fold-text
+                v-if="projectCate.length > 0"
+                style="width: 250px"
+                :row="3"
+              >
                 <div :key="item.name" v-for="item in projectCate">
                   {{ item.name }}
                 </div>
               </fold-text>
+              <span style="width: 250px" v-else>--</span>
 
-              <el-popover v-if="projectInfo.projectStatus=='pending'"
+              <el-popover
+                v-if="projectInfo.projectStatus == 'pending'"
                 placement="bottom"
                 width="400"
                 height="400"
@@ -93,13 +99,19 @@
             </div>
             <div class="info-prop">
               <span>标签：</span>
-              <fold-text style="width: 300px" :row="3">
+              <fold-text
+                v-if="projectTag.length > 0"
+                style="width: 250px"
+                :row="3"
+              >
                 <div :key="item.name" v-for="item in projectTag">
                   {{ item.name }}
                 </div>
               </fold-text>
+              <span style="width: 250px" v-else>--</span>
 
-              <el-popover v-if="projectInfo.projectStatus=='pending'"
+              <el-popover
+                v-if="projectInfo.projectStatus == 'pending'"
                 placement="bottom"
                 width="400"
                 height="400"

From 2f64b924591506cd0927d7aa763e64b34c34d28e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 20 May 2022 11:14:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/event/cpts/event-detail.vue    | 31 ++++----
 .../shequzhili/event/cpts/event-info.vue      | 52 +++++--------
 .../event/cpts/process-form-demand.vue        | 46 +++++------
 .../event/cpts/process-form-project.vue       | 29 +++----
 .../event/cpts/process-form-replay.vue        | 20 +++--
 .../shequzhili/event/cpts/process-form.vue    | 77 +++++++++++--------
 .../modules/shequzhili/event/eventList.vue    | 33 ++++++--
 7 files changed, 151 insertions(+), 137 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index ce2cbf937..6bb7c4eb8 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -72,6 +72,7 @@ function iniData () {
     pageType: "info",
 
     info: {},
+    eventDetailCopy: {}
   };
 }
 
@@ -86,6 +87,13 @@ export default {
       type: String,
       default: "info",
     },
+
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
   },
 
   components: {
@@ -101,7 +109,11 @@ export default {
   },
 
   mounted () {
-    this.getApiData();
+    if (this.eventId) {
+      this.info = JSON.parse(JSON.stringify(this.eventDetailData));
+    }
+    // this.getApiData();
+
   },
 
   methods: {
@@ -114,24 +126,9 @@ export default {
     },
 
     async getApiData () {
-      this.getEventInfo();
-    },
-    //加载组织数据
-    async getEventInfo () {
-      const url = "/gov/project/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.info = { ...data };
-      } else {
-        this.$message.error(msg);
-      }
     },
+
   },
 };
 </script>
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 84905e414..e952ece1c 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -35,7 +35,8 @@
         <el-card>
           <h3>事件详情</h3>
           <event-detail ref="ref_detail"
-                        :eventId="eventId"></event-detail>
+                        :eventId="eventId"
+                        :eventDetailData="eventDetailData"></event-detail>
           <div v-if="eventDetailData.operationId"
                class="div-btn ">
             <el-button size="small"
@@ -49,7 +50,8 @@
           <el-card>
             <h3>处理</h3>
             <process-form ref="ref_processinfo_dispose"
-                          :eventId="eventId"></process-form>
+                          :eventId="eventId"
+                          :eventDetailData="eventDetailData"></process-form>
 
             <div class="div-btn ">
               <el-button size="small"
@@ -203,7 +205,7 @@ function iniData () {
   return {
     formData: {
       operationType: '',
-      categoryList: []
+
     },
     eventInfoData: {},
     replayInfo: {},
@@ -215,7 +217,7 @@ function iniData () {
     demandUserName: '',
     demandUserMobile: '',
 
-    eventDetailData: {},
+    eventDetailCopy: {},
 
     projectProcess: [],
 
@@ -233,6 +235,12 @@ export default {
       type: String,
       default: "",
     },
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
   },
 
   components: {
@@ -263,29 +271,14 @@ export default {
     }
 
     if (this.eventId) {
-      this.getEventDetail()
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
     }
   },
 
   methods: {
-    //加载组织数据
-    async getEventDetail () {
-      const url = "/gov/project/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 };
-      } else {
-        this.$message.error(msg);
-      }
-    },
     changeName (val) {
-
       this.demandUserName = val
     },
     changeMobile (val) {
@@ -330,6 +323,7 @@ export default {
 
       console.log('eventInfo', this.eventInfoData)
     },
+
     handleComfirm () {
       if (this.pageType === 'add') {
         this.handelAdd()
@@ -356,10 +350,11 @@ export default {
       if (this.$refs.ref_processinfo_add.okflag) {
 
         this.formData.operationType = this.$refs.ref_processinfo_add.operationType
-        this.formData.categoryList = this.$refs.ref_processinfo_add.categoryList
+        this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType
 
-        if (this.formData.operationType === '0') {
+        this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList
 
+        if (this.formData.operationType === '0') {
           this.project = {}
           this.demand = {}
           this.replayInfo = this.$refs.ref_processinfo_add.replayInfo
@@ -367,8 +362,6 @@ export default {
           //回复属性赋值
           this.eventInfoData.content = this.replayInfo.content
           this.eventInfoData.status = this.replayInfo.status
-          this.eventInfoData.categoryList = this.$refs.ref_processinfo_add.categoryList
-
 
         } else if (this.formData.operationType === '1') {
           this.replayInfo = {}
@@ -394,11 +387,6 @@ export default {
         return false
       }
 
-      //处理时，带给需求
-      // this.demand.demandUserId//需求人：user.id或者ic_resi_user.id	
-      // this.demand.demandUserName//需求人姓名		
-      // this.demand.demandUserMobile//需求人联系电话
-
       this.formData = {
         ...this.eventInfoData,
         // replayInfo: this.replayInfo,
@@ -409,6 +397,7 @@ export default {
       console.log('this.formData', this.formData)
       this.submit()
     },
+
     async submit () {
       const url = "/gov/project/icEvent/add";
 
@@ -434,13 +423,13 @@ export default {
       if (this.$refs.ref_processinfo_dispose.okflag) {
 
         this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType
-        this.formData.categoryList = this.$refs.ref_processinfo_dispose.categoryList
 
         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)
           //回复属性赋值
@@ -452,7 +441,6 @@ export default {
           this.demand = {}
           this.project = this.$refs.ref_processinfo_dispose.project
           //项目的属性同事件一样
-
           this.project.icEventId = this.eventId
           console.log('projectInfo', this.project)
           let url = '/gov/project/icEvent/icEventToProject'
@@ -463,7 +451,7 @@ export default {
           this.project = {}
           this.demand = this.$refs.ref_processinfo_dispose.demand
           //需求的属性同事件一样
-          this.demand.IcEventId = this.eventId
+          this.demand.icEventId = this.eventId
           console.log('demond', this.demand)
           let url = '/gov/project/icEvent/icEventToDemand'
           this.submitDispose(url, this.demand)
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 560667fe9..23176b402 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -165,8 +165,8 @@ var geocoder // 新建一个正逆地址解析类
 
 function iniFmData () {
   return {
-    operationType: '1',//处理方式[0:已回复 1:已转项目  1:已转需求]	
-    IcEventId: '',//事件Id	
+    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转需求]	
+    icEventId: '',//事件Id	
     gridId: '',//	
     categoryCode: '',//	二级需求分类编码	
     parentCode: '',//	父级需求分类编码	
@@ -215,7 +215,7 @@ export default {
 
       formData: iniFmData(),
       formDataTemp: {
-        IcEventId: "",
+        icEventId: "",
         serviceLocation: "34534534",
         categoryCode: "10030002",
         content: "341231",
@@ -224,7 +224,7 @@ export default {
         demandUserName: "123123",
         gridId: "",
 
-        operationType: "1",
+        operationType: "2",
         parentCode: "1003",
         reportTime: "",
         reportType: "self_help",
@@ -243,7 +243,7 @@ export default {
       //地图相关
       keyWords: '',
 
-
+      eventDetailCopy: {}
     };
   },
   components: {},
@@ -297,6 +297,13 @@ export default {
       default: "",
     },
 
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+
   },
   watch: {
     demandUserName: function (val) {
@@ -323,7 +330,13 @@ export default {
     this.initMap()
 
     if (this.eventId) {
-      this.getEventInfo()
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+      this.formData.reportUserMobile = this.eventDetailCopy.mobile
+      this.formData.reportUserName = this.eventDetailCopy.name
+      this.formData.reportTime = this.eventDetailCopy.happenTime
+      this.formData.gridId = this.eventDetailCopy.gridId
+
+
     } else {
       this.formData.demandUserName = this.demandUserName
       this.formData.demandUserMobile = this.demandUserMobile
@@ -334,28 +347,7 @@ export default {
   },
 
   methods: {
-    //加载组织数据
-    async getEventInfo () {
-      const url = "/gov/project/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.formData.demandUserName = data.name
-        this.formData.demandUserMobile = data.mobile
-        this.formData.demandUserId = data.reportUserId
-        this.formData.reportTime = data.createdTime
-        this.formData.gridId = data.gridId
-        this.formData.reportUserMobile = data.name
-        this.formData.reportUserName = data.mobile
-
-      } else {
-        this.$message.error(msg);
-      }
-    },
     async getDemandOptions () {
       const url = "/heart/icresidemanddict/demandoption"
       let params = {}
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index ee62b518c..ff08b830d 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -245,7 +245,7 @@ export default {
       okflag: false,
 
       uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
-
+      eventDetailCopy: {}
 
     };
   },
@@ -272,7 +272,15 @@ export default {
 
 
   },
-  props: {},
+  props: {
+
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+  },
   watch: {
     "formData.assistanceUnitIndex": function (val) {
 
@@ -327,7 +335,7 @@ export default {
     this.getTagList()
     this.formData = { ...this.formDataTemp }
     if (this.eventId) {
-      this.getEventInfo()
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
     } else {
 
     }
@@ -409,22 +417,7 @@ export default {
       this.visibleTagPanel = false;
     },
 
-    async getEventInfo () {
-      const url = "/gov/project/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.formData.gridId = data.gridId
-
-      } else {
-        this.$message.error(msg);
-      }
-    },
     async getProjectInfo () {
       this.okflag = false
       this.$refs["ref_form"].validate((valid, messageObj) => {
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 1320d10d0..678100301 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -46,14 +46,15 @@ export default {
     return {
       btnDisable: false,
       formData: {
+        operationType: '0',//处理方式[0:已回复 1:已转项目  1:已转需求]	
         content: '',
         status: ''
       },
 
       status: false,
-      okflag: false
-
+      okflag: false,
 
+      eventDetailCopy: {}
 
     };
   },
@@ -71,16 +72,25 @@ export default {
 
 
   },
-  props: {},
+  props: {
+
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+  },
   watch: {},
 
   async mounted () {
-
+    if (this.eventId) {
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+    }
   },
 
   methods: {
 
-
     async getReplayInfo () {
       this.okflag = false
       this.$refs["ref_form1"].validate((valid, messageObj) => {
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index eb48d64ab..6ab88929e 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -32,11 +32,13 @@
       </el-form>
 
       <div v-if="operationType==='0'">
-        <process-form-replay ref="ref_process_form_replay"></process-form-replay>
+        <process-form-replay ref="ref_process_form_replay"
+                             :eventDetailData="eventDetailData"></process-form-replay>
       </div>
 
       <div v-if="operationType==='1'">
-        <process-form-project ref="ref_process_form_project"></process-form-project>
+        <process-form-project ref="ref_process_form_project"
+                              :eventDetailData="eventDetailData"></process-form-project>
       </div>
 
       <div v-if="operationType==='2'">
@@ -44,7 +46,8 @@
                              :eventId="eventId"
                              :demandUserId="demandUserId"
                              :demandUserName="demandUserName"
-                             :demandUserMobile="demandUserMobile"></process-form-demand>
+                             :demandUserMobile="demandUserMobile"
+                             :eventDetailData="eventDetailData"></process-form-demand>
 
       </div>
 
@@ -67,9 +70,7 @@ export default {
   data () {
     return {
 
-      btnDisable: false,
-      gridList: [],//所属网格list--场所区域
-      categrayList: [],
+
       casOptions: [],
       iscascaderShow: 0,
       selCategoryArray: [
@@ -84,14 +85,15 @@ export default {
 
       },
 
-      operationType: '1',
-
+      operationType: '0',
 
       categoryList: [],
       replayInfo: {},
       demand: {},
       project: {},
-      okflag: false
+      okflag: false,
+
+      eventDetailCopy: {}
 
     };
   },
@@ -132,6 +134,12 @@ export default {
       type: String,
       default: "",
     },
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
   },
 
   watch: {
@@ -141,30 +149,28 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    this.loadGrid();
-    this.getCategoryList()
-
-  },
-
-  methods: {
+    await this.getCategoryList()
+    if (this.eventId) {
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+        this.selCategoryArray = []
+        this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
+        this.selCategoryArray.push(this.eventDetailCopy.categoryId)
+
+        this.selCateObj = {
+          name: this.eventDetailCopy.categoryName,
+          id: this.eventDetailCopy.categoryId
+        }
+      }
+    }
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
 
-      let params = {
-        agencyId: this.agencyId
-      }
 
-      const { data, code, msg } = await requestPost(url, params)
+  },
 
-      if (code === 0) {
-        this.gridList = data
+  methods: {
 
-      } else {
-        this.$message.error(msg)
-      }
 
-    },
     async getCategoryList () {
       const url = "/gov/issue/issueprojectcategorydict/list"
 
@@ -175,11 +181,11 @@ export default {
       if (code === 0) {
 
         let treeDataNew = this.filterTree(data)
-        // this.categrayList = data
+
         //组织级联数据
         ++this.iscascaderShow
         this.casOptions = []
-        this.selCategoryArray = ["1001", "1015"]
+
 
         this.casOptions = treeDataNew
 
@@ -226,15 +232,17 @@ export default {
       this.categoryList = []
 
       this.categoryList.push(this.selCategoryArray[1])
-      console.log(this.categoryList)
+
 
       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.replayInfo.categoryId = this.selCateObj.id
-          this.replayInfo.categoryList = []
-          this.replayInfo.categoryList.push(this.selCateObj)
+
+          this.replayInfo.categoryId = this.categoryList[0]
+          this.replayInfo.categoryList = this.categoryList
+
           this.okflag = true
 
         } else {
@@ -245,10 +253,13 @@ export default {
       } 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
+
           this.project.categoryList = []
           this.project.categoryList.push(this.selCateObj)
 
+
           //赋值分类信息
           this.okflag = true
 
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 585657dc9..5bc4f19cc 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -153,6 +153,7 @@
 
           <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"
@@ -165,6 +166,7 @@
           </el-table-column>
           <el-table-column prop="voiceList"
                            align="center"
+                           width="80"
                            label="音频">
             <template slot-scope="scope">
               <img class="img-voice"
@@ -177,7 +179,7 @@
 
           <el-table-column prop="sourceTypeName"
                            align="center"
-                           min-width="150"
+                           width="110"
                            label="上报渠道"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -196,13 +198,14 @@
 
           <el-table-column prop="mobile"
                            align="center"
-                           width="100"
+                           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">
@@ -213,12 +216,15 @@
 
           <el-table-column prop="createdTime"
                            align="center"
+                           width="140"
+                           :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">
 
@@ -231,7 +237,7 @@
           <el-table-column fixed="right"
                            label="操作"
                            align="center"
-                           width="160">
+                           width="100">
             <template slot-scope="scope">
               <el-button v-if="scope.row.status==='closed_case' && scope.row.satisfactionName"
                          @click="handleWatch(scope.row)"
@@ -275,6 +281,7 @@
       <event-info ref="eleEditForm"
                   :pageType="pageType"
                   :eventId="eventId"
+                  :eventDetailData="eventDetailData"
                   @handleClose="handleClose"
                   @handleOk="handleOk"
                   @dialogOk="handleEditSuccess" />
@@ -369,6 +376,8 @@ export default {
       },
       eventId: '',
 
+      eventDetailData: {},
+
     };
   },
   computed: {
@@ -463,13 +472,27 @@ export default {
       this.pageType = "info";
     },
 
+    //加载组织数据
     async handleDispose (row) {
-
       this.eventId = row.icEventId
+      const url = "/gov/project/icEvent/detail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
 
-      this.pageType = "dispose";
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
     },
 
+
+
     handleClose () {
       this.pageType = "list";