From 6524258ada440cc9159dfb973ebe1f4233d582ca Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 10 Oct 2022 17:19:28 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/util.js                                |   5 +-
 src/views/modules/base/epidemic/travel.vue    |   2 +-
 .../shequzhili/event/cpts/event-detail.vue    |   9 +
 .../shequzhili/event/cpts/event-info.vue      |  68 +-
 .../event/cpts/process-form-issue.vue         | 253 ++++++
 .../shequzhili/event/cpts/process-form.vue    |  23 +-
 .../modules/shequzhili/event/eventList.vue    |  24 +-
 .../modules/shequzhili/issue/cpts/add.vue     | 778 ++++++++++++++++++
 .../issue/cpts/evaluationDetail.vue           | 210 +++++
 .../shequzhili/issue/cpts/eventDetail.vue     | 182 ++++
 .../shequzhili/issue/cpts/issue-detail.vue    | 443 ++++++++++
 .../shequzhili/issue/cpts/issue-info.vue      | 446 ++++++++++
 .../issue/cpts/process-form-demand.vue        | 703 ++++++++++++++++
 .../issue/cpts/process-form-project.vue       | 640 ++++++++++++++
 .../issue/cpts/process-form-replay.vue        | 252 ++++++
 .../shequzhili/issue/cpts/process-form.vue    | 330 ++++++++
 .../shequzhili/issue/cpts/suggestDetail.vue   | 202 +++++
 .../shequzhili/issue/cpts/topicDetail.vue     | 190 +++++
 .../shequzhili/issue/issueAuditList.vue       | 509 ++++++++++++
 .../modules/shequzhili/issue/issueList.vue    | 553 +++++++++++++
 src/views/modules/workPc/guidance/addForm.vue |   3 +-
 21 files changed, 5806 insertions(+), 19 deletions(-)
 create mode 100644 src/views/modules/shequzhili/event/cpts/process-form-issue.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/add.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/eventDetail.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/issue-detail.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/issue-info.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-demand.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-project.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-replay.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
 create mode 100644 src/views/modules/shequzhili/issue/cpts/topicDetail.vue
 create mode 100644 src/views/modules/shequzhili/issue/issueAuditList.vue
 create mode 100644 src/views/modules/shequzhili/issue/issueList.vue

diff --git a/src/js/util.js b/src/js/util.js
index eceb943be..eef08ea21 100644
--- a/src/js/util.js
+++ b/src/js/util.js
@@ -15,7 +15,10 @@ export default {
     
     let message = ''
     for (var oneObj in messageObj) {
-      message = message + messageObj[oneObj][0].message + ' <br/> '
+      if(messageObj[oneObj][0].message){
+        message = message + messageObj[oneObj][0].message + ' <br/> '
+      }
+     
     }
 
     Vue.prototype.$message({
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index f7fda935a..dc69ea127 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -279,7 +279,7 @@
                              size="small"
                              @click="handleVisiteList(scope.row) ">随访记录</el-button>
                 </el-dropdown-item>
-                <el-dropdown-item>
+                <el-dropdown-item v-if=" agencyId===scope.row.agencyId">
                   <el-button type="text"
                              class="div-table-button--delete--noline "
                              size="small"
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 4a4adcbc0..55df457d5 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -75,6 +75,12 @@
             <div class="line"
                  @click="handleToDemand">查看需求</div>
           </div>
+          <div v-if="info.operationType==='3'"
+               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">已转议题：</span>
+            <div class="line"
+                 @click="handleToIssue">查看议题</div>
+          </div>
           <div v-if="info.satisfactionName"
                :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">满意度：</span>
@@ -287,6 +293,9 @@ export default {
     handleToDemand () {
       this.$emit("handleToDemand")
     },
+    handleToIssue () {
+      this.$emit("handleToIssue")
+    },
 
     //满意度评价
     handleSatisfy () {
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index a62f736d5..f901c55aa 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -43,6 +43,7 @@
                       :source="source"
                       @handleToProject="handleToProject"
                       @handleToDemand="handleToDemand"
+                      @handleToIssue="handleToIssue"
                       @handleClose="handleClose"></event-detail>
 
         <div v-if="!eventDetailData.operationId &&pageTypeCopy == 'dispose' "
@@ -201,6 +202,15 @@
                           :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>
 </template>
@@ -211,6 +221,7 @@ import { Loading } from "element-ui"; // 引入Loading服务
 import foldText from "@/views/components/foldText";
 import projectInfoOrigin from "../../xiangmu/cpts/project-info";
 import demandInfoOrigin from "@/views/modules/communityService/measure/info";
+import issueInfoOrigin from "../../issue/cpts/issue-info";
 import dateFormat from "dai-js/tools/dateFormat";
 import eventAdd from "./add";
 import eventDetail from "./event-detail";
@@ -227,6 +238,7 @@ function iniData () {
     replayInfo: {},
     demand: {},
     project: {},
+    issueInfo: {},
 
     //新增
     demandUserId: '',
@@ -238,7 +250,10 @@ function iniData () {
 
     projectProcess: [],
     projectPageType: 'info',
-    pageTypeCopy: ''
+    pageTypeCopy: '',
+
+    issuePageType: '',
+    issueDetailData: {},
 
   };
 }
@@ -274,7 +289,8 @@ export default {
     eventDetail,
     processForm,
     projectInfoOrigin,
-    demandInfoOrigin
+    demandInfoOrigin,
+    issueInfoOrigin
   },
 
   data: iniData,
@@ -423,6 +439,18 @@ export default {
           // 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)
+
         }
 
       }
@@ -431,7 +459,8 @@ export default {
         ...this.eventInfoData,
         // replayInfo: this.replayInfo,
         project: this.project,
-        demand: this.demand
+        demand: this.demand,
+        issueInfo: this.issueInfo
       }
 
       console.log('this.formData', this.formData)
@@ -496,6 +525,17 @@ export default {
           console.log('demond', this.demand)
           let url = '/gov/project/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 = '/gov/project/icEvent/icEventToIssue'
+          await this.submitDispose(url, this.issueInfo)
+
         } else {
           this.$message.info("请选择一种处理方式");
         }
@@ -545,6 +585,28 @@ export default {
       this.pageTypeCopy = 'demand'
 
     },
+    async handleToIssue () {
+      const url = "/gov/issue/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.eventDetailCopy.status === 'processing') {
+        this.issuePageType = 'dispose'
+      } else {
+        this.issuePageType = 'info'
+      }
+      this.pageTypeCopy = 'issue'
+    },
     handleCloseProject () {
       this.getProjectProcess()
       this.pageTypeCopy = 'info'
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-issue.vue b/src/views/modules/shequzhili/event/cpts/process-form-issue.vue
new file mode 100644
index 000000000..d48ac2f3c
--- /dev/null
+++ b/src/views/modules/shequzhili/event/cpts/process-form-issue.vue
@@ -0,0 +1,253 @@
+<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="issueTitle"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    style="display: block">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input v-model="formData.issueTitle"
+                    class="cell-width-2"
+                    clearable
+                    placeholder="请输入议题标题">
+          </el-input>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="处理意见"
+                    prop="suggestion"
+                    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.suggestion"></el-input>
+        </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: '3',//处理方式[0:已回复 1:已转项目  2:已转需求 3:转议题]	
+        suggestion: '',
+        issueTitle: '',
+
+      },
+
+
+      okflag: false,
+
+      eventDetailCopy: {},
+
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
+
+    };
+  },
+  components: {},
+  computed: {
+    dataRule () {
+
+      return {
+        issueTitle: [
+          { required: true, message: "议题标题不能为空", trigger: "blur" },
+        ],
+        suggestion: [
+          { required: true, message: "处理建议不能为空", trigger: "blur" },
+        ],
+
+      };
+    },
+
+
+  },
+  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));
+
+      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
+        }
+      }
+    }
+  },
+
+  methods: {
+    async getCategoryList () {
+      const url = "/gov/issue/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 () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+
+    },
+
+    //重构树，去除网格
+    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 getIssueInfo () {
+      this.okflag = false
+      this.$refs["ref_form1"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+
+        } else {
+          this.formData.icEventId = this.eventId
+          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>
+
+
+
+<style>
+.el-dialog__body {
+  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 560b8aeda..5ef9b381d 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -19,6 +19,7 @@
             <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>
@@ -50,6 +51,13 @@
                              :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>
 
@@ -62,6 +70,7 @@ import { requestPost } from "@/js/dai/request";
 import processFormReplay from "./process-form-replay";
 import processFormProject from "./process-form-project";
 import processFormDemand from "./process-form-demand";
+import processFormIssue from "./process-form-issue";
 
 
 let loading; // 加载动画
@@ -87,6 +96,7 @@ export default {
       replayInfo: {},
       demand: {},
       project: {},
+      issueInfo: {},
       okflag: false,
 
       eventDetailCopy: {}
@@ -96,7 +106,8 @@ export default {
   components: {
     processFormReplay,
     processFormProject,
-    processFormDemand
+    processFormDemand,
+    processFormIssue
   },
   computed: {
     dataRule () {
@@ -201,6 +212,16 @@ export default {
 
           this.okflag = true
 
+        } else {
+          return false
+        }
+      } 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
         }
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 64527997b..3dc1889a2 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -268,7 +268,7 @@
                            :show-overflow-tooltip="true"
                            label="发生时间">
           </el-table-column>
-          <el-table-column prop="operationTypeShow"
+          <el-table-column prop="operationTypeName"
                            align="center"
                            width="100"
                            :show-overflow-tooltip="true"
@@ -744,18 +744,18 @@ export default {
           })
           : [];
 
-        this.tableData.forEach(item => {
-          if (item.operationType === '2') {
-            item.operationTypeShow = '已转服务'
-          }
-          if (item.operationType === '1') {
-            item.operationTypeShow = '已立项'
-          }
-          if (item.operationType === '0') {
-            item.operationTypeShow = '已回复'
-          }
+        // 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);
       }
diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue
new file mode 100644
index 000000000..dfb95312d
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/add.vue
@@ -0,0 +1,778 @@
+<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>
+          </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"
+              list-type="picture-card"
+              :on-exceed="exceedPic"
+              :on-remove="removePic"
+              :file-list="replayImgList"
+              :on-change="handleEditChange"
+              :on-success="handleSuccess"
+              :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="address"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-input class="cell-width-1" v-model="formData.address">
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            label="位置坐标"
+            prop="longitude"
+            label-width="150px"
+            style="display: block"
+          >
+            <div style="width: 500px">
+              <div class="div_map">
+                <div id="app"></div>
+                <div class="div_searchmap">
+                  <el-input
+                    class="cell-width-map"
+                    maxlength="50"
+                    size="mini"
+                    placeholder="请输入关键字"
+                    v-model="keyWords"
+                  >
+                  </el-input>
+                  <el-button
+                    style="margin-left: 10px"
+                    type="primary"
+                    size="mini"
+                    @click="handleSearchMap"
+                    >查询</el-button
+                  >
+                </div>
+              </div>
+
+              <!-- <div style="margin-top: 10px">
+                <span>经度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入经度"
+                          v-model="formData.longitude">
+                </el-input>
+                <span style="margin-left: 20px">纬度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入纬度"
+                          v-model="formData.latitude">
+                </el-input>
+              </div> -->
+            </div>
+          </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="item.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>
+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; // 加载动画
+var map;
+var search;
+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
+  };
+}
+
+export default {
+  data() {
+    return {
+      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+
+      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,
+
+      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" },
+        ],
+      };
+    },
+  },
+  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.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 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 = "/gov/issue/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);
+      }
+    },
+
+    //重构树，去除网格
+    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] : ''
+    },
+
+    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张预览图片");
+    },
+    handleSuccess(response, file, fileList) {
+      this.replayImgList.push(file);
+      this.formData.imageList.push(response.data.url);
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(
+        this.formData.latitude,
+        this.formData.longitude
+      );
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("app"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
+
+      search = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
+      infoWindowList = Array(10);
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter();
+      // this.convert()
+    },
+
+    setMarker(lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    handleSearchMap() {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.formData.latitude = lat;
+            this.formData.longitude = lng;
+            this.convert();
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+
+    handleMoveCenter() {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.formData.latitude = lat;
+      this.formData.longitude = lng;
+      this.setMarker(lat, lng);
+      this.convert(lat, lng);
+    },
+
+    convert(lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location;
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(
+          this.formData.latitude,
+          this.formData.longitude
+        );
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: "main", // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          if (!this.isFirst) {
+            //再次查询时再赋值
+            this.formData.address = result.result.address;
+          }
+
+          if (this.isFirst) {
+            this.isFirst = false;
+          }
+        });
+    },
+
+    resetData() {
+      this.formData = iniFmData();
+      this.replayImgList = [];
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/shequzhili/event-info.scss"
+  scoped
+></style>
+
+<style lang="scss">
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+
+.hide {
+  .el-upload--picture-card {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
new file mode 100644
index 000000000..b401aa503
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-table :data="commentList"
+                border
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                class="table"
+                style="width: 100%"
+                :height="maxTableHeight">
+
+        <el-table-column label="序号"
+                         fixed="left"
+                         type="index"
+                         align="center"
+                         width="50" />
+
+        <el-table-column prop="userNickName"
+                         align="center"
+                         width="80"
+                         label="评价人"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="evaluateTimeShow"
+                         align="center"
+                         width="150"
+                         label="评价时间"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="satisfaction"
+                         align="center"
+                         min-width="180"
+                         :show-overflow-tooltip="true"
+                         label="评价结果">
+          <template slot-scope="scope">
+            <el-image v-if="scope.row.satisfaction=='bad'"
+                      style="width: 40px; height: 40px"
+                      src="@/assets/img/satisfy-images/face1_light.png">
+            </el-image>
+            <el-image v-else-if="scope.row.satisfaction=='good'"
+                      style="width: 40px; height: 40px"
+                      src="@/assets/img/satisfy-images/face2_light.png">
+            </el-image>
+            <el-image v-else
+                      style="width: 40px; height: 40px"
+                      src="@/assets/img/satisfy-images/face3_light.png">
+            </el-image>
+
+          </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">
+        </el-pagination>
+      </div>
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import dateFormat from "dai-js/tools/dateFormat";
+import { mapGetters } from "vuex";
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+
+      commentList: [],
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (topicInfo) {
+      this.startLoading()
+
+      await this.getList()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+    async getList () {
+      const url = "/gov/issue/manage/evaluationlist"
+
+      let params = {
+        issueId: this.issueId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        data.forEach(element => {
+
+          element.evaluateTimeShow = dateFormat(
+            new Date(element.evaluateTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+        });
+        this.commentList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleSizeChange (val) {
+
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getSuggestion();
+    },
+    handleCurrentChange (val) {
+
+      this.pageNo = val;
+      this.getSuggestion();
+    },
+    handleCancle () {
+      // this.resetData()
+      this.$emit('diaDetailClose')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.topicInfo = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+
+  },
+  props: {
+    issueId: {
+      type: String,
+      default: ''
+    },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
new file mode 100644
index 000000000..0bfe2e7a5
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
@@ -0,0 +1,182 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">所属网格：</span>
+            <span>{{ eventDetailData.topicContent||'--'  }}</span>
+          </div>
+          <div class="info-prop"
+               v-if="eventDetailData.photoList&&eventDetailData.photoList.length>0">
+            <span class="info-title-2">图片：</span>
+
+            <div class="info-pics">
+
+              <img v-for="(item,index) in eventDetailData.photoList"
+                   style="width:80px;height:80px"
+                   :key="index"
+                   :src="item.url"
+                   @click="watchImg(item)">
+
+            </div>
+          </div>
+          <div class="info-prop"
+               v-if="voiceList&&voiceList.length>0">
+            <span class="info-title-2">音频：</span>
+
+            <audio controls>
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in voiceList" />
+            </audio>
+
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发布人：</span>
+            <span>{{ eventDetailData.topicPublisher||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发布时间：</span>
+            <span>{{ eventDetailData.topicPublisherTimeShow||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">联系方式：</span>
+            <span>{{ eventDetailData.topicPublisherMobile||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">发布小组：</span>
+            <span>{{ eventDetailData.groupName||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import dateFormat from "dai-js/tools/dateFormat";
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+      eventId: '',
+      eventDetailData: {},
+
+      voiceList: [],
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (eventId) {
+      this.startLoading()
+      this.eventId = eventId
+      await this.loadForm()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+    async loadForm () {
+
+      const url = "/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);
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('diaDetailClose')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.eventDetailData = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+
+
+  },
+  props: {
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
new file mode 100644
index 000000000..e3d886b38
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -0,0 +1,443 @@
+<template>
+  <div class="">
+    <el-card :class="{'box-card':source==='visiual'}"
+             v-if="showType==''">
+      <h3 v-if="source==='manage'">议题详情</h3>
+      <div class="m-row">
+        <div class="m-info">
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">议题标题：</span>
+            <span>{{ issueInfo.issueTitle }}</span>
+          </div>
+
+          <!-- <div v-if="info.imageList&&info.imageList.length>0"
+               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="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="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">语音：</span>
+            <audio controls>
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in info.voiceList" />
+            </audio>
+          </div> -->
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">处理意见：</span>
+            <span>{{ issueInfo.issueSuggestion||'--' }}</span>
+          </div>
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">所属网格：</span>
+            <span>{{ issueInfo.belongsGridName||'--' }}</span>
+          </div>
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">议题来源：</span>
+            <div v-if="issueInfo.sourceType==='resi_topic'"
+                 class="line"
+                 @click="handleToTopic">查看话题</div>
+            <div v-else-if="issueInfo.sourceType==='ic_event'"
+                 class="line"
+                 @click="handleToEvent">查看事件</div>
+            <!-- <div v-else>--</div> -->
+            <div v-else
+                 class="line"
+                 @click="handleToTopic">查看话题>--</div>
+          </div>
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">意见和建议：</span>
+            <div v-if="issueInfo.sourceType==='resi_topic'"
+                 class="line"
+                 @click="handleToSuggest">查看全部</div>
+          </div>
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">分类：</span>
+            <fold-text v-if="issueCate.length > 0"
+                       style="width: 250px"
+                       :row="3">
+              <div :key="item.name"
+                   v-for="item in issueCate">
+                {{ item.name }}
+              </div>
+            </fold-text>
+            <span style="width: 250px"
+                  v-else>--</span>
+
+            <el-popover v-if="issueInfo.issueStatus == 'voting'"
+                        placement="bottom"
+                        width="400"
+                        height="400"
+                        v-model="visibleCatePanel">
+              <div class="f"
+                   style="min-height: 120px">
+                <h2>更改分类</h2>
+                <el-cascader v-model="selectedCateData"
+                             :options="cateOptions"
+                             :props="{
+                      multiple: true,
+                      label: 'name',
+                      value: 'id',
+                      children: 'subCategory',
+                    }"
+                             clearable></el-cascader>
+                <el-button style="margin-left: 10px"
+                           size="small"
+                           type="danger"
+                           @click="updateIssueCate">确定</el-button>
+              </div>
+              <div slot="reference">
+                <el-button v-if="source==='manage'"
+                           size="small"
+                           type="">更改</el-button>
+
+                <div v-else
+                     class="one-btn">更改</div>
+              </div>
+            </el-popover>
+          </div>
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">标签：</span>
+            <fold-text v-if="issueTag.length > 0"
+                       style="width: 250px"
+                       :row="3">
+              <div :key="item.name"
+                   v-for="item in issueTag">
+                {{ item.name }}
+              </div>
+            </fold-text>
+            <span style="width: 250px"
+                  v-else>--</span>
+
+            <el-popover v-if="issueInfo.issueStatus == 'voting'"
+                        placement="bottom"
+                        width="450"
+                        height="400"
+                        v-model="visibleTagPanel">
+              <div class="f"
+                   style="min-height: 120px">
+                <h2>更改标签</h2>
+                <el-select v-model="selectedTagData"
+                           multiple
+                           allow-create
+                           filterable
+                           placeholder="请选择"
+                           @change="handleTagChange"
+                           size="medium"
+                           style="width: 350px">
+                  <el-option-group label="自定义标签">
+                    <el-option v-for="item in tagOptions.customized"
+                               :key="item.id"
+                               :label="item.name"
+                               :value="item.id">
+                    </el-option>
+                  </el-option-group>
+
+                  <el-option-group label="常用标签">
+                    <el-option v-for="item in tagOptions.defaulted"
+                               :key="item.id"
+                               :label="item.name"
+                               :value="item.id">
+                    </el-option>
+                  </el-option-group>
+                </el-select>
+
+                <el-button style="margin-left: 10px"
+                           size="small"
+                           type="danger"
+                           @click="updateIssueTag">确定</el-button>
+              </div>
+              <div slot="reference">
+                <el-button v-if="source==='manage'"
+                           size="small"
+                           type="">更改</el-button>
+
+                <div v-else
+                     class="one-btn">更改</div>
+              </div>
+            </el-popover>
+          </div>
+
+          <div v-if="issueInfo.issueStatus==='closed'"
+               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">满意度评价：</span>
+            <div v-if="issueInfo.sourceType==='resi_topic'"
+                 class="line"
+                 @click="handleToEvaluation">查看全部</div>
+          </div>
+
+        </div>
+      </div>
+      <!-- 
+显示关闭：
+1、状态=完成    (已评价)||(没评价&&不是本人)
+
+2、状态=未完成 （有操作id） -->
+      <div v-if="type==='info'"
+           class="div-btn ">
+        <el-button size="small"
+                   @click="handleCloseEvent">关闭</el-button>
+
+      </div>
+
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import foldText from "@/views/components/foldText";
+import projectInfo from "../../xiangmu/cpts/project-info";
+import dateFormat from "dai-js/tools/dateFormat";
+
+function iniData () {
+  return {
+    user: {},
+    projectPageType: 'info',
+
+    issueInfo: {},
+    showType: '',
+
+    issueCate: [],
+    cateOptions: [],
+    visibleCatePanel: false,
+    selectedCateData: [],
+
+    issueTag: [],
+    tagOptions: [],
+    visibleTagPanel: false,
+    selectedTagData: [],
+
+  };
+}
+
+export default {
+  name: "issueInfo",
+  props: {
+    issueId: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "info",
+    },
+
+    issueDetailData: {
+
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+
+  components: {
+    foldText, projectInfo
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    selectedCateData (val) {
+      const { cateOptions } = this;
+      this.issueCate = val
+        .filter((arr) => arr.length > 0)
+        .map((arr) => {
+          let ele1 = cateOptions.find((item) => item.id == arr[0]);
+          let ele2 = ele1.subCategory.find((item) => item.id == arr[1]);
+          return {
+            id: ele2.id,
+            name: ele1.name + "-" + ele2.name,
+          };
+        });
+    },
+    async selectedTagData (val) {
+      const { tagOptions } = this;
+      this.issueTag = await Promise.all(
+        val.map(async (id) => {
+          let ele = [...tagOptions.customized, ...tagOptions.defaulted].find(
+            (item) => item.id == id || item.name == id
+          );
+          if (!ele) {
+            await this.createTag(id);
+            ele = [
+              ...this.tagOptions.customized,
+              ...this.tagOptions.defaulted,
+            ].find((item) => item.name == id);
+            if (!ele)
+              return {
+                id: "",
+                name: ele.name,
+              };
+          }
+          return {
+            id: ele.id,
+            name: ele.name,
+          };
+        })
+      );
+      this.issueTag = this.issueTag.filter((item) => item.id);
+    },
+  },
+  created () { },
+
+  mounted () {
+    this.user = this.$store.state.user
+    if (this.issueId) {
+      this.issueInfo = JSON.parse(JSON.stringify(this.issueDetailData));
+
+    }
+    this.getIssueCate();
+
+  },
+
+  methods: {
+    watchImg (src) {
+      window.open(src);
+    },
+
+    handleClose () {
+      this.showType = ''
+    },
+
+    handleCloseEvent () {
+      this.$emit("handleClose");
+    },
+
+    async getApiData () {
+    },
+
+    handleToTopic () {
+      this.$emit("handleToTopic")
+    },
+
+    handleToEvent () {
+      this.$emit("handleToEvent")
+    },
+    handleToSuggest () {
+      this.$emit("handleToSuggest")
+    },
+    handleToEvaluation () {
+      this.$emit("handleToEvaluation")
+    },
+
+    async getIssueCate () {
+      const url = "/gov/issue/issuecategory/categorytaglist";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+        this.issueCate = data.categoryList;
+        this.issueTag = data.tagList;
+        if (this.issueInfo.issueStatus == "voting") {
+          this.getCateOptions();
+          this.getTagOptions();
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getCateOptions () {
+      const url = "/gov/issue/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;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getTagOptions () {
+      const url = "/gov/issue/issueprojecttagdict/list";
+
+      const { data, code, msg } = await requestPost(url, {
+        categoryList: this.issueCate,
+      });
+
+      if (code === 0) {
+        this.tagOptions = {
+          customized: data.customized,
+          defaulted: data.defaulted,
+        };
+        this.selectedTagData = this.issueTag.map((item) => item.id);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async updateIssueCate () {
+      const url = "/gov/issue/issuecategory/save";
+      const { issueCate } = this;
+      if (issueCate.length == 0) {
+        return this.$message.error("分类不能为空");
+      }
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+        categoryList: issueCate,
+      });
+
+      if (code === 0) {
+        this.$message.success("更改成功");
+        this.visibleCatePanel = false;
+        this.getTagOptions();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async updateIssueTag () {
+      const url = "/gov/issue/issuetags/save";
+      const { issueTag } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+        tagList: issueTag,
+      });
+
+      if (code === 0) {
+        this.$message.success("更改成功");
+        this.visibleTagPanel = false;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    handleTagChange (val) {
+      console.log(val);
+    },
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+</style>
+
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-info.vue b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
new file mode 100644
index 000000000..bc79795da
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="">
+
+    <div v-if="pageTypeCopy == 'dispose'||pageTypeCopy == 'info'"
+         class="g-page">
+      <div :class="['g-total',{'g-left':projectProcess.length>0}]">
+
+        <issue-detail ref="ref_detail"
+                      :type="pageType"
+                      :issueId="issueId"
+                      :issueDetailData="issueDetailData"
+                      :source="source"
+                      @handleToEvent="handleToEvent"
+                      @handleToTopic="handleToTopic"
+                      @handleToSuggest="handleToSuggest"
+                      @handleToEvaluation="handleToEvaluation"
+                      @handleClose="handleClose"></issue-detail>
+
+        <div v-if="!issueDetailData.operationId &&pageTypeCopy == 'dispose' "
+             class="process-form">
+          <el-card :class="{'box-card':source==='visiual'}">
+            <div :class="['process-title',{'process-title-vis':source==='visiual'}]">处理</div>
+            <process-form ref="ref_processinfo_dispose"
+                          :source="source"
+                          :issueId="issueId"
+                          :issueDetailData="issueDetailData"></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="projectProcess.length>0"
+           class="g-right">
+        <el-card :class="{'box-card':source==='visiual'}"
+                 style="max-height: 90vh; overflow: auto">
+
+          <div class="m-process">
+            <div :class="['process-title',{'process-title-vis':source==='visiual'}]">处理进展</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==='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 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>
+
+                <div 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.progressDesc }}</div>
+                  </div>
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </div>
+    </div>
+
+    <el-dialog :visible.sync="topicShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'话题详情'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaDetailClose">
+      <topic-detail ref="ref_detail_topic"
+                    @diaDetailClose="diaDetailClose"></topic-detail>
+    </el-dialog>
+
+    <el-dialog :visible.sync="eventShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'事件详情'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaDetailClose">
+      <event-detail ref="ref_detail_event"
+                    @diaDetailClose="diaDetailClose"></event-detail>
+    </el-dialog>
+    <el-dialog :visible.sync="suggestShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'意见和建议'"
+               width="1150px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaDetailClose">
+      <suggest-detail ref="ref_detail_suggest"
+                      :issueId="issueId"
+                      @diaDetailClose="diaDetailClose"></suggest-detail>
+    </el-dialog>
+    <el-dialog :visible.sync="evaluationShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'满意度评价'"
+               width="1150px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaDetailClose">
+      <evaluation-detail ref="ref_detail_evaluation"
+                         :issueId="issueId"
+                         @diaDetailClose="diaDetailClose"></evaluation-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import { Loading } from "element-ui"; // 引入Loading服务
+import foldText from "@/views/components/foldText";
+import dateFormat from "dai-js/tools/dateFormat";
+
+import issueDetail from "./issue-detail";
+import processForm from "./process-form";
+import topicDetail from "./topicDetail";
+import eventDetail from "./eventDetail";
+import suggestDetail from "./suggestDetail";
+import evaluationDetail from "./evaluationDetail";
+
+let loading; // 加载动画
+function iniData () {
+  return {
+    formData: {
+      operationType: '',
+
+    },
+    issueInfoData: {},
+    closeInfo: {},
+    demand: {},
+    project: {},
+
+    //新增
+    demandUserId: '',
+    demandUserName: '',
+    demandUserMobile: '',
+    gridId: '',
+
+    issueDetailCopy: {},
+
+    projectProcess: [],
+    projectPageType: 'info',
+    pageTypeCopy: '',
+
+    //话题、事件详情
+    topicShow: false,
+    eventShow: false,
+    suggestShow: false,
+    evaluationShow: false,
+
+  };
+}
+
+export default {
+  name: "projectInfo",
+  props: {
+    issueId: {
+      type: String,
+      default: "",
+    },
+    pageType: {
+      type: String,
+      default: "",
+    },
+    issueDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+
+  components: {
+    foldText,
+    issueDetail,
+    processForm,
+    topicDetail,
+    eventDetail,
+    suggestDetail,
+    evaluationDetail,
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    issueId () {
+      let data = iniData();
+      Object.keys(data).forEach((k) => {
+        this[k] = data[k];
+      });
+      // this.getApiData();
+    },
+  },
+  created () {
+
+
+  },
+  mounted () {
+    this.pageTypeCopy = this.pageType
+    this.getProjectProcess()
+    if (this.issueId) {
+      this.issueDetailCopy = JSON.parse(JSON.stringify(this.issueDetailData));
+    }
+  },
+
+  methods: {
+    diaDetailClose () {
+
+      this.topicShow = false
+      this.eventShow = false
+      this.suggestShow = false
+      this.evaluationShow = false
+    },
+
+    //加载组织数据
+    async getProjectProcess () {
+      const url = "/gov/issue/manage/progress";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/process";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      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);
+      }
+    },
+
+    async handleComfirm () {
+      this.startLoading()
+
+      if (this.pageTypeCopy === 'dispose') {
+        await this.handelDispose()
+      }
+      this.endLoading()
+    },
+
+    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') {
+          let categoryList = this.$refs.ref_detail.issueCate
+          if (categoryList.length === 0) {
+            this.$message.info("请先选择议题分类");
+            return false
+          }
+          this.closedInfo = {}
+
+          this.project = this.$refs.ref_processinfo_dispose.project
+          //项目的属性同事件一样
+          this.project.issueId = this.issueId
+          console.log('projectInfo', this.project)
+          let url = '/gov/issue/manage/shiftproject-v2'
+          await this.submitDispose(url, this.project)
+
+
+        } else if (this.formData.operationType === '1') {
+          this.project = {}
+
+          this.closedInfo = this.$refs.ref_processinfo_dispose.closedInfo
+
+          this.closedInfo.issueId = this.issueId
+          console.log('closedInfo', this.closedInfo)
+          //关闭属性赋值
+          let url = '/gov/issue/manage/closeissue'
+          await this.submitDispose(url, this.closedInfo)
+
+        } 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 () {
+      this.$emit("handleClose");
+    },
+    handleToEvent () {
+      // this.pageTypeCopy = 'event'
+      this.eventShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail_event.initForm(this.issueDetailCopy.sourceId)
+      })
+    },
+    handleToTopic () {
+      // this.pageTypeCopy = 'topic'
+      this.topicShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail_topic.initForm(this.issueDetailCopy.topicInfo)
+      })
+
+    },
+    handleToSuggest () {
+      // this.pageTypeCopy = 'topic'
+      this.suggestShow = true
+
+    },
+    handleToEvaluation () {
+      // this.pageTypeCopy = 'topic'
+      this.evaluationShow = true
+
+    },
+
+    // 开启加载动画
+    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>
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue b/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue
new file mode 100644
index 000000000..77c0193f0
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue
@@ -0,0 +1,703 @@
+<template>
+  <div class="">
+    <el-form ref="ref_form"
+             :inline="false"
+             :model="formData"
+             :rules="dataRule"
+             label-width="100px">
+      <!-- <el-form-item label="事件分类"
+                    label-width="150px"
+                    prop="categoryId">
+        <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>
+      </el-form-item> -->
+      <el-form-item label="服务内容"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="content">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input v-model="formData.content"
+                    :autosize="{ minRows: 2, maxRows: 10 }"
+                    type="textarea"
+                    clearable
+                    class="cell-width-area"
+                    placeholder="请输入内容"></el-input>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="服务类型"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="categoryCode">
+        <div :class="{'visiual-form':source==='visiual'}">
+
+          <el-cascader v-model="formData.categoryCode"
+                       :options="demandOptions"
+                       clearable
+                       class="cell-width-1"
+                       @change="handleCateSlect"></el-cascader>
+        </div>
+
+      </el-form-item>
+
+      <el-form-item label="服务时间"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="wantServiceTime">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-date-picker v-model="formData.wantServiceTime"
+                          type="datetime"
+                          class="cell-width-1"
+                          clearable
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="需求人"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="demandUserName">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input v-model="formData.demandUserName"
+                    class="cell-width-1"></el-input>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="联系电话"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="demandUserMobile">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input v-model="formData.demandUserMobile"
+                    class="cell-width-1"></el-input>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="服务地点"
+                    prop="serviceLocation"
+                    :class="{'form-item':source==='visiual'}"
+                    label-width="150px"
+                    style="display: block">
+
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input class="cell-width-1"
+                    v-model="formData.serviceLocation">
+          </el-input>
+        </div>
+
+      </el-form-item>
+      <el-form-item label="位置坐标"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="longitude"
+                    label-width="150px"
+                    style="display: block">
+        <div style="width:500px">
+
+          <div class="div_map">
+            <div id="app_map">
+
+            </div>
+            <div class="div_searchmap">
+              <el-input class="cell-width-map"
+                        maxlength="50"
+                        size="mini"
+                        placeholder="请输入关键字"
+                        v-model="keyWords">
+              </el-input>
+              <el-button style="margin-left: 10px"
+                         type="primary"
+                         size="mini"
+                         @click="handleSearchMap">查询</el-button>
+            </div>
+          </div>
+
+          <!-- <div style="margin-top: 10px">
+            <span>经度</span>
+            <el-input class="item_width_3"
+                      maxlength="50"
+                      placeholder="请输入经度"
+                      v-model="formData.longitude">
+            </el-input>
+            <span style="margin-left: 20px">纬度</span>
+            <el-input class="item_width_3"
+                      maxlength="50"
+                      placeholder="请输入纬度"
+                      v-model="formData.latitude">
+            </el-input>
+          </div> -->
+        </div>
+      </el-form-item>
+
+      <el-form-item label="门牌号"
+                    :class="{'form-item':source==='visiual'}"
+                    label-width="150px"
+                    prop="locationDetail">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input v-model="formData.locationDetail"
+                    class="cell-width-1"></el-input>
+        </div>
+
+      </el-form-item>
+
+      <el-form-item label="服务方"
+                    :class="{'form-item':source==='visiual'}"
+                    label-width="150px"
+                    prop="serverId">
+
+        <template>
+          <div :class="[{'single-select':source==='visiual'},'sel-service']">
+            <el-select v-model="formData.serviceType"
+                       class="cell-width-1"
+                       placeholder="请选择"
+                       clearable
+                       @change="handleServiceChange('add', $event)">
+              <el-option v-for="item in serviceOptions"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            -
+            <el-select v-model="formData.serverId"
+                       class="cell-width-1"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in serviceOptiondList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </template>
+      </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; // 加载动画
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+function iniFmData () {
+  return {
+    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转服务]	
+    icEventId: '',//事件Id	
+    gridId: '',//	
+    categoryCode: '',//	二级服务分类编码	
+    parentCode: '',//	父级服务分类编码	
+    content: '',//		服务内容1000字	
+    reportType: 'self_help',//	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help	
+    reportUserName: '',//	上报人姓名	
+    reportUserMobile: '',//	自身上报时存储注册居民的手机号	
+    reportTime: '',//	上报时间	
+    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
+    demandUserName: '',//	需求人姓名	
+    demandUserMobile: '',//需求人联系电话	
+    wantServiceTime: '',//	希望服务时间
+    serviceType: '',
+    serverId: '',
+    locationDetail: '',
+    serviceLocation: '',//事件地址	
+    latitude: '',//	经度	
+    longitude: '',//维度	
+    // categoryId: ''
+  };
+}
+export default {
+  data () {
+    return {
+      btnDisable: false,
+      customerId: localStorage.getItem("customerId"),
+      demandOptions: [],
+      serviceOptions: [
+      ],
+      serviceOptiondList: [],
+
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
+
+      formData: iniFmData(),
+
+
+      okflag: false,
+      //地图相关
+      keyWords: '',
+
+      eventDetailCopy: {}
+    };
+  },
+  components: {},
+  computed: {
+    dataRule () {
+
+      return {
+        // categoryId: [
+        //   { required: true, message: "请填写事件分类", trigger: "blur" },
+        // ],
+        content: [
+          { required: true, message: "服务内容不能为空", trigger: "blur" },
+        ],
+        categoryCode: [
+          { required: true, message: "服务类型不能为空", trigger: "blur" },
+        ],
+        wantServiceTime: [
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
+        ],
+        demandUserName: [
+          { required: true, message: "需求人不能为空", trigger: "blur" },
+        ],
+        demandUserMobile: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        serviceLocation: [
+          { required: true, message: "服务地点不能为空", trigger: "blur" },
+        ],
+        serverId: [
+          { required: true, message: "服务方不能为空", trigger: "blur" },
+        ],
+
+      };
+    },
+
+
+  },
+  props: {
+
+    demandUserId: {
+      type: String,
+      default: "",
+    },
+    demandUserName: {
+      type: String,
+      default: "",
+    },
+    demandUserMobile: {
+      type: String,
+      default: "",
+    },
+    eventId: {
+      type: String,
+      default: "",
+    },
+
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+
+  },
+  watch: {
+    demandUserName: function (val) {
+
+      this.formData.reportUserName = val
+      this.formData.demandUserName = val
+    },
+    demandUserMobile: function (val) {
+
+      this.formData.reportUserMobile = val
+      this.formData.demandUserMobile = val
+    },
+    demandUserId: function (val) {
+
+      this.formData.demandUserId = val
+    },
+  },
+  created () {
+
+
+  },
+
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    this.getCategoryList();
+    this.getDemandOptions();
+    this.getServiceOption()
+    // this.formData = { ...this.formDataTemp }
+    this.initMap()
+
+    if (this.eventId) {
+      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
+      this.formData.demandUserId = this.eventDetailCopy.reportUserId
+      this.formData.demandUserName = this.eventDetailCopy.name
+      this.formData.demandUserMobile = this.eventDetailCopy.mobile
+
+      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+        // this.selCategoryArray = []
+        // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
+        // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
+        // this.formData.categoryId = this.eventDetailCopy.categoryId
+
+        // this.selCateObj = {
+        //   name: this.eventDetailCopy.categoryName,
+        //   id: this.eventDetailCopy.categoryId
+        // }
+      }
+
+    } else {
+      this.formData.demandUserName = this.demandUserName
+      this.formData.demandUserMobile = this.demandUserMobile
+      this.formData.demandUserId = this.demandUserId
+    }
+
+  },
+
+  methods: {
+
+    async getCategoryList () {
+      const url = "/gov/issue/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 () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.formData.categoryId = this.selCateObj.id
+    },
+
+    //重构树，去除网格
+    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 getDemandOptions () {
+      const url = "/heart/icresidemanddict/demandoption"
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.demandOptions = this.getFlagData(
+          this.getTreeData(data),
+          "usableFlag"
+        );
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async getServiceOption () {
+      const url = "/sys/dict/data/dictlist"
+      let params = { dictType: "user_demand_service_type", }
+
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.serviceOptions = data;
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    getTreeData (data) {
+      if (!Array.isArray(data)) return [];
+      let arr = data.map((item) => {
+        let _item = {};
+        if (item.children) {
+          if (item.children.length === 0)
+            _item = { ...item, children: undefined };
+          else _item = { ...item, children: this.getTreeData(item.children) };
+        } else {
+          _item = { ...item };
+        }
+        return _item;
+      });
+      return arr;
+    },
+    getFlagData (data, flag) {
+      if (!Array.isArray(data)) return [];
+      let arr1 = data.filter((item) => item[flag]);
+      let arr2 = arr1.map((item) => {
+        if (item.children)
+          return { ...item, children: this.getFlagData(item.children, flag) };
+        else return item;
+      });
+      // console.log('arrr-oppp', arr2)
+      return arr2;
+    },
+
+    handleCateSlect (val) {
+      console.log("val", val);
+      if (val.length === 1) {
+        this.demandOptions.forEach((item) => {
+          if (item.value == val[0]) this.formData.parentCode = item.pvalue;
+        });
+        this.formData.categoryCode = val[0];
+      } else {
+        this.formData.parentCode = val[0];
+        this.formData.categoryCode = val[1];
+      }
+    },
+
+    handleServiceChange (type, val) {
+      if (val === "social_org") {
+        if (type === "add") {
+          this.getServiceuserList(val, "add_demand");
+        } else {
+          this.getServiceuserList(val, "query_demand");
+        }
+      } else {
+        this.getServiceuserList(val, "");
+      }
+    },
+
+    async getServiceuserList (serviceType, query) {
+
+      if (!serviceType) return false;
+      const { demandUserId } = this.formData;
+      const params = {
+        serviceName: "",
+        serviceType: serviceType,
+        queryPurpose: query,
+      };
+
+
+      const url = "/heart/userdemand/servicelist"
+
+
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.serviceOptiondList = data.filter(
+          (item) => item.value != demandUserId
+        );
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+
+    async getDemandInfo () {
+      this.okflag = false
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          // this.formData.categoryId = this.selCateObj.id
+        } else {
+
+          this.okflag = true
+        }
+      });
+    },
+
+
+    resetData () {
+
+    },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app_map'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+      this.convert()
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
+
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
+        })
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+
+
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
+    },
+
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          this.formData.serviceLocation = result.result.address
+          // 显示搜索到的地址
+        });
+    },
+
+
+
+    // 开启加载动画
+    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>
+
+
+
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-project.vue b/src/views/modules/shequzhili/issue/cpts/process-form-project.vue
new file mode 100644
index 000000000..b8d3af313
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/process-form-project.vue
@@ -0,0 +1,640 @@
+<template>
+  <div class="">
+    <el-form ref="ref_form"
+             :inline="false"
+             :model="formData"
+             :rules="dataRule"
+             label-width="100px">
+      <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="title"
+                    :class="{'form-item':source==='visiual'}"
+                    label-width="150px"
+                    style="display: block">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input class="cell-width-1"
+                    maxlength="50"
+                    placeholder="请输入项目标题"
+                    v-model="formData.title">
+          </el-input>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="所属网格	"
+                    prop="gridId"
+                    :class="{'form-item':source==='visiual'}"
+                    label-width="150px"
+                    style="display: block">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <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>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="处理部门"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="staffList">
+        <el-popover placement="bottom"
+                    width="400"
+                    height="400"
+                    v-model="visibleStaffPanel">
+          <div class="f">
+            <select-staff @confirm="(ret) => (formData.staffList = ret)"
+                          @close="visibleStaffPanel = false" />
+          </div>
+
+          <div slot="reference">
+            <a v-if="formData.staffList.length == 0"
+               style="cursor: pointer">点击选择</a>
+            <a v-else
+               style="cursor: pointer">已选 {{ formData.staffList.length }} 人</a>
+          </div>
+        </el-popover>
+      </el-form-item>
+
+      <!-- <el-form-item label="协办单位"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="assistanceUnitIndex">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-select v-model.trim="formData.assistanceUnitIndex"
+                     placeholder="请选择"
+                     class="cell-width-1">
+            <el-option v-for="(item, index) in assistanceUnitList"
+                       :key="item.assistanceUnitId"
+                       :label="item.assistanceUnitName"
+                       :value="index">
+            </el-option>
+          </el-select>
+        </div>
+      </el-form-item> -->
+
+      <el-form-item label="项目方案"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="publicReply">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input type="textarea"
+                    class="cell-width-area"
+                    :rows="2"
+                    placeholder="请输入项目方案"
+                    v-model="formData.publicReply">
+          </el-input>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="内部备注"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="internalRemark">
+        <div :class="{'visiual-form':source==='visiual'}">
+          <el-input type="textarea"
+                    class="cell-width-area"
+                    :rows="2"
+                    placeholder="请输入内部备注"
+                    v-model="formData.internalRemark">
+          </el-input>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="图片/附件："
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="internalFile">
+        <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
+                   :action="uploadUlr"
+                   :data="{ customerId: customerId }"
+                   :show-file-list="true"
+                   :on-success="handleImgSuccess"
+                   :on-remove="handleImgRemove"
+                   :before-upload="beforeImgUpload">
+          <i v-if="source==='manage'"
+             :class="['el-icon-plus']"></i>
+          <img v-else
+               style="width:27px;height:27px"
+               src="@/assets/img/file-add.png">
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item label="标签"
+                    label-width="150px"
+                    :class="{'form-item':source==='visiual'}"
+                    prop="tagList">
+
+        <fold-text v-if="tagList.length>0"
+                   style="width: 300px"
+                   :row="3">
+          <div :key="item.name"
+               class="tag-name"
+               v-for="item in tagList">
+            {{ item.name }}
+          </div>
+        </fold-text>
+
+        <el-popover placement="top"
+                    width="450"
+                    height="450"
+                    v-model="visibleTagPanel">
+          <div class="f"
+               style="min-height: 120px">
+            <h2>选择标签</h2>
+            <el-select style="width: 350px"
+                       v-model="selectedTagData"
+                       multiple
+                       allow-create
+                       filterable
+                       placeholder="请选择"
+                       @change="handleTagChange">
+              <el-option-group label="自定义标签">
+                <el-option v-for="item in tagOptions.customized"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                </el-option>
+              </el-option-group>
+
+              <el-option-group label="常用标签">
+                <el-option v-for="item in tagOptions.defaulted"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                </el-option>
+              </el-option-group>
+            </el-select>
+
+            <el-button style="margin-left: 10px"
+                       size="small"
+                       type="danger"
+                       @click="updateProjectTag">关闭</el-button>
+          </div>
+          <div slot="reference">
+            <el-button v-if="source==='manage'"
+                       size="small"
+                       type="">选择</el-button>
+            <div v-else
+                 class="one-btn">选择</div>
+          </div>
+        </el-popover>
+      </el-form-item>
+
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import selectStaff from "@/views/components/selectStaff";
+import formVltHelper from "dai-js/tools/formVltHelper";
+import foldText from "@/views/components/foldText";
+
+import { isCard } from "@/utils/validate";
+
+let loading; // 加载动画
+function iniFmData () {
+  return {
+    operationType: '1',//处理方式[0:已回复 1:已转项目  2:已转需求]	
+    publicReply: '',//项目方案 1000	
+    internalRemark: '',//	内部备注 1000	
+    gridId: '',//
+    assistanceUnitIndex: '',
+    assistanceUnitId: '',//	协办单位Id	
+    assistanceUnitType: '',//	 协办单位类型，1社区自组织，2联建单位	
+    staffList: [],// 	勾选人员信息	
+    categoryList: [],//	 	
+    tagList: [],//
+
+    internalFile: [],//	
+    title: '',//		
+
+    publicFile: [],// 	
+    locateAddress: '',//		
+    locateLongitude: '',//	
+    locateDimension: '',//	
+    eventId: '',//	
+  };
+}
+export default {
+  data () {
+    return {
+      btnDisable: false,
+      customerId: localStorage.getItem("customerId"),
+      gridList: [],//所属网格list--场所区域
+      myDepartmentList: [],//部门数组
+      visibleStaffPanel: false,
+      assistanceUnitList: [],//协办单位数组
+      tagList: [],//标签数组
+
+      tagOptions: [],
+      visibleTagPanel: false,
+      selectedTagData: [],
+
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
+
+      formData: iniFmData(),
+      formDataTemp: {
+        assistanceUnitIndex: 0,
+        assistanceUnitId: '',//	协办单位Id	
+        assistanceUnitType: '',//	 协办单位类型，1社区自组织，2联建单位	
+
+        eventId: "",
+        gridId: "63d5ff92ea981b1c58e4914ac894c610",
+        internalRemark: "内部备注",
+        operationType: "1",
+        projectStaffId: "1514068005825622017",
+        publicReply: "项目方案",
+        title: "3123123",
+
+        internalFile: [],
+        staffList: [],
+        tagList: [{
+          id: "46294b3c9f96ee4d0b00e997e06c8f97",
+          isDisable: "enable",
+          name: "车行道、人行道、盲道、无障碍通道、路名牌",
+        },
+        {
+          id: "953bafc1191f784841d9b8da61ec7b9b",
+          isDisable: "enable",
+          name: "城市广场管理",
+        }],
+
+
+      },
+
+      okflag: false,
+
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      eventDetailCopy: {}
+
+    };
+  },
+  components: { selectStaff, foldText },
+  computed: {
+    dataRule () {
+
+      return {
+        categoryList: [
+          { required: true, message: "请填写事件分类", trigger: "blur" },
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" },
+        ],
+        gridId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" },
+        ],
+        staffList: [
+          { required: true, message: "处理部门不能为空", trigger: "blur" },
+        ],
+        publicReply: [
+          { required: true, message: "项目方案不能为空", trigger: "blur" },
+        ],
+
+      };
+    },
+
+
+  },
+  props: {
+    gridId: {//新增是选择的网格id
+      type: String,
+      default: "",
+    },
+    eventId: {
+      type: String,
+      default: "",
+    },
+    eventDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+  watch: {
+    gridId: function (val) {
+
+      this.formData.gridId = val
+
+    },
+    "formData.assistanceUnitIndex": function (val) {
+
+      if (val === "" || this.assistanceUnitList.length === 0) {
+        this.formData.assistanceUnitId = "";
+        this.formData.assistanceUnitType = "";
+      } else {
+        this.formData.assistanceUnitId =
+          this.assistanceUnitList[val].assistanceUnitId;
+        this.formData.assistanceUnitType =
+          this.assistanceUnitList[val].assistanceUnitType;
+      }
+    },
+
+    async selectedTagData (val) {
+      const { tagOptions } = this;
+      this.tagList = await Promise.all(
+        val.map(async (id) => {
+          let ele = [...tagOptions.customized, ...tagOptions.defaulted].find(
+            (item) => item.id == id || item.name == id
+          );
+          if (!ele) {
+            await this.createTag(id);
+            ele = [
+              ...this.tagOptions.customized,
+              ...this.tagOptions.defaulted,
+            ].find((item) => item.name == id);
+            if (!ele)
+              return {
+                id: "",
+                name: ele.name,
+              };
+          }
+          return {
+            id: ele.id,
+            name: ele.name,
+          };
+        })
+      );
+
+      this.tagList = this.tagList.filter((item) => item.id);
+      console.log(this.tagList)
+    },
+  },
+  created () {
+
+
+
+  },
+
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    this.getCategoryList();
+    this.loadGrid();
+    this.getMyDepartmentList();
+    this.getAssistanceUnitList();
+    this.getTagList()
+    // this.formData = { ...this.formDataTemp }
+    if (this.eventId) {
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+      this.formData.gridId = this.eventDetailCopy.gridId
+
+      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
+        }
+
+        this.formData.categoryList = []
+        this.formData.categoryList.push(this.selCateObj)
+      }
+    } else {
+      this.formData.gridId = this.gridId
+
+    }
+  },
+
+  methods: {
+    async getCategoryList () {
+      const url = "/gov/issue/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 () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.formData.categoryList = []
+      this.formData.categoryList.push(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 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
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载处理部门数据
+    async getMyDepartmentList () {
+      const url = "/gov/project/trace/approvalagencylist";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: '',
+        projectStaffId: '',
+      });
+
+      if (code === 0) {
+        this.myDepartmentList = data.subAgencyList;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载协同单位数据
+    async getAssistanceUnitList () {
+      const url = "/heart/icpartyunit/assistanceUnitList";
+
+      const { data, code, msg } = await requestPost(url, {
+        // projectId: this.projectIdCopy,
+      });
+
+      if (code === 0) {
+        this.assistanceUnitList = data;
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //加载标签
+    async getTagList () {
+      const url = "/gov/issue/issueprojecttagdict/list";
+      const { data, code, msg } = await requestPost(url, {
+
+      });
+
+      if (code === 0) {
+        this.tagOptions = {
+          customized: data.customized,
+          defaulted: data.defaulted,
+        };
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleTagChange (val) {
+      console.log(val);
+    },
+    updateProjectTag () {
+      this.visibleTagPanel = false;
+    },
+
+
+    async getProjectInfo () {
+      this.okflag = false
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+
+        } else {
+
+          this.formData.tagList = this.tagList
+          this.okflag = true
+        }
+      });
+    },
+
+    beforeImgUpload (file) {
+      const isLt1M = file.size / 1024 / 1024 < 10;
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return isLt1M;
+    },
+    resetData () {
+
+    },
+    handleImgSuccess (res, file, fileList) {
+      console.log("res.data.url", file);
+      if (res.code === 0 && res.msg === "success") {
+        console.log("res.data.url", res.data.url);
+        this.formData.internalFile.push({
+          format: file.name.split(".").pop(),
+          name: file.name,
+          size: file.size,
+          type: file.raw.type,
+          url: res.data.url,
+        });
+        console.log(this.formData.internalFile);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    handleImgRemove (file) {
+      let index = this.formData.internalFile.findIndex(
+        (item) => item.url == file.response.data.url
+      );
+      this.formData.internalFile.splice(index, 1);
+      console.log(this.formData.internalFile);
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/shequzhili/project-info.scss"
+  scoped
+></style>
+
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+</style>
+
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue b/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue
new file mode 100644
index 000000000..0eeceaa40
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue
@@ -0,0 +1,252 @@
+<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">已完成</el-checkbox>
+      </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: ''
+      },
+
+      status: false,
+      okflag: false,
+
+      eventDetailCopy: {},
+
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
+
+    };
+  },
+  components: {},
+  computed: {
+    dataRule () {
+
+      return {
+        content: [
+          { required: true, message: "回复内容不能为空", trigger: "blur" },
+        ],
+
+      };
+    },
+
+
+  },
+  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));
+
+      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
+        }
+      }
+    }
+  },
+
+  methods: {
+    async getCategoryList () {
+      const url = "/gov/issue/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 () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+
+    },
+
+    //重构树，去除网格
+    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.info("请填写事件分类");
+              return false
+            }
+            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
+        }
+      });
+    },
+
+    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>
+
+
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form.vue b/src/views/modules/shequzhili/issue/cpts/process-form.vue
new file mode 100644
index 000000000..2287fcf9e
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/process-form.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="">
+    <div>
+
+      <el-form ref="ref_form1"
+               :inline="false"
+               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 label="0">转项目</el-radio>
+            <el-radio label="1">关闭</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+      </el-form>
+
+      <div v-if="operationType==='0'">
+        <el-form ref="ref_project_form"
+                 :inline="false"
+                 :model="project"
+                 :rules="projectDataRule">
+          <el-form-item label="处理部门"
+                        label-width="150px"
+                        :class="{'form-item':source==='visiual'}"
+                        prop="staffList">
+            <el-popover placement="bottom"
+                        width="400"
+                        height="400"
+                        v-model="visibleStaffPanel">
+              <div class="f">
+                <select-staff @confirm="(ret) => (project.staffList = ret)"
+                              @close="visibleStaffPanel = false" />
+              </div>
+
+              <div slot="reference">
+                <a v-if="project.staffList.length == 0"
+                   style="cursor: pointer">点击选择</a>
+                <a v-else
+                   style="cursor: pointer">已选 {{ project.staffList.length }} 人</a>
+              </div>
+            </el-popover>
+          </el-form-item>
+          <el-form-item label="项目方案"
+                        prop="publicReply"
+                        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="project.publicReply"></el-input>
+            </div>
+
+          </el-form-item>
+          <el-form-item label="内部备注"
+                        prop="internalRemark"
+                        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="project.internalRemark"></el-input>
+            </div>
+
+          </el-form-item>
+
+        </el-form>
+      </div>
+
+      <div v-if="operationType==='1'">
+        <el-form ref="ref_close_form"
+                 :inline="false"
+                 :model="closedInfo"
+                 :rules="closeDataRule">
+          <el-form-item label="处理结果"
+                        label-width="150px"
+                        :class="{'form-item':source==='visiual'}"
+                        prop="resolveType">
+            <el-radio-group :class="{'form-item':source==='visiual'}"
+                            v-model="closedInfo.resolveType">
+
+              <el-radio label="resolved">已解决</el-radio>
+              <el-radio label="unresolved">无需解决</el-radio>
+
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="关闭原因"
+                        prop="closeReason"
+                        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="closedInfo.closeReason"></el-input>
+            </div>
+
+          </el-form-item>
+
+        </el-form>
+
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+import selectStaff from "@/views/components/selectStaff";
+
+let loading; // 加载动画
+
+export default {
+  data () {
+    return {
+
+      casOptions: [],
+      iscascaderShow: 0,
+      selCategoryArray: [],
+      selCateObj: {},
+      optionProps: {
+        multiple: false,
+        value: 'id',
+        label: 'name',
+        children: 'subCategory',
+      },
+
+      operationType: '0',
+      visibleStaffPanel: false,
+
+      okflag: false,
+
+      eventDetailCopy: {},
+
+      closedInfo: {
+        resolveType: 'resolved',
+        closeReason: '',//关闭原因
+      },
+
+      project: {
+        staffList: [],
+        internalRemark: '',
+        publicReply: '',
+      }
+
+    };
+  },
+  components: {
+    selectStaff,
+
+  },
+  computed: {
+    closeDataRule () {
+      return {
+        resolveType: [
+          { required: true, message: "处理结果不能为空", trigger: "change" },
+        ],
+        closeReason: [
+          { required: true, message: "关闭原因不能为空", trigger: "change" },
+        ],
+
+      };
+    },
+    projectDataRule () {
+      return {
+        staffList: [
+          { required: true, message: "处理部门不能为空", trigger: "change" },
+        ],
+
+        publicReply: [
+          { required: true, message: "项目方案不能为空", trigger: "change" },
+        ],
+
+      };
+    },
+
+
+  },
+  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'
+    }
+  },
+
+  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));
+
+    }
+
+  },
+
+  methods: {
+    handleChangeOperationType (val) {
+      if (val === '0') {
+        this.$refs['ref_project_form'].resetFields()
+      } else {
+        this.$refs['ref_close_form'].resetFields()
+      }
+
+    },
+    async getProcessInfo () {
+      this.okflag = false
+
+      if (this.operationType === '0') {
+        this.$refs["ref_project_form"].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj);
+
+          } else {
+            this.okflag = true
+          }
+        });
+
+      } else if (this.operationType === '1') {
+        this.$refs["ref_close_form"].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj);
+
+          } else {
+            this.okflag = true
+          }
+        });
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData();
+
+    },
+    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>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
new file mode 100644
index 000000000..071ce19fe
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-table :data="suggestionList"
+                border
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                class="table"
+                style="width: 100%"
+                :height="maxTableHeight">
+
+        <el-table-column label="序号"
+                         fixed="left"
+                         type="index"
+                         align="center"
+                         width="50" />
+
+        <el-table-column prop="userShowName"
+                         align="center"
+                         width="80"
+                         label="姓名"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="aititudeShow"
+                         label="投票"
+                         width="80"
+                         align="center"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="timeShow"
+                         align="center"
+                         width="150"
+                         label="时间"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="suggestion"
+                         align="center"
+                         min-width="180"
+                         :show-overflow-tooltip="true"
+                         label="建议">
+        </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">
+        </el-pagination>
+      </div>
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import dateFormat from "dai-js/tools/dateFormat";
+import { mapGetters } from "vuex";
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+
+      suggestionList: [],
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (topicInfo) {
+      this.startLoading()
+
+      await this.getSuggestion()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+    async getSuggestion () {
+      const url = "/gov/issue/issuesuggestion/list"
+
+      let params = {
+        issueId: this.issueId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        data.forEach(element => {
+          element.userShowName = element.userShowName || '匿名'
+          element.aititudeShow = element.aititude === 'opposition' ? '反对' : '支持'
+          element.timeShow = dateFormat(
+            new Date(element.publishTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+        });
+        this.suggestionList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleSizeChange (val) {
+
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getSuggestion();
+    },
+    handleCurrentChange (val) {
+
+      this.pageNo = val;
+      this.getSuggestion();
+    },
+    handleCancle () {
+      // this.resetData()
+      this.$emit('diaDetailClose')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.topicInfo = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    maxTableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+
+  },
+  props: {
+    issueId: {
+      type: String,
+      default: ''
+    },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/cpts/topicDetail.vue b/src/views/modules/shequzhili/issue/cpts/topicDetail.vue
new file mode 100644
index 000000000..69267555b
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/topicDetail.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">话题内容：</span>
+            <span>{{ topicInfo.topicContent||'--'  }}</span>
+          </div>
+          <div class="info-prop"
+               v-if="topicInfo.photoList&&topicInfo.photoList.length>0">
+            <span class="info-title-2">图片：</span>
+
+            <div class="info-pics">
+
+              <img v-for="(item,index) in topicInfo.photoList"
+                   style="width:80px;height:80px"
+                   :key="index"
+                   :src="item.url"
+                   @click="watchImg(item)">
+
+            </div>
+          </div>
+          <div class="info-prop"
+               v-if="voiceList&&voiceList.length>0">
+            <span class="info-title-2">音频：</span>
+
+            <audio controls>
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in voiceList" />
+            </audio>
+
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发布人：</span>
+            <span>{{ topicInfo.topicPublisher||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发布时间：</span>
+            <span>{{ topicInfo.topicPublisherTimeShow||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">联系方式：</span>
+            <span>{{ topicInfo.topicPublisherMobile||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">发布小组：</span>
+            <span>{{ topicInfo.groupName||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import dateFormat from "dai-js/tools/dateFormat";
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+
+      topicInfo: {},
+
+      voiceList: [],
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (topicInfo) {
+      this.startLoading()
+      this.topicInfo = JSON.parse(JSON.stringify(topicInfo))
+      if (this.topicInfo.topicPublishTime) {
+        this.topicInfo.topicPublisherTimeShow = dateFormat(
+          new Date(this.topicInfo.topicPublishTime * 1000),
+          "yyyy-MM-dd hh:mm"
+        );
+      }
+
+      await this.getAttechment()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+    async getAttechment () {
+      const url = "/resi/group/topic/topicattachmentlist"
+
+      let params = {
+        topicId: this.topicInfo.topicId,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.voiceList = data.voiceList
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('diaDetailClose')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.topicInfo = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+
+
+  },
+  props: {
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
new file mode 100644
index 000000000..4bfc5fbd6
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -0,0 +1,509 @@
+<template>
+  <div class="div_main">
+    <div v-show="pageType == 'list'">
+      <div class="div_search">
+        <el-form :inline="true"
+                 :model="formData"
+                 ref="ref_searchform"
+                 :label-width="'90px'">
+          <div>
+
+            <el-form-item label="所属组织"
+                          prop="orgId">
+              <el-cascader class="item_width_1"
+                           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="item_width_1"
+                        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="item_width_2"
+                              size="small"
+                              type="date"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value="yyyy-MM-dd"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="formData.endTime"
+                              :picker-options="endPickerOptions"
+                              class="item_width_2 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="applyStatus">
+              <el-select class="item_width_2"
+                         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-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </div>
+        </el-form>
+      </div>
+
+      <div class="div_table">
+
+        <div class="div_btn">
+
+          <el-button @click="handleExport"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
+
+        </div>
+
+        <el-table :data="tableData"
+                  border
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  class="table"
+                  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"
+                         class="div-table-button--edit">审核</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>
+    <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>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import issueInfo from "./cpts/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: "驳回",
+        },
+
+      ],
+
+
+      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 - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...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.getOrgTreeList();
+    this.getTableData();
+
+  },
+  methods: {
+
+    handleSearch (val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    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 = ''
+      }
+
+
+    },
+
+    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 handleExport () {
+      const url = "/gov/project/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]
+          );
+          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.issueId
+      const url = "/gov/issue/manage/votingissuedetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+
+        this.issueDetailData = { ...data };
+        this.pageType = "info";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async handleAudit (row) {
+      this.issueId = row.issueId
+      // this.issueId = '29bbec4b08bb11edbb6b0050568f8cf7'
+      const url = "/gov/issue/manage/votingissuedetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+
+        this.issueDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "list";
+      this.issueId = ""
+      this.getTableData()
+
+    },
+    handleOk () {
+      this.pageType = "list";
+      this.issueId = ""
+      this.pageNo = 1
+      this.getTableData()
+
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+      this.getTableData();
+    },
+
+
+
+    async getTableData () {
+      const url = "/gov/issue/issueaudit/auditList";
+      // const url = "http://yapi.elinkservice.cn/mock/102/gov/issue/issue/allIssueList";
+      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);
+      }
+    },
+
+
+    handleSizeChange (val) {
+
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange (val) {
+
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    resetSearch () {
+      this.formData = {
+        orgId: '',
+        orgType: '',
+        issueTitle: '',
+        startTime: '',
+        endTime: '',
+        applyStatus: '',
+
+      }
+
+
+
+      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
+          }
+        })
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_search {
+  .item_width_2 {
+    width: 200px;
+  }
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
new file mode 100644
index 000000000..16d595690
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -0,0 +1,553 @@
+<template>
+  <div class="div_main">
+    <div v-show="pageType == 'list'">
+      <div class="div_search">
+        <el-form :inline="true"
+                 :model="formData"
+                 ref="ref_searchform"
+                 :label-width="'90px'">
+          <div>
+
+            <el-form-item label="所属组织"
+                          prop="orgId">
+              <el-cascader class="item_width_1"
+                           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="item_width_1"
+                        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="item_width_2"
+                              size="small"
+                              type="date"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value="yyyy-MM-dd"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="formData.endTime"
+                              :picker-options="endPickerOptions"
+                              class="item_width_2 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="issueStatus">
+              <el-select class="item_width_2"
+                         v-model="formData.issueStatus"
+                         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-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </div>
+        </el-form>
+      </div>
+
+      <div class="div_table">
+
+        <div class="div_btn">
+
+          <el-button @click="handleExport"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
+
+        </div>
+
+        <el-table :data="tableData"
+                  border
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  class="table"
+                  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="createdTime"
+                           align="center"
+                           width="180"
+                           :show-overflow-tooltip="true"
+                           label="转议题时间">
+          </el-table-column>
+
+          <el-table-column prop="supportCount"
+                           align="center"
+                           width="80"
+                           label="支持"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="oppositionCount"
+                           align="center"
+                           width="80"
+                           label="反对"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="issueStatusName"
+                           align="center"
+                           label="状态"
+                           width="80"
+                           :show-overflow-tooltip="true">
+            <!-- <template slot-scope="scope">
+
+              <span v-if="scope.row.issueStatus==='voting'">表决中</span>
+              <span v-else-if="scope.row.issueStatus==='shift_project'">已转项目</span>
+              <span v-else-if="scope.row.issueStatus==='closed'">已关闭</span>
+              <span v-else>--</span>
+            </template> -->
+          </el-table-column>
+
+          <el-table-column fixed="right"
+                           label="操作"
+                           align="center"
+                           width="100">
+            <template slot-scope="scope">
+
+              <!-- <el-button v-if="scope.row.issueStatus==='voting'&& agencyId===scope.row.orgId"
+                         @click="handleDispose(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">处理</el-button> -->
+              <el-button v-if="scope.row.issueStatus==='voting'"
+                         @click="handleDispose(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">处理</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>
+    <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>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import issueInfo from "./cpts/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: "voting",
+          label: "表决中",
+        },
+        {
+          value: "shift_project",
+          label: "已转项目",
+        },
+        {
+          value: "closed",
+          label: "已关闭",
+        },
+      ],
+
+
+      formData: {
+        orgId: '',
+        orgType: '',
+        issueTitle: '',
+        startTime: '',
+        endTime: '',
+        issueStatus: '',
+      },
+      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 - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...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.getOrgTreeList();
+    this.getTableData();
+
+  },
+  methods: {
+
+    handleSearch (val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    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 = ''
+      }
+
+
+    },
+
+    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 handleExport () {
+      const url = "/gov/project/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]
+          );
+          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.issueId
+      const url = "/gov/issue/manage/votingissuedetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+
+        this.issueDetailData = { ...data };
+        this.pageType = "info";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async handleDispose (row) {
+      this.issueId = row.issueId
+      // this.issueId = '29bbec4b08bb11edbb6b0050568f8cf7'
+      const url = "/gov/issue/manage/votingissuedetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+
+        this.issueDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+
+
+    handleClose () {
+      this.pageType = "list";
+      this.issueId = ""
+      this.getTableData()
+
+    },
+    handleOk () {
+      this.pageType = "list";
+      this.issueId = ""
+      this.pageNo = 1
+      this.getTableData()
+
+
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+      this.getTableData();
+    },
+
+
+
+    async getTableData () {
+      const url = "/gov/issue/issue/allIssueList";
+      // const url = "http://yapi.elinkservice.cn/mock/102/gov/issue/issue/allIssueList";
+      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.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);
+      }
+    },
+
+
+    handleSizeChange (val) {
+
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange (val) {
+
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    resetSearch () {
+      this.formData = {
+        orgId: '',
+        orgType: '',
+        issueTitle: '',
+        startTime: '',
+        endTime: '',
+        issueStatus: '',
+
+      }
+
+
+
+      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
+          }
+        })
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_search {
+  .item_width_2 {
+    width: 200px;
+  }
+}
+</style>
diff --git a/src/views/modules/workPc/guidance/addForm.vue b/src/views/modules/workPc/guidance/addForm.vue
index 8bea54ce7..ac33b8c1b 100644
--- a/src/views/modules/workPc/guidance/addForm.vue
+++ b/src/views/modules/workPc/guidance/addForm.vue
@@ -106,7 +106,8 @@
           <el-form-item class="block"
                         label="附件"
                         prop="attach">
-            <el-upload class="upload-demo"
+            <el-upload :headers="$getElUploadHeaders()"
+                       class="upload-demo"
                        :action="uploadUlr"
                        :data="{customerId:customerId}"
                        accept=".doc,.pdf,.xls,.docx,.xlsx"

From b9f6b2b6cd396b42e810814bbe72971818fbed64 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 11 Oct 2022 16:08:07 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E8=AE=AE=E9=A2=98=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-info.vue      |  17 +-
 .../shequzhili/issue/cpts/eventDetail.vue     |  54 +-
 .../shequzhili/issue/cpts/issue-detail.vue    |  11 +-
 .../issue/cpts/process-form-demand.vue        | 703 ------------------
 .../issue/cpts/process-form-project.vue       | 640 ----------------
 .../issue/cpts/process-form-replay.vue        | 252 -------
 .../issue/cptsAudit/eventDetail.vue           | 204 +++++
 .../issue/cptsAudit/issue-detail.vue          | 156 ++++
 .../shequzhili/issue/cptsAudit/issue-info.vue | 308 ++++++++
 .../issue/cptsAudit/process-form.vue          | 188 +++++
 .../issue/cptsAudit/topicDetail.vue           | 186 +++++
 .../shequzhili/issue/issueAuditList.vue       |  41 +-
 .../modules/shequzhili/issue/issueList.vue    |  30 +-
 13 files changed, 1131 insertions(+), 1659 deletions(-)
 delete mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-demand.vue
 delete mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-project.vue
 delete mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-replay.vue
 create mode 100644 src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
 create mode 100644 src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
 create mode 100644 src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
 create mode 100644 src/views/modules/shequzhili/issue/cptsAudit/process-form.vue
 create mode 100644 src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue

diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index f901c55aa..5da15c03a 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -98,7 +98,7 @@
                   </div>
                 </div>
 
-                <div v-if="item.type==='project'">
+                <div v-else-if="item.type==='project'">
                   <div v-if="item.processName==='回复'">
                     <div class="detail">
                       <div class="detail-field">回复人：</div>
@@ -152,7 +152,7 @@
                   </div>
                 </div>
 
-                <div v-if="item.type==='demand'">
+                <div v-else-if="item.type==='demand'">
                   <div v-if="item.processName==='回复'">
                     <div class="detail">
                       <div class="detail-field">回复人：</div>
@@ -181,6 +181,17 @@
 
                   </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>
             </div>
           </div>
@@ -600,7 +611,7 @@ export default {
         this.$message.error(msg);
       }
 
-      if (this.eventDetailCopy.status === 'processing') {
+      if (this.issueDetailData.issueStatus === 'voting') {
         this.issuePageType = 'dispose'
       } else {
         this.issuePageType = 'info'
diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
index 0bfe2e7a5..5a9b8e4b3 100644
--- a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
@@ -6,52 +6,74 @@
         <div class="m-info">
           <div class="info-prop">
             <span class="info-title-2">所属网格：</span>
-            <span>{{ eventDetailData.topicContent||'--'  }}</span>
+            <span>{{ eventDetailData.gridName||'--'  }}</span>
           </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发生时间：</span>
+            <span>{{ eventDetailData.happenTime||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">事件内容：</span>
+            <span>{{ eventDetailData.eventContent||'--'  }}</span>
+          </div>
+
           <div class="info-prop"
-               v-if="eventDetailData.photoList&&eventDetailData.photoList.length>0">
+               v-if="eventDetailData.imageList&&eventDetailData.imageList.length>0">
             <span class="info-title-2">图片：</span>
 
             <div class="info-pics">
 
-              <img v-for="(item,index) in eventDetailData.photoList"
+              <img v-for="(item,index) in eventDetailData.imageList"
                    style="width:80px;height:80px"
                    :key="index"
-                   :src="item.url"
+                   :src="item"
                    @click="watchImg(item)">
 
             </div>
           </div>
           <div class="info-prop"
-               v-if="voiceList&&voiceList.length>0">
+               v-if="eventDetailData.voiceList&&eventDetailData.voiceList.length>0">
             <span class="info-title-2">音频：</span>
 
             <audio controls>
               <source :src="item.url"
                       type=""
                       :key="item.url"
-                      v-for="item in voiceList" />
+                      v-for="item in eventDetailData.voiceList" />
             </audio>
 
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">发布人：</span>
-            <span>{{ eventDetailData.topicPublisher||'--' }}</span>
+            <span class="info-title-2">反映渠道：</span>
+            <span>{{ eventDetailData.sourceTypeName||'--'  }}</span>
           </div>
-
           <div class="info-prop">
-            <span class="info-title-2">发布时间：</span>
-            <span>{{ eventDetailData.topicPublisherTimeShow||'--'  }}</span>
+            <span class="info-title-2">地址：</span>
+            <span>{{ eventDetailData.address||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">报事人：</span>
+            <span>{{ eventDetailData.name||'--'  }}</span>
           </div>
-
           <div class="info-prop">
-            <span class="info-title-2">联系方式：</span>
-            <span>{{ eventDetailData.topicPublisherMobile||'--'  }}</span>
+            <span class="info-title-2">手机号：</span>
+            <span>{{ eventDetailData.mobile||'--'  }}</span>
           </div>
           <div class="info-prop">
-            <span class="info-title-2">发布小组：</span>
-            <span>{{ eventDetailData.groupName||'--'  }}</span>
+            <span class="info-title-2">身份证号：</span>
+            <span>{{ eventDetailData.idCard||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">痛点难点：</span>
+            <span>{{ eventDetailData.difficultPointName||'--'  }}</span>
+          </div>
+          <div v-if="eventDetailData.satisfactionName"
+               class="info-prop">
+            <span class="info-title-2">满意度：</span>
+            <span>{{ eventDetailData.satisfactionName||'--'  }}</span>
           </div>
 
         </div>
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index e3d886b38..c4ab9ad7e 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -54,10 +54,10 @@
                  @click="handleToTopic">查看话题>--</div>
           </div>
 
-          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+          <div v-if="issueInfo.sourceType==='resi_topic'"
+               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">意见和建议：</span>
-            <div v-if="issueInfo.sourceType==='resi_topic'"
-                 class="line"
+            <div class="line"
                  @click="handleToSuggest">查看全部</div>
           </div>
 
@@ -168,11 +168,10 @@
             </el-popover>
           </div>
 
-          <div v-if="issueInfo.issueStatus==='closed'"
+          <div v-if="issueInfo.issueStatus==='closed'&&issueInfo.sourceType==='resi_topic'"
                :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">满意度评价：</span>
-            <div v-if="issueInfo.sourceType==='resi_topic'"
-                 class="line"
+            <div class="line"
                  @click="handleToEvaluation">查看全部</div>
           </div>
 
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue b/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue
deleted file mode 100644
index 77c0193f0..000000000
--- a/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue
+++ /dev/null
@@ -1,703 +0,0 @@
-<template>
-  <div class="">
-    <el-form ref="ref_form"
-             :inline="false"
-             :model="formData"
-             :rules="dataRule"
-             label-width="100px">
-      <!-- <el-form-item label="事件分类"
-                    label-width="150px"
-                    prop="categoryId">
-        <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>
-      </el-form-item> -->
-      <el-form-item label="服务内容"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="content">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.content"
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                    type="textarea"
-                    clearable
-                    class="cell-width-area"
-                    placeholder="请输入内容"></el-input>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="服务类型"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="categoryCode">
-        <div :class="{'visiual-form':source==='visiual'}">
-
-          <el-cascader v-model="formData.categoryCode"
-                       :options="demandOptions"
-                       clearable
-                       class="cell-width-1"
-                       @change="handleCateSlect"></el-cascader>
-        </div>
-
-      </el-form-item>
-
-      <el-form-item label="服务时间"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="wantServiceTime">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-date-picker v-model="formData.wantServiceTime"
-                          type="datetime"
-                          class="cell-width-1"
-                          clearable
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="需求人"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="demandUserName">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserName"
-                    class="cell-width-1"></el-input>
-        </div>
-
-      </el-form-item>
-      <el-form-item label="联系电话"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="demandUserMobile">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserMobile"
-                    class="cell-width-1"></el-input>
-        </div>
-
-      </el-form-item>
-      <el-form-item label="服务地点"
-                    prop="serviceLocation"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    style="display: block">
-
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input class="cell-width-1"
-                    v-model="formData.serviceLocation">
-          </el-input>
-        </div>
-
-      </el-form-item>
-      <el-form-item label="位置坐标"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="longitude"
-                    label-width="150px"
-                    style="display: block">
-        <div style="width:500px">
-
-          <div class="div_map">
-            <div id="app_map">
-
-            </div>
-            <div class="div_searchmap">
-              <el-input class="cell-width-map"
-                        maxlength="50"
-                        size="mini"
-                        placeholder="请输入关键字"
-                        v-model="keyWords">
-              </el-input>
-              <el-button style="margin-left: 10px"
-                         type="primary"
-                         size="mini"
-                         @click="handleSearchMap">查询</el-button>
-            </div>
-          </div>
-
-          <!-- <div style="margin-top: 10px">
-            <span>经度</span>
-            <el-input class="item_width_3"
-                      maxlength="50"
-                      placeholder="请输入经度"
-                      v-model="formData.longitude">
-            </el-input>
-            <span style="margin-left: 20px">纬度</span>
-            <el-input class="item_width_3"
-                      maxlength="50"
-                      placeholder="请输入纬度"
-                      v-model="formData.latitude">
-            </el-input>
-          </div> -->
-        </div>
-      </el-form-item>
-
-      <el-form-item label="门牌号"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    prop="locationDetail">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.locationDetail"
-                    class="cell-width-1"></el-input>
-        </div>
-
-      </el-form-item>
-
-      <el-form-item label="服务方"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    prop="serverId">
-
-        <template>
-          <div :class="[{'single-select':source==='visiual'},'sel-service']">
-            <el-select v-model="formData.serviceType"
-                       class="cell-width-1"
-                       placeholder="请选择"
-                       clearable
-                       @change="handleServiceChange('add', $event)">
-              <el-option v-for="item in serviceOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-            -
-            <el-select v-model="formData.serverId"
-                       class="cell-width-1"
-                       filterable
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in serviceOptiondList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-        </template>
-      </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; // 加载动画
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-function iniFmData () {
-  return {
-    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转服务]	
-    icEventId: '',//事件Id	
-    gridId: '',//	
-    categoryCode: '',//	二级服务分类编码	
-    parentCode: '',//	父级服务分类编码	
-    content: '',//		服务内容1000字	
-    reportType: 'self_help',//	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help	
-    reportUserName: '',//	上报人姓名	
-    reportUserMobile: '',//	自身上报时存储注册居民的手机号	
-    reportTime: '',//	上报时间	
-    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
-    demandUserName: '',//	需求人姓名	
-    demandUserMobile: '',//需求人联系电话	
-    wantServiceTime: '',//	希望服务时间
-    serviceType: '',
-    serverId: '',
-    locationDetail: '',
-    serviceLocation: '',//事件地址	
-    latitude: '',//	经度	
-    longitude: '',//维度	
-    // categoryId: ''
-  };
-}
-export default {
-  data () {
-    return {
-      btnDisable: false,
-      customerId: localStorage.getItem("customerId"),
-      demandOptions: [],
-      serviceOptions: [
-      ],
-      serviceOptiondList: [],
-
-      casOptions: [],
-      iscascaderShow: 0,
-      selCategoryArray: [],
-      selCateObj: {},
-      optionProps: {
-        multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
-      },
-
-      formData: iniFmData(),
-
-
-      okflag: false,
-      //地图相关
-      keyWords: '',
-
-      eventDetailCopy: {}
-    };
-  },
-  components: {},
-  computed: {
-    dataRule () {
-
-      return {
-        // categoryId: [
-        //   { required: true, message: "请填写事件分类", trigger: "blur" },
-        // ],
-        content: [
-          { required: true, message: "服务内容不能为空", trigger: "blur" },
-        ],
-        categoryCode: [
-          { required: true, message: "服务类型不能为空", trigger: "blur" },
-        ],
-        wantServiceTime: [
-          { required: true, message: "服务时间不能为空", trigger: "blur" },
-        ],
-        demandUserName: [
-          { required: true, message: "需求人不能为空", trigger: "blur" },
-        ],
-        demandUserMobile: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
-        ],
-        serviceLocation: [
-          { required: true, message: "服务地点不能为空", trigger: "blur" },
-        ],
-        serverId: [
-          { required: true, message: "服务方不能为空", trigger: "blur" },
-        ],
-
-      };
-    },
-
-
-  },
-  props: {
-
-    demandUserId: {
-      type: String,
-      default: "",
-    },
-    demandUserName: {
-      type: String,
-      default: "",
-    },
-    demandUserMobile: {
-      type: String,
-      default: "",
-    },
-    eventId: {
-      type: String,
-      default: "",
-    },
-
-    eventDetailData: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: 'manage'
-    }
-
-  },
-  watch: {
-    demandUserName: function (val) {
-
-      this.formData.reportUserName = val
-      this.formData.demandUserName = val
-    },
-    demandUserMobile: function (val) {
-
-      this.formData.reportUserMobile = val
-      this.formData.demandUserMobile = val
-    },
-    demandUserId: function (val) {
-
-      this.formData.demandUserId = val
-    },
-  },
-  created () {
-
-
-  },
-
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-    this.getCategoryList();
-    this.getDemandOptions();
-    this.getServiceOption()
-    // this.formData = { ...this.formDataTemp }
-    this.initMap()
-
-    if (this.eventId) {
-      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
-      this.formData.demandUserId = this.eventDetailCopy.reportUserId
-      this.formData.demandUserName = this.eventDetailCopy.name
-      this.formData.demandUserMobile = this.eventDetailCopy.mobile
-
-      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-        // this.selCategoryArray = []
-        // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
-        // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
-        // this.formData.categoryId = this.eventDetailCopy.categoryId
-
-        // this.selCateObj = {
-        //   name: this.eventDetailCopy.categoryName,
-        //   id: this.eventDetailCopy.categoryId
-        // }
-      }
-
-    } else {
-      this.formData.demandUserName = this.demandUserName
-      this.formData.demandUserMobile = this.demandUserMobile
-      this.formData.demandUserId = this.demandUserId
-    }
-
-  },
-
-  methods: {
-
-    async getCategoryList () {
-      const url = "/gov/issue/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 () {
-      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
-      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      this.formData.categoryId = this.selCateObj.id
-    },
-
-    //重构树，去除网格
-    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 getDemandOptions () {
-      const url = "/heart/icresidemanddict/demandoption"
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.demandOptions = this.getFlagData(
-          this.getTreeData(data),
-          "usableFlag"
-        );
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    async getServiceOption () {
-      const url = "/sys/dict/data/dictlist"
-      let params = { dictType: "user_demand_service_type", }
-
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.serviceOptions = data;
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    getTreeData (data) {
-      if (!Array.isArray(data)) return [];
-      let arr = data.map((item) => {
-        let _item = {};
-        if (item.children) {
-          if (item.children.length === 0)
-            _item = { ...item, children: undefined };
-          else _item = { ...item, children: this.getTreeData(item.children) };
-        } else {
-          _item = { ...item };
-        }
-        return _item;
-      });
-      return arr;
-    },
-    getFlagData (data, flag) {
-      if (!Array.isArray(data)) return [];
-      let arr1 = data.filter((item) => item[flag]);
-      let arr2 = arr1.map((item) => {
-        if (item.children)
-          return { ...item, children: this.getFlagData(item.children, flag) };
-        else return item;
-      });
-      // console.log('arrr-oppp', arr2)
-      return arr2;
-    },
-
-    handleCateSlect (val) {
-      console.log("val", val);
-      if (val.length === 1) {
-        this.demandOptions.forEach((item) => {
-          if (item.value == val[0]) this.formData.parentCode = item.pvalue;
-        });
-        this.formData.categoryCode = val[0];
-      } else {
-        this.formData.parentCode = val[0];
-        this.formData.categoryCode = val[1];
-      }
-    },
-
-    handleServiceChange (type, val) {
-      if (val === "social_org") {
-        if (type === "add") {
-          this.getServiceuserList(val, "add_demand");
-        } else {
-          this.getServiceuserList(val, "query_demand");
-        }
-      } else {
-        this.getServiceuserList(val, "");
-      }
-    },
-
-    async getServiceuserList (serviceType, query) {
-
-      if (!serviceType) return false;
-      const { demandUserId } = this.formData;
-      const params = {
-        serviceName: "",
-        serviceType: serviceType,
-        queryPurpose: query,
-      };
-
-
-      const url = "/heart/userdemand/servicelist"
-
-
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.serviceOptiondList = data.filter(
-          (item) => item.value != demandUserId
-        );
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
-
-    async getDemandInfo () {
-      this.okflag = false
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          // this.formData.categoryId = this.selCateObj.id
-        } else {
-
-          this.okflag = true
-        }
-      });
-    },
-
-
-    resetData () {
-
-    },
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_map'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
-
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
-        {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
-        }
-      ])
-    },
-
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
-    },
-
-    handleMoveCenter () {
-      //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
-    },
-
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
-      } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-      }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.formData.serviceLocation = result.result.address
-          // 显示搜索到的地址
-        });
-    },
-
-
-
-    // 开启加载动画
-    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>
-
-
-
-
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-project.vue b/src/views/modules/shequzhili/issue/cpts/process-form-project.vue
deleted file mode 100644
index b8d3af313..000000000
--- a/src/views/modules/shequzhili/issue/cpts/process-form-project.vue
+++ /dev/null
@@ -1,640 +0,0 @@
-<template>
-  <div class="">
-    <el-form ref="ref_form"
-             :inline="false"
-             :model="formData"
-             :rules="dataRule"
-             label-width="100px">
-      <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="title"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    style="display: block">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input class="cell-width-1"
-                    maxlength="50"
-                    placeholder="请输入项目标题"
-                    v-model="formData.title">
-          </el-input>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="所属网格	"
-                    prop="gridId"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    style="display: block">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <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>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="处理部门"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="staffList">
-        <el-popover placement="bottom"
-                    width="400"
-                    height="400"
-                    v-model="visibleStaffPanel">
-          <div class="f">
-            <select-staff @confirm="(ret) => (formData.staffList = ret)"
-                          @close="visibleStaffPanel = false" />
-          </div>
-
-          <div slot="reference">
-            <a v-if="formData.staffList.length == 0"
-               style="cursor: pointer">点击选择</a>
-            <a v-else
-               style="cursor: pointer">已选 {{ formData.staffList.length }} 人</a>
-          </div>
-        </el-popover>
-      </el-form-item>
-
-      <!-- <el-form-item label="协办单位"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="assistanceUnitIndex">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-select v-model.trim="formData.assistanceUnitIndex"
-                     placeholder="请选择"
-                     class="cell-width-1">
-            <el-option v-for="(item, index) in assistanceUnitList"
-                       :key="item.assistanceUnitId"
-                       :label="item.assistanceUnitName"
-                       :value="index">
-            </el-option>
-          </el-select>
-        </div>
-      </el-form-item> -->
-
-      <el-form-item label="项目方案"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="publicReply">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input type="textarea"
-                    class="cell-width-area"
-                    :rows="2"
-                    placeholder="请输入项目方案"
-                    v-model="formData.publicReply">
-          </el-input>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="内部备注"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="internalRemark">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input type="textarea"
-                    class="cell-width-area"
-                    :rows="2"
-                    placeholder="请输入内部备注"
-                    v-model="formData.internalRemark">
-          </el-input>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="图片/附件："
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="internalFile">
-        <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
-                   :action="uploadUlr"
-                   :data="{ customerId: customerId }"
-                   :show-file-list="true"
-                   :on-success="handleImgSuccess"
-                   :on-remove="handleImgRemove"
-                   :before-upload="beforeImgUpload">
-          <i v-if="source==='manage'"
-             :class="['el-icon-plus']"></i>
-          <img v-else
-               style="width:27px;height:27px"
-               src="@/assets/img/file-add.png">
-        </el-upload>
-      </el-form-item>
-
-      <el-form-item label="标签"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="tagList">
-
-        <fold-text v-if="tagList.length>0"
-                   style="width: 300px"
-                   :row="3">
-          <div :key="item.name"
-               class="tag-name"
-               v-for="item in tagList">
-            {{ item.name }}
-          </div>
-        </fold-text>
-
-        <el-popover placement="top"
-                    width="450"
-                    height="450"
-                    v-model="visibleTagPanel">
-          <div class="f"
-               style="min-height: 120px">
-            <h2>选择标签</h2>
-            <el-select style="width: 350px"
-                       v-model="selectedTagData"
-                       multiple
-                       allow-create
-                       filterable
-                       placeholder="请选择"
-                       @change="handleTagChange">
-              <el-option-group label="自定义标签">
-                <el-option v-for="item in tagOptions.customized"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id">
-                </el-option>
-              </el-option-group>
-
-              <el-option-group label="常用标签">
-                <el-option v-for="item in tagOptions.defaulted"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id">
-                </el-option>
-              </el-option-group>
-            </el-select>
-
-            <el-button style="margin-left: 10px"
-                       size="small"
-                       type="danger"
-                       @click="updateProjectTag">关闭</el-button>
-          </div>
-          <div slot="reference">
-            <el-button v-if="source==='manage'"
-                       size="small"
-                       type="">选择</el-button>
-            <div v-else
-                 class="one-btn">选择</div>
-          </div>
-        </el-popover>
-      </el-form-item>
-
-    </el-form>
-
-  </div>
-</template>
-
-<script>
-import { Loading } from "element-ui"; // 引入Loading服务
-import { requestPost } from "@/js/dai/request";
-import selectStaff from "@/views/components/selectStaff";
-import formVltHelper from "dai-js/tools/formVltHelper";
-import foldText from "@/views/components/foldText";
-
-import { isCard } from "@/utils/validate";
-
-let loading; // 加载动画
-function iniFmData () {
-  return {
-    operationType: '1',//处理方式[0:已回复 1:已转项目  2:已转需求]	
-    publicReply: '',//项目方案 1000	
-    internalRemark: '',//	内部备注 1000	
-    gridId: '',//
-    assistanceUnitIndex: '',
-    assistanceUnitId: '',//	协办单位Id	
-    assistanceUnitType: '',//	 协办单位类型，1社区自组织，2联建单位	
-    staffList: [],// 	勾选人员信息	
-    categoryList: [],//	 	
-    tagList: [],//
-
-    internalFile: [],//	
-    title: '',//		
-
-    publicFile: [],// 	
-    locateAddress: '',//		
-    locateLongitude: '',//	
-    locateDimension: '',//	
-    eventId: '',//	
-  };
-}
-export default {
-  data () {
-    return {
-      btnDisable: false,
-      customerId: localStorage.getItem("customerId"),
-      gridList: [],//所属网格list--场所区域
-      myDepartmentList: [],//部门数组
-      visibleStaffPanel: false,
-      assistanceUnitList: [],//协办单位数组
-      tagList: [],//标签数组
-
-      tagOptions: [],
-      visibleTagPanel: false,
-      selectedTagData: [],
-
-      casOptions: [],
-      iscascaderShow: 0,
-      selCategoryArray: [],
-      selCateObj: {},
-      optionProps: {
-        multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
-      },
-
-      formData: iniFmData(),
-      formDataTemp: {
-        assistanceUnitIndex: 0,
-        assistanceUnitId: '',//	协办单位Id	
-        assistanceUnitType: '',//	 协办单位类型，1社区自组织，2联建单位	
-
-        eventId: "",
-        gridId: "63d5ff92ea981b1c58e4914ac894c610",
-        internalRemark: "内部备注",
-        operationType: "1",
-        projectStaffId: "1514068005825622017",
-        publicReply: "项目方案",
-        title: "3123123",
-
-        internalFile: [],
-        staffList: [],
-        tagList: [{
-          id: "46294b3c9f96ee4d0b00e997e06c8f97",
-          isDisable: "enable",
-          name: "车行道、人行道、盲道、无障碍通道、路名牌",
-        },
-        {
-          id: "953bafc1191f784841d9b8da61ec7b9b",
-          isDisable: "enable",
-          name: "城市广场管理",
-        }],
-
-
-      },
-
-      okflag: false,
-
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
-      eventDetailCopy: {}
-
-    };
-  },
-  components: { selectStaff, foldText },
-  computed: {
-    dataRule () {
-
-      return {
-        categoryList: [
-          { required: true, message: "请填写事件分类", trigger: "blur" },
-        ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" },
-        ],
-        gridId: [
-          { required: true, message: "所属网格不能为空", trigger: "blur" },
-        ],
-        staffList: [
-          { required: true, message: "处理部门不能为空", trigger: "blur" },
-        ],
-        publicReply: [
-          { required: true, message: "项目方案不能为空", trigger: "blur" },
-        ],
-
-      };
-    },
-
-
-  },
-  props: {
-    gridId: {//新增是选择的网格id
-      type: String,
-      default: "",
-    },
-    eventId: {
-      type: String,
-      default: "",
-    },
-    eventDetailData: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: 'manage'
-    }
-  },
-  watch: {
-    gridId: function (val) {
-
-      this.formData.gridId = val
-
-    },
-    "formData.assistanceUnitIndex": function (val) {
-
-      if (val === "" || this.assistanceUnitList.length === 0) {
-        this.formData.assistanceUnitId = "";
-        this.formData.assistanceUnitType = "";
-      } else {
-        this.formData.assistanceUnitId =
-          this.assistanceUnitList[val].assistanceUnitId;
-        this.formData.assistanceUnitType =
-          this.assistanceUnitList[val].assistanceUnitType;
-      }
-    },
-
-    async selectedTagData (val) {
-      const { tagOptions } = this;
-      this.tagList = await Promise.all(
-        val.map(async (id) => {
-          let ele = [...tagOptions.customized, ...tagOptions.defaulted].find(
-            (item) => item.id == id || item.name == id
-          );
-          if (!ele) {
-            await this.createTag(id);
-            ele = [
-              ...this.tagOptions.customized,
-              ...this.tagOptions.defaulted,
-            ].find((item) => item.name == id);
-            if (!ele)
-              return {
-                id: "",
-                name: ele.name,
-              };
-          }
-          return {
-            id: ele.id,
-            name: ele.name,
-          };
-        })
-      );
-
-      this.tagList = this.tagList.filter((item) => item.id);
-      console.log(this.tagList)
-    },
-  },
-  created () {
-
-
-
-  },
-
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-    this.getCategoryList();
-    this.loadGrid();
-    this.getMyDepartmentList();
-    this.getAssistanceUnitList();
-    this.getTagList()
-    // this.formData = { ...this.formDataTemp }
-    if (this.eventId) {
-      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-      this.formData.gridId = this.eventDetailCopy.gridId
-
-      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
-        }
-
-        this.formData.categoryList = []
-        this.formData.categoryList.push(this.selCateObj)
-      }
-    } else {
-      this.formData.gridId = this.gridId
-
-    }
-  },
-
-  methods: {
-    async getCategoryList () {
-      const url = "/gov/issue/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 () {
-      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
-      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      this.formData.categoryList = []
-      this.formData.categoryList.push(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 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
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    //加载处理部门数据
-    async getMyDepartmentList () {
-      const url = "/gov/project/trace/approvalagencylist";
-
-      const { data, code, msg } = await requestPost(url, {
-        issueId: '',
-        projectStaffId: '',
-      });
-
-      if (code === 0) {
-        this.myDepartmentList = data.subAgencyList;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    //加载协同单位数据
-    async getAssistanceUnitList () {
-      const url = "/heart/icpartyunit/assistanceUnitList";
-
-      const { data, code, msg } = await requestPost(url, {
-        // projectId: this.projectIdCopy,
-      });
-
-      if (code === 0) {
-        this.assistanceUnitList = data;
-
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    //加载标签
-    async getTagList () {
-      const url = "/gov/issue/issueprojecttagdict/list";
-      const { data, code, msg } = await requestPost(url, {
-
-      });
-
-      if (code === 0) {
-        this.tagOptions = {
-          customized: data.customized,
-          defaulted: data.defaulted,
-        };
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    handleTagChange (val) {
-      console.log(val);
-    },
-    updateProjectTag () {
-      this.visibleTagPanel = false;
-    },
-
-
-    async getProjectInfo () {
-      this.okflag = false
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj);
-
-        } else {
-
-          this.formData.tagList = this.tagList
-          this.okflag = true
-        }
-      });
-    },
-
-    beforeImgUpload (file) {
-      const isLt1M = file.size / 1024 / 1024 < 10;
-
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-      }
-      return isLt1M;
-    },
-    resetData () {
-
-    },
-    handleImgSuccess (res, file, fileList) {
-      console.log("res.data.url", file);
-      if (res.code === 0 && res.msg === "success") {
-        console.log("res.data.url", res.data.url);
-        this.formData.internalFile.push({
-          format: file.name.split(".").pop(),
-          name: file.name,
-          size: file.size,
-          type: file.raw.type,
-          url: res.data.url,
-        });
-        console.log(this.formData.internalFile);
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
-
-    handleImgRemove (file) {
-      let index = this.formData.internalFile.findIndex(
-        (item) => item.url == file.response.data.url
-      );
-      this.formData.internalFile.splice(index, 1);
-      console.log(this.formData.internalFile);
-    },
-
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
-    },
-  },
-};
-</script>
-
-<style
-  lang="scss"
-  src="@/assets/scss/modules/shequzhili/project-info.scss"
-  scoped
-></style>
-
-<style lang='scss' scoped>
-@import "@/assets/scss/modules/visual/a_customize.scss";
-@import "@/assets/scss/modules/shequzhili/event-info.scss";
-</style>
-
-
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue b/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue
deleted file mode 100644
index 0eeceaa40..000000000
--- a/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<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">已完成</el-checkbox>
-      </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: ''
-      },
-
-      status: false,
-      okflag: false,
-
-      eventDetailCopy: {},
-
-      casOptions: [],
-      iscascaderShow: 0,
-      selCategoryArray: [],
-      selCateObj: {},
-      optionProps: {
-        multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
-      },
-
-    };
-  },
-  components: {},
-  computed: {
-    dataRule () {
-
-      return {
-        content: [
-          { required: true, message: "回复内容不能为空", trigger: "blur" },
-        ],
-
-      };
-    },
-
-
-  },
-  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));
-
-      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
-        }
-      }
-    }
-  },
-
-  methods: {
-    async getCategoryList () {
-      const url = "/gov/issue/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 () {
-      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
-      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-
-    },
-
-    //重构树，去除网格
-    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.info("请填写事件分类");
-              return false
-            }
-            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
-        }
-      });
-    },
-
-    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>
-
-
-
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
new file mode 100644
index 000000000..5a9b8e4b3
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
@@ -0,0 +1,204 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">所属网格：</span>
+            <span>{{ eventDetailData.gridName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发生时间：</span>
+            <span>{{ eventDetailData.happenTime||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">事件内容：</span>
+            <span>{{ eventDetailData.eventContent||'--'  }}</span>
+          </div>
+
+          <div class="info-prop"
+               v-if="eventDetailData.imageList&&eventDetailData.imageList.length>0">
+            <span class="info-title-2">图片：</span>
+
+            <div class="info-pics">
+
+              <img v-for="(item,index) in eventDetailData.imageList"
+                   style="width:80px;height:80px"
+                   :key="index"
+                   :src="item"
+                   @click="watchImg(item)">
+
+            </div>
+          </div>
+          <div class="info-prop"
+               v-if="eventDetailData.voiceList&&eventDetailData.voiceList.length>0">
+            <span class="info-title-2">音频：</span>
+
+            <audio controls>
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in eventDetailData.voiceList" />
+            </audio>
+
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">反映渠道：</span>
+            <span>{{ eventDetailData.sourceTypeName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">地址：</span>
+            <span>{{ eventDetailData.address||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">报事人：</span>
+            <span>{{ eventDetailData.name||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ eventDetailData.mobile||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">身份证号：</span>
+            <span>{{ eventDetailData.idCard||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">痛点难点：</span>
+            <span>{{ eventDetailData.difficultPointName||'--'  }}</span>
+          </div>
+          <div v-if="eventDetailData.satisfactionName"
+               class="info-prop">
+            <span class="info-title-2">满意度：</span>
+            <span>{{ eventDetailData.satisfactionName||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import dateFormat from "dai-js/tools/dateFormat";
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+      eventId: '',
+      eventDetailData: {},
+
+      voiceList: [],
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (eventId) {
+      this.startLoading()
+      this.eventId = eventId
+      await this.loadForm()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+    async loadForm () {
+
+      const url = "/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);
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('diaDetailClose')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.eventDetailData = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+
+
+  },
+  props: {
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
new file mode 100644
index 000000000..fa2852b93
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="">
+    <el-card :class="{'box-card':source==='visiual'}"
+             v-if="showType==''">
+      <h3 v-if="source==='manage'">议题详情</h3>
+      <div class="m-row">
+        <div class="m-info">
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">议题标题：</span>
+            <span>{{ issueInfo.issueTitle }}</span>
+          </div>
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">处理意见：</span>
+            <span>{{ issueInfo.issueSuggestion||'--' }}</span>
+          </div>
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">所属网格：</span>
+            <span>{{ issueInfo.gridName||'--' }}</span>
+          </div>
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">议题来源：</span>
+            <div v-if="issueInfo.sourceType==='resi_topic'"
+                 class="line"
+                 @click="handleToTopic">查看话题</div>
+            <div v-else-if="issueInfo.sourceType==='ic_event'"
+                 class="line"
+                 @click="handleToEvent">查看事件</div>
+            <!-- <div v-else>--</div> -->
+            <div v-else
+                 class="line"
+                 @click="handleToTopic">查看话题</div>
+          </div>
+
+        </div>
+      </div>
+      <!-- 
+显示关闭：
+1、状态=完成    (已评价)||(没评价&&不是本人)
+
+2、状态=未完成 （有操作id） -->
+      <div v-if="type==='info'"
+           class="div-btn ">
+        <el-button size="small"
+                   @click="handleCloseEvent">关闭</el-button>
+
+      </div>
+
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import foldText from "@/views/components/foldText";
+import projectInfo from "../../xiangmu/cpts/project-info";
+import dateFormat from "dai-js/tools/dateFormat";
+
+function iniData () {
+  return {
+    user: {},
+    projectPageType: 'info',
+
+    issueInfo: {},
+    showType: '',
+
+
+
+  };
+}
+
+export default {
+  name: "issueInfo",
+  props: {
+    issueId: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "info",
+    },
+
+    issueDetailData: {
+
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+
+  components: {
+    foldText, projectInfo
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+
+  },
+  created () { },
+
+  mounted () {
+    this.user = this.$store.state.user
+    if (this.issueId) {
+      this.issueInfo = JSON.parse(JSON.stringify(this.issueDetailData));
+
+    }
+
+  },
+
+  methods: {
+    watchImg (src) {
+      window.open(src);
+    },
+
+    handleClose () {
+      this.showType = ''
+    },
+
+    handleCloseEvent () {
+      this.$emit("handleClose");
+    },
+
+    async getApiData () {
+    },
+
+    handleToTopic () {
+      this.$emit("handleToTopic")
+    },
+
+    handleToEvent () {
+      this.$emit("handleToEvent")
+    },
+
+    handleTagChange (val) {
+      console.log(val);
+    },
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+</style>
+
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
new file mode 100644
index 000000000..280464295
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
@@ -0,0 +1,308 @@
+<template>
+  <div class="">
+
+    <div v-if="pageTypeCopy == 'dispose'||pageTypeCopy == 'info'"
+         class="g-page">
+      <div :class="['g-total',{'g-left':projectProcess.length>0}]">
+
+        <issue-detail ref="ref_detail"
+                      :type="pageType"
+                      :issueId="issueId"
+                      :issueDetailData="issueDetailData"
+                      :source="source"
+                      @handleToEvent="handleToEvent"
+                      @handleToTopic="handleToTopic"
+                      @handleClose="handleClose"></issue-detail>
+
+        <div v-if="!issueDetailData.operationId &&pageTypeCopy == 'dispose' "
+             class="process-form">
+          <el-card :class="{'box-card':source==='visiual'}">
+            <div :class="['process-title',{'process-title-vis':source==='visiual'}]">处理</div>
+            <process-form ref="ref_processinfo_dispose"
+                          :source="source"
+                          :issueId="issueId"
+                          :issueDetailData="issueDetailData"></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="projectProcess.length>0"
+           class="g-right">
+        <el-card :class="{'box-card':source==='visiual'}"
+                 style="max-height: 90vh; overflow: auto">
+
+          <div class="m-process">
+            <div :class="['process-title',{'process-title-vis':source==='visiual'}]">处理进展</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"
+                       v-if="item.actionType==='under_auditing'">{{ '待审核' }}</div>
+                  <div class="name"
+                       v-if="item.actionType==='rejected'">{{ '驳回' }}</div>
+                  <!-- <div class="date">
+                    {{ item.operateTime }}
+                  </div> -->
+                </div>
+
+                <div>
+                  <div v-if="item.actionType==='under_auditing'"
+                       class="detail">
+                    <div class="detail-field">提交审核时间：</div>
+                    <div class="detail-value">{{ item.operateTime }}</div>
+                  </div>
+                  <div v-if="item.actionType==='rejected'"
+                       class="detail">
+                    <div class="detail-field">理由：</div>
+                    <div class="detail-value">{{ item.reason }}</div>
+                  </div>
+
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </div>
+    </div>
+
+    <el-dialog :visible.sync="topicShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'话题详情'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaDetailClose">
+      <topic-detail ref="ref_detail_topic"
+                    @diaDetailClose="diaDetailClose"></topic-detail>
+    </el-dialog>
+
+    <el-dialog :visible.sync="eventShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'事件详情'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaDetailClose">
+      <event-detail ref="ref_detail_event"
+                    @diaDetailClose="diaDetailClose"></event-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import { Loading } from "element-ui"; // 引入Loading服务
+import foldText from "@/views/components/foldText";
+import dateFormat from "dai-js/tools/dateFormat";
+
+import issueDetail from "./issue-detail";
+import processForm from "./process-form";
+import topicDetail from "./topicDetail";
+import eventDetail from "./eventDetail";
+
+
+let loading; // 加载动画
+function iniData () {
+  return {
+
+    auditInfo: {},
+    issueDetailCopy: {},
+
+    projectProcess: [],
+    projectPageType: 'info',
+    pageTypeCopy: '',
+
+    //话题、事件详情
+    topicShow: false,
+    eventShow: false,
+
+  };
+}
+
+export default {
+  name: "projectInfo",
+  props: {
+    issueId: {
+      type: String,
+      default: "",
+    },
+    pageType: {
+      type: String,
+      default: "",
+    },
+    issueDetailData: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+
+  components: {
+    foldText,
+    issueDetail,
+    processForm,
+    topicDetail,
+    eventDetail,
+
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    issueId () {
+      let data = iniData();
+      Object.keys(data).forEach((k) => {
+        this[k] = data[k];
+      });
+      // this.getApiData();
+    },
+  },
+  created () {
+
+
+  },
+  mounted () {
+    this.pageTypeCopy = this.pageType
+    this.getProjectProcess()
+    if (this.issueId) {
+      this.issueDetailCopy = JSON.parse(JSON.stringify(this.issueDetailData));
+    }
+  },
+
+  methods: {
+    diaDetailClose () {
+
+      this.topicShow = false
+      this.eventShow = false
+
+    },
+
+    //加载组织数据
+    async getProjectProcess () {
+      const url = "/gov/issue/issueaudit/applicationhistory";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueApplicationId: this.issueId,
+      });
+
+      if (code === 0) {
+        this.projectProcess = data.map((item) => {
+          item.operateTime = dateFormat(
+            new Date(item.operateTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async handleComfirm () {
+      this.startLoading()
+
+      if (this.pageTypeCopy === 'dispose') {
+        await this.handelDispose()
+      }
+      this.endLoading()
+    },
+
+    async handelDispose () {
+      this.$refs.ref_processinfo_dispose.getProcessInfo()
+      if (this.$refs.ref_processinfo_dispose.okflag) {
+
+        this.auditInfo = this.$refs.ref_processinfo_dispose.auditInfo
+
+        this.auditInfo.issueApplicationId = this.issueId
+        console.log('auditInfo', this.auditInfo)
+        //关闭属性赋值
+        let url = '/gov/issue/issueaudit/audit'
+        await this.submitDispose(url, this.auditInfo)
+
+      } 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 () {
+      this.$emit("handleClose");
+    },
+    handleToEvent () {
+      // this.pageTypeCopy = 'event'
+      this.eventShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail_event.initForm(this.issueDetailCopy.sourceId)
+      })
+    },
+    handleToTopic () {
+      // this.pageTypeCopy = 'topic'
+      this.topicShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail_topic.initForm(this.issueDetailCopy.topicInfo)
+      })
+
+    },
+
+
+    // 开启加载动画
+    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>
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue b/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue
new file mode 100644
index 000000000..4a8c61878
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="">
+    <div>
+
+      <el-form ref="ref_audit_form"
+               :inline="false"
+               :model="auditInfo"
+               :rules="auditDataRule">
+        <el-form-item label="处理方式"
+                      label-width="150px"
+                      :class="{'form-item':source==='visiual'}"
+                      prop="actionType">
+          <el-radio-group :class="{'form-item':source==='visiual'}"
+                          v-model="auditInfo.actionType">
+
+            <el-radio label="approved">通过</el-radio>
+            <el-radio label="rejected">驳回</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="理由"
+                      prop="reason"
+                      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="auditInfo.reason"></el-input>
+          </div>
+
+        </el-form-item>
+
+      </el-form>
+
+    </div>
+
+  </div>
+
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+import selectStaff from "@/views/components/selectStaff";
+
+let loading; // 加载动画
+
+export default {
+  data () {
+    return {
+      okflag: false,
+
+      eventDetailCopy: {},
+
+      auditInfo: {
+        actionType: 'approved',
+        reason: '',//理由
+      },
+
+    };
+  },
+  components: {
+    selectStaff,
+
+  },
+  computed: {
+    auditDataRule () {
+      return {
+        actionType: [
+          { required: true, message: "处理方式不能为空", trigger: "change" },
+        ],
+        reason: [
+          { required: true, message: "理由不能为空", trigger: "change" },
+        ],
+
+      };
+    },
+
+
+  },
+  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 () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    if (this.eventId) {
+      this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+
+    }
+
+  },
+
+  methods: {
+    handleChangeOperationType (val) {
+
+      this.$refs['ref_audit_form'].resetFields()
+
+
+    },
+    async getProcessInfo () {
+      this.okflag = false
+
+
+      this.$refs["ref_audit_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+
+        } else {
+          this.okflag = true
+        }
+      });
+
+
+    },
+
+    handleCancle () {
+      this.$refs['ref_audit_form'].resetFields()
+      this.resetData();
+
+    },
+    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>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue
new file mode 100644
index 000000000..de29ff5d4
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">话题内容：</span>
+            <span>{{ topicInfo.topicContent||'--'  }}</span>
+          </div>
+          <div class="info-prop"
+               v-if="topicInfo.photoList&&topicInfo.photoList.length>0">
+            <span class="info-title-2">图片：</span>
+
+            <div class="info-pics">
+
+              <img v-for="(item,index) in topicInfo.photoList"
+                   style="width:80px;height:80px"
+                   :key="index"
+                   :src="item.url"
+                   @click="watchImg(item)">
+
+            </div>
+          </div>
+          <div class="info-prop"
+               v-if="voiceList&&voiceList.length>0">
+            <span class="info-title-2">音频：</span>
+
+            <audio controls>
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in voiceList" />
+            </audio>
+
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发布人：</span>
+            <span>{{ topicInfo.publishedUser||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">发布时间：</span>
+            <span>{{ topicInfo.publishedTime||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">联系方式：</span>
+            <span>{{ topicInfo.topicPublishMobile||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import dateFormat from "dai-js/tools/dateFormat";
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      initLoading: false,
+
+      topicInfo: {},
+
+      voiceList: [],
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+  },
+
+  methods: {
+
+
+    async initForm (topicInfo) {
+      this.startLoading()
+      this.topicInfo = JSON.parse(JSON.stringify(topicInfo))
+      if (this.topicInfo.publishedTime) {
+        this.topicInfo.publishedTime = dateFormat(
+          new Date(this.topicInfo.publishedTime * 1000),
+          "yyyy-MM-dd hh:mm"
+        );
+      }
+
+      await this.getAttechment()
+      this.initLoading = true
+      this.endLoading()
+
+
+    },
+    async getAttechment () {
+      const url = "/resi/group/topic/topicattachmentlist"
+
+      let params = {
+        topicId: this.topicInfo.topicId,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.voiceList = data.voiceList
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('diaDetailClose')
+
+    },
+
+    watchImg (src) {
+      window.open(src);
+    },
+
+    resetData () {
+
+      this.topicInfo = {}
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+
+
+  },
+  props: {
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
index 4bfc5fbd6..2f6983ed1 100644
--- a/src/views/modules/shequzhili/issue/issueAuditList.vue
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -10,7 +10,7 @@
 
             <el-form-item label="所属组织"
                           prop="orgId">
-              <el-cascader class="item_width_1"
+              <el-cascader class="item_width_2"
                            ref="myCascader"
                            size="small"
                            v-model="agencyIdArray"
@@ -24,7 +24,7 @@
             <el-form-item label="议题标题"
                           prop="issueTitle">
               <el-input v-model="formData.issueTitle"
-                        class="item_width_1"
+                        class="item_width_2"
                         size="small"
                         clearable
                         placeholder="请输入">
@@ -38,7 +38,7 @@
                               class="item_width_2"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyyMMdd"
                               value="yyyy-MM-dd"
                               placeholder="开始时间">
               </el-date-picker>
@@ -48,7 +48,7 @@
                               class="item_width_2 data-tag"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyyMMdd"
                               value="yyyy-MM-dd"
                               placeholder="结束时间">
               </el-date-picker>
@@ -194,7 +194,7 @@
 import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
-import issueInfo from "./cpts/issue-info";
+import issueInfo from "./cptsAudit/issue-info";
 import axios from "axios";
 
 export default {
@@ -258,10 +258,10 @@ export default {
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
       endPickerOptions: {
-        disabledDate: endDisabledDate
+        // disabledDate: endDisabledDate
       },
       startPickerOptions: {
-        disabledDate: startDisabledDate
+        // disabledDate: startDisabledDate
       },
       issueId: '',
       issueDetailData: {},
@@ -271,8 +271,8 @@ export default {
   computed: {
     maxTableHeight () {
       return this.$store.state.inIframe
-        ? this.clientHeight - 410 + this.iframeHeigh
-        : this.clientHeight - 410;
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
@@ -373,11 +373,13 @@ export default {
     },
 
     async handleWatch (row) {
-      this.issueId = row.issueId
-      const url = "/gov/issue/manage/votingissuedetail";
+      this.issueId = row.issueApplicationId
+
+      const url = "/gov/issue/issueaudit/applicationdetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
 
       const { data, code, msg } = await requestPost(url, {
-        issueId: this.issueId,
+        issueApplicationId: this.issueId,
       });
 
       if (code === 0) {
@@ -391,13 +393,13 @@ export default {
 
     //加载组织数据
     async handleAudit (row) {
-      this.issueId = row.issueId
-      // this.issueId = '29bbec4b08bb11edbb6b0050568f8cf7'
-      const url = "/gov/issue/manage/votingissuedetail";
+      this.issueId = row.issueApplicationId
+
+      const url = "/gov/issue/issueaudit/applicationdetail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
 
       const { data, code, msg } = await requestPost(url, {
-        issueId: this.issueId,
+        issueApplicationId: this.issueId,
       });
 
       if (code === 0) {
@@ -466,6 +468,7 @@ export default {
     },
 
     resetSearch () {
+      this.agencyIdArray = []
       this.formData = {
         orgId: '',
         orgType: '',
@@ -476,11 +479,9 @@ export default {
 
       }
 
-
-
       this.pageNo = 1
-      this.getTableData();
-      // this.loadTable()
+      // this.getTableData();
+
     },
     deepTree (arr, child) {
       if (Array.isArray(arr) && arr.length > 0) {
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
index 16d595690..3b955295b 100644
--- a/src/views/modules/shequzhili/issue/issueList.vue
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -10,7 +10,7 @@
 
             <el-form-item label="所属组织"
                           prop="orgId">
-              <el-cascader class="item_width_1"
+              <el-cascader class="item_width_2"
                            ref="myCascader"
                            size="small"
                            v-model="agencyIdArray"
@@ -24,7 +24,7 @@
             <el-form-item label="议题标题"
                           prop="issueTitle">
               <el-input v-model="formData.issueTitle"
-                        class="item_width_1"
+                        class="item_width_2"
                         size="small"
                         clearable
                         placeholder="请输入">
@@ -38,7 +38,7 @@
                               class="item_width_2"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyyMMdd"
                               value="yyyy-MM-dd"
                               placeholder="开始时间">
               </el-date-picker>
@@ -48,7 +48,7 @@
                               class="item_width_2 data-tag"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyyMMdd"
                               value="yyyy-MM-dd"
                               placeholder="结束时间">
               </el-date-picker>
@@ -154,13 +154,7 @@
                            label="状态"
                            width="80"
                            :show-overflow-tooltip="true">
-            <!-- <template slot-scope="scope">
 
-              <span v-if="scope.row.issueStatus==='voting'">表决中</span>
-              <span v-else-if="scope.row.issueStatus==='shift_project'">已转项目</span>
-              <span v-else-if="scope.row.issueStatus==='closed'">已关闭</span>
-              <span v-else>--</span>
-            </template> -->
           </el-table-column>
 
           <el-table-column fixed="right"
@@ -263,7 +257,6 @@ export default {
         },
       ],
 
-
       formData: {
         orgId: '',
         orgType: '',
@@ -286,10 +279,10 @@ export default {
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
       endPickerOptions: {
-        disabledDate: endDisabledDate
+        // disabledDate: endDisabledDate
       },
       startPickerOptions: {
-        disabledDate: startDisabledDate
+        // disabledDate: startDisabledDate
       },
       issueId: '',
       issueDetailData: {},
@@ -299,8 +292,8 @@ export default {
   computed: {
     maxTableHeight () {
       return this.$store.state.inIframe
-        ? this.clientHeight - 410 + this.iframeHeigh
-        : this.clientHeight - 410;
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
@@ -510,6 +503,7 @@ export default {
     },
 
     resetSearch () {
+      this.agencyIdArray = []
       this.formData = {
         orgId: '',
         orgType: '',
@@ -520,11 +514,9 @@ export default {
 
       }
 
-
-
       this.pageNo = 1
-      this.getTableData();
-      // this.loadTable()
+      // this.getTableData();
+
     },
     deepTree (arr, child) {
       if (Array.isArray(arr) && arr.length > 0) {

From 8b599f3ca21c877a87a9ed88cb21444b682e526a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 11 Oct 2022 16:47:22 +0800
Subject: [PATCH 03/15] 111

---
 .../shequzhili/issue/cpts/issue-detail.vue    | 93 ++++++++++++++-----
 .../issue/cptsAudit/issue-detail.vue          | 49 +++++++++-
 .../shequzhili/issue/issueAuditList.vue       |  6 +-
 .../modules/shequzhili/issue/issueList.vue    |  6 +-
 4 files changed, 122 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index c4ab9ad7e..0ab40d1a8 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -11,26 +11,6 @@
             <span>{{ issueInfo.issueTitle }}</span>
           </div>
 
-          <!-- <div v-if="info.imageList&&info.imageList.length>0"
-               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
-            <span class="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="['info-prop',{'info-prop-vis':source==='visiual'}]">
-            <span class="info-title-2">语音：</span>
-            <audio controls>
-              <source :src="item.url"
-                      type=""
-                      :key="item.url"
-                      v-for="item in info.voiceList" />
-            </audio>
-          </div> -->
-
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">处理意见：</span>
             <span>{{ issueInfo.issueSuggestion||'--' }}</span>
@@ -176,6 +156,32 @@
           </div>
 
         </div>
+
+        <div class="m-line">
+          <div class="stat">
+            <div class="stat-item">
+              <div>
+                {{ issueTrend.realityVoteCount }}/{{
+                      issueTrend.shouldVoteCount
+                    }}
+              </div>
+              <div class="z-weak">已表决/应表决</div>
+            </div>
+            <div class="stat-item">
+              <div>{{ issueTrend.supportAmount }}</div>
+              <div class="z-weak">支持</div>
+            </div>
+            <div class="stat-item">
+              <div>{{ issueTrend.oppositionAmount }}</div>
+              <div class="z-weak">反对</div>
+            </div>
+          </div>
+
+          <div v-if="issueChartData.length > 0"
+               class="m-chart">
+            <line-chart :list="issueChartData" />
+          </div>
+        </div>
       </div>
       <!-- 
 显示关闭：
@@ -199,6 +205,7 @@ import { requestPost } from "@/js/dai/request";
 import foldText from "@/views/components/foldText";
 import projectInfo from "../../xiangmu/cpts/project-info";
 import dateFormat from "dai-js/tools/dateFormat";
+import lineChart from "@/views/modules/visual/cpts/line-chart";
 
 function iniData () {
   return {
@@ -218,6 +225,9 @@ function iniData () {
     visibleTagPanel: false,
     selectedTagData: [],
 
+    issueTrend: {},
+    issueChartData: [],
+
   };
 }
 
@@ -247,7 +257,7 @@ export default {
   },
 
   components: {
-    foldText, projectInfo
+    foldText, projectInfo, lineChart
   },
 
   data: iniData,
@@ -304,6 +314,7 @@ export default {
       this.issueInfo = JSON.parse(JSON.stringify(this.issueDetailData));
 
     }
+    this.getChartInfo();
     this.getIssueCate();
 
   },
@@ -338,6 +349,41 @@ export default {
       this.$emit("handleToEvaluation")
     },
 
+    async getChartInfo () {
+      const url = "/gov/issue/manage/votingtrend";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.issueId,
+      });
+
+      if (code === 0) {
+
+        this.issueTrend = data;
+        let chartData = [];
+        data.polyLine.forEach((item) => {
+          let date = dateFormat(new Date(item.voteDate * 1000), "yyyy-MM-dd");
+          // console.log("date:" + date);
+          chartData.push(
+            {
+              date,
+              value: item.supportIncrement,
+              type: "支持",
+            },
+            {
+              date,
+              value: item.oppositionIncrement,
+              type: "反对",
+            }
+          );
+        });
+        this.issueChartData = chartData;
+
+
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
     async getIssueCate () {
       const url = "/gov/issue/issuecategory/categorytaglist";
 
@@ -436,6 +482,11 @@ export default {
   },
 };
 </script>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/shequzhili/project-info.scss"
+  scoped
+></style>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 </style>
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
index fa2852b93..b4db55186 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
@@ -21,6 +21,40 @@
           </div>
 
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">话题内容：</span>
+            <span>{{ topicInfo.topicContent||'--' }}</span>
+          </div>
+
+          <div v-if="topicInfo.photoList&&topicInfo.photoList.length>0"
+               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">图片：</span>
+            <img :src="src.url"
+                 :key="src.url"
+                 style="width:150px;height:150px;padding-right:10px"
+                 v-for="src in topicInfo.photoList"
+                 @click="watchImg(src.url)" />
+          </div>
+          <div v-if="topicInfo.voiceList&&topicInfo.voiceList.length>0"
+               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">语音：</span>
+            <audio controls>
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in topicInfo.voiceList" />
+            </audio>
+          </div>
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">发布人：</span>
+            <span>{{ topicInfo.publishedUser||'--'  }}</span>
+          </div>
+
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">发布时间：</span>
+            <span>{{ topicInfo.publishedTime||'--' }}</span>
+          </div>
+
+          <!-- <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">议题来源：</span>
             <div v-if="issueInfo.sourceType==='resi_topic'"
                  class="line"
@@ -28,11 +62,11 @@
             <div v-else-if="issueInfo.sourceType==='ic_event'"
                  class="line"
                  @click="handleToEvent">查看事件</div>
-            <!-- <div v-else>--</div> -->
+        
             <div v-else
                  class="line"
                  @click="handleToTopic">查看话题</div>
-          </div>
+          </div> -->
 
         </div>
       </div>
@@ -65,10 +99,9 @@ function iniData () {
     projectPageType: 'info',
 
     issueInfo: {},
+    topicInfo: {},
     showType: '',
 
-
-
   };
 }
 
@@ -114,7 +147,13 @@ export default {
     this.user = this.$store.state.user
     if (this.issueId) {
       this.issueInfo = JSON.parse(JSON.stringify(this.issueDetailData));
-
+      this.topicInfo = JSON.parse(JSON.stringify(this.issueDetailData.topicInfo));
+      if (this.topicInfo.publishedTime) {
+        this.topicInfo.publishedTime = dateFormat(
+          new Date(this.topicInfo.publishedTime * 1000),
+          "yyyy-MM-dd hh:mm"
+        );
+      }
     }
 
   },
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
index 2f6983ed1..564e08474 100644
--- a/src/views/modules/shequzhili/issue/issueAuditList.vue
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -338,14 +338,14 @@ export default {
     },
 
     async handleExport () {
-      const url = "/gov/project/icEvent/export";
+      const url = "/gov/issue/issueaudit/auditListExport";
       const { pageSize, pageNo, formData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
         data: {
-          pageSize,
-          pageNo,
+          // pageSize,
+          // pageNo,
           ...formData,
         },
         responseType: "blob",
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
index 3b955295b..c9f0d229e 100644
--- a/src/views/modules/shequzhili/issue/issueList.vue
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -359,14 +359,14 @@ export default {
     },
 
     async handleExport () {
-      const url = "/gov/project/icEvent/export";
+      const url = "/gov/issue/issue/allIssueListExport";
       const { pageSize, pageNo, formData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
         data: {
-          pageSize,
-          pageNo,
+          // pageSize,
+          // pageNo,
           ...formData,
         },
         responseType: "blob",

From 0592852ac2a5ed7011cc134ef61742e2be6c1540 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 11 Oct 2022 17:21:47 +0800
Subject: [PATCH 04/15] 11

---
 .../shequzhili/issue/cpts/issue-info.vue      |  2 +-
 .../shequzhili/xiangmu/cpts/project-info.vue  | 47 ++++++++++++++++---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/issue-info.vue b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
index bc79795da..f5f636d5d 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-info.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
@@ -64,7 +64,7 @@
                   </div>
                   <div class="detail">
                     <div class="detail-field">回复内容：</div>
-                    <div class="detail-value">{{ item.publicReply }}</div>
+                    <div class="detail-value">{{ item.publicReply|| item.progressDesc}}</div>
                   </div>
                 </div>
 
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index dfced3f53..66168167a 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -308,11 +308,11 @@
                     </el-input>
                   </el-form-item>
 
-                  <el-form-item 
-                                label="图片/附件："
+                  <el-form-item label="图片/附件："
                                 :class="{'form-item':source==='visiual'}"
                                 prop="internalFile">
-                    <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
+                    <el-upload :headers="$getElUploadHeaders()"
+                               class="avatar-uploader"
                                :action="uploadUrl"
                                :data="{ customerId: customerId }"
                                :show-file-list="true"
@@ -439,9 +439,17 @@
     </div>
 
     <div v-if="pageType == 'origin-info'">
-      <issue-info v-if="projectInfo.origin == 'issue'"
+      <issue-info-origin v-if="projectInfo.origin == 'issue'"
+                         ref="eleEditForm"
+                         :pageType="issuePageType"
+                         :issueId="projectInfo.originId"
+                         :issueDetailData="issueDetailData"
+                         @handleClose="handleBackInfo"
+                         @handleOk="handleBackInfo"
+                         @dialogOk="handleBackInfo" />
+      <!-- <issue-info v-if="projectInfo.origin == 'issue'"
                   @close="handleBackInfo"
-                  :issue-id="projectInfo.originId" />
+                  :issue-id="projectInfo.originId" /> -->
       <event-info v-if="projectInfo.origin == 'resi_event'"
                   @close="handleBackInfo"
                   :event-id="projectInfo.originId" />
@@ -470,6 +478,7 @@ import issueInfo from "./issue-info";
 import eventInfo from "./event-info";
 import projectEvaluation from "./project-evaluation";
 import dateFormat from "dai-js/tools/dateFormat";
+import issueInfoOrigin from "../../issue/cpts/issue-info";
 
 function iniData () {
   return {
@@ -587,6 +596,9 @@ function iniData () {
     tagOptions: [],
     visibleTagPanel: false,
     selectedTagData: [],
+
+    issuePageType: '',
+    issueDetailData: {},
   };
 }
 
@@ -613,6 +625,7 @@ export default {
     eventInfo,
     projectEvaluation,
     selectStaff,
+    issueInfoOrigin
   },
 
   data: iniData,
@@ -853,8 +866,30 @@ export default {
       }
     },
 
-    handleWatchOrigin () {
+    async handleWatchOrigin () {
+
+
+      const url = "/gov/issue/manage/votingissuedetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+
+        this.issueDetailData = { ...data };
+
+      } else {
+        this.$message.error(msg);
+      }
       this.pageType = "origin-info";
+      if (this.issueDetailData.issueStatus === 'voting') {
+        this.issuePageType = 'dispose'
+      } else {
+        this.issuePageType = 'info'
+      }
+      this.pageTypeCopy = 'issue'
+
     },
     handleBackInfo () {
       this.pageType = "info";

From 34042357602e65145eb90061d6d98d0a747edb36 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 12 Oct 2022 13:52:42 +0800
Subject: [PATCH 05/15] 111

---
 .../shequzhili/issue/cpts/issue-detail.vue    |   3 +-
 .../shequzhili/issue/issueAuditList.vue       |   2 +-
 .../modules/shequzhili/issue/issueList.vue    |  21 +-
 .../modules/shequzhili/xiangmu/index.vue      | 432 ++++++++----------
 4 files changed, 219 insertions(+), 239 deletions(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index 0ab40d1a8..8d7b536d2 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -34,8 +34,7 @@
                  @click="handleToTopic">查看话题>--</div>
           </div>
 
-          <div v-if="issueInfo.sourceType==='resi_topic'"
-               :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">意见和建议：</span>
             <div class="line"
                  @click="handleToSuggest">查看全部</div>
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
index 564e08474..3f2f71c6a 100644
--- a/src/views/modules/shequzhili/issue/issueAuditList.vue
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -434,7 +434,7 @@ export default {
 
     async getTableData () {
       const url = "/gov/issue/issueaudit/auditList";
-      // const url = "http://yapi.elinkservice.cn/mock/102/gov/issue/issue/allIssueList";
+
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
index c9f0d229e..974af1788 100644
--- a/src/views/modules/shequzhili/issue/issueList.vue
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -134,17 +134,22 @@
                            :show-overflow-tooltip="true"
                            label="转议题时间">
           </el-table-column>
-
+          <el-table-column prop="sourceTypeName"
+                           label="来源"
+                           width="60"
+                           align="center"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
           <el-table-column prop="supportCount"
                            align="center"
-                           width="80"
+                           width="60"
                            label="支持"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
           <el-table-column prop="oppositionCount"
                            align="center"
-                           width="80"
+                           width="60"
                            label="反对"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -456,7 +461,7 @@ export default {
 
     async getTableData () {
       const url = "/gov/issue/issue/allIssueList";
-      // const url = "http://yapi.elinkservice.cn/mock/102/gov/issue/issue/allIssueList";
+
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
@@ -473,6 +478,14 @@ export default {
           : [];
 
         this.tableData.forEach(item => {
+          if (item.sourceType === 'ic_event') {
+            item.sourceTypeName = '事件'
+          } else if (item.sourceType === 'resi_topic') {
+            item.sourceTypeName = '话题'
+          } else {
+            item.sourceTypeName = '--'
+          }
+
           if (item.operationType === '2') {
             item.operationTypeShow = '已转服务'
           }
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 36e244ab0..bcef8c2d0 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -1,80 +1,67 @@
 <template>
   <div class="resi-container">
-    <div class="g-page" v-show="pageType == 'list'">
-      <el-card ref="searchCard" class="search-card">
-        <el-form
-          ref="searchForm"
-          :inline="true"
-          :model="fmData"
-          :label-width="'100px'"
-          class="demo-form-inline"
-        >
+    <div class="g-page"
+         v-show="pageType == 'list'">
+      <el-card ref="searchCard"
+               class="search-card">
+        <el-form ref="searchForm"
+                 :inline="true"
+                 :model="fmData"
+                 :label-width="'100px'"
+                 class="demo-form-inline">
           <div>
-            <el-form-item label="项目标题" prop="title">
-              <el-input
-                v-model="fmData.title"
-                class="resi-cell-input"
-                size="small"
-                clearable
-                placeholder="请输入"
-              >
+            <el-form-item label="项目标题"
+                          prop="title">
+              <el-input v-model="fmData.title"
+                        class="resi-cell-input"
+                        size="small"
+                        clearable
+                        placeholder="请输入">
               </el-input>
             </el-form-item>
 
-            <el-form-item label="转项目时间" prop="date">
-              <el-date-picker
-                v-model="fmData.startDate"
-                size="small"
-                type="date"
-                value-format="yyyy-MM-dd"
-                style="width: 150px"
-                placeholder="开始时间"
-              >
+            <el-form-item label="转项目时间"
+                          prop="date">
+              <el-date-picker v-model="fmData.startDate"
+                              size="small"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              style="width: 150px"
+                              placeholder="开始时间">
               </el-date-picker>
               <span style="margin:0 8px;">至</span>
-              <el-date-picker
-                v-model="fmData.endDate"
-                size="small"
-                type="date"
-                style="width: 150px"
-                value-format="yyyy-MM-dd"
-                placeholder="结束时间"
-              >
+              <el-date-picker v-model="fmData.endDate"
+                              size="small"
+                              type="date"
+                              style="width: 150px"
+                              value-format="yyyy-MM-dd"
+                              placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model.trim="fmData.status"
-                placeholder="请选择"
-                size="small"
-                clearable
-                style="width: 150px"
-                class="resi-cell-select"
-              >
-                <el-option
-                  v-for="item in optionsStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+            <el-form-item label="状态"
+                          prop="status">
+              <el-select v-model.trim="fmData.status"
+                         placeholder="请选择"
+                         size="small"
+                         clearable
+                         style="width: 150px"
+                         class="resi-cell-select">
+                <el-option v-for="item in optionsStatus"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
 
             <el-form-item style="margin-left: 35px">
-              <el-button
-                class="diy-button--search"
-                size="small"
-                @click="handleSearch"
-                >查询</el-button
-              >
-              <el-button
-                class="diy-button--reset"
-                size="small"
-                @click="resetForm('searchForm')"
-                >重置</el-button
-              >
+              <el-button class="diy-button--search"
+                         size="small"
+                         @click="handleSearch">查询</el-button>
+              <el-button class="diy-button--reset"
+                         size="small"
+                         @click="resetForm('searchForm')">重置</el-button>
             </el-form-item>
           </div>
         </el-form>
@@ -82,185 +69,147 @@
 
       <el-card class="resi-card-table">
         <div class="resi-row-btn">
-          <el-button
-            v-if="false"
-            class="diy-button--add"
-            size="small"
-            @click="handleAdd"
-            >新增</el-button
-          >
-          <el-button
-            v-if="false"
-            class="diy-button--export"
-            size="small"
-            @click="handleExportModule('room')"
-            >下载模板</el-button
-          >
-          <el-upload :headers="$getElUploadHeaders()" 
-            v-if="false"
-            ref="upload"
-            class="upload-btn"
-            action="uploadUlr"
-            :limit="1"
-            :accept="'.xls,.xlsx'"
-            :with-credentials="true"
-            :show-file-list="false"
-            :auto-upload="true"
-            :on-progress="handleProgress"
-            :on-success="handleExcelSuccess"
-            :before-upload="beforeExcelUpload"
-            :http-request="uploadHttpRequest"
-          >
-            <el-button
-              size="small"
-              class="diy-button--delete"
-              :loading="importLoading"
-              >{{ importBtnTitle }}</el-button
-            >
+          <el-button v-if="false"
+                     class="diy-button--add"
+                     size="small"
+                     @click="handleAdd">新增</el-button>
+          <el-button v-if="false"
+                     class="diy-button--export"
+                     size="small"
+                     @click="handleExportModule('room')">下载模板</el-button>
+          <el-upload :headers="$getElUploadHeaders()"
+                     v-if="false"
+                     ref="upload"
+                     class="upload-btn"
+                     action="uploadUlr"
+                     :limit="1"
+                     :accept="'.xls,.xlsx'"
+                     :with-credentials="true"
+                     :show-file-list="false"
+                     :auto-upload="true"
+                     :on-progress="handleProgress"
+                     :on-success="handleExcelSuccess"
+                     :before-upload="beforeExcelUpload"
+                     :http-request="uploadHttpRequest">
+            <el-button size="small"
+                       class="diy-button--delete"
+                       :loading="importLoading">{{ importBtnTitle }}</el-button>
           </el-upload>
 
-          <el-button @click="handleChu" class="diy-button--reset" size="small"
-            >导出</el-button
-          >
+          <el-button @click="handleChu"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
         </div>
 
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%"
-          class="resi-table"
-          :height="maxTableHeight"
-        >
-          <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 :data="tableData"
+                  border
+                  style="width: 100%"
+                  class="resi-table"
+                  :height="maxTableHeight">
+          <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="title"
-            label="项目标题"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="title"
+                           label="项目标题"
+                           align="center"
+                           :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column
-            prop="shiftProjectTime"
-            width="100"
-            align="center"
-            label="转项目时间"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="shiftProjectTime"
+                           width="100"
+                           align="center"
+                           label="转项目时间"
+                           :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column
-            prop="projectScheme"
-            align="center"
-            label="项目方案"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="projectScheme"
+                           align="center"
+                           label="项目方案"
+                           :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column
-            prop="internalRemark"
-            align="center"
-            label="内部备注"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="internalRemark"
+                           align="center"
+                           label="内部备注"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="originName"
+                           align="center"
+                           label="来源"
+                           width="100"
+                           :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column
-            prop="departmentNameList"
-            align="center"
-            label="当前处理部门	"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="departmentNameList"
+                           align="center"
+                           label="当前处理部门	"
+                           :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column
-            prop="detentionDays"
-            align="center"
-            label="滞留工作日	"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="detentionDays"
+                           align="center"
+                           label="滞留工作日	"
+                           :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column
-            fixed="right"
-            label="操作"
-            align="center"
-            width="100"
-          >
+          <el-table-column fixed="right"
+                           label="操作"
+                           align="center"
+                           width="100">
             <template slot-scope="scope">
-              <el-button
-                v-if="scope.row.status == 'pending' && scope.row.processable"
-                @click="handleEdit(scope.$index)"
-                type="text"
-                size="small"
-                class="div-table-button--edit"
-                >处理</el-button
-              >
-
-              <el-button
-                v-else
-                @click="handleWatch(scope.$index)"
-                type="text"
-                size="small"
-                >查看</el-button
-              >
-
-              <el-popconfirm
-                v-if="false"
-                title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row, scope.$index)"
-                @confirm="handleDel(scope.row, scope.$index)"
-              >
-                <el-button
-                  slot="reference"
-                  type="text"
-                  size="small"
-                  class="div-table-button--delete"
-                  style="margin-left: 10px"
-                  >删除</el-button
-                >
+              <el-button v-if="scope.row.status == 'pending' && scope.row.processable"
+                         @click="handleEdit(scope.$index)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">处理</el-button>
+
+              <el-button v-else
+                         @click="handleWatch(scope.$index)"
+                         type="text"
+                         size="small">查看</el-button>
+
+              <el-popconfirm v-if="false"
+                             title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row, scope.$index)"
+                             @confirm="handleDel(scope.row, scope.$index)">
+                <el-button slot="reference"
+                           type="text"
+                           size="small"
+                           class="div-table-button--delete"
+                           style="margin-left: 10px">删除</el-button>
               </el-popconfirm>
             </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 @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>
       </el-card>
     </div>
 
-    <div class="g-page" v-if="pageType == 'edit' || pageType == 'info'">
-      <project-info
-        ref="eleEditForm"
-        :type="pageType"
-        :projectId="currentProject.projectId"
-        @close="handleClose"
-        @afterEdit="handleEditSuccess"
-      />
+    <div class="g-page"
+         v-if="pageType == 'edit' || pageType == 'info'">
+      <project-info ref="eleEditForm"
+                    :type="pageType"
+                    :projectId="currentProject.projectId"
+                    @close="handleClose"
+                    @afterEdit="handleEditSuccess" />
     </div>
   </div>
 </template>
@@ -275,7 +224,7 @@ import axios from "axios";
 export default {
   components: { projectInfo },
 
-  data() {
+  data () {
     return {
       pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
 
@@ -315,7 +264,7 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
+    maxTableHeight () {
       return this.$store.state.inIframe
         ? this.clientHeight - 360 + this.iframeHeigh
         : this.clientHeight - 360;
@@ -333,11 +282,11 @@ export default {
       }
     },
   },
-  mounted() {
+  mounted () {
     this.getTableData();
   },
   methods: {
-    async handleExportModule() {
+    async handleExportModule () {
       let url = "/heart/iccommunityselforganization/import-template-download";
 
       let params = {};
@@ -374,18 +323,18 @@ export default {
         });
     },
     // 上传大图标成功
-    handleExcelSuccess(res, file) {
+    handleExcelSuccess (res, file) {
       if (res.code === 0 && res.msg === "success") {
         console.log("resss---ppp", res);
       } else {
         this.$message.error(res.msg);
       }
     },
-    handleProgress(event, file, fileList) {
+    handleProgress (event, file, fileList) {
       console.log("percentage", file.percentage);
     },
 
-    beforeExcelUpload(file) {
+    beforeExcelUpload (file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
@@ -402,7 +351,7 @@ export default {
       }
       return fileType && isLt1M;
     },
-    async uploadHttpRequest(file) {
+    async uploadHttpRequest (file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
@@ -457,29 +406,29 @@ export default {
       this.$refs.upload.clearFiles();
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleSearch(val) {
+    handleSearch (val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm(formName) {
+    resetForm (formName) {
       this.$refs[formName].resetFields();
       this.handleSearch();
     },
 
-    async handleChu() {
+    async handleChu () {
       const url = "/gov/project/project/project-list-export";
       const { pageSize, pageNo, fmData } = this;
       axios({
@@ -514,8 +463,8 @@ export default {
         });
     },
 
-    async handleAdd() {},
-    async handleWatch(rowIndex) {
+    async handleAdd () { },
+    async handleWatch (rowIndex) {
       let item = this.tableData[rowIndex];
       this.currentProject = {
         projectId: item.projectId,
@@ -523,7 +472,7 @@ export default {
       this.pageType = "info";
     },
 
-    async handleEdit(rowIndex) {
+    async handleEdit (rowIndex) {
       let item = this.tableData[rowIndex];
       this.currentProject = {
         projectId: item.projectId,
@@ -531,19 +480,19 @@ export default {
       this.pageType = "edit";
     },
 
-    handleClose() {
+    handleClose () {
       this.pageType = "list";
       this.currentProject = {
         projectId: "",
       };
     },
 
-    handleEditSuccess() {
+    handleEditSuccess () {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -561,7 +510,7 @@ export default {
       }
     },
 
-    async getTableData() {
+    async getTableData () {
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
       const url = "/gov/project/project/project-list";
       const { pageSize, pageNo, fmData } = this;
@@ -575,9 +524,28 @@ export default {
         this.total = data.total || 0;
         this.tableData = data.list
           ? data.list.map((item) => {
-              return item;
-            })
+            return item;
+          })
           : [];
+
+
+        this.tableData.forEach(item => {
+          if (item.origin === 'issue') {
+            item.originName = '议题 '
+          } else if (item.origin === 'agency') {
+            item.originName = '项目立项'
+          } else if (item.origin === 'resi_event') {
+            item.originName = '旧版事件上报'
+          } else if (item.origin === 'work_event') {
+            item.originName = '巡查上报'
+          } else if (item.origin === 'ic_event') {
+            item.originName = '事件'
+          } else {
+            item.sourceTypeName = '--'
+          }
+
+
+        });
       } else {
       }
     },

From fdbcbf753d024718419cf9991211b4114a408348 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 12 Oct 2022 14:01:02 +0800
Subject: [PATCH 06/15] 11

---
 src/views/modules/shequzhili/issue/cpts/issue-detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index 8d7b536d2..c706a614a 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -147,7 +147,7 @@
             </el-popover>
           </div>
 
-          <div v-if="issueInfo.issueStatus==='closed'&&issueInfo.sourceType==='resi_topic'"
+          <div v-if="issueInfo.issueStatus==='closed'"
                :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">满意度评价：</span>
             <div class="line"

From ceb9afeef13869647d880ed6fe2904bd17c3347a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 12 Oct 2022 14:11:01 +0800
Subject: [PATCH 07/15] 11

---
 .../modules/shequzhili/issue/cpts/evaluationDetail.vue     | 2 +-
 src/views/modules/shequzhili/issue/cpts/issue-info.vue     | 7 ++++++-
 src/views/modules/shequzhili/issue/cpts/suggestDetail.vue  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
index b401aa503..99f2d404a 100644
--- a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
@@ -106,7 +106,7 @@ export default {
   methods: {
 
 
-    async initForm (topicInfo) {
+    async initForm () {
       this.startLoading()
 
       await this.getList()
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-info.vue b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
index f5f636d5d..d70182a70 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-info.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
@@ -414,12 +414,17 @@ export default {
     handleToSuggest () {
       // this.pageTypeCopy = 'topic'
       this.suggestShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail_suggest.initForm()
+      })
 
     },
     handleToEvaluation () {
       // this.pageTypeCopy = 'topic'
       this.evaluationShow = true
-
+      this.$nextTick(() => {
+        this.$refs.ref_detail_evaluation.initForm()
+      })
     },
 
     // 开启加载动画
diff --git a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
index 071ce19fe..3c7ff4e9e 100644
--- a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
@@ -97,7 +97,7 @@ export default {
   methods: {
 
 
-    async initForm (topicInfo) {
+    async initForm () {
       this.startLoading()
 
       await this.getSuggestion()

From cc41c2a8bd7829b77fecfae78431a0423f971292 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 12 Oct 2022 14:42:43 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/issue/cpts/evaluationDetail.vue   | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
index 99f2d404a..cd5910c4a 100644
--- a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
@@ -16,14 +16,14 @@
 
         <el-table-column prop="userNickName"
                          align="center"
-                         width="80"
+                         min-width="120"
                          label="评价人"
                          :show-overflow-tooltip="true">
         </el-table-column>
 
         <el-table-column prop="evaluateTimeShow"
                          align="center"
-                         width="150"
+                         min-width="170"
                          label="评价时间"
                          :show-overflow-tooltip="true">
         </el-table-column>
@@ -36,15 +36,15 @@
           <template slot-scope="scope">
             <el-image v-if="scope.row.satisfaction=='bad'"
                       style="width: 40px; height: 40px"
-                      src="@/assets/img/satisfy-images/face1_light.png">
+                      :src="badurl_light">
             </el-image>
             <el-image v-else-if="scope.row.satisfaction=='good'"
                       style="width: 40px; height: 40px"
-                      src="@/assets/img/satisfy-images/face2_light.png">
+                      :src="goodurl_light">
             </el-image>
             <el-image v-else
                       style="width: 40px; height: 40px"
-                      src="@/assets/img/satisfy-images/face3_light.png">
+                      :src="perfecturl_light">
             </el-image>
 
           </template>
@@ -94,6 +94,11 @@ export default {
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
 
+      badurl_light: require('@/assets/img/satisfy-images/face1_light.png'),
+
+      goodurl_light: require('@/assets/img/satisfy-images/face2_light.png'),
+
+      perfecturl_light: require('@/assets/img/satisfy-images/face3_light.png'),
     }
   },
   components: {},
@@ -127,6 +132,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+
         data.forEach(element => {
 
           element.evaluateTimeShow = dateFormat(

From 5ca217dcdc3c2961fb29efa897b53843eaf75b4d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 12 Oct 2022 14:44:32 +0800
Subject: [PATCH 09/15] 111

---
 src/views/modules/shequzhili/issue/cpts/issue-detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index c706a614a..64f8a63a0 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -349,7 +349,7 @@ export default {
     },
 
     async getChartInfo () {
-      const url = "/gov/issue/manage/votingtrend";
+      const url = "/gov/issue/manage/votingTrendV2";
 
       const { data, code, msg } = await requestPost(url, {
         issueId: this.issueId,

From 1f049411325f674e8f60f4ae4b624befb7856438 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 12 Oct 2022 16:32:17 +0800
Subject: [PATCH 10/15] 11

---
 src/views/modules/shequzhili/issue/cpts/issue-detail.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index 64f8a63a0..d506cd179 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -19,6 +19,10 @@
             <span class="info-title-2">所属网格：</span>
             <span>{{ issueInfo.belongsGridName||'--' }}</span>
           </div>
+          <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
+            <span class="info-title-2">议题发表人：</span>
+            <span>{{ issueInfo.issueInitiator||'--' }}</span>
+          </div>
 
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">议题来源：</span>

From 5df76815f7d79e8bd75542c52d2141db664bb623 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 14 Oct 2022 16:15:51 +0800
Subject: [PATCH 11/15] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/article/index.vue  | 163 ++++-
 .../communityParty/heart/heartForm.vue        | 573 ++++++++----------
 .../shequzhili/issue/cpts/issue-detail.vue    |  10 +-
 .../shequzhili/issue/cptsAudit/issue-info.vue |  19 +-
 4 files changed, 427 insertions(+), 338 deletions(-)

diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue
index ac8ae1b0f..8c2aa34e6 100644
--- a/src/views/modules/communityParty/article/index.vue
+++ b/src/views/modules/communityParty/article/index.vue
@@ -42,7 +42,7 @@
 
       <template v-slot:listBtnbefore="{ item }">
         <el-button v-if="item.isTop == '1'"
-                   @click="handleTopArticle(item,'cancel_top')"
+                   @click="handleCancleTopArticle(item,'cancel_top')"
                    type="text"
                    size="small"
                    style="color: #fe6252">取消置顶</el-button>
@@ -67,6 +67,57 @@
                @close="offlineShowed = false"
                @afterOffline="handleOfflineSuccess"></offline>
     </el-dialog>
+    <el-dialog :visible.sync="showAddImage"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="上传封面图片"
+               width="650px"
+               top="5vh"
+               class="dialog-h"
+               @closed="showAddImage = false">
+      <div class="dialog-h-content scroll-h">
+        <!-- <span>请先上 传封面图片</span> -->
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 class="div_form">
+          <div class="form_flex">
+            <div class="form_item">
+
+              <el-form-item label=""
+                            prop="selImgUrl"
+                            label-width="150px"
+                            style="display: block">
+                <el-upload :headers="$getElUploadHeaders()"
+                           :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                           ref="uploadPic"
+                           :action="uploadUlr"
+                           list-type="picture-card"
+                           :on-exceed="exceedPic"
+                           :before-upload="beforeAvatarUpload"
+                           :on-remove="removePic"
+                           :file-list="replayImgList"
+                           :on-change="handleEditChange"
+                           :on-success="handleSuccess"
+                           :limit="1">
+                  <span class="font-14">选择图片</span>
+                </el-upload>
+              </el-form-item>
+
+            </div>
+
+          </div>
+
+        </el-form>
+      </div>
+      <div class="div_btn">
+        <el-button size="small"
+                   @click="showAddImage = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="handleAddImage">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -475,6 +526,15 @@ export default {
           return true;
         },
       },
+
+      formData: {},
+      showAddImage: false,
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+      replayImgList: [],
+      hideUploadBtn: false,
+      selType: 'top',
+      selArticleId: '',
+      selImgUrl: ''
     };
   },
   components: { basePage, offline },
@@ -491,24 +551,103 @@ export default {
       this.$refs.offlineForm.initForm(item);
     },
 
+    async handleAddImage () {
+      console.log('formData', this.formData)
+      this.topArticle()
+    },
+    async handleCancleTopArticle (item, type) {
+      this.selType = type
+      this.selArticleId = item.articleId
+      await this.topArticle()
+    },
+
     async handleTopArticle (item, type) {
 
-      const url = "/gov/voice/article/topArticle";
+      this.selType = type
+      this.selArticleId = item.articleId
+
+      let hasImage = await this.isHasImage()
+
+      if (hasImage === 'refrsh') {
+        this.$message.error("请求失败，请重新尝试");
+
+      } else if (hasImage === 'no') {
+        // this.$message.info("请先上传封面图片");
+        this.showAddImage = true
+      } else {
+        await this.topArticle()
+      }
+
+    },
+
+    async isHasImage () {
+      const url = "/gov/voice/article/detailV2";
       const { tableData } = this;
 
       const { data, code, msg } = await requestPost(url, {
-        articleId: item.articleId,
-        type: type
+        articleId: this.selArticleId,
+
       });
 
+      if (code === 0) {
+        // this.formData = data
+        if (data.imgUrl) {
+          return 'has'
+        } else {
+          return 'no'
+        }
+      } else {
+        return 'refrsh'
+      }
+    },
+
+    async topArticle () {
+      const url = "/gov/voice/article/topArticle";
+      const { tableData } = this;
+      let params = {
+        articleId: this.selArticleId,
+        type: this.selType
+      }
+      if (this.selImgUrl) {
+        params.imgUrl = this.selImgUrl
+      }
+      const { data, code, msg } = await requestPost(url, params);
+
       if (code === 0) {
         this.$message.success("操作成功！");
+        this.showAddImage = false
         this.$refs.basePage.refresh();
       } else {
         this.$message.success("操作失败！");
       }
     },
 
+    removePic (file, fileList) {
+      this.selImgUrl = "";
+      this.replayImgList = [];
+      this.hideUploadBtn = fileList.length >= 1;
+    },
+    // 最多上传3张图，超过时隐藏上传按钮
+    handleEditChange (file, fileList) {
+      this.hideUploadBtn = fileList.length >= 1;
+    },
+    exceedPic () {
+      this.$message.warning("只能上传1张封面图");
+    },
+    beforeAvatarUpload (file) {
+      const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 10;
+
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 10MB!");
+      }
+      return isLt2M;
+    },
+    handleSuccess (response, file, fileList) {
+      this.replayImgList.push(file);
+      this.selImgUrl = response.data.url;
+    },
+
     handleOfflineSuccess () {
       this.$refs.basePage.refresh();
       this.offlineShowed = false;
@@ -541,4 +680,18 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+
+.avatar-uploader {
+  margin: 0 0 0 20px;
+}
+</style>
+
+<style lang="scss">
+.hide {
+  .el-upload--picture-card {
+    display: none !important;
+  }
+}
+</style>
diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
index 093b3e690..7a3cfdfe6 100644
--- a/src/views/modules/communityParty/heart/heartForm.vue
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -1,279 +1,215 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="div_form"
-      >
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="div_form">
         <div class="form_flex">
           <div class="form_item">
-            <el-form-item label="主办方" prop="sponsorId" label-width="150px">
-              <el-cascader
-                v-if="formData.richTextFlag || formType === 'add'"
-                class="item_width_6"
-                ref="myCascader"
-                v-model="agencyIdArray"
-                :options="orgOptions"
-                :props="orgOptionProps"
-                :show-all-levels="false"
-                @change="handleChangeAgency"
-              ></el-cascader>
-              <el-input
-                v-else
-                class="item_width_6"
-                v-model="formData.sponsorName"
-              ></el-input>
+            <el-form-item label="主办方"
+                          prop="sponsorId"
+                          label-width="150px">
+              <el-cascader v-if="formData.richTextFlag || formType === 'add'"
+                           class="item_width_6"
+                           ref="myCascader"
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
+              <el-input v-else
+                        class="item_width_6"
+                        v-model="formData.sponsorName"></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="活动标题"
-              prop="title"
-              label-width="150px"
-              style="display: block"
-            >
-              <el-input
-                class="item_width_6"
-                type="textarea"
-                maxlength="50"
-                show-word-limit
-                :rows="2"
-                placeholder="请输入活动标题，不超过50字"
-                v-model="formData.title"
-              ></el-input>
+            <el-form-item label="活动标题"
+                          prop="title"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        type="textarea"
+                        maxlength="50"
+                        show-word-limit
+                        :rows="2"
+                        placeholder="请输入活动标题，不超过50字"
+                        v-model="formData.title"></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="封面"
-              prop="coverPic"
-              label-width="150px"
-              style="display: block"
-            >
-              <el-upload
-                :headers="$getElUploadHeaders()"
-                :class="['avatar-uploader', { hide: hideUploadBtn }]"
-                ref="uploadPic"
-                :action="uploadUlr"
-                list-type="picture-card"
-                :on-exceed="exceedPic"
-                :before-upload="beforeAvatarUpload"
-                :on-remove="removePic"
-                :file-list="replayImgList"
-                :on-change="handleEditChange"
-                :on-success="handleSuccess"
-                :limit="1"
-              >
+            <el-form-item label="封面"
+                          prop="coverPic"
+                          label-width="150px"
+                          style="display: block">
+              <el-upload :headers="$getElUploadHeaders()"
+                         :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                         ref="uploadPic"
+                         :action="uploadUlr"
+                         list-type="picture-card"
+                         :on-exceed="exceedPic"
+                         :before-upload="beforeAvatarUpload"
+                         :on-remove="removePic"
+                         :file-list="replayImgList"
+                         :on-change="handleEditChange"
+                         :on-success="handleSuccess"
+                         :limit="1">
                 <span class="font-14">选择图片</span>
               </el-upload>
             </el-form-item>
 
-            <el-form-item
-              label="活动时间"
-              label-width="150px"
-              prop="actStartTime"
-            >
-              <el-date-picker
-                v-model="formData.actStartTime"
-                class="list_item_width_3"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm"
-                format="yyyy-MM-dd HH:mm"
-                placeholder="开始时间"
-              >
+            <el-form-item label="活动时间"
+                          label-width="150px"
+                          prop="actStartTime">
+              <el-date-picker v-model="formData.actStartTime"
+                              class="list_item_width_3"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="开始时间">
               </el-date-picker>
               <span class="data-tag">至</span>
-              <el-date-picker
-                v-model="formData.actEndTime"
-                class="list_item_width_3 data-tag"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm"
-                format="yyyy-MM-dd HH:mm"
-                placeholder="结束时间"
-              >
+              <el-date-picker v-model="formData.actEndTime"
+                              class="list_item_width_3 data-tag"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item
-              label="活动人数"
-              prop="actQuota"
-              style="display: block"
-              label-width="150px"
-            >
-              <el-input-number
-                class="item_width_2"
-                :min="0"
-                v-model="formData.actQuota"
-                label="活动人数"
-              ></el-input-number>
+            <el-form-item label="活动人数"
+                          prop="actQuota"
+                          style="display: block"
+                          label-width="150px">
+              <el-input-number class="item_width_2"
+                               :min="0"
+                               v-model="formData.actQuota"
+                               label="活动人数"></el-input-number>
             </el-form-item>
 
-            <el-form-item
-              label="活动积分"
-              prop="reward"
-              style="display: block"
-              label-width="150px"
-            >
-              <el-input-number
-                class="item_width_2"
-                :min="0"
-                v-model="formData.reward"
-                label="活动积分"
-              ></el-input-number>
+            <el-form-item label="活动积分"
+                          prop="reward"
+                          style="display: block"
+                          label-width="150px">
+              <el-input-number class="item_width_2"
+                               :min="0"
+                               v-model="formData.reward"
+                               label="活动积分"></el-input-number>
             </el-form-item>
-            <el-form-item
-              label="联系人"
-              prop="sponsorContacts"
-              label-width="150px"
-              style="display: block"
-            >
-              <el-input
-                class="item_width_6"
-                maxlength="20"
-                placeholder="请输入联系人"
-                v-model="formData.sponsorContacts"
-              >
+            <el-form-item label="联系人"
+                          prop="sponsorContacts"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        maxlength="20"
+                        placeholder="请输入联系人"
+                        v-model="formData.sponsorContacts">
               </el-input>
             </el-form-item>
           </div>
           <div class="form_item">
-            <el-form-item
-              label="联系电话"
-              prop="sponsorTel"
-              label-width="150px"
-              style="display: block"
-            >
-              <el-input
-                class="item_width_6"
-                maxlength="20"
-                placeholder="请输入联系电话"
-                v-model="formData.sponsorTel"
-              >
+            <el-form-item label="联系电话"
+                          prop="sponsorTel"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        maxlength="20"
+                        placeholder="请输入联系电话"
+                        v-model="formData.sponsorTel">
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="报名仅限志愿者"
-              prop="volunteerLimit"
-              label-width="150px"
-              style="display: block"
-            >
+            <el-form-item label="报名仅限志愿者"
+                          prop="volunteerLimit"
+                          label-width="150px"
+                          style="display: block">
               <el-checkbox v-model="formData.volunteerLimit"></el-checkbox>
             </el-form-item>
 
-            <el-form-item
-              label="报名无需审核"
-              prop="auditSwitch"
-              label-width="150px"
-              style="display: block"
-            >
+            <el-form-item label="报名无需审核"
+                          prop="auditSwitch"
+                          label-width="150px"
+                          style="display: block">
               <el-checkbox v-model="noauditSwitch"></el-checkbox>
-              <span class="div-tooltip"
-                >（选中后报名参加活动人员可以直接审核通过）</span
-              >
+              <span class="div-tooltip">（选中后报名参加活动人员可以直接审核通过）</span>
             </el-form-item>
 
-            <el-form-item
-              label="报名截止时间"
-              style="display: block"
-              prop="signUpEndTime"
-              label-width="150px"
-            >
-              <el-date-picker
-                class="item_width_2"
-                v-model="formData.signUpEndTime"
-                value-format="yyyy-MM-dd HH:mm"
-                format="yyyy-MM-dd HH:mm"
-                type="datetime"
-                placeholder="选择时间"
-              >
+            <el-form-item label="报名截止时间"
+                          style="display: block"
+                          prop="signUpEndTime"
+                          label-width="150px">
+              <el-date-picker class="item_width_2"
+                              v-model="formData.signUpEndTime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              type="datetime"
+                              placeholder="选择时间">
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item
-              label="报名条件"
-              prop="requirement"
-              label-width="150px"
-              style="display: block"
-            >
-              <el-input
-                class="item_width_6"
-                type="textarea"
-                maxlength="200"
-                show-word-limit
-                :rows="7"
-                placeholder="请输入报名条件，不超过200字"
-                v-model="formData.requirement"
-              ></el-input>
+            <el-form-item label="报名条件"
+                          prop="requirement"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_6"
+                        type="textarea"
+                        maxlength="200"
+                        show-word-limit
+                        :rows="7"
+                        placeholder="请输入报名条件，不超过200字"
+                        v-model="formData.requirement"></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="签到时间"
-              label-width="150px"
-              prop="signInStartTime"
-            >
-              <el-date-picker
-                v-model="formData.signInStartTime"
-                class="list_item_width_3"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm"
-                format="yyyy-MM-dd HH:mm"
-                placeholder="开始时间"
-              >
+            <el-form-item label="签到时间"
+                          label-width="150px"
+                          prop="signInStartTime">
+              <el-date-picker v-model="formData.signInStartTime"
+                              class="list_item_width_3"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="开始时间">
               </el-date-picker>
               <span class="data-tag">至</span>
-              <el-date-picker
-                v-model="formData.signInEndTime"
-                class="list_item_width_3 data-tag"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm"
-                format="yyyy-MM-dd HH:mm"
-                placeholder="结束时间"
-              >
+              <el-date-picker v-model="formData.signInEndTime"
+                              class="list_item_width_3 data-tag"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm"
+                              format="yyyy-MM-dd HH:mm"
+                              placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item
-              label="签到有效范围（米）"
-              prop="signInRadius"
-              style="display: block"
-              label-width="150px"
-            >
-              <el-input-number
-                class="item_width_2"
-                :min="0"
-                v-model="formData.signInRadius"
-                label="签到有效范围"
-              ></el-input-number>
+            <el-form-item label="签到有效范围（米）"
+                          prop="signInRadius"
+                          style="display: block"
+                          label-width="150px">
+              <el-input-number class="item_width_2"
+                               :min="0"
+                               v-model="formData.signInRadius"
+                               label="签到有效范围"></el-input-number>
             </el-form-item>
           </div>
         </div>
         <div class="form_flex">
           <div class="form_item">
-            <el-form-item
-              label="活动地点"
-              prop="actAddress"
-              label-width="150px"
-            >
+            <el-form-item label="活动地点"
+                          prop="actAddress"
+                          label-width="150px">
               <div style="width: 400px">
-                <el-input
-                  class="item_width_4"
-                  maxlength="100"
-                  style="width: 330px"
-                  show-word-limit
-                  placeholder="请输入所在地址"
-                  v-model="formData.actAddress"
-                >
+                <el-input class="item_width_4"
+                          maxlength="100"
+                          style="width: 330px"
+                          show-word-limit
+                          placeholder="请输入所在地址"
+                          v-model="formData.actAddress">
                 </el-input>
-                <el-button
-                  style="margin-left: 10px"
-                  type="default"
-                  size="small"
-                  @click="handleSearchMapAct"
-                  >查询</el-button
-                >
-                <div id="map_act_id" class="div_map"></div>
+                <el-button style="margin-left: 10px"
+                           type="default"
+                           size="small"
+                           @click="handleSearchMapAct">查询</el-button>
+                <div id="map_act_id"
+                     class="div_map"></div>
                 <!-- <div style="margin-top: 10px">
                   <span>经度</span>
                   <el-input class="item_width_3"
@@ -292,29 +228,23 @@
             </el-form-item>
           </div>
           <div class="form_item">
-            <el-form-item
-              label="签到地点"
-              prop="signInAddress"
-              label-width="150px"
-            >
+            <el-form-item label="签到地点"
+                          prop="signInAddress"
+                          label-width="150px">
               <div style="width: 400px">
-                <el-input
-                  class="item_width_4"
-                  maxlength="100"
-                  style="width: 330px"
-                  show-word-limit
-                  placeholder="请输入所在地址"
-                  v-model="formData.signInAddress"
-                >
+                <el-input class="item_width_4"
+                          maxlength="100"
+                          style="width: 330px"
+                          show-word-limit
+                          placeholder="请输入所在地址"
+                          v-model="formData.signInAddress">
                 </el-input>
-                <el-button
-                  style="margin-left: 10px"
-                  type="default"
-                  size="small"
-                  @click="handleSearchMapSignin"
-                  >查询</el-button
-                >
-                <div id="map_signin_id" class="div_map"></div>
+                <el-button style="margin-left: 10px"
+                           type="default"
+                           size="small"
+                           @click="handleSearchMapSignin">查询</el-button>
+                <div id="map_signin_id"
+                     class="div_map"></div>
                 <!-- <div style="margin-top: 10px">
                   <span>经度</span>
                   <el-input class="item_width_3"
@@ -333,74 +263,67 @@
             </el-form-item>
           </div>
         </div>
-        <el-form-item
-          label="活动详情"
-          prop="actContentHtml"
-          label-width="150px"
-          style="display: block"
-        >
+        <el-form-item label="活动详情"
+                      prop="actContentHtml"
+                      label-width="150px"
+                      style="display: block">
           <div v-if="formData.richTextFlag || formType === 'add'">
-            <Tinymce
-              class="tinymce_view"
-              v-if="formType != 'detail'"
-              v-model="formData.actContentHtml"
-              :height="250"
-              style="width: 1000px"
-              :customerId="customerId"
-              placeholder="在这里输入文字"
-            />
-            <p v-else class="text_p" v-html="formData.actContentHtml"></p>
+            <Tinymce class="tinymce_view"
+                     v-if="formType != 'detail'"
+                     v-model="formData.actContentHtml"
+                     :height="250"
+                     style="width: 1000px"
+                     :customerId="customerId"
+                     placeholder="在这里输入文字" />
+            <p v-else
+               class="text_p"
+               v-html="formData.actContentHtml"></p>
           </div>
-          <div class="div_content" v-else>
-            <div v-for="(item, index) in formData.actContent" :key="index">
+          <div class="div_content"
+               v-else>
+            <div v-for="(item, index) in formData.actContent"
+                 :key="index">
               <div v-if="item.contentType === 'text'">{{ item.content }}</div>
-              <img
-                v-if="item.contentType === 'img'"
-                class="img_icon"
-                :src="item.content"
-              />
+              <img v-if="item.contentType === 'img'"
+                   class="img_icon"
+                   :src="item.content" />
             </div>
           </div>
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.summaryFlag"
-          label="活动回顾"
-          prop="summaryContentHtml"
-          label-width="150px"
-          style="display: block"
-        >
+        <el-form-item v-if="formData.summaryFlag"
+                      label="活动回顾"
+                      prop="summaryContentHtml"
+                      label-width="150px"
+                      style="display: block">
           <div v-if="formData.richTextFlag">
-            <p class="text_p" v-html="formData.summaryContentHtml"></p>
+            <p class="text_p"
+               v-html="formData.summaryContentHtml"></p>
           </div>
-          <div class="div_content" v-else>
-            <div v-for="(item, index) in formData.summaryContent" :key="index">
+          <div class="div_content"
+               v-else>
+            <div v-for="(item, index) in formData.summaryContent"
+                 :key="index">
               <div v-if="item.contentType === 'text'">{{ item.content }}</div>
-              <img
-                v-if="item.contentType === 'img'"
-                class="img_icon"
-                :src="item.content"
-              />
-              <p
-                v-if="item.contentType === 'rich_text'"
-                class="text_p"
-                v-html="item.content"
-              ></p>
+              <img v-if="item.contentType === 'img'"
+                   class="img_icon"
+                   :src="item.content" />
+              <p v-if="item.contentType === 'rich_text'"
+                 class="text_p"
+                 v-html="item.content"></p>
             </div>
           </div>
         </el-form-item>
       </el-form>
     </div>
     <div class="div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        size="small"
-        v-if="formType != 'detail'"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
     </div>
   </div>
 </template>
@@ -427,7 +350,7 @@ var infoWindowList_signin;
 var geocoder_signin; // 新建一个正逆地址解析类
 
 export default {
-  data() {
+  data () {
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
@@ -542,7 +465,7 @@ export default {
     };
   },
   components: { Tinymce },
-  mounted() {
+  mounted () {
     this.customerId = localStorage.getItem("customerId");
     this.loadSponsorlist();
     this.initMap();
@@ -551,7 +474,7 @@ export default {
   },
 
   methods: {
-    async initForm(type, actId) {
+    async initForm (type, actId) {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
@@ -570,7 +493,7 @@ export default {
     },
 
     //获取主办方
-    async loadSponsorlist() {
+    async loadSponsorlist () {
       const url = "/heart/work/act/sponsorlist";
 
       let params = {};
@@ -587,7 +510,7 @@ export default {
       }
     },
 
-    handleChangeAgency(val) {
+    handleChangeAgency (val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
       if (obj) {
         this.formData.sponsorId = obj.gridId;
@@ -608,7 +531,7 @@ export default {
     },
 
     //加载form
-    async loadFormData() {
+    async loadFormData () {
       const url = "/heart/work/act/detail";
 
       let params = {
@@ -651,7 +574,7 @@ export default {
       }
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
       console.log(this.formData);
 
       this.btnDisable = true;
@@ -690,7 +613,7 @@ export default {
         }
       });
     },
-    async addHeartAct() {
+    async addHeartAct () {
       let obj = {
         contentType: "rich_text",
         content: this.dormatHtml(this.formData.actContentHtml),
@@ -730,7 +653,7 @@ export default {
       }
     },
 
-    dormatHtml(content) {
+    dormatHtml (content) {
       let c = "";
       if (content.indexOf("DOCTYPE") != -1) {
         c = content.slice(45, -16);
@@ -739,19 +662,19 @@ export default {
       return c || content;
     },
 
-    removePic(file, fileList) {
+    removePic (file, fileList) {
       this.formData.coverPic = "";
       this.replayImgList = [];
       this.hideUploadBtn = fileList.length >= 1;
     },
     // 最多上传3张图，超过时隐藏上传按钮
-    handleEditChange(file, fileList) {
+    handleEditChange (file, fileList) {
       this.hideUploadBtn = fileList.length >= 1;
     },
-    exceedPic() {
+    exceedPic () {
       this.$message.warning("只能上传1张封面图");
     },
-    beforeAvatarUpload(file) {
+    beforeAvatarUpload (file) {
       const isJPG = file.type === "image/jpeg";
       const isLt2M = file.size / 1024 / 1024 < 10;
 
@@ -760,13 +683,13 @@ export default {
       }
       return isLt2M;
     },
-    handleSuccess(response, file, fileList) {
+    handleSuccess (response, file, fileList) {
       this.replayImgList.push(file);
       this.formData.coverPic = response.data.url;
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap() {
+    initMap () {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
@@ -819,7 +742,7 @@ export default {
       this.handleMoveCenterSignin();
     },
 
-    setMarkerAct(lat, lng) {
+    setMarkerAct (lat, lng) {
       markers_act.setGeometries([]);
       markers_act.add([
         {
@@ -833,7 +756,7 @@ export default {
       ]);
     },
 
-    handleSearchMapAct() {
+    handleSearchMapAct () {
       infoWindowList_act.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -863,7 +786,7 @@ export default {
         });
     },
 
-    handleMoveCenterAct(e) {
+    handleMoveCenterAct (e) {
       //修改地图中心点
       const center = map_act.getCenter();
       const lat = center.getLat();
@@ -880,7 +803,7 @@ export default {
           });
       }
     },
-    setMarkerSignin(lat, lng) {
+    setMarkerSignin (lat, lng) {
       markers_signin.setGeometries([]);
       markers_signin.add([
         {
@@ -894,7 +817,7 @@ export default {
       ]);
     },
 
-    handleSearchMapSignin() {
+    handleSearchMapSignin () {
       infoWindowList_signin.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -924,7 +847,7 @@ export default {
         });
     },
 
-    handleMoveCenterSignin(e) {
+    handleMoveCenterSignin (e) {
       //修改地图中心点
       const center = map_signin.getCenter();
       const lat = center.getLat();
@@ -942,12 +865,12 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.resetData();
       this.$emit("dialogCancle");
     },
 
-    resetData() {
+    resetData () {
       this.actId = "";
       this.replayImgList = [];
       this.agencyIdArray = [];
@@ -995,7 +918,7 @@ export default {
       };
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1003,7 +926,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -1011,7 +934,7 @@ export default {
     },
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         sponsorId: [
           { required: true, message: "主办方不能为空", trigger: "change" },
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index d506cd179..3a83fb3e7 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -218,6 +218,7 @@ function iniData () {
     issueInfo: {},
     showType: '',
 
+    popSelIssueCate: [],
     issueCate: [],
     cateOptions: [],
     visibleCatePanel: false,
@@ -270,7 +271,7 @@ export default {
   watch: {
     selectedCateData (val) {
       const { cateOptions } = this;
-      this.issueCate = val
+      this.popSelIssueCate = val
         .filter((arr) => arr.length > 0)
         .map((arr) => {
           let ele1 = cateOptions.find((item) => item.id == arr[0]);
@@ -443,19 +444,20 @@ export default {
 
     async updateIssueCate () {
       const url = "/gov/issue/issuecategory/save";
-      const { issueCate } = this;
-      if (issueCate.length == 0) {
+      const { popSelIssueCate } = this;
+      if (popSelIssueCate.length == 0) {
         return this.$message.error("分类不能为空");
       }
 
       const { data, code, msg } = await requestPost(url, {
         issueId: this.issueId,
-        categoryList: issueCate,
+        categoryList: popSelIssueCate,
       });
 
       if (code === 0) {
         this.$message.success("更改成功");
         this.visibleCatePanel = false;
+        this.issueCate = popSelIssueCate
         this.getTagOptions();
       } else {
         this.$message.error(msg);
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
index 280464295..4357faf2a 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
@@ -64,10 +64,21 @@
                     <div class="detail-field">提交审核时间：</div>
                     <div class="detail-value">{{ item.operateTime }}</div>
                   </div>
-                  <div v-if="item.actionType==='rejected'"
-                       class="detail">
-                    <div class="detail-field">理由：</div>
-                    <div class="detail-value">{{ item.reason }}</div>
+                  <div v-if="item.actionType==='rejected'">
+                    <div class="detail">
+                      <div class="detail-field">驳回时间：</div>
+                      <div class="detail-value">{{ item.operateTime }}</div>
+                    </div>
+
+                    <div class="detail">
+                      <div class="detail-field">驳回人：</div>
+                      <div class="detail-value">{{ item.staffName }}</div>
+                    </div>
+                    <div class="detail">
+                      <div class="detail-field">驳回理由：</div>
+                      <div class="detail-value">{{ item.reason }}</div>
+                    </div>
+
                   </div>
 
                 </div>

From 2c906b6af15c0a6c041055033e8ebea23ac9bd9e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 14 Oct 2022 16:32:46 +0800
Subject: [PATCH 12/15] bug

---
 .../issue/cptsAudit/issue-detail.vue          | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
index b4db55186..eac1c06d2 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
@@ -34,14 +34,14 @@
                  v-for="src in topicInfo.photoList"
                  @click="watchImg(src.url)" />
           </div>
-          <div v-if="topicInfo.voiceList&&topicInfo.voiceList.length>0"
+          <div v-if="voiceList&&voiceList.length>0"
                :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">语音：</span>
             <audio controls>
               <source :src="item.url"
                       type=""
                       :key="item.url"
-                      v-for="item in topicInfo.voiceList" />
+                      v-for="item in voiceList" />
             </audio>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
@@ -100,6 +100,7 @@ function iniData () {
 
     issueInfo: {},
     topicInfo: {},
+    voiceList: {},
     showType: '',
 
   };
@@ -154,11 +155,30 @@ export default {
           "yyyy-MM-dd hh:mm"
         );
       }
+
+      this.getAttechment()
     }
 
   },
 
   methods: {
+    async getAttechment () {
+      const url = "/resi/group/topic/topicattachmentlist"
+
+      let params = {
+        topicId: this.topicInfo.topicId,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.voiceList = data.voiceList
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
     watchImg (src) {
       window.open(src);
     },
@@ -171,8 +191,6 @@ export default {
       this.$emit("handleClose");
     },
 
-    async getApiData () {
-    },
 
     handleToTopic () {
       this.$emit("handleToTopic")

From 96d9c429c71db5674333d3d53acbf3d8dbb4b89b Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 21 Oct 2022 16:40:47 +0800
Subject: [PATCH 13/15] 11

---
 .../base/epidemic/natInfo/natDetail.vue       |  6 +++-
 .../modules/base/epidemic/natInfo/natForm.vue | 30 +++++++++----------
 .../modules/base/epidemic/natInfo/natList.vue | 30 +++++++++----------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue
index 65498f1ff..718b51c4e 100644
--- a/src/views/modules/base/epidemic/natInfo/natDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue
@@ -18,9 +18,13 @@
             <span class="info-title-2">证件号：</span>
             <span>{{ formData.idCard||'--'  }}</span>
           </div>
+          <div class="info-prop">
+            <span class="info-title-2">采样时间：</span>
+            <span>{{ formData.sampleTime||'--'  }}</span>
+          </div>
 
           <div class="info-prop">
-            <span class="info-title-2">检检测地点：</span>
+            <span class="info-title-2">检测地点：</span>
             <span>{{ formData.natAddress||'--'  }}</span>
           </div>
           <div class="info-prop">
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index ebd7d29f3..1bcdf2af5 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -95,7 +95,20 @@
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
-
+        <el-form-item label="采样时间"
+                      style="display: block"
+                      prop="sampleTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.sampleTime"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          :picker-options="pickerOptions"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="检测时间"
                       style="display: block"
                       prop="natTime"
@@ -133,21 +146,6 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="采样时间"
-                      style="display: block"
-                      prop="sampleTime"
-                      label-width="150px">
-          <el-date-picker class="item_width_2"
-                          v-model="formData.sampleTime"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
-                          type="datetime"
-                          :picker-options="pickerOptions"
-                          clearable
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
-
         <el-form-item v-if=" formType!=='detail' || (formType=='detail'&&fileList.length>0)"
                       class="block"
                       label-width="150px"
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 4659e13d1..648b2e73f 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -32,14 +32,13 @@
               </el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="核酸检测时间"
+          <el-form-item label="采样时间"
                         label-width="110px"
-                        prop="startTime">
-            <el-date-picker v-model="timeRange"
+                        prop="sampleStartTime">
+            <el-date-picker v-model="sampleTimeRange"
                             size="small"
                             type="datetimerange"
-                            @change="handleTimeChange"
+                            @change="handleSampleTimeChange"
                             format="yyyy-MM-dd HH:mm"
                             value-format="yyyy-MM-dd HH:mm"
                             range-separator="至"
@@ -48,13 +47,13 @@
             </el-date-picker>
 
           </el-form-item>
-          <el-form-item label="采样时间"
+          <el-form-item label="核酸检测时间"
                         label-width="110px"
-                        prop="sampleStartTime">
-            <el-date-picker v-model="sampleTimeRange"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
                             size="small"
                             type="datetimerange"
-                            @change="handleSampleTimeChange"
+                            @change="handleTimeChange"
                             format="yyyy-MM-dd HH:mm"
                             value-format="yyyy-MM-dd HH:mm"
                             range-separator="至"
@@ -177,6 +176,12 @@
                          label="证件号"
                          min-width="170">
         </el-table-column>
+        <el-table-column prop="sampleTime"
+                         header-align="center"
+                         align="center"
+                         label="采样时间"
+                         width="150">
+        </el-table-column>
         <el-table-column prop="natTime"
                          header-align="center"
                          align="center"
@@ -198,12 +203,7 @@
                          label="检测结果"
                          width="100">
         </el-table-column>
-        <el-table-column prop="sampleTime"
-                         header-align="center"
-                         align="center"
-                         label="采样时间"
-                         width="150">
-        </el-table-column>
+
         <el-table-column v-if="isResiUser"
                          prop="isResiUserShow"
                          header-align="center"

From 63cf9e72f9805826748031dbab6943eaf6b18c01 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 21 Oct 2022 16:52:01 +0800
Subject: [PATCH 14/15] 11

---
 src/views/modules/base/epidemic/natInfo/natDetail.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue
index 718b51c4e..69224e2a8 100644
--- a/src/views/modules/base/epidemic/natInfo/natDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue
@@ -22,7 +22,10 @@
             <span class="info-title-2">采样时间：</span>
             <span>{{ formData.sampleTime||'--'  }}</span>
           </div>
-
+          <div class="info-prop">
+            <span class="info-title-2">检测时间：</span>
+            <span>{{ formData.natTime||'--'  }}</span>
+          </div>
           <div class="info-prop">
             <span class="info-title-2">检测地点：</span>
             <span>{{ formData.natAddress||'--'  }}</span>

From 6b44b5ca1a721b1e3705ad6ebb5f859fd77f02c8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 25 Oct 2022 15:14:52 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E4=B9=9F=E8=AE=B8=E6=94=B9=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shujuduibi/canji.vue  | 6 +++++-
 src/views/modules/shujuduibi/siwang.vue | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index 0d7a877c7..776bc7992 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -19,7 +19,11 @@
       </template>
 
       <template v-slot:listBtnSup="{ item }">
-        <el-button type="text" @click="handleSync(item)" size="small"
+        <el-button
+          type="text"
+          v-if="item.dealStatus != 1"
+          @click="handleSync(item)"
+          size="small"
           >全部更新</el-button
         >
       </template>
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 274c8566a..cdea89fa1 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -19,7 +19,11 @@
       </template>
 
       <template v-slot:listBtnSup="{ item }">
-        <el-button type="text" @click="handleSync(item)" size="small"
+        <el-button
+          type="text"
+          v-if="item.dealStatus != 1"
+          @click="handleSync(item)"
+          size="small"
           >全部更新</el-button
         >
       </template>