From ff575e13667333988a217eaa7a33dfcb570a3ffa Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 15 Dec 2023 14:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=89=E5=A4=A7=E8=AF=89?=
 =?UTF-8?q?=E6=B1=82=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appeal-appeal-list-unsatisfactory.vue     |  421 ++++++
 .../modules/events/appeal-appeal-list.vue     |  451 ++++++
 .../events/appeal-appeal-unsatisfactory.vue   |   30 +
 src/views/modules/events/appeal-appeal.vue    |   30 +
 .../events/appeal-check-start-detail.vue      |    2 +-
 src/views/modules/events/appeal-cssb-list.vue |  798 +++++-----
 .../modules/events/appeal-detail-view.vue     | 1310 ++++++++++-------
 ...appeal-development-list-unsatisfactory.vue |   30 +-
 .../events/appeal-development-list.vue        |  873 +++++------
 .../appeal-enforce-list-unsatisfactory.vue    |   14 +-
 .../modules/events/appeal-enforce-list.vue    |  831 +++++------
 .../events/appeal-peo-list-unsatisfactory.vue |   11 +-
 src/views/modules/events/appeal-peo-list.vue  |  931 ++++++------
 .../modules/events/item-deal-detail-view.vue  |   42 +-
 src/views/modules/events/item-deal-list.vue   |  761 +++++-----
 15 files changed, 3847 insertions(+), 2688 deletions(-)
 create mode 100644 src/views/modules/events/appeal-appeal-list-unsatisfactory.vue
 create mode 100644 src/views/modules/events/appeal-appeal-list.vue
 create mode 100644 src/views/modules/events/appeal-appeal-unsatisfactory.vue
 create mode 100644 src/views/modules/events/appeal-appeal.vue

diff --git a/src/views/modules/events/appeal-appeal-list-unsatisfactory.vue b/src/views/modules/events/appeal-appeal-list-unsatisfactory.vue
new file mode 100644
index 00000000..f7986c88
--- /dev/null
+++ b/src/views/modules/events/appeal-appeal-list-unsatisfactory.vue
@@ -0,0 +1,421 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+      <div class="mod-item__item}">
+          <el-form
+                  :inline="true"
+                  :model="dataForm"
+                  @keyup.enter.native="getDataListSearch()"
+          >
+              <el-form-item label="所属机构" label-width="100px">
+                  <el-cascader
+                          v-model="ids"
+                          :options="options"
+                          :props="{ checkStrictly: true }"
+                          clearable
+                          style="width:250px;"
+                  >
+                  </el-cascader>
+              </el-form-item>
+              <el-form-item label="诉求内容" prop="itemCode">
+                  <el-input
+                          v-model="dataForm.itemContent"
+                          placeholder="请输入诉求内容"
+                          clearable
+                          @keyup.native="btKeyUpItemContent"
+                          style="width:200px;"
+                  ></el-input>
+              </el-form-item>
+
+              <el-form-item label="诉求编码" prop="serialNum">
+                  <el-input
+                          v-model="dataForm.serialNum"
+                          placeholder="诉求编码"
+                          clearable
+                          style="width:200px;"
+                  ></el-input>
+              </el-form-item>
+
+              <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
+                  <el-select v-model="dataForm.evaluationScore" style="width:250px;"  placeholder="请选择" clearable>
+                      <el-option label="不满意" value="0"> </el-option>
+                      <el-option label="基本满意" value="1"> </el-option>
+                      <el-option label="非常满意" value="2"> </el-option>
+                  </el-select>
+              </el-form-item>
+
+              <el-form-item label="处理状态">
+                  <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
+                      <el-option label="处理中" value="0"></el-option>
+                      <el-option label="已结案" value="10"></el-option>
+                  </el-select>
+              </el-form-item>
+
+              <el-form-item label="评价状态">
+                  <el-select v-model="dataForm.evaluationState" clearable  placeholder="请选择" style="width:200px;">
+                      <el-option label="待评价" value="80"></el-option>
+                      <el-option label="已评价" value="90"></el-option>
+                  </el-select>
+              </el-form-item>
+              <br/>
+              <el-form-item label="联系人姓名" prop="nickName" label-width="100px">
+                  <el-input
+                          v-model="dataForm.nickName"
+                          placeholder="请输入联系人姓名"
+                          clearable
+                          style="width:250px;"
+                  ></el-input>
+              </el-form-item>
+              <el-form-item label="手机号" prop="mobile" label-width="68px">
+                  <el-input
+                          v-model="dataForm.mobile"
+                          placeholder="请输入手机号"
+                          clearable
+                          style="width:200px;"
+                  ></el-input>
+              </el-form-item>
+              <br/>
+                  <el-form-item label="上报时间" prop="startTime" label-width="100px">
+                      <el-date-picker
+                              v-model="dataForm.startTime"
+                              type="date"
+                              :picker-options="pickerBeginDateBefore"
+                              value-format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
+                              placeholder="选择日期时间"
+                              style="width:250px;" @change="changeTime"
+                      >
+                      </el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="至" label-width="25px" prop="endTime">
+                      <el-date-picker
+                              v-model="dataForm.endTime"
+                              type="date"
+                              :picker-options="pickerBeginDateAfter"
+                              value-format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
+                              placeholder="选择日期时间"
+                              style="width:250px;" @change="changeTime"
+                      >
+                      </el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="诉求类型" prop="appealType" label-width="80px">
+                      <el-select v-model="dataForm.appealType" placeholder="请选择" clearable>
+                          <el-option label="民生" value="0"> </el-option>
+                          <el-option label="发展" value="1"> </el-option>
+                          <el-option label="执法" value="2"> </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                      <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+                  </el-form-item>
+                  <!-- <el-form-item>
+                    <el-button type="primary"
+                               class="custom-button-add"
+                               @click="addAppealEnforcement()">新增执法诉求</el-button>
+                  </el-form-item> -->
+                <!-- <el-form-item>
+                  <el-button type="success"
+                      @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
+                </el-form-item> -->
+
+          </el-form>
+          <el-table
+                  v-loading="dataListLoading"
+                  :data="dataList"
+                  border
+                  @selection-change="dataListSelectionChangeHandle"
+                  style="width: 100%;"
+          >
+              <el-table-column
+                      label=" "
+                      align="center"
+                      width="50"
+              >
+                  <template slot-scope="scope">
+                      <img :src="red" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '1' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"/>
+                      <img :src="yellow" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '2' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"/>
+                      <img :src="green" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '3' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"/>
+                  </template>
+              </el-table-column>
+              <el-table-column
+                      label="序号"
+                      type="index"
+                      show-overflow-tooltip
+                      align="center"
+                      width="50"
+              ></el-table-column>
+              <el-table-column
+                      prop="streetName"
+                      label="属事街道"
+                      header-align="center"
+                      width="120"
+                      align="center"
+                      show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                      prop="communityName"
+                      label="属事社区"
+                      header-align="center"
+                      width="130"
+                      align="center"
+                      show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                      prop="gridName"
+                      label="属事网格"
+                      header-align="center"
+                      width="140"
+                      align="center"
+                      show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                      prop="itemContent"
+                      label="诉求内容"
+                      header-align="center"
+                      min-width="300"
+                      align="left"
+                      show-overflow-tooltip
+              ></el-table-column>
+              <!--<el-table-column-->
+                      <!--prop="serialNum"-->
+                      <!--label="诉求编码"-->
+                      <!--header-align="center"-->
+                      <!--min-width="200"-->
+                      <!--align="center"-->
+              <!--&gt;</el-table-column>-->
+              <!-- <el-table-column
+                      prop="peopleFlagName"
+                      label="诉求类型"
+                      header-align="center"
+                      min-width="150"
+                      align="center"
+              ></el-table-column> -->
+
+              <el-table-column
+                      prop="itemStateName"
+                      label="处理状态"
+                      header-align="center"
+                      width="100"
+                      align="center"
+                      :formatter="stateFormat"
+              >
+              </el-table-column>
+
+              <el-table-column
+                      prop="createdTime"
+                      label="上报时间"
+                      header-align="center"
+                      width="180"
+                      align="center"
+              ></el-table-column>
+              <el-table-column
+                      prop="nickName"
+                      label="联系人姓名"
+                      header-align="center"
+                      min-width="100"
+                      align="center"
+                      show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                      prop="evaluationScoreName"
+                      label="满意度"
+                      header-align="center"
+                      align="center"
+              ></el-table-column>
+              <el-table-column
+                      :label="$t('handle')"
+                      fixed="right"
+                      header-align="center"
+                      align="center"
+              >
+                  <template slot-scope="scope">
+                      <el-button
+                          type="text"
+                          size="small"
+                          class="custom-table-button-default"
+                          @click="dealAction(scope.row.id)">详情
+                      </el-button>
+                  </template>
+              </el-table-column>
+          </el-table>
+          <el-pagination
+                  :current-page="page"
+                  :page-sizes="[10, 20, 50, 100]"
+                  :page-size="limit"
+                  :total="total"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  @size-change="pageSizeChangeHandle"
+                  @current-change="pageCurrentChangeHandle"
+          >
+          </el-pagination>
+
+      </div>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"></add-or-update>
+  </el-card>
+</template>
+
+<script>
+import green from '@/assets/img/green_img.png'
+import red from '@/assets/img/red_img.png'
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './appeal-enforcement-add'
+
+export default {
+  mixins: [mixinViewModule],
+  name: 'AppealList',
+  data () {
+    return {
+      green,
+      red,
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/getItemAppealPageUnsatisfactory',
+        getDataListIsPage: true,
+        exportURL: '/events/item/unexport'
+      },
+      dataForm: {
+        id: '',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        itemCode: '',
+        itemContent: '',
+        nickName: '',
+        mobile: '',
+        appealType: '',
+        evaluationScore: '',
+        itemHandleDeptId: '',
+        itemState: '',
+        processState: ''
+      },
+      ids: [],
+      options: [],
+      optionsDept: [],
+      addOrUpdateVisible: false,
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = this.ids[2]
+      }
+    }
+  },
+  created: function () {
+    this.getOptions()
+  },
+  methods: {
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {
+        })
+      this.$http
+        .post(`/sys/dept/queryUserSysDeptTypeKey`, {  })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.optionsDept = res.data
+        })
+        .catch(() => {
+        })
+    },
+    stateFormat (row, column) {
+      if (row.itemState === 0) {
+        if (row.processState === '16') {
+          return '市区处理中'
+        }
+        if (row.evaluationState === '1') {
+          if (row.evaluationTime !== null && row.evaluationTime !== '') {
+            return '已评价'
+          } else {
+            return '待评价'
+          }
+        }
+        if (row.itemHandleDeptId === null || row.itemHandleDeptId === '0') {
+          return '街道处理中'
+        } else {
+          let itemStateDetail = '网格处理中'
+          this.optionsDept.filter(function (item) {
+            if (item.id === row.itemHandleDeptId) {
+              if (item.typeKey === 'grid_party') {
+                itemStateDetail = '网格处理中'
+              }
+              if (item.typeKey === 'community_party') {
+                itemStateDetail = '社区处理中'
+              }
+            }
+          })
+          return itemStateDetail
+        }
+      } else if (row.itemState === 10) {
+        return '已结案'
+      }
+    },
+    dealAction (id) {
+      this.$parent.selectComponent = 'AppealDetailView'
+      this.$router.push({ path: '/events-appeal-appeal-unsatisfactory', query: { id: id } })
+    },
+    addAppealEnforcement () {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init()
+      })
+    },
+    btKeyUpItemContent (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.itemContent = e.target.value
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/events/appeal-appeal-list.vue b/src/views/modules/events/appeal-appeal-list.vue
new file mode 100644
index 00000000..a8288172
--- /dev/null
+++ b/src/views/modules/events/appeal-appeal-list.vue
@@ -0,0 +1,451 @@
+<template>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-item__item}">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+				<!--<el-form-item label="诉求类型" prop="appealType" label-width="80px">-->
+				<!--<el-select v-model="dataForm.appealType" placeholder="请选择" clearable>-->
+				<!--<el-option label="民生" value="0"> </el-option>-->
+				<!--<el-option label="发展" value="1"> </el-option>-->
+				<!--<el-option label="执法" value="2"> </el-option>-->
+				<!--</el-select>-->
+				<!--</el-form-item>-->
+				<el-form-item label="所属机构" label-width="100px">
+					<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px;"></el-cascader>
+				</el-form-item>
+				<el-form-item label="诉求内容" prop="itemCode">
+					<el-input v-model="dataForm.itemContent" placeholder="请输入诉求内容" clearable @keyup.native="btKeyUpItemContent" style="width:200px;"></el-input>
+				</el-form-item>
+
+				<el-form-item label="诉求编码" prop="serialNum">
+					<el-input v-model="dataForm.serialNum" placeholder="诉求编码" clearable style="width:200px;"></el-input>
+				</el-form-item>
+
+				<!-- <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
+					<el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;" clearable>
+						<el-option label="不满意" value="0"></el-option>
+						<el-option label="基本满意" value="1"></el-option>
+						<el-option label="非常满意" value="2"></el-option>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="处理状态">
+					<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:200px;">
+						<el-option label="处理中" value="0"></el-option>
+						<el-option label="已结案" value="10"></el-option>
+					</el-select>
+				</el-form-item> -->
+
+				<el-form-item label="评价状态">
+					<el-select v-model="dataForm.evaluationState" clearable placeholder="请选择" style="width:200px;">
+						<el-option label="待评价" value="80"></el-option>
+						<el-option label="已评价" value="90"></el-option>
+					</el-select>
+				</el-form-item>
+				<br />
+				<el-form-item label="联系人姓名" prop="nickName" label-width="100px">
+					<el-input v-model="dataForm.nickName" placeholder="请输入联系人姓名" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<el-form-item label="所属类别:" prop="categoryValue">
+					<!-- :disabled="disabledCategory" -->
+					<el-cascader
+						clearable
+						v-model="dataForm.categoryValue"
+						placeholder="试试搜索关键字"
+						:props="{ checkStrictly: true, emitPath: false }"
+						:options="categoryOptions"
+						filterable
+					></el-cascader>
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobile" label-width="68px">
+					<el-input v-model="dataForm.mobile" placeholder="请输入手机号" clearable style="width:200px;"></el-input>
+				</el-form-item>
+				<br />
+				<el-form-item label="上报时间" prop="startTime" label-width="100px">
+					<el-date-picker
+						v-model="dataForm.startTime"
+						type="date"
+						:picker-options="pickerBeginDateBefore"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item label="至" label-width="25px" prop="endTime">
+					<el-date-picker
+						v-model="dataForm.endTime"
+						type="date"
+						:picker-options="pickerBeginDateAfter"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<!-- <el-form-item><el-button type="primary" class="custom-button-add" @click="addAppealEnforcement()">新增诉求</el-button></el-form-item>
+				<el-form-item>
+					<el-button type="success" @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
+				</el-form-item> -->
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+				<el-table-column label=" " align="center" width="50">
+					<template slot-scope="scope">
+						<img
+							:src="red"
+							width="25"
+							height="25"
+							v-if="scope.row.itemState == '0' && scope.row.isRemind == '1' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"
+						/>
+						<img
+							:src="yellow"
+							width="25"
+							height="25"
+							v-if="scope.row.itemState == '0' && scope.row.isRemind == '2' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"
+						/>
+						<img
+							:src="green"
+							width="25"
+							height="25"
+							v-if="scope.row.itemState == '0' && scope.row.isRemind == '3' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+				<el-table-column prop="streetName" label="属事街道" header-align="center" width="120" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="communityName" label="属事社区" header-align="center" width="130" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gridName" label="属事网格" header-align="center" width="140" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="itemContent" label="诉求内容" header-align="center" min-width="300" align="left" show-overflow-tooltip></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="serialNum"-->
+				<!--label="诉求编码"-->
+				<!--header-align="center"-->
+				<!--min-width="200"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!-- <el-table-column
+                      prop="peopleFlagName"
+                      label="诉求类型"
+                      header-align="center"
+                      min-width="150"
+                      align="center"
+              ></el-table-column> -->
+
+				<el-table-column prop="itemStateName" label="处理状态" header-align="center" width="100" align="center" :formatter="stateFormat"></el-table-column>
+				<el-table-column prop="solutionInfoName" label="解决情况" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="createdTime" label="上报时间" header-align="center" width="180" align="center"></el-table-column>
+				<el-table-column prop="remainTime" label="事件时间" header-align="center" min-width="120" align="center" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<span v-if="scope.row.itemState == '0' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'">{{ scope.row.remainTime }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="nickName" label="联系人姓名" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="categoryName" label="所属类别" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column> -->
+				<el-table-column prop="evaluationScoreName" label="满意度" header-align="center" align="center"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" max-width="250" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id, 'view')">详情</el-button>
+						<el-button type="primary" class="custom-button-add" v-if="scope.row.appealFlag==0" @click="addAppealEnforcement()">诉求</el-button>
+						<!-- <el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
+							class="custom-table-button-default"
+							@click="addDiff(scope.row.id)"
+						>
+							添加难点堵点
+						</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
+							class="custom-table-button-default"
+							@click="addTypi(scope.row.id)"
+						>
+							添加典型案例
+						</el-button>
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id,'edit')">修改类别</el-button> -->
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			></el-pagination>
+		</div>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</el-card>
+</template>
+
+<script>
+import green from '@/assets/img/green_img.png';
+import red from '@/assets/img/red_img.png';
+import yellow from '@/assets/img/yellow_img.png';
+import mixinViewModule from '@/mixins/view-module';
+import AddOrUpdate from './appeal-enforcement-add';
+
+export default {
+	mixins: [mixinViewModule],
+	name: 'AppealList',
+	data() {
+		return {
+			categoryIds: [],
+			categoryOptions: [],
+			green,
+			red,
+			yellow,
+			mixinViewModuleOptions: {
+				getDataListURL: '/events/item/getItemAppealPage',
+				getDataListIsPage: true,
+				exportURL: '/events/item/exportItemAppealList',
+				exportMoudle: ''
+			},
+			dataForm: {
+				categoryValue: '',
+				id: '',
+				startTime: '',
+				endTime: '',
+				streetId: '',
+				communityId: '',
+				gridId: '',
+				itemCode: '',
+				itemContent: '',
+				nickName: '',
+				mobile: '',
+				appealType: 0,
+				evaluationScore: '',
+				itemHandleDeptId: '',
+				itemState: '',
+				processState: '',
+				sorce: 2
+			},
+			ids: [],
+			options: [],
+			optionsDept: [],
+			addOrUpdateVisible: false,
+			pickerBeginDateBefore: {
+				disabledDate: time => {
+					let beginDateVal = this.dataForm.endTime;
+					if (beginDateVal) {
+						return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime();
+					}
+				}
+			},
+			pickerBeginDateAfter: {
+				disabledDate: time => {
+					let EndDateVal = this.dataForm.startTime;
+					if (EndDateVal) {
+						return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime();
+					}
+				}
+			}
+		};
+	},
+	components: {
+		AddOrUpdate
+	},
+	watch: {
+		ids: function(val) {
+			if (val.length === 0) {
+				this.dataForm.streetId = '';
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 1) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 2) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 3) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = this.ids[2];
+			}
+		}
+	},
+	created: function() {
+		this.getOptions();
+		this.getCategoryList();
+	},
+	methods: {
+		getCategoryList() {
+			// this.disabledCategory = true;
+			return this.$http
+				.get('/events/category/list', {
+					params: {
+						infoCode: 'A'
+					}
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					var data = res.data;
+
+					this.getSelectedNode(data, data);
+					this.categoryOptions = data;
+					// this.disabledCategory = false
+				})
+				.catch(() => {});
+		},
+		getSelectedNode(nodeData, parent) {
+			nodeData.forEach(item => {
+				if ('children' in item && item.children.length === 0) {
+					delete item.children;
+				} else if ('children' in item && item.children.length) {
+					this.getSelectedNode(item.children, item);
+				}
+			});
+		},
+		getOptions() {
+			this.$http
+				.get(`/sys/user/deptOptions/getByLoginUser`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.options = res.data.options;
+				})
+				.catch(() => {});
+			this.$http
+				.post(`/sys/dept/queryUserSysDeptTypeKey`, {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.optionsDept = res.data;
+				})
+				.catch(() => {});
+		},
+		stateFormat(row, column) {
+			if (row.itemState === 0) {
+				if (row.processState === '16') {
+					return '市区处理中';
+				}
+				if (row.evaluationState === '1') {
+					if (row.evaluationTime !== null && row.evaluationTime !== '') {
+						return '已评价';
+					} else {
+						return '待评价';
+					}
+				}
+				if (row.itemHandleDeptId === null || row.itemHandleDeptId === '0') {
+					return '街道处理中';
+				} else {
+					let itemStateDetail = '网格处理中';
+					this.optionsDept.filter(function(item) {
+						if (item.id === row.itemHandleDeptId) {
+							if (item.typeKey === 'grid_party') {
+								itemStateDetail = '网格处理中';
+							}
+							if (item.typeKey === 'community_party') {
+								itemStateDetail = '社区处理中';
+							}
+						}
+					});
+					return itemStateDetail;
+				}
+			} else if (row.itemState === 10) {
+				return '已结案';
+			}
+		},
+		dealAction(id, type) {
+			this.$parent.selectComponent = 'AppealDetailView';
+			this.$router.push({ path: '/events-appeal-appeal', query: { id: id, type: type, infoCode: 'A' } });
+		},
+		addDiff(id) {
+			this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isDifficulty = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addTypi(id) {
+			this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isTypical = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addAppealEnforcement() {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+			});
+		},
+		btKeyUpItemContent(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.itemContent = e.target.value;
+		}
+	}
+};
+</script>
diff --git a/src/views/modules/events/appeal-appeal-unsatisfactory.vue b/src/views/modules/events/appeal-appeal-unsatisfactory.vue
new file mode 100644
index 00000000..61da1635
--- /dev/null
+++ b/src/views/modules/events/appeal-appeal-unsatisfactory.vue
@@ -0,0 +1,30 @@
+<template>
+  <keep-alive include="AppealList">
+      <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+
+<script>
+import AppeaPeolList from './appeal-appeal-list-unsatisfactory.vue'
+import AppealDetailView from './appeal-detail-view'
+export default {
+  data () {
+    return {
+      selectComponent: AppeaPeolList
+    }
+  },
+  components: {
+    AppeaPeolList,
+    AppealDetailView
+  },
+  methods: {
+    init () {
+      this.selectComponent = AppeaPeolList
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/appeal-appeal.vue b/src/views/modules/events/appeal-appeal.vue
new file mode 100644
index 00000000..16bbaae8
--- /dev/null
+++ b/src/views/modules/events/appeal-appeal.vue
@@ -0,0 +1,30 @@
+<template>
+  <keep-alive include="AppealList">
+      <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+
+<script>
+import AppeaPeolList from './appeal-appeal-list.vue'
+import AppealDetailView from './appeal-detail-view'
+export default {
+  data () {
+    return {
+      selectComponent: AppeaPeolList
+    }
+  },
+  components: {
+    AppeaPeolList,
+    AppealDetailView
+  },
+  methods: {
+    init () {
+      this.selectComponent = AppeaPeolList
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/events/appeal-check-start-detail.vue b/src/views/modules/events/appeal-check-start-detail.vue
index f60d0d5e..a121b5a8 100644
--- a/src/views/modules/events/appeal-check-start-detail.vue
+++ b/src/views/modules/events/appeal-check-start-detail.vue
@@ -162,7 +162,7 @@
     </div>
 
     <el-dialog
-      title="此案件为不满意案件 请进一步了解有关情况并进行填写"
+      title="请进一步了解有关情况并进行填写"
       :visible.sync="dialogVisible_fk"
       width="800px"
       :before-close="handleClose">
diff --git a/src/views/modules/events/appeal-cssb-list.vue b/src/views/modules/events/appeal-cssb-list.vue
index 8cf3dae4..6cece601 100644
--- a/src/views/modules/events/appeal-cssb-list.vue
+++ b/src/views/modules/events/appeal-cssb-list.vue
@@ -1,244 +1,247 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-      <div class="mod-item__item}">
-          <el-form
-                  :inline="true"
-                  :model="dataForm"
-                  @keyup.enter.native="getDataListSearch()"
-          >
-              <el-form-item label="诉求类型" prop="peopleFlag" label-width="100px">
-                <el-select v-model="dataForm.peopleFlag" placeholder="请选择" clearable>
-                  <el-option label="民生" value="0"> </el-option>
-                  <el-option label="发展" value="1"> </el-option>
-                  <el-option label="执法" value="2"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="所属机构" label-width="100px">
-                  <el-cascader
-                          v-model="ids"
-                          :options="options"
-                          :props="{ checkStrictly: true }"
-                          clearable
-                          style="width:250px;"
-                  >
-                  </el-cascader>
-              </el-form-item>
-              <el-form-item label="诉求内容" prop="itemCode" label-width="100px">
-                  <el-input
-                          v-model="dataForm.itemContent"
-                          placeholder="请输入诉求内容"
-                          clearable
-                          @keyup.native="btKeyUpItemContent"
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
-
-              <el-form-item label="诉求编码" prop="serialNum" label-width="100px">
-                  <el-input
-                          v-model="dataForm.serialNum"
-                          placeholder="诉求编码"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
-
-<!--              <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">-->
-<!--                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>-->
-<!--                      <el-option label="不满意" value="0"> </el-option>-->
-<!--                      <el-option label="基本满意" value="1"> </el-option>-->
-<!--                      <el-option label="非常满意" value="2"> </el-option>-->
-<!--                  </el-select>-->
-<!--              </el-form-item>-->
-
-<!--              <el-form-item label="处理状态" label-width="105px">-->
-<!--                  <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">-->
-<!--                      <el-option label="处理中" value="0"></el-option>-->
-<!--                      <el-option label="已结案" value="10"></el-option>-->
-<!--                  </el-select>-->
-<!--              </el-form-item>-->
-              <br/>
-                  <el-form-item label="上报起始时间" prop="startTime" label-width="100px">
-                      <el-date-picker
-                              v-model="dataForm.startTime"
-                              type="date"
-                              :picker-options="pickerBeginDateBefore"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="至" label-width="25px" prop="endTime">
-                      <el-date-picker
-                              v-model="dataForm.endTime"
-                              type="date"
-                              :picker-options="pickerBeginDateAfter"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item>
-                      <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
-                  </el-form-item>
+    <el-card shadow="never"
+             class="aui-card--fill">
+        <div class="mod-item__item}">
+            <el-form :inline="true"
+                     :model="dataForm"
+                     @keyup.enter.native="getDataListSearch()">
+                <el-form-item label="诉求类型"
+                              prop="peopleFlag"
+                              label-width="100px">
+                    <el-select v-model="dataForm.peopleFlag"
+                               placeholder="请选择"
+                               clearable>
+                        <el-option label="民生"
+                                   value="0"> </el-option>
+                        <el-option label="发展"
+                                   value="1"> </el-option>
+                        <el-option label="执法"
+                                   value="2"> </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属机构"
+                              label-width="100px">
+                    <el-cascader v-model="ids"
+                                 :options="options"
+                                 :props="{ checkStrictly: true }"
+                                 clearable
+                                 style="width:250px;">
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="诉求内容"
+                              prop="itemCode"
+                              label-width="100px">
+                    <el-input v-model="dataForm.itemContent"
+                              placeholder="请输入诉求内容"
+                              clearable
+                              @keyup.native="btKeyUpItemContent"
+                              style="width:200px;"></el-input>
+                </el-form-item>
+                <el-form-item label="诉求编码"
+                              prop="serialNum"
+                              label-width="100px">
+                    <el-input v-model="dataForm.serialNum"
+                              placeholder="诉求编码"
+                              clearable
+                              style="width:200px;"></el-input>
+                </el-form-item>
+                <!--              <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">-->
+                <!--                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>-->
+                <!--                      <el-option label="不满意" value="0"> </el-option>-->
+                <!--                      <el-option label="基本满意" value="1"> </el-option>-->
+                <!--                      <el-option label="非常满意" value="2"> </el-option>-->
+                <!--                  </el-select>-->
+                <!--              </el-form-item>-->
+                <!--              <el-form-item label="处理状态" label-width="105px">-->
+                <!--                  <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">-->
+                <!--                      <el-option label="处理中" value="0"></el-option>-->
+                <!--                      <el-option label="已结案" value="10"></el-option>-->
+                <!--                  </el-select>-->
+                <!--              </el-form-item>-->
+                <br />
+                <el-form-item label="上报起始时间"
+                              prop="startTime"
+                              label-width="100px">
+                    <el-date-picker v-model="dataForm.startTime"
+                                    type="date"
+                                    :picker-options="pickerBeginDateBefore"
+                                    value-format="yyyy-MM-dd"
+                                    format="yyyy-MM-dd"
+                                    placeholder="选择日期时间"
+                                    style="width:250px;"
+                                    @change="changeTime">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="至"
+                              label-width="25px"
+                              prop="endTime">
+                    <el-date-picker v-model="dataForm.endTime"
+                                    type="date"
+                                    :picker-options="pickerBeginDateAfter"
+                                    value-format="yyyy-MM-dd"
+                                    format="yyyy-MM-dd"
+                                    placeholder="选择日期时间"
+                                    style="width:250px;"
+                                    @change="changeTime">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="success"
+                               @click="getDataListSearch()"
+                               class="custom-button-default">{{ $t('query') }}</el-button>
+                </el-form-item>
                 <!-- <el-form-item>
                   <el-button type="success"
                       @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
                 </el-form-item> -->
-
-          </el-form>
-          <el-table
-                  v-loading="dataListLoading"
-                  :data="dataList"
-                  border
-                  @selection-change="dataListSelectionChangeHandle"
-                  style="width: 100%;"
-          >
-              <el-table-column
-                      label=" "
-                      align="center"
-                      width="50"
-              >
-                  <template slot-scope="scope">
-                      <img :src="red" width="25" height="25" v-if="scope.row.itemState === 0 && scope.row.isRemind === '1'"/>
-                      <img :src="yellow" width="25" height="25" v-if="scope.row.itemState === 0 && scope.row.isRemind === '2'"/>
-                      <img :src="green" width="25" height="25" v-if="scope.row.itemState === 0 && scope.row.isRemind === '3'"/>
-                  </template>
-              </el-table-column>
-              <el-table-column
-                      label="序号"
-                      type="index"
-                      show-overflow-tooltip
-                      align="center"
-                      width="50"
-              ></el-table-column>
-              <el-table-column
-                      prop="gridName"
-                      label="属事街道"
-                      header-align="center"
-                      width="120"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="itemContent"
-                      label="诉求内容"
-                      header-align="center"
-                      min-width="300"
-                      align="left"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <!--<el-table-column-->
-                      <!--prop="serialNum"-->
-                      <!--label="诉求编码"-->
-                      <!--header-align="center"-->
-                      <!--min-width="200"-->
-                      <!--align="center"-->
-              <!--&gt;</el-table-column>-->
-              <el-table-column
-                      prop="peopleFlagName"
-                      label="诉求类型"
-                      header-align="center"
-                      min-width="120"
-                      align="center"
-              ></el-table-column>
-
-              <el-table-column
-                      prop="itemStateName"
-                      label="处理状态"
-                      header-align="center"
-                      min-width="120"
-                      align="center"
-              >
-                  <template slot-scope="scope">
-                      <span v-if="scope.row.processState === '16'">市区处理中</span>
-                      <span v-else>{{scope.row.itemStateName}}</span>
-                  </template>
-              </el-table-column>
-
-
-              <el-table-column
-                      prop="createdTime"
-                      label="上报时间"
-                      header-align="center"
-                      width="180"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      prop="remainTime"
-                      label="事件时间"
-                      header-align="center"
-                      min-width="120"
-                      align="center"
-                      show-overflow-tooltip
-              >
-                  <template slot-scope="scope">
-                      <span v-if="scope.row.itemState === 0">{{scope.row.remainTime}}</span>
-                  </template>
-              </el-table-column>
-              <el-table-column
-                      prop="nickName"
-                      label="联系人姓名"
-                      header-align="center"
-                      min-width="100"
-                      align="center"
-                      show-overflow-tooltip
-              ></el-table-column>
-<!--              <el-table-column-->
-<!--                      prop="evaluationScoreName"-->
-<!--                      label="满意度"-->
-<!--                      header-align="center"-->
-<!--                      align="center"-->
-<!--              ></el-table-column>-->
-              <el-table-column
-                      :label="$t('handle')"
-                      fixed="right"
-                      min-width="150"
-                      header-align="center"
-                      align="center">
-                  <template slot-scope="scope">
-                      <el-button
-                          type="text"
-                          size="small"
-                          class="custom-table-button-default"
-                          @click="dealAction(scope.row.id)">详情
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="scope.row.processState !== '16'"
-                              class="custom-table-button-default"
-                              @click="cssbAction(scope.row.id)">吹哨上报
-                      </el-button>
-                  </template>
-              </el-table-column>
-          </el-table>
-          <el-pagination
-                  :current-page="page"
-                  :page-sizes="[10, 20, 50, 100]"
-                  :page-size="limit"
-                  :total="total"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="pageSizeChangeHandle"
-                  @current-change="pageCurrentChangeHandle"
-          >
-          </el-pagination>
-
-      </div>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-        ref="addOrUpdate"
-        @refreshDataList="getDataList"></add-or-update>
-      <cssb-reason v-if="cssbReasonVisible"
+            </el-form>
+            <el-table v-loading="dataListLoading"
+                      :data="dataList"
+                      border
+                      @selection-change="dataListSelectionChangeHandle"
+                      style="width: 100%;">
+                <el-table-column label=" "
+                                 align="center"
+                                 width="50">
+                    <template slot-scope="scope">
+                        <img :src="red"
+                             width="25"
+                             height="25"
+                             v-if="scope.row.itemState === 0 && scope.row.isRemind === '1'" />
+                        <img :src="yellow"
+                             width="25"
+                             height="25"
+                             v-if="scope.row.itemState === 0 && scope.row.isRemind === '2'" />
+                        <img :src="green"
+                             width="25"
+                             height="25"
+                             v-if="scope.row.itemState === 0 && scope.row.isRemind === '3'" />
+                    </template>
+                </el-table-column>
+                <el-table-column label="序号"
+                                 type="index"
+                                 show-overflow-tooltip
+                                 align="center"
+                                 width="50"></el-table-column>
+                <el-table-column prop="gridName"
+                                 label="属事街道"
+                                 header-align="center"
+                                 width="120"
+                                 align="center"
+                                 show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="itemContent"
+                                 label="诉求内容"
+                                 header-align="center"
+                                 min-width="300"
+                                 align="left"
+                                 show-overflow-tooltip></el-table-column>
+                <!--<el-table-column-->
+                <!--prop="serialNum"-->
+                <!--label="诉求编码"-->
+                <!--header-align="center"-->
+                <!--min-width="200"-->
+                <!--align="center"-->
+                <!--&gt;</el-table-column>-->
+                <el-table-column prop="peopleFlagName"
+                                 label="诉求类型"
+                                 header-align="center"
+                                 min-width="120"
+                                 align="center"></el-table-column>
+                <el-table-column prop="itemStateName"
+                                 label="处理状态"
+                                 header-align="center"
+                                 min-width="120"
+                                 align="center">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.processState === '16'">市区处理中</span>
+                        <span v-else>{{scope.row.itemStateName}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createdTime"
+                                 label="上报时间"
+                                 header-align="center"
+                                 width="180"
+                                 align="center"></el-table-column>
+                <el-table-column prop="remainTime"
+                                 label="事件时间"
+                                 header-align="center"
+                                 min-width="120"
+                                 align="center"
+                                 show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.itemState === 0">{{scope.row.remainTime}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="nickName"
+                                 label="联系人姓名"
+                                 header-align="center"
+                                 min-width="100"
+                                 align="center"
+                                 show-overflow-tooltip></el-table-column>
+                <!--              <el-table-column-->
+                <!--                      prop="evaluationScoreName"-->
+                <!--                      label="满意度"-->
+                <!--                      header-align="center"-->
+                <!--                      align="center"-->
+                <!--              ></el-table-column>-->
+                <el-table-column :label="$t('handle')"
+                                 fixed="right"
+                                 min-width="150"
+                                 header-align="center"
+                                 align="center">
+                    <template slot-scope="scope">
+                        <el-button type="text"
+                                   size="small"
+                                   class="custom-table-button-default"
+                                   @click="dealAction(scope.row.id)">详情 </el-button>
+                        <!-- 吹哨上报@click="cssbAction(scope.row.id)"吹哨上报，再次上报dealAction -->
+                        <el-button type="text"
+                                   size="small"
+                                   v-if="!(scope.row.processState == '16'||scope.row.processState == '2021'||scope.row.processState == '1105'||scope.row.processState == '3001' )"
+                                   class="custom-table-button-default"
+                                   @click="goShowCssbActionPopup(scope.row.id,scope.row.itemHandleDeptId,scope.row.itemHandleDeptName)">再处理</el-button>
+                        <el-button type="text"
+                                   size="small"
+                                   v-if="scope.row.processState == '2021'"
+                                   class="custom-table-button-default"
+                                   @click="evaluationIssue(scope.row.id)">下发评价 </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination :current-page="page"
+                           :page-sizes="[10, 20, 50, 100]"
+                           :page-size="limit"
+                           :total="total"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           @size-change="pageSizeChangeHandle"
+                           @current-change="pageCurrentChangeHandle">
+            </el-pagination>
+        </div>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible"
+                       ref="addOrUpdate"
+                       @refreshDataList="getDataList"></add-or-update>
+        <cssb-reason v-if="cssbReasonVisible"
                      ref="cssbReason"
                      @refreshDataList="getDataList"></cssb-reason>
-  </el-card>
+        <el-dialog title="再处理"
+                   :visible.sync="ifShowCssbAction"
+                   width="30%"
+                   :modal="false">
+            <div class="popupButton">
+                <div>
+                    <el-button type="primary"
+                               @click="cssbAction()">吹哨上报</el-button>
+                </div>
+                <div>
+                    <el-button type="primary"
+                               @click="reportAgain()">再次上报</el-button>
+                </div>
+            </div>
+        </el-dialog>
+    </el-card>
 </template>
-
 <script>
 import green from '@/assets/img/green_img.png'
 import red from '@/assets/img/red_img.png'
@@ -246,126 +249,227 @@ import yellow from '@/assets/img/yellow_img.png'
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './appeal-cssb-add'
 import CssbReason from './appeal-cssb-reason'
-
 export default {
-  mixins: [mixinViewModule],
-  name: 'AppealList',
-  data () {
-    return {
-      green,
-      red,
-      yellow,
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/epdcpage',
-        getDataListIsPage: true,
-        exportURL: '/events/item/unexport'
-      },
-      dataForm: {
-        id: '',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: '',
-        itemContent: '',
-        nickName: '',
-        mobile: '',
-        peopleFlag: '',
-        evaluationScore: '',
-        itemState: 0
-      },
-      ids: [],
-      options: [],
-      cssbReasonVisible: false,
-      addOrUpdateVisible: false,
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
+    mixins: [mixinViewModule],
+    name: 'AppealList',
+    data() {
+        return {
+            green,
+            red,
+            yellow,
+            mixinViewModuleOptions: {
+                getDataListURL: '/events/item/epdcpage',
+                getDataListIsPage: true,
+                exportURL: '/events/item/unexport'
+            },
+            dataForm: {
+                id: '',
+                startTime: '',
+                endTime: '',
+                streetId: '',
+                communityId: '',
+                gridId: '',
+                itemCode: '',
+                itemContent: '',
+                nickName: '',
+                mobile: '',
+                peopleFlag: '',
+                evaluationScore: '',
+                itemState: 0
+            },
+            ids: [],
+            options: [],
+            cssbReasonVisible: false,
+            addOrUpdateVisible: false,
+            pickerBeginDateBefore: {
+                disabledDate: (time) => {
+                    let beginDateVal = this.dataForm.endTime
+                    if (beginDateVal) {
+                        return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                    }
+                }
+            },
+            pickerBeginDateAfter: {
+                disabledDate: (time) => {
+                    let EndDateVal = this.dataForm.startTime
+                    if (EndDateVal) {
+                        return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                    }
+                }
+            },
+            ifShowCssbAction: false,
+            againEscalationId: null,
+            itemHandleDeptId: null,
+            itemHandleDeptName: null
         }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      }
-    }
-  },
-  components: {
-    AddOrUpdate,
-    CssbReason
-  },
-  created: function () {
-    this.getPeoList()
-    this.getOptions()
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {
-        })
     },
-    getPeoList () {
-      console.log(this.dataList)
+    components: {
+        AddOrUpdate,
+        CssbReason
     },
-    dealAction (id) {
-      this.$parent.selectComponent = 'AppealDetailView'
-      this.$router.push({ path: '/events-appeal-cssb', query: { id: id } })
+    created: function () {
+        this.getPeoList()
+        this.getOptions()
     },
-    cssbAction (id) {
-      this.cssbReasonVisible = true
-      this.$nextTick(() => {
-        this.$refs.cssbReason.dataForm.id = id
-        this.$refs.cssbReason.init()
-      })
-    },
-    addAppealEnforcement () {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init()
-      })
+    watch: {
+        ids: function (val) {
+            if (val.length === 0) {
+                this.dataForm.streetId = ''
+                this.dataForm.communityId = ''
+                this.dataForm.gridId = ''
+            }
+            if (val.length === 1) {
+                this.dataForm.streetId = this.ids[0]
+                this.dataForm.communityId = ''
+                this.dataForm.gridId = ''
+            }
+            if (val.length === 2) {
+                this.dataForm.streetId = this.ids[0]
+                this.dataForm.communityId = this.ids[1]
+                this.dataForm.gridId = ''
+            }
+            if (val.length === 3) {
+                this.dataForm.streetId = this.ids[0]
+                this.dataForm.communityId = this.ids[1]
+                this.dataForm.gridId = this.ids[2]
+            }
+        }
     },
-    btKeyUpItemContent (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.itemContent = e.target.value
+    methods: {
+        getOptions() {
+            this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({
+                data: res
+            }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.options = res.data.options
+            }).catch(() => { })
+        },
+        getPeoList() {
+            console.log(this.dataList)
+        },
+        dealAction(id) {
+            this.$parent.selectComponent = 'AppealDetailView'
+            this.$router.push({
+                path: '/events-appeal-cssb',
+                query: {
+                    id: id
+                }
+            })
+        },
+        cssbAction() {
+            this.cssbReasonVisible = true
+            this.$nextTick(() => {
+                this.$refs.cssbReason.dataForm.id = this.againEscalationId;
+                this.$refs.cssbReason.init()
+                this.ifShowCssbAction = false
+            })
+        },
+        evaluationIssue(id) {
+            this.$confirm('确认要下发评价么?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+
+                this.$http['post']('events/item/evaluationIssue', { itemId: id }).then(({
+                    data: res
+                }) => {
+                    console.log(res)
+                    this.$message({
+                        type: 'success',
+                        message: '下发评价成功'
+                    });
+
+
+                    this.getDataList()
+                    // if (res.code !== 0) {
+                    //   return this.$message.error(res.msg)
+                    // }
+                    // this.$message({
+                    //   message: this.$t('prompt.success'),
+                    //   type: 'success',
+                    //   duration: 500,
+                    //   onClose: () => {
+                    //     this.visible = false
+                    //     this.$emit('refreshDataList')
+                    //   }
+                    // })
+                }).catch(() => { })
+
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消下发评价'
+                });
+            });
+
+        },
+        addAppealEnforcement() {
+            this.addOrUpdateVisible = true
+            this.$nextTick(() => {
+                this.$refs.addOrUpdate.init()
+            })
+        },
+        btKeyUpItemContent(e) {
+            e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g,
+                '')
+            this.dataForm.itemContent = e.target.value
+        },
+        goShowCssbActionPopup(id, itemHandleDeptId, itemHandleDeptName) {
+            this.ifShowCssbAction = true;
+            this.againEscalationId = id;
+            this.itemHandleDeptId = itemHandleDeptId;
+            this.itemHandleDeptName = itemHandleDeptName;
+        },
+        reportAgain() {
+            this.$confirm('确认要再次上报吗么?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const condition = {
+                    id: this.againEscalationId || null,
+                    handleCategory: 3000,
+                    handlerDept: this.itemHandleDeptName,
+                    handlerDeptId: this.itemHandleDeptId
+                }
+                this.$http['post']('events/item/reportWGH', condition).then(({
+                    data: res
+                }) => {
+                    if (res && res.code == 0) {
+                        this.$message({
+                            type: 'success',
+                            message: '再次上报成功'
+                        });
+                        this.getDataList()
+                    } else {
+                        this.$message({
+                            type: 'info',
+                            message: res.msg
+                        });
+                    }
+
+                    this.ifShowCssbAction = false
+                }).catch(() => { })
+
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消'
+                });
+            });
+        }
+
     }
-  }
 }
 </script>
+
+<style>
+.popupButton {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/events/appeal-detail-view.vue b/src/views/modules/events/appeal-detail-view.vue
index 1a27f5fc..b61c0d4b 100644
--- a/src/views/modules/events/appeal-detail-view.vue
+++ b/src/views/modules/events/appeal-detail-view.vue
@@ -1,543 +1,793 @@
 <template>
-  <div class="project-handle">
-    <el-form :model="dataForm" ref="dataForm" style="width: 100%; height: 100%;">
-      <div class="project-detail">
-        <div class="project-detail-tip">诉求详情</div>
-          <el-form label-position="right" class="projectDetail-left-appeal">
-            <el-form-item label="诉求内容:">
-              <div>{{dataForm.itemContent}}</div>
-                <el-image v-for="url in dataForm.images"
-                          style="width: 100px; height: 100px; margin-right: 10px"
-                          :key="url"
-                          :src="url"
-                          :preview-src-list="previewImgList"
-                          @click="clickImg(url)">
-                </el-image>
-                <div v-if="dataForm.itemVoice">
-                    <audio controls style="height: 30px;">
-                        <source :src="dataForm.itemVoice" >
-                    </audio>
-                </div>
-            </el-form-item>
-              <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
-                  <div>{{dataForm.groupName}}</div>
-              </el-form-item>
-            <el-form-item v-if="dataForm.enterpriseName" label="企业名称:">
-              <div>{{dataForm.enterpriseName}}</div>
-            </el-form-item>
-            <el-form-item v-if="dataForm.uniformSocialCreditCode" label="社会信用代码:">
-              <div>{{dataForm.uniformSocialCreditCode}}</div>
-            </el-form-item>
-            <el-form-item label="上报时间:">
-              <div>{{dataForm.distributeTime}}</div>
-            </el-form-item>
-            <el-form-item label="联系人姓名:">
-              <div>{{dataForm.nickName}}</div>
-            </el-form-item>
-              <el-form-item label="手机号:" prop="mobile">
-                  <div>{{dataForm.mobile}}</div>
-              </el-form-item>
-            <!-- <el-form-item label="所属类别:" prop="categoryName">
+	<div class="project-handle">
+		<div class="flex">
+			<div class="flexV">
+				<div class="project-detail">
+					<div class="project-detail-tip">诉求详情</div>
+					<el-form :model="dataForm" ref="dataForm" label-position="right" class="projectDetail-left-appeal">
+						<el-form-item label="诉求内容:">
+							<div>{{ dataForm.itemContent }}</div>
+							<el-image
+								v-for="url in dataForm.images"
+								style="width: 100px; height: 100px; margin-right: 10px"
+								:key="url"
+								:src="url"
+								:preview-src-list="previewImgList"
+								@click="clickImg(url)"
+							></el-image>
+							<div v-if="dataForm.itemVoice">
+								<audio controls style="height: 30px;"><source :src="dataForm.itemVoice" /></audio>
+							</div>
+						</el-form-item>
+						<el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+							<div>{{ dataForm.groupName }}</div>
+						</el-form-item>
+						<el-form-item v-if="dataForm.enterpriseName" label="企业名称:">
+							<div>{{ dataForm.enterpriseName }}</div>
+						</el-form-item>
+						<el-form-item v-if="dataForm.uniformSocialCreditCode" label="社会信用代码:">
+							<div>{{ dataForm.uniformSocialCreditCode }}</div>
+						</el-form-item>
+						<el-form-item label="上报时间:">
+							<div>{{ dataForm.distributeTime }}</div>
+						</el-form-item>
+						<el-form-item label="联系人姓名:">
+							<div>{{ dataForm.nickName }}</div>
+						</el-form-item>
+						<el-form-item label="手机号:" prop="mobile">
+							<div>{{ dataForm.mobile }}</div>
+						</el-form-item>
+						<!-- <el-form-item label="所属类别:" prop="categoryName">
               <div>{{dataForm.categoryName}}</div>
             </el-form-item> -->
 
-            <el-form-item label="事件位置:" prop="issueAddress">
-                  <div>{{dataForm.issueAddress}}</div>
-            </el-form-item>
-
-            <el-form-item label="分类:" prop="categoryName">
-              <div>{{dataForm.peopleFlag == '0' ? '民生诉求' : dataForm.peopleFlag == '1' ? '发展诉求' : '执法诉求'}}</div>
-            </el-form-item>
-
-            <el-form-item label="诉求编码:" prop="serialNum">
-              <div>{{dataForm.serialNum}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawName" label="事项名称:" prop="lawName">
-              <div>{{dataForm.lawDetail.lawName}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawContent" label="诉求详情:" prop="lawContent">
-              <div>{{dataForm.lawDetail.lawContent}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.hostUnit" label="建议主办单位:" prop="hostUnit">
-              <div>{{dataForm.lawDetail.hostUnit}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.assistUnit" label="建议协办单位:" prop="assistUnit">
-              <div>{{dataForm.lawDetail.assistUnit}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.demand" label="有关需求:" prop="demand">
-              <div>{{dataForm.lawDetail.demand}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawType" label="事项类型:" prop="lawType">
-              <div>{{dataForm.lawDetail.lawType == '0' ? '计划事项' : '临时事项'}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.isExchange" label="与部门是否沟通:" prop="isExchange">
-              <div>{{dataForm.lawDetail.isExchange == '0' ? '已经沟通' : '尚未沟通'}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerName" label="召集人姓名:" prop="convenerName">
-              <div>{{dataForm.lawDetail.convenerName}}</div>
-            </el-form-item>
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerJob" label="召集人职务:" prop="convenerJob">
-              <div>{{dataForm.lawDetail.convenerJob}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerMobile" label="召集人电话:" prop="convenerMobile">
-              <div>{{dataForm.lawDetail.convenerMobile}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactName" label="联系人姓名:" prop="contactName">
-              <div>{{dataForm.lawDetail.contactName}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactJob" label="联系人职务:" prop="contactJob">
-              <div>{{dataForm.lawDetail.contactJob}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactMobile" label="联系人电话:" prop="contactMobile">
-              <div>{{dataForm.lawDetail.contactMobile}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportTime" label="报到时间:" prop="reportTime">
-              <div>{{dataForm.lawDetail.reportTime}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportAddress" label="报到地点:" prop="reportAddress">
-              <div>{{dataForm.lawDetail.reportAddress}}</div>
-            </el-form-item>
-
-            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.meetingName" label="会议名称:" prop="meetingName">
-              <div>{{dataForm.lawDetail.meetingName}}</div>
-            </el-form-item>
-
-            <el-form-item label="用户满意度评价:"  v-if="dataForm.itemState == 10">
-              <div>{{dataForm.evaluationScoreName}}</div>
-            </el-form-item>
-            <el-form-item label="用户满意度评价内容:" v-if="dataForm.itemState == 10">
-              <div>{{dataForm.evaluationContent}}</div>
-            </el-form-item>
-          </el-form>
-          <div class="container">
-              <!-- <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.issueAddress}}</div> -->
-              <div id="map"></div>
-          </div>
-      </div>
-        <div class="project-progress">
-          <div class="project-progress-tip">处理进展</div>
-          <div class="refresh"><el-button type="text" @click="refreshProgress"> <i class="el-icon-refresh"></i></el-button></div>
-            <el-timeline v-loading="timeloading" style="padding-top: 12px;">
-                <el-timeline-item
-                        v-for="(item, index) in timeLineList"
-                        :key="item.id"
-                        :color="item.type === 'init' ? 'red' : item.type === 'project' ? '#009688' : '#ffa546'">
-                        <div :id="`content${index}`" style="line-height:25px; ">
-                          <div
-                            :style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.type === 'project' ? '#009688': item.type === 'issue' || item.type === 'issue-project' ? '#ffa546' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
-                            v-if="item.type !== 'init'">
-                            {{item.type === 'project' ? '项目': item.type === 'issue' || item.type === 'issue-project' ? '议题' : ''}}
-                          </div>
-                          <div><span style="font-weight: bold; color: rgb(96, 98, 102);">[{{item | formatState}}]</span> {{item.createdTime}}</div>
-                            <div v-if="item.state === 3">
-                                <div><span style="font-weight: bold; color: rgb(96, 98, 102);">来源社群：</span>{{item.groupName}}</div>
-                                <div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理人：</span>{{item.handlerDept}}</div>
-                                <div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理人电话：</span>{{item.mobile}}</div>
-                            </div>
-                            <div v-if="item.state !== 3">
-                                <div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理部门：</span>{{item.handlerDept}}</div>
-                            </div>
-                            <div v-if="item.itemDeptDTOS && item.itemDeptDTOS.length > 0" style="width: 100%; display: flex;">
-                            <div><span style="font-weight: bold; color: rgb(96, 98, 102);">被吹哨部门：</span> </div>
-                            <div>
-                              <span v-for="(csDept, index1) in item.itemDeptDTOS" :key="index1">
-                              {{ csDept.deptName }}<br/>
-                            </span>
-                            </div>
-                          </div>
-                          <div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理意见：</span>  {{item.advice}}</div>
-                          <div style="display: flex;">
-                              <el-image v-for="url in item.images"
-                                        style="width: 60px; height: 60px; object-fit: cover; margin-right: 8px; border-radius: 2px;"
-                                        :key="url"
-                                        :src="url"
-                                        :preview-src-list="previewImgList"
-                                        alt="处理图片"
-                                        @click="clickImg(url)">
-                              </el-image>
-                          </div>
-                        </div>
-
-                </el-timeline-item>
-            </el-timeline>
-        </div>
-        <div style="width: 100%; text-align:center; float:left;">
-            <el-button size="medium" style="width: 95px" type="primary" @click="back">返回</el-button>
-        </div>
-    </el-form>
-
-  </div>
+						<el-form-item label="事件位置:" prop="issueAddress">
+							<div>{{ dataForm.issueAddress }}</div>
+						</el-form-item>
+
+						<el-form-item label="分类:" prop="peopleFlag">
+							<div>{{ dataForm.peopleFlag == '0' ? '民生诉求' : dataForm.peopleFlag == '1' ? '发展诉求' : '执法诉求' }}</div>
+						</el-form-item>
+
+						<el-form-item label="诉求编码:" prop="serialNum">
+							<div>{{ dataForm.serialNum }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawName" label="事项名称:" prop="lawName">
+							<div>{{ dataForm.lawDetail.lawName }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawContent" label="诉求详情:" prop="lawContent">
+							<div>{{ dataForm.lawDetail.lawContent }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.hostUnit" label="建议主办单位:" prop="hostUnit">
+							<div>{{ dataForm.lawDetail.hostUnit }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.assistUnit" label="建议协办单位:" prop="assistUnit">
+							<div>{{ dataForm.lawDetail.assistUnit }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.demand" label="有关需求:" prop="demand">
+							<div>{{ dataForm.lawDetail.demand }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawType" label="事项类型:" prop="lawType">
+							<div>{{ dataForm.lawDetail.lawType == '0' ? '计划事项' : '临时事项' }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.isExchange" label="与部门是否沟通:" prop="isExchange">
+							<div>{{ dataForm.lawDetail.isExchange == '0' ? '已经沟通' : '尚未沟通' }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerName" label="召集人姓名:" prop="convenerName">
+							<div>{{ dataForm.lawDetail.convenerName }}</div>
+						</el-form-item>
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerJob" label="召集人职务:" prop="convenerJob">
+							<div>{{ dataForm.lawDetail.convenerJob }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerMobile" label="召集人电话:" prop="convenerMobile">
+							<div>{{ dataForm.lawDetail.convenerMobile }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactName" label="联系人姓名:" prop="contactName">
+							<div>{{ dataForm.lawDetail.contactName }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactJob" label="联系人职务:" prop="contactJob">
+							<div>{{ dataForm.lawDetail.contactJob }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactMobile" label="联系人电话:" prop="contactMobile">
+							<div>{{ dataForm.lawDetail.contactMobile }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportTime" label="报到时间:" prop="reportTime">
+							<div>{{ dataForm.lawDetail.reportTime }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportAddress" label="报到地点:" prop="reportAddress">
+							<div>{{ dataForm.lawDetail.reportAddress }}</div>
+						</el-form-item>
+
+						<el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.meetingName" label="会议名称:" prop="meetingName">
+							<div>{{ dataForm.lawDetail.meetingName }}</div>
+						</el-form-item>
+
+						<el-form-item label="用户满意度评价:" v-if="dataForm.itemState == 10">
+							<div>{{ dataForm.evaluationScoreName }}</div>
+						</el-form-item>
+						<el-form-item label="用户满意度评价内容:" v-if="dataForm.itemState == 10">
+							<div>{{ dataForm.evaluationContent }}</div>
+						</el-form-item>
+						<el-form-item label="所属类别:" prop="categoryIds" v-if="dataForm.categoryFullCode">
+							{{ dataForm.categoryName }}
+							
+							<!-- :disabled="disabledCategory" -->
+						<!-- <div style="display: none;">
+								<el-cascader
+									clearable
+									ref="cascaderShow"
+									v-model="dataForm.categoryIds"
+									placeholder="试试搜索关键字"
+									:props="{ checkStrictly: false }"
+									:options="categoryOptions"
+									filterable
+								></el-cascader>
+							</div> -->
+						</el-form-item>
+						<el-form-item label="解决情况:" v-if="dataForm.solutionInfo">
+							<div v-if="dataForm.solutionInfo == '01'">解决</div>
+							<div v-if="dataForm.solutionInfo == '02'">基本解决</div>
+							<div v-if="dataForm.solutionInfo == '03'">未解决</div>
+						</el-form-item>
+					</el-form>
+					<div class="container">
+						<!-- <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.issueAddress}}</div> -->
+						<div id="map"></div>
+					</div>
+				</div>
+				<div class="handle-operation" v-if="pageType == 'edit'">
+					<div class="handle-operation-tip">处理操作</div>
+					<el-form ref="dataForm2" class="operation" label-width="140px" label-position="right" style="width: 720px;" :model="dataForm2" :rules="dataRule">
+						<el-form-item label="所属类别:" prop="categoryIds">
+							<div class="block">
+								<el-cascader
+									ref="cascader"
+									v-model="categoryIds"
+									placeholder="试试搜索关键字"
+									:props="{ checkStrictly: false }"
+									:options="categoryOptions"
+									filterable
+								></el-cascader>
+							</div>
+						</el-form-item>
+
+						<el-form-item style="float: right;">
+							<el-button size="small" type="primary" style="width: 95px" @click="dataFormSubmitHandle()">确定修改</el-button>
+							<el-button size="medium" style="width: 95px" @click="back">返回</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+			</div>
+			<div class="project-progress">
+				<div class="project-progress-tip">处理进展</div>
+				<div class="refresh">
+					<el-button type="text" @click="refreshProgress"><i class="el-icon-refresh"></i></el-button>
+				</div>
+				<el-timeline v-loading="timeloading" style="padding-top: 12px;">
+					<el-timeline-item v-for="(item, index) in timeLineList" :key="item.id" :color="item.type === 'init' ? 'red' : item.type === 'project' ? '#009688' : '#ffa546'">
+						<div :id="`content${index}`" style="line-height:25px; ">
+							<div
+								:style="{
+									marginBottom: '10px',
+									width: '35px',
+									height: '20px',
+									fontSize: '12px',
+									borderRadius: '4px',
+									background: item.type === 'project' ? '#009688' : item.type === 'issue' || item.type === 'issue-project' ? '#ffa546' : '',
+									color: '#fff',
+									textAlign: 'center',
+									lineHeight: '20px'
+								}"
+								v-if="item.type !== 'init'"
+							>
+								{{ item.type === 'project' ? '项目' : item.type === 'issue' || item.type === 'issue-project' ? '议题' : '' }}
+							</div>
+							<div>
+								<span style="font-weight: bold; color: rgb(96, 98, 102);">[{{ item | formatState }}]</span>
+								{{ item.createdTime }}
+							</div>
+							<div v-if="item.state === 3">
+								<div>
+									<span style="font-weight: bold; color: rgb(96, 98, 102);">来源社群：</span>
+									{{ item.groupName }}
+								</div>
+								<div>
+									<span style="font-weight: bold; color: rgb(96, 98, 102);">处理人：</span>
+									{{ item.handlerDept }}
+								</div>
+								<div>
+									<span style="font-weight: bold; color: rgb(96, 98, 102);">处理人电话：</span>
+									{{ item.mobile }}
+								</div>
+							</div>
+							<div v-if="item.state !== 3">
+								<div>
+									<span style="font-weight: bold; color: rgb(96, 98, 102);">处理部门：</span>
+									{{ item.handlerDept }}
+								</div>
+							</div>
+							<div v-if="item.itemDeptDTOS && item.itemDeptDTOS.length > 0" style="width: 100%; display: flex;">
+								<div><span style="font-weight: bold; color: rgb(96, 98, 102);">被吹哨部门：</span></div>
+								<div>
+									<span v-for="(csDept, index1) in item.itemDeptDTOS" :key="index1">
+										{{ csDept.deptName }}
+										<br />
+									</span>
+								</div>
+							</div>
+							<div>
+								<span style="font-weight: bold; color: rgb(96, 98, 102);">处理意见：</span>
+								{{ item.advice }}
+							</div>
+							<div style="display: flex;">
+								<el-image
+									v-for="url in item.images"
+									style="width: 60px; height: 60px; object-fit: cover; margin-right: 8px; border-radius: 2px;"
+									:key="url"
+									:src="url"
+									:preview-src-list="previewImgList"
+									alt="处理图片"
+									@click="clickImg(url)"
+								></el-image>
+							</div>
+						</div>
+					</el-timeline-item>
+				</el-timeline>
+			</div>
+		</div>
+		<div style="width: 100%; text-align:center;margin-top: 10px;" v-if="pageType != 'edit'"><el-button size="medium" style="width: 95px" @click="back">返回</el-button></div>
+	</div>
 </template>
 
 <script>
-import BMap from 'BMap'
-import 'element-ui/lib/theme-chalk/timeline.css'
-import 'element-ui/lib/theme-chalk/timeline-item.css'
-import 'element-ui/lib/theme-chalk/image.css'
-import { gcj02tobd09 } from '../../../utils/gcj02tobd09'
+import BMap from 'BMap';
+import 'element-ui/lib/theme-chalk/timeline.css';
+import 'element-ui/lib/theme-chalk/timeline-item.css';
+import 'element-ui/lib/theme-chalk/image.css';
+import { gcj02tobd09 } from '../../../utils/gcj02tobd09';
 export default {
-  name: 'itemCloseDetailView',
-  data () {
-    return {
-      timeloading: true,
-      map: '',
-      dataForm: {
-        id: '',
-        nickName: '',
-        distributeTime: '',
-        itemContent: '',
-        handleProgressResultDTOS: [],
-        issueProgressResultDTOS: [],
-        images: [],
-        voice: ''
-      },
-      previewImgList: [],
-      order: '',
-      orderField: '',
-
-      timeLineList: []
-    }
-  },
-  mounted () {
-    this.dataForm.id = this.$route.query.id
-    this.init()
-  },
-  filters: {
-    formatState (item) {
-      if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0
-        ) {
-          return '网格吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
-          return '回应'
-        } else if (item.state === 1) {
-          return '社区吹哨'
-        } else if (item.state === 5) {
-          return '不予受理'
-        } else if (item.state === 10) {
-          return '结案'
-        } else if (item.state === 11) {
-          return '结案申请'
-        } else if (item.state === 12 || item.state === 1001) {
-          return '响应拟办'
-        } else if (item.state === 13) {
-          return '直接办理'
-        } else if (item.state === 14) {
-          return '社区驳回'
-        } else if (item.state === 15) {
-          return '社区吹哨'
-        } else if (item.state === 16) {
-          return '吹哨市平台'
-        } else if (item.state === 2018) {
-          return '市平台-诉求督办'
-        } else if (item.state === 2020) {
-          return '市平台-吹哨驳回'
-        } else if (item.state === 2021) {
-          return '市平台-吹哨反馈'
-        } else if (item.state === 20) {
-          return '网格化平台-受理'
-        } else if (item.state === 25) {
-          return '网格化平台-立案'
-        } else if (item.state === 30) {
-          return '网格化平台-派遣'
-        } else if (item.state === 35) {
-          return '网格化平台-中间再派'
-        } else if (item.state === 40) {
-          return '网格化平台-接单'
-        } else if (item.state === 45) {
-          return '网格化平台-处置完成'
-        } else if (item.state === 50) {
-          return '网格化平台-中间督办'
-        } else if (item.state === 55) {
-          return '网格化平台-催办'
-        } else if (item.state === 60) {
-          return '网格化平台-结案'
-        } else if (item.state === 65) {
-          return '网格化平台-办理'
-        } else if (item.state === 70) {
-          return '网格化平台-批转'
-        } else if (item.state === 75) {
-          return '网格化平台-退单'
-        } else if (item.state === 80) {
-          return '网格化平台-办结'
-        } else if (item.state === 85) {
-          return '项目延期-审核通过'
-        } else if (item.state === 90) {
-          return '项目熔断-审核通过'
-        } else if (item.state === 1002) {
-          return '诉求初验'
-        } else if (item.state === 1003) {
-          return '诉求终验'
-        } else if (item.state === 1004) {
-          return '诉求终验'
-        } else if (item.state === 1005) {
-          return '诉求初验'
-        } else if (item.state === 1105) {
-          return '下发评价'
-        } else if (item.state === 1106) {
-          return '初验申请'
-        } else {
-          return '网格化平台-派遣中'
-        }
-      } else if (item.type === 'issue' || item.type === 'init') {
-        if (item.state === 0) {
-          return '审核通过'
-        } else if (item.state === 1) {
-          return '回应'
-        } else if (item.state === 2) {
-          return '关闭'
-        } else if (item.state === 3) {
-          return '转议题'
-        }
-      } else if (item.type === 'issue-project') {
-        return '转项目'
-      }
-    }
-  },
-  methods: {
-    refreshProgress () {
-      this.timeloading = true
-      this.$http
-        .get(`/events/platform/item/get/${this.dataForm.id}`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.getInfo()
-          // console.log(res)
-        })
-        .catch(() => {})
-    },
-    back () {
-      this.$parent.init()
-      // this.$router.push({ path: this.$route.path })
-    },
-    initBmap (latitude, longitude) {
-      this.map = new BMap.Map('map')
-      const point = new BMap.Point(longitude, latitude)
-      var marker = new BMap.Marker(point)
-      this.map.addOverlay(marker)
-      this.map.centerAndZoom(point, 13)
-      this.map.enableScrollWheelZoom(true)
-    },
-    init () {
-      this.$nextTick(() => {
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    clickImg (url) {
-      this.previewImgList = []
-      this.previewImgList.push(url)
-    },
-
-    getInfo () {
-      this.$http.get(`/events/item/getItemAppealDetail/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.timeloading = false
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-        this.dataForm.handleProgressResultDTOS.forEach((item, index, arr) => {
-          if (index === arr.length - 1) {
-            // item.type = 'issue-project'
-            item.type = 'project'
-          } else {
-            item.type = 'project'
-          }
-        })
-        this.dataForm.issueProgressResultDTOS.forEach((item, index, arr) => {
-          if (index === arr.length - 1) {
-            item.type = 'init'
-          } else {
-            item.type = 'issue'
-          }
-        })
-        this.timeLineList = [...this.dataForm.handleProgressResultDTOS, ...this.dataForm.issueProgressResultDTOS]
-        this.$nextTick(() => {
-          this.timeLineList.forEach((item, index) => {
-            const oDiv = document.getElementById(`content${index}`)
-            const oBorder = oDiv.parentNode.parentNode.parentNode.firstChild
-            if (item.type === 'issue' || item.type === 'issue-project') {
-              oBorder.style.borderLeft = '1px solid #ffa546'
-            } else if (item.type === 'project') {
-              oBorder.style.borderLeft = '1px solid #009688'
-            }
-          })
-        })
-        this.dataForm.issueLongitude = gcj02tobd09(this.dataForm.issueLongitude, this.dataForm.issueLatitude)[0]
-        this.dataForm.issueLatitude = gcj02tobd09(this.dataForm.issueLongitude, this.dataForm.issueLatitude)[1]
-        this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
-      }).catch(() => {})
-    }
-  }
-}
+	name: 'itemCloseDetailView',
+	data() {
+		return {
+			infoCode: '',
+			categoryIds: [],
+			categoryOptions: [],
+			timeloading: true,
+			map: '',
+			dataForm: {
+				id: '',
+				nickName: '',
+				distributeTime: '',
+				itemContent: '',
+				handleProgressResultDTOS: [],
+				issueProgressResultDTOS: [],
+				images: [],
+				voice: '',
+				
+			},
+			dataForm2: { itemId: '', categoryId: '', categoryFullId: '' },
+			postDataForm: {  },
+			previewImgList: [],
+			order: '',
+			orderField: '',
+			pageType: '',
+			timeLineList: []
+		};
+	},
+	computed: {
+		dataRule() {
+			return {
+				categoryIds: [
+					{
+						required: true,
+						message: this.$t('validate.required'),
+						trigger: 'blur'
+					}
+				]
+			};
+		}
+	},
+	mounted() {
+		this.dataForm.id = this.$route.query.id;
+		this.pageType = this.$route.query.type;
+		this.infoCode = this.$route.query.infoCode;
+		this.init();
+		this.getCategoryList();
+	},
+	watch: {
+	       // dataForm: function() {
+	       //    this.$nextTick(()=>{
+	       //    	const checkedNode = this.$refs['cascaderShow'].getCheckedNodes();
+	       //    	console.log("checkedNode",checkedNode)
+	       //    	this.dataForm.categoryLabel = checkedNode[0].pathLabels.join('-');
+	       //    })
+	       // }
+	   },
+	filters: {
+		formatState(item) {
+			if (item.type === 'project') {
+				if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
+					return '网格吹哨';
+				} else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
+					return '回应';
+				} else if (item.state === 1) {
+					return '社区吹哨';
+				} else if (item.state === 5) {
+					return '不予受理';
+				} else if (item.state === 10) {
+					return '结案';
+				} else if (item.state === 11) {
+					return '结案申请';
+				} else if (item.state === 12 || item.state === 1001) {
+					return '响应拟办';
+				} else if (item.state === 13) {
+					return '直接办理';
+				} else if (item.state === 14) {
+					return '社区驳回';
+				} else if (item.state === 15) {
+					return '社区吹哨';
+				} else if (item.state === 16) {
+					return '吹哨市平台';
+				} else if (item.state === 2018) {
+					return '市平台-诉求督办';
+				} else if (item.state === 2020) {
+					return '市平台-吹哨驳回';
+				} else if (item.state === 2021) {
+					return '市平台-吹哨反馈';
+				} else if (item.state === 20) {
+					return '网格化平台-受理';
+				} else if (item.state === 25) {
+					return '网格化平台-立案';
+				} else if (item.state === 30) {
+					return '网格化平台-派遣';
+				} else if (item.state === 35) {
+					return '网格化平台-中间再派';
+				} else if (item.state === 40) {
+					return '网格化平台-接单';
+				} else if (item.state === 45) {
+					return '网格化平台-处置完成';
+				} else if (item.state === 50) {
+					return '网格化平台-中间督办';
+				} else if (item.state === 55) {
+					return '网格化平台-催办';
+				} else if (item.state === 60) {
+					return '网格化平台-结案';
+				} else if (item.state === 65) {
+					return '网格化平台-办理';
+				} else if (item.state === 70) {
+					return '网格化平台-批转';
+				} else if (item.state === 75) {
+					return '网格化平台-退单';
+				} else if (item.state === 80) {
+					return '网格化平台-办结';
+				} else if (item.state === 85) {
+					return '项目延期-审核通过';
+				} else if (item.state === 90) {
+					return '项目熔断-审核通过';
+				} else if (item.state === 1002) {
+					return '诉求初验';
+				} else if (item.state === 1003) {
+					return '诉求终验';
+				} else if (item.state === 1004) {
+					return '诉求终验';
+				} else if (item.state === 1005) {
+					return '诉求初验';
+				} else if (item.state === 1105) {
+					return '下发评价';
+				} else if (item.state === 1106) {
+					return '初验申请';
+				} else {
+					return '网格化平台-派遣中';
+				}
+			} else if (item.type === 'issue' || item.type === 'init') {
+				if (item.state === 0) {
+					return '审核通过';
+				} else if (item.state === 1) {
+					return '回应';
+				} else if (item.state === 2) {
+					return '关闭';
+				} else if (item.state === 3) {
+					return '转议题';
+				}
+			} else if (item.type === 'issue-project') {
+				return '转项目';
+			}
+		}
+	},
+	methods: {
+		dataFormSubmitHandle() {
+			console.log("this.categoryIds",this.categoryIds)
+			if (this.categoryIds == undefined || this.categoryIds.length == 0|| this.categoryIds == "") {
+				return this.$message.error('请选择所属类别');
+			}
+			// this.postDataForm.categoryIds = this.categoryIds;
+			this.postDataForm.categoryFullId = this.categoryIds.join('-');
+			this.postDataForm.categoryId = this.categoryIds[this.categoryIds.length - 1];
+			// this.postDataForm.categoryLabel=
+
+			const checkedNode = this.$refs['cascader'].getCheckedNodes();
+
+			this.postDataForm.categoryLabel = checkedNode[0].pathLabels.join('-');
+			this.postDataForm.fistCategoryId =this.categoryIds[0];
+			this.postDataForm.itemId = this.dataForm.id;
+			console.log('this.postDataForm', this.postDataForm);
+			this.$http
+				.post(`/events/item/changeCategory`, { ...this.postDataForm })
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						return this.$message.success('修改成功');
+					}
+				})
+				.catch(() => {});
+		},
+		// dataFormSubmitHandle: debounce(
+		// 	function(type = '') {
+		// 		if (this.postDataForm.categoryId === undefined || this.postDataForm.categoryId === '') {
+		// 			return this.$message.error('请选择所属类别');
+		// 		}
+		// 		this.postDataForm.categoryFullId = this.categoryIds;
+		// 		this.postDataForm.categoryId = this.categoryIds[this.categoryIds.length - 1];
+
+		// 		this.postDataForm.itemId = this.dataForm.id;
+
+		// 		this.$confirm(messageTitle, '提示', {
+		// 			confirmButtonText: '确定',
+		// 			cancelButtonText: '取消',
+		// 			type: 'warning'
+		// 		})
+		// 			.then(() => {
+		// 				this.$http['post']('/events/item/changeCategory', this.postDataForm)
+		// 					.then(({ data: res }) => {
+		// 						if (res.code !== 0) {
+		// 							this.isAble = false;
+		// 							return this.$message.error(res.msg);
+		// 						}
+		// 						this.$message({
+		// 							message: this.$t('prompt.success'),
+		// 							type: 'success',
+		// 							duration: 500,
+		// 							onClose: () => {
+		// 								this.visible = false;
+		// 								this.$emit('refreshDataList');
+		// 							}
+		// 						});
+		// 						this.$parent.selectComponent = 'ItemDeal';
+		// 					})
+		// 					.catch(() => {});
+		// 			})
+		// 			.catch(() => {
+		// 				this.isAble = false;
+		// 			});
+		// 	},
+		// 	1000,
+		// 	{ leading: true, trailing: false }
+		// ),
+		getCategoryList() {
+			return this.$http
+				.get('/events/category/list', {
+					params: {
+						infoCode: this.infoCode
+					}
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					var data = res.data;
+
+					this.getSelectedNode(data, data);
+					this.categoryOptions = data;
+					// this.disabledCategory = false
+				})
+				.catch(() => {});
+		},
+		getSelectedNode(nodeData, parent) {
+			nodeData.forEach(item => {
+				if ('children' in item && item.children.length === 0) {
+					delete item.children;
+				} else if ('children' in item && item.children.length) {
+					this.getSelectedNode(item.children, item);
+				}
+			});
+		},
+		refreshProgress() {
+			this.timeloading = true;
+			this.$http
+				.get(`/events/platform/item/get/${this.dataForm.id}`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.getInfo();
+					// console.log(res)
+				})
+				.catch(() => {});
+		},
+		back() {
+			this.$parent.init();
+			// this.$router.push({ path: this.$route.path })
+		},
+		initBmap(latitude, longitude) {
+			this.map = new BMap.Map('map');
+			const point = new BMap.Point(longitude, latitude);
+			var marker = new BMap.Marker(point);
+			this.map.addOverlay(marker);
+			this.map.centerAndZoom(point, 13);
+			this.map.enableScrollWheelZoom(true);
+		},
+		init() {
+			this.$nextTick(() => {
+				if (this.dataForm.id) {
+					this.getInfo();
+				}
+			});
+		},
+		clickImg(url) {
+			this.previewImgList = [];
+			this.previewImgList.push(url);
+		},
+
+		getInfo() {
+			this.$http
+				.get(`/events/item/getItemAppealDetail/${this.dataForm.id}`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.timeloading = false;
+					this.dataForm = {
+						...this.dataForm,
+						...res.data
+					};
+					this.categoryIds = this.dataForm.categoryIds;
+					
+					
+					console.log(this.categoryIds);
+					console.log(' this.dataForm', this.dataForm.solutionInfo);
+					this.dataForm.handleProgressResultDTOS.forEach((item, index, arr) => {
+						if (index === arr.length - 1) {
+							// item.type = 'issue-project'
+							item.type = 'project';
+						} else {
+							item.type = 'project';
+						}
+					});
+					this.dataForm.issueProgressResultDTOS.forEach((item, index, arr) => {
+						if (index === arr.length - 1) {
+							item.type = 'init';
+						} else {
+							item.type = 'issue';
+						}
+					});
+					this.timeLineList = [...this.dataForm.handleProgressResultDTOS, ...this.dataForm.issueProgressResultDTOS];
+					this.$nextTick(() => {
+						this.timeLineList.forEach((item, index) => {
+							const oDiv = document.getElementById(`content${index}`);
+							const oBorder = oDiv.parentNode.parentNode.parentNode.firstChild;
+							if (item.type === 'issue' || item.type === 'issue-project') {
+								oBorder.style.borderLeft = '1px solid #ffa546';
+							} else if (item.type === 'project') {
+								oBorder.style.borderLeft = '1px solid #009688';
+							}
+						});
+					});
+					this.dataForm.issueLongitude = gcj02tobd09(this.dataForm.issueLongitude, this.dataForm.issueLatitude)[0];
+					this.dataForm.issueLatitude = gcj02tobd09(this.dataForm.issueLongitude, this.dataForm.issueLatitude)[1];
+					this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude);
+					
+				})
+				.catch(() => {});
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-    .project-handle {
-        .el-timeline {
-            padding-left: 9px;
-            font-size: 13px;
-        }
-    }
-    .el-form-item__label {
-        font-weight: bold;
-    }
-</style>
+.project-handle {
+	.el-timeline {
+		padding-left: 9px;
+		font-size: 13px;
+	}
+}
+.el-form-item__label {
+	font-weight: bold;
+}
+
+.project-handle {
+	width: 100%;
+	height: calc(100vh - 130px);
+	display: flex;
+	flex-direction: column;
+	background: #ffffff;
+	box-sizing: border-box;
+	padding: 10px;
+	.flex {
+		display: flex;
+		flex: 1;
+		overflow-y: auto;
+		.flexV {
+			display: flex;
+			flex-direction: column;
+			width: 79%;
+			height: 100%;
 
-<style lang="scss" scoped>
-    .project-handle {
-        width: 100%;
-        height: calc(100vh - 120px);
-        background: #ffffff;
-        box-sizing: border-box;
-        padding: 10px;
-        .project-detail {
-            width: 79%;
-            height: 80%;
-            border: 2px solid #ccc;
-            box-sizing: border-box;
-            // padding: 10px;
-            float:left;
-            margin-bottom: 1%;
-            position: relative;
-            padding: 20px 85px;
-            box-sizing: border-box;
-            .projectDetail-left-appeal{
-                .image-list{
-                  width: 100%;
-                  height: auto;
-                  padding: 0px 45px;
-                  box-sizing: border-box;
-                }
-                .el-form-item{
-                  .el-form-item__label{
-                    width: auto;
-                    padding-left: 48px;
-                    text-align: left !important;
-                  }
-              }
-              .el-form-item{
-                margin-bottom: 0px;
-              }
-            }
-            .project-detail-tip {
-              position: absolute;
-              top: 0;
-              left:0;
-              width: 80px;
-              height: 30px;
-              line-height: 30px;
-              color: #ffffff;
-              background: #4ac38b;
-              text-align:center;
-            }
-            .el-form {
-                width: 50%;
-                height: 100%;
-                float:left;
-                overflow-y:auto;
-                &::-webkit-scrollbar {
-                    width: 5px;
-                    height: 1px;
-                }
-                &::-webkit-scrollbar-thumb {
-                    border-radius: 5px;
-                    background: #aaa;
-                }
-                &::-webkit-scrollbar-track {
-                    border-radius: 10px;
-                    background: #fff;
-                }
-
-            }
-            .container {
-                width: 48%;
-                height: 80%;
-                float: right;
-                .location {
-                    height: 30px;
-                    line-height: 30px;
-                }
-                #map {
-                    width: 100%;
-                    height: calc(100% - 30px);
-                }
-            }
-        }
-        .project-progress {
-            width: 20%;
-            height: 80%;
-            float: right;
-            border: 2px solid #ccc;
-            box-sizing: border-box;
-            margin-left: 1%;
-            padding-top: 20px;
-            overflow-y:auto;
-            position: relative;
-            padding-top: 40px;
-            .project-progress-tip {
-              position: absolute;
-              top: 0;
-              left:0;
-              width: 80px;
-              height: 30px;
-              line-height: 30px;
-              color: #ffffff;
-              background: #0098ff;
-              text-align:center;
-            }
-            &::-webkit-scrollbar {
-                width: 5px;
-                height: 1px;
-            }
-            &::-webkit-scrollbar-thumb {
-                border-radius: 5px;
-                background: #aaa;
-            }
-            &::-webkit-scrollbar-track {
-                border-radius: 10px;
-                background: #ccc;
-            }
-        }
-        .handle-operation {
-            width: 79%;
-            height: 49%;
-            box-sizing: border-box;
-            border: 2px solid #ccc;
-            float:left;
-        }
-    }
-
-    .refresh {
-      position: absolute;
-      top: -10px;
-      right: 0;
-      width: 35px;
-      height: 30px;
-      font-size: 23px;
-      line-height: 30px;
-      .el-icon-refresh {
-        font-size: 20px;
-      }
-    }
+			.project-detail {
+				width: 100%;
+				flex: 1;
+				height: 0;
+				border: 2px solid #ccc;
+				box-sizing: border-box;
+				overflow-y: auto;
+
+				position: relative;
+				padding: 20px 85px;
+				box-sizing: border-box;
+				.projectDetail-left-appeal {
+					.image-list {
+						width: 100%;
+						height: auto;
+						padding: 0px 45px;
+						box-sizing: border-box;
+					}
+					.el-form-item {
+						.el-form-item__label {
+							width: auto;
+							// padding-left: 48px;
+							text-align: left !important;
+						}
+					}
+					.el-form-item {
+						margin-bottom: 0px;
+					}
+				}
+				.project-detail-tip {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 80px;
+					height: 30px;
+					line-height: 30px;
+					color: #ffffff;
+					background: #4ac38b;
+					text-align: center;
+				}
+				.el-form {
+					width: 50%;
+					height: 100%;
+					float: left;
+					overflow-y: auto;
+					&::-webkit-scrollbar {
+						width: 5px;
+						height: 1px;
+					}
+					&::-webkit-scrollbar-thumb {
+						border-radius: 5px;
+						background: #aaa;
+					}
+					&::-webkit-scrollbar-track {
+						border-radius: 10px;
+						background: #fff;
+					}
+				}
+				.container {
+					width: 48%;
+					height: 80%;
+					float: right;
+					.location {
+						height: 30px;
+						line-height: 30px;
+					}
+					#map {
+						width: 100%;
+						height: calc(100% - 30px);
+					}
+				}
+			}
+			.handle-operation {
+				flex-shrink: 0;
+				padding-top: 20px;
+				box-sizing: border-box;
+				width: 100%;
+				height: 130px;
+				box-sizing: border-box;
+				border: 2px solid #ccc;
+				margin-top: 10px;
+				overflow-y: auto;
+				position: relative;
+
+				&::-webkit-scrollbar {
+					width: 5px;
+					height: 1px;
+				}
+
+				&::-webkit-scrollbar-thumb {
+					border-radius: 5px;
+					background: #aaa;
+				}
+
+				&::-webkit-scrollbar-track {
+					border-radius: 10px;
+					background: #ccc;
+				}
+
+				.handle-operation-tip {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 80px;
+					height: 30px;
+					line-height: 30px;
+					color: #ffffff;
+					background: #ff7600;
+					text-align: center;
+				}
+			}
+		}
+		.project-progress {
+			flex: 1;
+			height: 100%;
+
+			border: 2px solid #ccc;
+			box-sizing: border-box;
+			margin-left: 1%;
+			padding-top: 20px;
+			overflow-y: auto;
+			position: relative;
+			padding-top: 40px;
+			.project-progress-tip {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 80px;
+				height: 30px;
+				line-height: 30px;
+				color: #ffffff;
+				background: #0098ff;
+
+				text-align: center;
+			}
+			&::-webkit-scrollbar {
+				width: 5px;
+				height: 1px;
+			}
+			&::-webkit-scrollbar-thumb {
+				border-radius: 5px;
+				background: #aaa;
+			}
+			&::-webkit-scrollbar-track {
+				border-radius: 10px;
+				background: #ccc;
+			}
+		}
+	}
+}
+
+.refresh {
+	position: absolute;
+	top: -10px;
+	right: 0;
+	width: 35px;
+	height: 30px;
+	font-size: 23px;
+	line-height: 30px;
+	.el-icon-refresh {
+		font-size: 20px;
+	}
+}
 </style>
diff --git a/src/views/modules/events/appeal-development-list-unsatisfactory.vue b/src/views/modules/events/appeal-development-list-unsatisfactory.vue
index 6fc4f486..7a0c0cc1 100644
--- a/src/views/modules/events/appeal-development-list-unsatisfactory.vue
+++ b/src/views/modules/events/appeal-development-list-unsatisfactory.vue
@@ -43,18 +43,23 @@
               </el-form-item>
 
               <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>
+                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;"  clearable>
                       <el-option label="不满意" value="0"> </el-option>
                       <el-option label="基本满意" value="1"> </el-option>
                       <el-option label="非常满意" value="2"> </el-option>
                   </el-select>
               </el-form-item>
 
-              <el-form-item label="处理状态" label-width="105px">
+              <el-form-item label="处理状态">
                   <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
                       <el-option label="处理中" value="0"></el-option>
                       <el-option label="已结案" value="10"></el-option>
-<!--                      <el-option label="待评价" value="80"></el-option>-->
+                  </el-select>
+              </el-form-item>
+
+              <el-form-item label="评价状态">
+                  <el-select v-model="dataForm.evaluationState" clearable  placeholder="请选择" style="width:200px;">
+                      <el-option label="待评价" value="80"></el-option>
                       <el-option label="已评价" value="90"></el-option>
                   </el-select>
               </el-form-item>
@@ -350,6 +355,25 @@ export default {
         .catch(() => {
         })
     },
+    stateFormat (row, column) {
+      if (row.itemState === 0) {
+        if (row.processState === '16') {
+          return '市区处理中'
+        }
+        if (row.evaluationState === '1') {
+          if (row.evaluationTime !== null && row.evaluationTime !== '') {
+            return '已评价'
+          } else {
+            return '待评价'
+          }
+        } else if (row.evaluationTime !== null && row.evaluationTime !== '') {
+          return '审验中'
+        }
+        return '处理中'
+      } else if (row.itemState === 10) {
+        return '已结案'
+      }
+    },
     getPeoList () {
       console.log(this.dataList)
     },
diff --git a/src/views/modules/events/appeal-development-list.vue b/src/views/modules/events/appeal-development-list.vue
index c5c19206..c1b1b030 100644
--- a/src/views/modules/events/appeal-development-list.vue
+++ b/src/views/modules/events/appeal-development-list.vue
@@ -1,187 +1,126 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-      <div class="mod-item__item}">
-          <el-form
-                  :inline="true"
-                  :model="dataForm"
-                  @keyup.enter.native="getDataListSearch()"
-          >
-              <!-- <el-form-item label="诉求类型" prop="appealType" label-width="80px">
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-item__item}">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+				<!-- <el-form-item label="诉求类型" prop="appealType" label-width="80px">
                 <el-select v-model="dataForm.appealType" placeholder="请选择" clearable>
                   <el-option label="民生" value="0"> </el-option>
                   <el-option label="发展" value="1"> </el-option>
                   <el-option label="执法" value="2"> </el-option>
                 </el-select>
               </el-form-item> -->
-              <el-form-item label="所属机构" label-width="100px">
-                  <el-cascader
-                          v-model="ids"
-                          :options="options"
-                          :props="{ checkStrictly: true }"
-                          clearable
-                          style="width:250px;"
-                  >
-                  </el-cascader>
-              </el-form-item>
-              <el-form-item label="诉求内容" prop="itemCode">
-                  <el-input
-                          v-model="dataForm.itemContent"
-                          placeholder="请输入诉求内容"
-                          clearable
-                          @keyup.native="btKeyUpItemContent"
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
+				<el-form-item label="所属机构" label-width="100px">
+					<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px;"></el-cascader>
+				</el-form-item>
+				<el-form-item label="诉求内容" prop="itemCode"label-width="100px">
+					<el-input v-model="dataForm.itemContent" placeholder="请输入诉求内容" clearable @keyup.native="btKeyUpItemContent" style="width:250px;"></el-input>
+				</el-form-item>
 
-              <el-form-item label="诉求编码" prop="serialNum">
-                  <el-input
-                          v-model="dataForm.serialNum"
-                          placeholder="诉求编码"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
+				<el-form-item label="诉求编码" prop="serialNum"label-width="100px">
+					<el-input v-model="dataForm.serialNum" placeholder="诉求编码" clearable style="width:250px;"></el-input>
+				</el-form-item>
 
-              <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>
-                      <el-option label="不满意" value="0"> </el-option>
-                      <el-option label="基本满意" value="1"> </el-option>
-                      <el-option label="非常满意" value="2"> </el-option>
-                  </el-select>
-              </el-form-item>
+				<el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
+					<el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;" clearable>
+						<el-option label="不满意" value="0"></el-option>
+						<el-option label="基本满意" value="1"></el-option>
+						<el-option label="非常满意" value="2"></el-option>
+					</el-select>
+				</el-form-item>
 
-              <el-form-item label="处理状态" label-width="105px">
-                  <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
-                      <el-option label="处理中" value="0"></el-option>
-                      <el-option label="已结案" value="10"></el-option>
-<!--                      <el-option label="待评价" value="80"></el-option>-->
-                      <el-option label="已评价" value="90"></el-option>
-                  </el-select>
-              </el-form-item>
-              <br/>
-              <el-form-item label="联系人姓名" prop="nickName" label-width="100px">
-                  <el-input
-                          v-model="dataForm.nickName"
-                          placeholder="请输入联系人姓名"
-                          clearable
-                          style="width:250px;"
-                  ></el-input>
-              </el-form-item>
-              <el-form-item label="手机号" prop="mobile" label-width="68px">
-                  <el-input
-                          v-model="dataForm.mobile"
-                          placeholder="请输入手机号"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
-              <br/>
-                  <el-form-item label="上报起始时间" prop="startTime" label-width="100px">
-                      <el-date-picker
-                              v-model="dataForm.startTime"
-                              type="date"
-                              :picker-options="pickerBeginDateBefore"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="至" label-width="25px" prop="endTime">
-                      <el-date-picker
-                              v-model="dataForm.endTime"
-                              type="date"
-                              :picker-options="pickerBeginDateAfter"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item>
-                      <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
-                  </el-form-item>
-                  <!-- <el-form-item>
+				<el-form-item label="处理状态"label-width="100px">
+					<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="处理中" value="0"></el-option>
+						<el-option label="已结案" value="10"></el-option>
+					</el-select>
+				</el-form-item>
+				
+				<el-form-item label="评价状态"label-width="100px">
+					<el-select v-model="dataForm.evaluationState" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="待评价" value="80"></el-option>
+						<el-option label="已评价" value="90"></el-option>
+					</el-select>
+				</el-form-item>
+				<br />
+				<el-form-item label="联系人姓名" prop="nickName" label-width="100px">
+					<el-input v-model="dataForm.nickName" placeholder="请输入联系人姓名" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<el-form-item label="所属类别:" prop="categoryValue"label-width="100px">
+					<!-- :disabled="disabledCategory" -->
+					<el-cascader
+						clearable
+						v-model="dataForm.categoryValue"
+						placeholder="试试搜索关键字"
+						:props="{ checkStrictly: true, emitPath: false }"
+						:options="categoryOptions"
+						filterable style="width:250px;"
+					></el-cascader>
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobile" label-width="100px">
+					<el-input v-model="dataForm.mobile" placeholder="请输入手机号" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<br />
+				<el-form-item label="上报起始时间" prop="startTime" label-width="100px">
+					<el-date-picker
+						v-model="dataForm.startTime"
+						type="date"
+						:picker-options="pickerBeginDateBefore"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item label="至" label-width="25px" prop="endTime">
+					<el-date-picker
+						v-model="dataForm.endTime"
+						type="date"
+						:picker-options="pickerBeginDateAfter"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<!-- <el-form-item>
                     <el-button type="primary"
                                class="custom-button-add"
                                @click="addAppealEnforcement()">新增执法诉求</el-button>
                   </el-form-item> -->
-                <!-- <el-form-item>
-                  <el-button type="success"
-                      @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
-                </el-form-item> -->
-
-          </el-form>
-          <el-table
-                  v-loading="dataListLoading"
-                  :data="dataList"
-                  border
-                  @selection-change="dataListSelectionChangeHandle"
-                  style="width: 100%;"
-          >
-              <!--<el-table-column-->
-                      <!--label=" "-->
-                      <!--align="center"-->
-                      <!--width="50"-->
-              <!--&gt;-->
-                  <!--<template slot-scope="scope">-->
-                      <!--<img :src="red" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '1'"/>-->
-                      <!--<img :src="yellow" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '2'"/>-->
-                      <!--<img :src="green" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '3'"/>-->
-                  <!--</template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                      label="序号"
-                      type="index"
-                      show-overflow-tooltip
-                      align="center"
-                      width="50"
-              ></el-table-column>
-              <el-table-column
-                      prop="gridName"
-                      label="属事街道"
-                      header-align="center"
-                      width="120"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="enterpriseName"
-                      label="企业名称"
-                      header-align="center"
-                      width="250"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="uniformSocialCreditCode"
-                      label="社会信用代码"
-                      header-align="center"
-                      width="180"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="itemContent"
-                      label="诉求内容"
-                      header-align="center"
-                      min-width="300"
-                      align="left"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <!--<el-table-column-->
-                      <!--prop="serialNum"-->
-                      <!--label="诉求编码"-->
-                      <!--header-align="center"-->
-                      <!--min-width="200"-->
-                      <!--align="center"-->
-              <!--&gt;</el-table-column>-->
-              <!-- <el-table-column
+				<el-form-item>
+					<el-button type="success" @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+				<!--<el-table-column-->
+				<!--label=" "-->
+				<!--align="center"-->
+				<!--width="50"-->
+				<!--&gt;-->
+				<!--<template slot-scope="scope">-->
+				<!--<img :src="red" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '1'"/>-->
+				<!--<img :src="yellow" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '2'"/>-->
+				<!--<img :src="green" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '3'"/>-->
+				<!--</template>-->
+				<!--</el-table-column>-->
+				<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+				<el-table-column prop="gridName" label="属事街道" header-align="center" width="120" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="enterpriseName" label="企业名称" header-align="center" width="250" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="uniformSocialCreditCode" label="社会信用代码" header-align="center" width="180" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="itemContent" label="诉求内容" header-align="center" min-width="300" align="left" show-overflow-tooltip></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="serialNum"-->
+				<!--label="诉求编码"-->
+				<!--header-align="center"-->
+				<!--min-width="200"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!-- <el-table-column
                       prop="peopleFlagName"
                       label="诉求类型"
                       header-align="center"
@@ -189,306 +128,308 @@
                       align="center"
               ></el-table-column> -->
 
-              <el-table-column
-                      prop="itemStateName"
-                      label="处理状态"
-                      header-align="center"
-                      align="center"
-                      :formatter="stateFormat"
-              ></el-table-column>
-
-              <el-table-column
-                      prop="createdTime"
-                      label="上报时间"
-                      header-align="center"
-                      width="180"
-                      align="center"
-              ></el-table-column>
-              <!--<el-table-column-->
-                      <!--prop="remainTime"-->
-                      <!--label="事件时间"-->
-                      <!--header-align="center"-->
-                      <!--min-width="120"-->
-                      <!--align="center"-->
-                      <!--show-overflow-tooltip-->
-              <!--&gt;-->
-                  <!--<template slot-scope="scope">-->
-                      <!--<span v-if="scope.row.itemState == '0'">{{scope.row.remainTime}}</span>-->
-                  <!--</template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                      prop="nickName"
-                      label="联系人姓名"
-                      header-align="center"
-                      min-width="100"
-                      align="center"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                      prop="enterpriseName"
-                      label="企业名称"
-                      header-align="center"
-                      min-width="180"
-                      align="center"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                      prop="uniformSocialCreditCode"
-                      label="统一社会信用代码"
-                      header-align="center"
-                      min-width="200"
-                      align="center"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                      prop="evaluationScoreName"
-                      label="满意度"
-                      header-align="center"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      :label="$t('handle')"
-                      fixed="right"
-                      header-align="center"
-                      max-width="250"
-                      align="center">
-                  <template slot-scope="scope">
-                      <el-button
-                          type="text"
-                          size="small"
-                          class="custom-table-button-default"
-                          @click="dealAction(scope.row.id)">详情
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
-                              class="custom-table-button-default"
-                              @click="addDiff(scope.row.id)">添加难点堵点
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
-                              class="custom-table-button-default"
-                              @click="addTypi(scope.row.id)">添加典型案例
-                      </el-button>
-                  </template>
-              </el-table-column>
-          </el-table>
-          <el-pagination
-                  :current-page="page"
-                  :page-sizes="[10, 20, 50, 100]"
-                  :page-size="limit"
-                  :total="total"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="pageSizeChangeHandle"
-                  @current-change="pageCurrentChangeHandle"
-          >
-          </el-pagination>
-
-      </div>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-        ref="addOrUpdate"
-        @refreshDataList="getDataList"></add-or-update>
-  </el-card>
+				<el-table-column prop="itemStateName" label="处理状态" header-align="center" align="center" :formatter="stateFormat"></el-table-column>
+<el-table-column prop="solutionInfoName" label="解决情况" header-align="center" align="center"></el-table-column>
+				<el-table-column prop="createdTime" label="上报时间" header-align="center" width="180" align="center"></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="remainTime"-->
+				<!--label="事件时间"-->
+				<!--header-align="center"-->
+				<!--min-width="120"-->
+				<!--align="center"-->
+				<!--show-overflow-tooltip-->
+				<!--&gt;-->
+				<!--<template slot-scope="scope">-->
+				<!--<span v-if="scope.row.itemState == '0'">{{scope.row.remainTime}}</span>-->
+				<!--</template>-->
+				<!--</el-table-column>-->
+				<el-table-column prop="nickName" label="联系人姓名" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="categoryName" label="所属类别" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column> -->
+				<el-table-column prop="enterpriseName" label="企业名称" header-align="center" min-width="180" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column
+					prop="uniformSocialCreditCode"
+					label="统一社会信用代码"
+					header-align="center"
+					min-width="200"
+					align="center"
+					show-overflow-tooltip
+				></el-table-column>
+				<el-table-column prop="evaluationScoreName" label="满意度" header-align="center" align="center"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" max-width="250" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id, 'view')">详情</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
+							class="custom-table-button-default"
+							@click="addDiff(scope.row.id)"
+						>
+							添加难点堵点
+						</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
+							class="custom-table-button-default"
+							@click="addTypi(scope.row.id)"
+						>
+							添加典型案例
+						</el-button>
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id, 'edit')">修改类别</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			></el-pagination>
+		</div>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</el-card>
 </template>
 
 <script>
-import green from '@/assets/img/green_img.png'
-import red from '@/assets/img/red_img.png'
-import yellow from '@/assets/img/yellow_img.png'
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './appeal-enforcement-add'
+import green from '@/assets/img/green_img.png';
+import red from '@/assets/img/red_img.png';
+import yellow from '@/assets/img/yellow_img.png';
+import mixinViewModule from '@/mixins/view-module';
+import AddOrUpdate from './appeal-enforcement-add';
 
 export default {
-  mixins: [mixinViewModule],
-  name: 'AppealList',
-  data () {
-    return {
-      green,
-      red,
-      yellow,
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/getItemAppealPage',
-        getDataListIsPage: true,
-        exportURL: '/events/item/unexport'
-      },
-      dataForm: {
-        id: '',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: '',
-        itemContent: '',
-        nickName: '',
-        mobile: '',
-        appealType: 1,
-        evaluationScore: '',
-        itemState: ''
+	mixins: [mixinViewModule],
+	name: 'AppealList',
+	data() {
+		return {
+			categoryOptions: [],
+			green,
+			red,
+			yellow,
+			mixinViewModuleOptions: {
+				getDataListURL: '/events/item/getItemAppealPage',
+				getDataListIsPage: true,
+				exportURL: '/events/item/exportItemAppealList'
+			},
+			dataForm: {
+				categoryValue: '',
+				id: '',
+				startTime: '',
+				endTime: '',
+				streetId: '',
+				communityId: '',
+				gridId: '',
+				itemCode: '',
+				itemContent: '',
+				nickName: '',
+				mobile: '',
+				appealType: 1,
+				evaluationScore: '',
+				itemState: ''
+			},
+			ids: [],
+			options: [],
+			addOrUpdateVisible: false,
+			pickerBeginDateBefore: {
+				disabledDate: time => {
+					let beginDateVal = this.dataForm.endTime;
+					if (beginDateVal) {
+						return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime();
+					}
+				}
+			},
+			pickerBeginDateAfter: {
+				disabledDate: time => {
+					let EndDateVal = this.dataForm.startTime;
+					if (EndDateVal) {
+						return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime();
+					}
+				}
+			}
+		};
+	},
+	components: {
+		AddOrUpdate
+	},
+	created: function() {
+		this.getPeoList();
+		this.getOptions();
+		this.getCategoryList();
+	},
+	watch: {
+		ids: function(val) {
+			if (val.length === 0) {
+				this.dataForm.streetId = '';
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 1) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 2) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 3) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = this.ids[2];
+			}
+		}
+	},
+	methods: {
+		getCategoryList() {
+			// this.disabledCategory = true;
+			return this.$http
+				.get('/events/category/list', {
+					params: {
+						infoCode: 'B'
+					}
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					var data = res.data;
 
-      },
-      ids: [],
-      options: [],
-      addOrUpdateVisible: false,
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  created: function () {
-    this.getPeoList()
-    this.getOptions()
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {
-        })
-    },
-    stateFormat (row, column) {
-      if (row.itemState === 0) {
-        if (row.processState === '16') {
-          return '市区处理中'
-        }
-        if (row.evaluationState === '1') {
-          if (row.evaluationTime !== null && row.evaluationTime !== '') {
-            return '已评价'
-          } else {
-            return '待评价'
-          }
-        }
-      } else if (row.itemState === 10) {
-        return '已结案'
-      }
-    },
-    getPeoList () {
-      console.log(this.dataList)
-    },
-    dealAction (id) {
-      this.$parent.selectComponent = 'AppealDetailView'
-      this.$router.push({ path: '/events-appeal-development', query: { id: id } })
-    },
-    addDiff (id) {
-      this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let data = {}
-        data.id = id
-        data.isDifficulty = '1'
-        this.$http['put']('/events/item/', data).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.getDataList()
-            }
-          })
-        }).catch(() => {})
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
-    addTypi (id) {
-      this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let data = {}
-        data.id = id
-        data.isTypical = '1'
-        this.$http['put']('/events/item/', data).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.getDataList()
-            }
-          })
-        }).catch(() => {})
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
-    addAppealEnforcement () {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init()
-      })
-    },
-    btKeyUpItemContent (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.itemContent = e.target.value
-    }
-  }
-}
+					this.getSelectedNode(data, data);
+					this.categoryOptions = data;
+					// this.disabledCategory = false
+				})
+				.catch(() => {});
+		},
+		getSelectedNode(nodeData, parent) {
+			nodeData.forEach(item => {
+				if ('children' in item && item.children.length === 0) {
+					delete item.children;
+				} else if ('children' in item && item.children.length) {
+					this.getSelectedNode(item.children, item);
+				}
+			});
+		},
+		getOptions() {
+			this.$http
+				.get(`/sys/user/deptOptions/getByLoginUser`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.options = res.data.options;
+				})
+				.catch(() => {});
+		},
+		stateFormat(row, column) {
+			if (row.itemState === 0) {
+				if (row.processState === '16') {
+					return '市区处理中';
+				}
+				if (row.evaluationState === '1') {
+					if (row.evaluationTime !== null && row.evaluationTime !== '') {
+						return '已评价';
+					} else {
+						return '待评价';
+					}
+				} else if (row.evaluationTime !== null && row.evaluationTime !== '') {
+					return '审验中';
+				}
+				return '处理中';
+			} else if (row.itemState === 10) {
+				return '已结案';
+			}
+		},
+		getPeoList() {
+			console.log(this.dataList);
+		},
+		dealAction(id, type) {
+			this.$parent.selectComponent = 'AppealDetailView';
+			this.$router.push({ path: '/events-appeal-development', query: { id: id, type: type, infoCode: 'B' } });
+		},
+		addDiff(id) {
+			this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isDifficulty = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addTypi(id) {
+			this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isTypical = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addAppealEnforcement() {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+			});
+		},
+		btKeyUpItemContent(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.itemContent = e.target.value;
+		}
+	}
+};
 </script>
diff --git a/src/views/modules/events/appeal-enforce-list-unsatisfactory.vue b/src/views/modules/events/appeal-enforce-list-unsatisfactory.vue
index 5387b2cb..59b44483 100644
--- a/src/views/modules/events/appeal-enforce-list-unsatisfactory.vue
+++ b/src/views/modules/events/appeal-enforce-list-unsatisfactory.vue
@@ -43,18 +43,23 @@
               </el-form-item>
 
               <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>
+                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;"  clearable>
                       <el-option label="不满意" value="0"> </el-option>
                       <el-option label="基本满意" value="1"> </el-option>
                       <el-option label="非常满意" value="2"> </el-option>
                   </el-select>
               </el-form-item>
 
-              <el-form-item label="处理状态" label-width="105px">
+              <el-form-item label="处理状态">
                   <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
                       <el-option label="处理中" value="0"></el-option>
                       <el-option label="已结案" value="10"></el-option>
-<!--                      <el-option label="待评价" value="80"></el-option>-->
+                  </el-select>
+              </el-form-item>
+
+              <el-form-item label="评价状态">
+                  <el-select v-model="dataForm.evaluationState" clearable  placeholder="请选择" style="width:200px;">
+                      <el-option label="待评价" value="80"></el-option>
                       <el-option label="已评价" value="90"></el-option>
                   </el-select>
               </el-form-item>
@@ -345,7 +350,10 @@ export default {
           } else {
             return '待评价'
           }
+        } else if (row.evaluationTime !== null && row.evaluationTime !== '') {
+          return '审验中'
         }
+        return '处理中'
       } else if (row.itemState === 10) {
         return '已结案'
       }
diff --git a/src/views/modules/events/appeal-enforce-list.vue b/src/views/modules/events/appeal-enforce-list.vue
index 0d6c100a..1dec4416 100644
--- a/src/views/modules/events/appeal-enforce-list.vue
+++ b/src/views/modules/events/appeal-enforce-list.vue
@@ -1,169 +1,120 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-      <div class="mod-item__item}">
-          <el-form
-                  :inline="true"
-                  :model="dataForm"
-                  @keyup.enter.native="getDataListSearch()"
-          >
-              <!-- <el-form-item label="诉求类型" prop="appealType" label-width="80px">
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-item__item}">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+				<!-- <el-form-item label="诉求类型" prop="appealType" label-width="80px">
                 <el-select v-model="dataForm.appealType" placeholder="请选择" clearable>
                   <el-option label="民生" value="0"> </el-option>
                   <el-option label="发展" value="1"> </el-option>
                   <el-option label="执法" value="2"> </el-option>
                 </el-select>
               </el-form-item> -->
-              <el-form-item label="所属机构" label-width="100px">
-                  <el-cascader
-                          v-model="ids"
-                          :options="options"
-                          :props="{ checkStrictly: true }"
-                          clearable
-                          style="width:250px;"
-                  >
-                  </el-cascader>
-              </el-form-item>
-              <el-form-item label="诉求内容" prop="itemCode">
-                  <el-input
-                          v-model="dataForm.itemContent"
-                          placeholder="请输入诉求内容"
-                          clearable
-                          @keyup.native="btKeyUpItemContent"
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
+				<el-form-item label="所属机构" label-width="100px">
+					<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px;"></el-cascader>
+				</el-form-item>
+				<el-form-item label="诉求内容" prop="itemCode"label-width="100px">
+					<el-input v-model="dataForm.itemContent" placeholder="请输入诉求内容" clearable @keyup.native="btKeyUpItemContent" style="width:250px;"></el-input>
+				</el-form-item>
 
-              <el-form-item label="诉求编码" prop="serialNum">
-                  <el-input
-                          v-model="dataForm.serialNum"
-                          placeholder="诉求编码"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
+				<el-form-item label="诉求编码" prop="serialNum"label-width="100px">
+					<el-input v-model="dataForm.serialNum" placeholder="诉求编码" clearable style="width:250px;"></el-input>
+				</el-form-item>
 
-              <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>
-                      <el-option label="不满意" value="0"> </el-option>
-                      <el-option label="基本满意" value="1"> </el-option>
-                      <el-option label="非常满意" value="2"> </el-option>
-                  </el-select>
-              </el-form-item>
+				<el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
+					<el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;" clearable>
+						<el-option label="不满意" value="0"></el-option>
+						<el-option label="基本满意" value="1"></el-option>
+						<el-option label="非常满意" value="2"></el-option>
+					</el-select>
+				</el-form-item>
 
-              <el-form-item label="处理状态" label-width="105px">
-                  <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
-                      <el-option label="处理中" value="0"></el-option>
-                      <el-option label="已结案" value="10"></el-option>
-<!--                      <el-option label="待评价" value="80"></el-option>-->
-                      <el-option label="已评价" value="90"></el-option>
-                  </el-select>
-              </el-form-item>
-              <br/>
-              <el-form-item label="联系人姓名" prop="nickName" label-width="100px">
-                  <el-input
-                          v-model="dataForm.nickName"
-                          placeholder="请输入联系人姓名"
-                          clearable
-                          style="width:250px;"
-                  ></el-input>
-              </el-form-item>
-              <el-form-item label="手机号" prop="mobile" label-width="68px">
-                  <el-input
-                          v-model="dataForm.mobile"
-                          placeholder="请输入手机号"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
-              <br/>
-                  <el-form-item label="上报起始时间" prop="startTime" label-width="100px">
-                      <el-date-picker
-                              v-model="dataForm.startTime"
-                              type="date"
-                              :picker-options="pickerBeginDateBefore"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="至" label-width="25px" prop="endTime">
-                      <el-date-picker
-                              v-model="dataForm.endTime"
-                              type="date"
-                              :picker-options="pickerBeginDateAfter"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item>
-                      <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
-                  </el-form-item>
-                  <el-form-item>
-                    <el-button type="primary"
-                               class="custom-button-add"
-                               @click="addAppealEnforcement()">新增执法诉求</el-button>
-                  </el-form-item>
-                <!-- <el-form-item>
-                  <el-button type="success"
-                      @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
-                </el-form-item> -->
+				<el-form-item label="处理状态"label-width="100px">
+					<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="处理中" value="0"></el-option>
+						<el-option label="已结案" value="10"></el-option>
+					</el-select>
+				</el-form-item>
 
-          </el-form>
-          <el-table
-                  v-loading="dataListLoading"
-                  :data="dataList"
-                  border
-                  @selection-change="dataListSelectionChangeHandle"
-                  style="width: 100%;"
-          >
-              <!--<el-table-column-->
-                      <!--label=" "-->
-                      <!--align="center"-->
-                      <!--width="50"-->
-              <!--&gt;-->
-                  <!--<template slot-scope="scope">-->
-                      <!--<img :src="red" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '1'"/>-->
-                      <!--<img :src="yellow" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '2'"/>-->
-                      <!--<img :src="green" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '3'"/>-->
-                  <!--</template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                      label="序号"
-                      type="index"
-                      show-overflow-tooltip
-                      align="center"
-                      width="50"
-              ></el-table-column>
-              <el-table-column
-                      prop="gridName"
-                      label="属事街道"
-                      header-align="center"
-                      width="120"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="itemContent"
-                      label="诉求内容"
-                      header-align="center"
-                      min-width="300"
-                      align="left"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <!--<el-table-column-->
-                      <!--prop="serialNum"-->
-                      <!--label="诉求编码"-->
-                      <!--header-align="center"-->
-                      <!--min-width="200"-->
-                      <!--align="center"-->
-              <!--&gt;</el-table-column>-->
-              <!-- <el-table-column
+				<el-form-item label="评价状态"label-width="100px">
+					<el-select v-model="dataForm.evaluationState" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="待评价" value="80"></el-option>
+						<el-option label="已评价" value="90"></el-option>
+					</el-select>
+				</el-form-item>
+				<br />
+				<el-form-item label="联系人姓名" prop="nickName" label-width="100px">
+					<el-input v-model="dataForm.nickName" placeholder="请输入联系人姓名" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<el-form-item label="所属类别:" prop="categoryValue"label-width="100px">
+					<!-- :disabled="disabledCategory" -->
+					<el-cascader
+						clearable
+						v-model="dataForm.categoryValue"
+						placeholder="试试搜索关键字"
+						:props="{ checkStrictly: true, emitPath: false }"
+						:options="categoryOptions"
+						filterable style="width:250px;"
+					></el-cascader>
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobile" label-width="100px">
+					<el-input v-model="dataForm.mobile" placeholder="请输入手机号" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<br />
+				<el-form-item label="上报起始时间" prop="startTime" label-width="100px">
+					<el-date-picker
+						v-model="dataForm.startTime"
+						type="date"
+						:picker-options="pickerBeginDateBefore"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item label="至" label-width="25px" prop="endTime">
+					<el-date-picker
+						v-model="dataForm.endTime"
+						type="date"
+						:picker-options="pickerBeginDateAfter"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<el-form-item><el-button type="primary" class="custom-button-add" @click="addAppealEnforcement()">新增执法诉求</el-button></el-form-item>
+				<el-form-item>
+					<el-button type="success" @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+				<!--<el-table-column-->
+				<!--label=" "-->
+				<!--align="center"-->
+				<!--width="50"-->
+				<!--&gt;-->
+				<!--<template slot-scope="scope">-->
+				<!--<img :src="red" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '1'"/>-->
+				<!--<img :src="yellow" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '2'"/>-->
+				<!--<img :src="green" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '3'"/>-->
+				<!--</template>-->
+				<!--</el-table-column>-->
+				<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+				<el-table-column prop="gridName" label="属事街道" header-align="center" width="120" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="itemContent" label="诉求内容" header-align="center" min-width="300" align="left" show-overflow-tooltip></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="serialNum"-->
+				<!--label="诉求编码"-->
+				<!--header-align="center"-->
+				<!--min-width="200"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!-- <el-table-column
                       prop="peopleFlagName"
                       label="诉求类型"
                       header-align="center"
@@ -171,291 +122,299 @@
                       align="center"
               ></el-table-column> -->
 
-              <el-table-column
-                      prop="itemStateName"
-                      label="处理状态"
-                      header-align="center"
-                      align="center"
-                      :formatter="stateFormat"
-              ></el-table-column>
-
-
-              <el-table-column
-                      prop="createdTime"
-                      label="上报时间"
-                      header-align="center"
-                      width="180"
-                      align="center"
-              ></el-table-column>
-              <!--<el-table-column-->
-                      <!--prop="remainTime"-->
-                      <!--label="事件时间"-->
-                      <!--header-align="center"-->
-                      <!--min-width="120"-->
-                      <!--align="center"-->
-                      <!--show-overflow-tooltip-->
-              <!--&gt;-->
-                  <!--<template slot-scope="scope">-->
-                      <!--<span v-if="scope.row.itemState == '0'">{{scope.row.remainTime}}</span>-->
-                  <!--</template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                      prop="nickName"
-                      label="联系人姓名"
-                      header-align="center"
-                      min-width="100"
-                      align="center"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                      prop="evaluationScoreName"
-                      label="满意度"
-                      header-align="center"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      :label="$t('handle')"
-                      fixed="right"
-                      header-align="center"
-                      max-width="250"
-                      align="center">
-                  <template slot-scope="scope">
-                      <el-button
-                          type="text"
-                          size="small"
-                          class="custom-table-button-default"
-                          @click="dealAction(scope.row.id)">详情
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
-                              class="custom-table-button-default"
-                              @click="addDiff(scope.row.id)">添加难点堵点
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
-                              class="custom-table-button-default"
-                              @click="addTypi(scope.row.id)">添加典型案例
-                      </el-button>
-                  </template>
-              </el-table-column>
-          </el-table>
-          <el-pagination
-                  :current-page="page"
-                  :page-sizes="[10, 20, 50, 100]"
-                  :page-size="limit"
-                  :total="total"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="pageSizeChangeHandle"
-                  @current-change="pageCurrentChangeHandle"
-          >
-          </el-pagination>
-
-      </div>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-        ref="addOrUpdate"
-        @refreshDataList="getDataList"></add-or-update>
-  </el-card>
+				<el-table-column prop="itemStateName" label="处理状态" header-align="center" align="center" :formatter="stateFormat"></el-table-column>
+				<el-table-column prop="solutionInfoName" label="解决情况" header-align="center" align="center" ></el-table-column>
+				<el-table-column prop="createdTime" label="上报时间" header-align="center" width="180" align="center"></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="remainTime"-->
+				<!--label="事件时间"-->
+				<!--header-align="center"-->
+				<!--min-width="120"-->
+				<!--align="center"-->
+				<!--show-overflow-tooltip-->
+				<!--&gt;-->
+				<!--<template slot-scope="scope">-->
+				<!--<span v-if="scope.row.itemState == '0'">{{scope.row.remainTime}}</span>-->
+				<!--</template>-->
+				<!--</el-table-column>-->
+				<el-table-column prop="nickName" label="联系人姓名" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="categoryName" label="所属类别" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column> -->
+				<el-table-column prop="evaluationScoreName" label="满意度" header-align="center" align="center"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" max-width="250" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id, 'view')">详情</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
+							class="custom-table-button-default"
+							@click="addDiff(scope.row.id)"
+						>
+							添加难点堵点
+						</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
+							class="custom-table-button-default"
+							@click="addTypi(scope.row.id)"
+						>
+							添加典型案例
+						</el-button>
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id, 'edit')">修改类别</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			></el-pagination>
+		</div>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</el-card>
 </template>
 
 <script>
-import green from '@/assets/img/green_img.png'
-import red from '@/assets/img/red_img.png'
-import yellow from '@/assets/img/yellow_img.png'
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './appeal-enforcement-add'
+import green from '@/assets/img/green_img.png';
+import red from '@/assets/img/red_img.png';
+import yellow from '@/assets/img/yellow_img.png';
+import mixinViewModule from '@/mixins/view-module';
+import AddOrUpdate from './appeal-enforcement-add';
 
 export default {
-  mixins: [mixinViewModule],
-  name: 'AppealList',
-  data () {
-    return {
-      green,
-      red,
-      yellow,
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/getItemAppealPage',
-        getDataListIsPage: true,
-        exportURL: '/events/item/unexport'
-      },
-      dataForm: {
-        id: '',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: '',
-        itemContent: '',
-        nickName: '',
-        mobile: '',
-        appealType: 2,
-        evaluationScore: '',
-        itemState: ''
+	mixins: [mixinViewModule],
+	name: 'AppealList',
+	data() {
+		return {
+			categoryOptions: [],
+			green,
+			red,
+			yellow,
+			mixinViewModuleOptions: {
+				getDataListURL: '/events/item/getItemAppealPage',
+				getDataListIsPage: true,
+				exportURL: '/events/item/exportItemAppealList'
+			},
+			dataForm: {
+				categoryValue: '',
+				id: '',
+				startTime: '',
+				endTime: '',
+				streetId: '',
+				communityId: '',
+				gridId: '',
+				itemCode: '',
+				itemContent: '',
+				nickName: '',
+				mobile: '',
+				appealType: 2,
+				evaluationScore: '',
+				itemState: ''
+			},
+			ids: [],
+			options: [],
+			addOrUpdateVisible: false,
+			pickerBeginDateBefore: {
+				disabledDate: time => {
+					let beginDateVal = this.dataForm.endTime;
+					if (beginDateVal) {
+						return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime();
+					}
+				}
+			},
+			pickerBeginDateAfter: {
+				disabledDate: time => {
+					let EndDateVal = this.dataForm.startTime;
+					if (EndDateVal) {
+						return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime();
+					}
+				}
+			}
+		};
+	},
+	components: {
+		AddOrUpdate
+	},
+	created: function() {
+		this.getPeoList();
+		this.getOptions();
+		this.getCategoryList();
+	},
+	watch: {
+		ids: function(val) {
+			if (val.length === 0) {
+				this.dataForm.streetId = '';
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 1) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 2) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 3) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = this.ids[2];
+			}
+		}
+	},
+	methods: {
+		getCategoryList() {
+			this.disabledCategory = true;
+			return this.$http
+				.get('/events/category/list', {
+					params: {
+						infoCode: 'C'
+					}
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					var data = res.data;
 
-      },
-      ids: [],
-      options: [],
-      addOrUpdateVisible: false,
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  created: function () {
-    this.getPeoList()
-    this.getOptions()
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {
-        })
-    },
-    stateFormat (row, column) {
-      if (row.itemState === 0) {
-        if (row.processState === '16') {
-          return '市区处理中'
-        }
-        if (row.evaluationState === '1') {
-          if (row.evaluationTime !== null && row.evaluationTime !== '') {
-            return '已评价'
-          } else {
-            return '待评价'
-          }
-        }
-      } else if (row.itemState === 10) {
-        return '已结案'
-      }
-    },
-    getPeoList () {
-      console.log(this.dataList)
-    },
-    dealAction (id) {
-      this.$parent.selectComponent = 'AppealDetailView'
-      this.$router.push({ path: '/events-appeal-enforce', query: { id: id } })
-    },
-    addDiff (id) {
-      this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let data = {}
-        data.id = id
-        data.isDifficulty = '1'
-        this.$http['put']('/events/item/', data).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.getDataList()
-            }
-          })
-        }).catch(() => {})
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        });
-      });
-    },
-    addTypi (id) {
-      this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let data = {}
-        data.id = id
-        data.isTypical = '1'
-        this.$http['put']('/events/item/', data).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.getDataList()
-            }
-          })
-        }).catch(() => {})
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        });
-      });
-    },
-    addAppealEnforcement () {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init()
-      })
-    },
-    btKeyUpItemContent (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.itemContent = e.target.value
-    }
-  }
-}
+					this.getSelectedNode(data, data);
+					this.categoryOptions = data;
+					// this.disabledCategory = false
+				})
+				.catch(() => {});
+		},
+		getSelectedNode(nodeData, parent) {
+			nodeData.forEach(item => {
+				if ('children' in item && item.children.length === 0) {
+					delete item.children;
+				} else if ('children' in item && item.children.length) {
+					this.getSelectedNode(item.children, item);
+				}
+			});
+		},
+		getOptions() {
+			this.$http
+				.get(`/sys/user/deptOptions/getByLoginUser`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.options = res.data.options;
+				})
+				.catch(() => {});
+		},
+		stateFormat(row, column) {
+			if (row.itemState === 0) {
+				if (row.processState === '16') {
+					return '市区处理中';
+				}
+				if (row.evaluationState === '1') {
+					if (row.evaluationTime !== null && row.evaluationTime !== '') {
+						return '已评价';
+					} else {
+						return '待评价';
+					}
+				} else if (row.evaluationTime !== null && row.evaluationTime !== '') {
+					return '审验中';
+				}
+				return '处理中';
+			} else if (row.itemState === 10) {
+				return '已结案';
+			}
+		},
+		getPeoList() {
+			console.log(this.dataList);
+		},
+		dealAction(id, type) {
+			this.$parent.selectComponent = 'AppealDetailView';
+			this.$router.push({ path: '/events-appeal-enforce', query: { id: id, type: type, infoCode: 'C' } });
+		},
+		addDiff(id) {
+			this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isDifficulty = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addTypi(id) {
+			this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isTypical = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addAppealEnforcement() {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+			});
+		},
+		btKeyUpItemContent(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.itemContent = e.target.value;
+		}
+	}
+};
 </script>
diff --git a/src/views/modules/events/appeal-peo-list-unsatisfactory.vue b/src/views/modules/events/appeal-peo-list-unsatisfactory.vue
index e9ff8bcb..d9895a6d 100644
--- a/src/views/modules/events/appeal-peo-list-unsatisfactory.vue
+++ b/src/views/modules/events/appeal-peo-list-unsatisfactory.vue
@@ -36,18 +36,23 @@
               </el-form-item>
 
               <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" clearable>
+                  <el-select v-model="dataForm.evaluationScore" style="width:250px;"  placeholder="请选择" clearable>
                       <el-option label="不满意" value="0"> </el-option>
                       <el-option label="基本满意" value="1"> </el-option>
                       <el-option label="非常满意" value="2"> </el-option>
                   </el-select>
               </el-form-item>
 
-              <el-form-item label="处理状态" label-width="105px">
+              <el-form-item label="处理状态">
                   <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
                       <el-option label="处理中" value="0"></el-option>
                       <el-option label="已结案" value="10"></el-option>
-<!--                      <el-option label="待评价" value="80"></el-option>-->
+                  </el-select>
+              </el-form-item>
+
+              <el-form-item label="评价状态">
+                  <el-select v-model="dataForm.evaluationState" clearable  placeholder="请选择" style="width:200px;">
+                      <el-option label="待评价" value="80"></el-option>
                       <el-option label="已评价" value="90"></el-option>
                   </el-select>
               </el-form-item>
diff --git a/src/views/modules/events/appeal-peo-list.vue b/src/views/modules/events/appeal-peo-list.vue
index f93c11b5..886c1485 100644
--- a/src/views/modules/events/appeal-peo-list.vue
+++ b/src/views/modules/events/appeal-peo-list.vue
@@ -1,187 +1,144 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-      <div class="mod-item__item}">
-          <el-form
-                  :inline="true"
-                  :model="dataForm"
-                  @keyup.enter.native="getDataListSearch()"
-          >
-              <!--<el-form-item label="诉求类型" prop="appealType" label-width="80px">-->
-                <!--<el-select v-model="dataForm.appealType" placeholder="请选择" clearable>-->
-                  <!--<el-option label="民生" value="0"> </el-option>-->
-                  <!--<el-option label="发展" value="1"> </el-option>-->
-                  <!--<el-option label="执法" value="2"> </el-option>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-              <el-form-item label="所属机构" label-width="100px">
-                  <el-cascader
-                          v-model="ids"
-                          :options="options"
-                          :props="{ checkStrictly: true }"
-                          clearable
-                          style="width:250px;"
-                  >
-                  </el-cascader>
-              </el-form-item>
-              <el-form-item label="诉求内容" prop="itemCode">
-                  <el-input
-                          v-model="dataForm.itemContent"
-                          placeholder="请输入诉求内容"
-                          clearable
-                          @keyup.native="btKeyUpItemContent"
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-item__item}">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+				<!--<el-form-item label="诉求类型" prop="appealType" label-width="80px">-->
+				<!--<el-select v-model="dataForm.appealType" placeholder="请选择" clearable>-->
+				<!--<el-option label="民生" value="0"> </el-option>-->
+				<!--<el-option label="发展" value="1"> </el-option>-->
+				<!--<el-option label="执法" value="2"> </el-option>-->
+				<!--</el-select>-->
+				<!--</el-form-item>-->
+				<el-form-item label="所属机构" label-width="100px">
+					<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px;"></el-cascader>
+				</el-form-item>
+				<el-form-item label="诉求内容" prop="itemCode" label-width="100px">
+					<el-input v-model="dataForm.itemContent" placeholder="请输入诉求内容" clearable @keyup.native="btKeyUpItemContent" style="width:250px;"></el-input>
+				</el-form-item>
 
-              <el-form-item label="诉求编码" prop="serialNum">
-                  <el-input
-                          v-model="dataForm.serialNum"
-                          placeholder="诉求编码"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
+				<el-form-item label="诉求编码" prop="serialNum" label-width="100px">
+					<el-input v-model="dataForm.serialNum" placeholder="诉求编码" clearable style="width:250px;"></el-input>
+				</el-form-item>
 
-              <el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
-                  <el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;" clearable>
-                      <el-option label="不满意" value="0"> </el-option>
-                      <el-option label="基本满意" value="1"> </el-option>
-                      <el-option label="非常满意" value="2"> </el-option>
-                  </el-select>
-              </el-form-item>
+				<el-form-item label="满意度" prop="evaluationScoreType" label-width="100px">
+					<el-select v-model="dataForm.evaluationScore" placeholder="请选择" style="width:250px;" clearable>
+						<el-option label="不满意" value="0"></el-option>
+						<el-option label="基本满意" value="1"></el-option>
+						<el-option label="非常满意" value="2"></el-option>
+					</el-select>
+				</el-form-item>
 
-              <el-form-item label="处理状态">
-                  <el-select v-model="dataForm.itemState" clearable  placeholder="请选择" style="width:200px;">
-                      <el-option label="处理中" value="0"></el-option>
-                      <el-option label="已结案" value="10"></el-option>
-<!--                      <el-option label="待评价" value="80"></el-option>-->
-                      <el-option label="已评价" value="90"></el-option>
-                  </el-select>
-              </el-form-item>
-              <br/>
-              <el-form-item label="联系人姓名" prop="nickName" label-width="100px">
-                  <el-input
-                          v-model="dataForm.nickName"
-                          placeholder="请输入联系人姓名"
-                          clearable
-                          style="width:250px;"
-                  ></el-input>
-              </el-form-item>
-              <el-form-item label="手机号" prop="mobile" label-width="68px">
-                  <el-input
-                          v-model="dataForm.mobile"
-                          placeholder="请输入手机号"
-                          clearable
-                          style="width:200px;"
-                  ></el-input>
-              </el-form-item>
-              <br/>
-                  <el-form-item label="上报时间" prop="startTime" label-width="100px">
-                      <el-date-picker
-                              v-model="dataForm.startTime"
-                              type="date"
-                              :picker-options="pickerBeginDateBefore"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="至" label-width="25px" prop="endTime">
-                      <el-date-picker
-                              v-model="dataForm.endTime"
-                              type="date"
-                              :picker-options="pickerBeginDateAfter"
-                              value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd"
-                              placeholder="选择日期时间"
-                              style="width:250px;" @change="changeTime"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                  <el-form-item>
-                      <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
-                  </el-form-item>
-                  <!-- <el-form-item>
+				<el-form-item label="处理状态" label-width="100px">
+					<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="处理中" value="0"></el-option>
+						<el-option label="已结案" value="10"></el-option>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="评价状态"label-width="100px">
+					<el-select v-model="dataForm.evaluationState" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="待评价" value="80"></el-option>
+						<el-option label="已评价" value="90"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="诉求来源"label-width="100px">
+					<el-select v-model="dataForm.appealSource" clearable placeholder="请选择" style="width:250px;">
+						<el-option label="排查上报" value="0"></el-option>
+						<el-option label="网络发声" value="1"></el-option>
+						<el-option label="新新向党" value="2"></el-option>
+					</el-select>
+				</el-form-item>
+				<br />
+				<el-form-item label="联系人姓名" prop="nickName" label-width="100px">
+					<el-input v-model="dataForm.nickName" placeholder="请输入联系人姓名" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<el-form-item label="所属类别:" prop="categoryValue"label-width="100px">
+					<!-- :disabled="disabledCategory" -->
+					<el-cascader
+						clearable
+						v-model="dataForm.categoryValue"
+						placeholder="试试搜索关键字"
+						:props="{ checkStrictly: true, emitPath: false }"
+						:options="categoryOptions"
+						filterable style="width:250px;"
+					></el-cascader>
+				</el-form-item>
+				<el-form-item label="手机号" prop="mobile" label-width="100px">
+					<el-input v-model="dataForm.mobile" placeholder="请输入手机号" clearable style="width:250px;"></el-input>
+				</el-form-item>
+				<br />
+				<el-form-item label="上报时间" prop="startTime" label-width="100px">
+					<el-date-picker
+						v-model="dataForm.startTime"
+						type="date"
+						:picker-options="pickerBeginDateBefore"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item label="至" label-width="25px" prop="endTime">
+					<el-date-picker
+						v-model="dataForm.endTime"
+						type="date"
+						:picker-options="pickerBeginDateAfter"
+						value-format="yyyy-MM-dd"
+						format="yyyy-MM-dd"
+						placeholder="选择日期时间"
+						style="width:250px;"
+						@change="changeTime"
+					></el-date-picker>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+				</el-form-item>
+				<!-- <el-form-item>
                     <el-button type="primary"
                                class="custom-button-add"
                                @click="addAppealEnforcement()">新增执法诉求</el-button>
                   </el-form-item> -->
-                <!-- <el-form-item>
-                  <el-button type="success"
-                      @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
-                </el-form-item> -->
-
-          </el-form>
-          <el-table
-                  v-loading="dataListLoading"
-                  :data="dataList"
-                  border
-                  @selection-change="dataListSelectionChangeHandle"
-                  style="width: 100%;"
-          >
-              <el-table-column
-                      label=" "
-                      align="center"
-                      width="50"
-              >
-                  <template slot-scope="scope">
-                      <img :src="red" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '1' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"/>
-                      <img :src="yellow" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '2' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"/>
-                      <img :src="green" width="25" height="25" v-if="scope.row.itemState == '0' && scope.row.isRemind == '3' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"/>
-                  </template>
-              </el-table-column>
-              <el-table-column
-                      label="序号"
-                      type="index"
-                      show-overflow-tooltip
-                      align="center"
-                      width="50"
-              ></el-table-column>
-              <el-table-column
-                      prop="streetName"
-                      label="属事街道"
-                      header-align="center"
-                      width="120"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="communityName"
-                      label="属事社区"
-                      header-align="center"
-                      width="130"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="gridName"
-                      label="属事网格"
-                      header-align="center"
-                      width="140"
-                      align="center"
-                      show-overflow-tooltip
-              >
-              </el-table-column>
-              <el-table-column
-                      prop="itemContent"
-                      label="诉求内容"
-                      header-align="center"
-                      min-width="300"
-                      align="left"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <!--<el-table-column-->
-                      <!--prop="serialNum"-->
-                      <!--label="诉求编码"-->
-                      <!--header-align="center"-->
-                      <!--min-width="200"-->
-                      <!--align="center"-->
-              <!--&gt;</el-table-column>-->
-              <!-- <el-table-column
+				<el-form-item>
+					<el-button type="success" @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button>
+				</el-form-item>
+			</el-form>
+			<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+				<el-table-column label=" " align="center" width="50">
+					<template slot-scope="scope">
+						<img
+							:src="red"
+							width="25"
+							height="25"
+							v-if="scope.row.itemState == '0' && scope.row.isRemind == '1' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"
+						/>
+						<img
+							:src="yellow"
+							width="25"
+							height="25"
+							v-if="scope.row.itemState == '0' && scope.row.isRemind == '2' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"
+						/>
+						<img
+							:src="green"
+							width="25"
+							height="25"
+							v-if="scope.row.itemState == '0' && scope.row.isRemind == '3' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+				<el-table-column prop="streetName" label="属事街道" header-align="center" width="120" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="communityName" label="属事社区" header-align="center" width="130" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gridName" label="属事网格" header-align="center" width="140" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="itemContent" label="诉求内容" header-align="center" min-width="300" align="left" show-overflow-tooltip></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="serialNum"-->
+				<!--label="诉求编码"-->
+				<!--header-align="center"-->
+				<!--min-width="200"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!-- <el-table-column
                       prop="peopleFlagName"
                       label="诉求类型"
                       header-align="center"
@@ -189,317 +146,323 @@
                       align="center"
               ></el-table-column> -->
 
-              <el-table-column
-                      prop="itemStateName"
-                      label="处理状态"
-                      header-align="center"
-                      width="100"
-                      align="center"
-                      :formatter="stateFormat"
-              >
-              </el-table-column>
-
-              <el-table-column
-                      prop="createdTime"
-                      label="上报时间"
-                      header-align="center"
-                      width="180"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      prop="remainTime"
-                      label="事件时间"
-                      header-align="center"
-                      min-width="120"
-                      align="center"
-                      show-overflow-tooltip
-              >
-                  <template slot-scope="scope">
-                      <span v-if="scope.row.itemState == '0' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'">{{scope.row.remainTime}}</span>
-                  </template>
-              </el-table-column>
-              <el-table-column
-                      prop="nickName"
-                      label="联系人姓名"
-                      header-align="center"
-                      min-width="100"
-                      align="center"
-                      show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                      prop="evaluationScoreName"
-                      label="满意度"
-                      header-align="center"
-                      align="center"
-              ></el-table-column>
-              <el-table-column
-                      :label="$t('handle')"
-                      fixed="right"
-                      header-align="center"
-                      max-width="250"
-                      align="center"
-              >
-                  <template slot-scope="scope">
-                      <el-button
-                          type="text"
-                          size="small"
-                          class="custom-table-button-default"
-                          @click="dealAction(scope.row.id)">详情
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
-                              class="custom-table-button-default"
-                              @click="addDiff(scope.row.id)">添加难点堵点
-                      </el-button>
-                      <el-button
-                              type="text"
-                              size="small"
-                              v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
-                              class="custom-table-button-default"
-                              @click="addTypi(scope.row.id)">添加典型案例
-                      </el-button>
-                  </template>
-              </el-table-column>
-          </el-table>
-          <el-pagination
-                  :current-page="page"
-                  :page-sizes="[10, 20, 50, 100]"
-                  :page-size="limit"
-                  :total="total"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="pageSizeChangeHandle"
-                  @current-change="pageCurrentChangeHandle"
-          >
-          </el-pagination>
-
-      </div>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-        ref="addOrUpdate"
-        @refreshDataList="getDataList"></add-or-update>
-  </el-card>
+				<el-table-column prop="itemStateName" label="处理状态" header-align="center" width="100" align="center" :formatter="stateFormat"></el-table-column>
+				<el-table-column prop="appealSource" label="诉求来源" header-align="center" min-width="100" align="center" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<span v-if="scope.row.appealSource == '0'">排查上报</span>
+						<span v-if="scope.row.appealSource == '1'">网络发声</span>
+						<span v-if="scope.row.appealSource == '2'">新新向党</span>
+					</template>
+				</el-table-column>
+<el-table-column prop="solutionInfoName" label="解决情况" header-align="center" align="center" ></el-table-column>
+				<el-table-column prop="createdTime" label="上报时间" header-align="center" width="180" align="center"></el-table-column>
+				<el-table-column prop="remainTime" label="事件时间" header-align="center" min-width="120" align="center" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<span v-if="scope.row.itemState == '0' && scope.row.itemHandleDeptId !== null && scope.row.itemHandleDeptId !== '0'">{{ scope.row.remainTime }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="nickName" label="联系人姓名" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="categoryName" label="所属类别" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column> -->
+				<el-table-column prop="evaluationScoreName" label="满意度" header-align="center" align="center"></el-table-column>
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" max-width="250" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id,'view')">详情</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isDifficulty === '0'"
+							class="custom-table-button-default"
+							@click="addDiff(scope.row.id)"
+						>
+							添加难点堵点
+						</el-button>
+						<el-button
+							type="text"
+							size="small"
+							v-if="$hasPermission('events:item:diff') && scope.row.isTypical === '0'"
+							class="custom-table-button-default"
+							@click="addTypi(scope.row.id)"
+						>
+							添加典型案例
+						</el-button>
+						<el-button type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row.id,'edit')">修改类别</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			></el-pagination>
+		</div>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+	</el-card>
 </template>
 
 <script>
-import green from '@/assets/img/green_img.png'
-import red from '@/assets/img/red_img.png'
-import yellow from '@/assets/img/yellow_img.png'
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './appeal-enforcement-add'
+import green from '@/assets/img/green_img.png';
+import red from '@/assets/img/red_img.png';
+import yellow from '@/assets/img/yellow_img.png';
+import mixinViewModule from '@/mixins/view-module';
+import AddOrUpdate from './appeal-enforcement-add';
 
 export default {
-  mixins: [mixinViewModule],
-  name: 'AppealList',
-  data () {
-    return {
-      green,
-      red,
-      yellow,
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/getItemAppealPage',
-        getDataListIsPage: true,
-        exportURL: '/events/item/unexport'
-      },
-      dataForm: {
-        id: '',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: '',
-        itemContent: '',
-        nickName: '',
-        mobile: '',
-        appealType: 0,
-        evaluationScore: '',
-        itemHandleDeptId: '',
-        itemState: '',
-        processState: ''
-      },
-      ids: [],
-      options: [],
-      optionsDept: [],
-      addOrUpdateVisible: false,
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  created: function () {
-    this.getOptions()
-  },
-  methods: {
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {
-        })
-      this.$http
-        .post(`/sys/dept/queryUserSysDeptTypeKey`, {  })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.optionsDept = res.data
-        })
-        .catch(() => {
-        })
-    },
-    stateFormat (row, column) {
-      if (row.itemState === 0) {
-        if (row.processState === '16') {
-          return '市区处理中'
-        }
-        if (row.evaluationState === '1') {
-          if (row.evaluationTime !== null && row.evaluationTime !== '') {
-            return '已评价'
-          } else {
-            return '待评价'
-          }
-        }
-        if (row.itemHandleDeptId === null || row.itemHandleDeptId === '0') {
-          return '街道处理中'
-        } else {
-          let itemStateDetail = '网格处理中'
-          this.optionsDept.filter(function (item) {
-            if (item.id === row.itemHandleDeptId) {
-              if (item.typeKey === 'grid_party') {
-                itemStateDetail = '网格处理中'
-              }
-              if (item.typeKey === 'community_party') {
-                itemStateDetail = '社区处理中'
-              }
-            }
-          })
-          return itemStateDetail
-        }
-      } else if (row.itemState === 10) {
-        return '已结案'
-      }
-    },
-    dealAction (id) {
-      this.$parent.selectComponent = 'AppealDetailView'
-      this.$router.push({ path: '/events-appeal-peo', query: { id: id } })
-    },
-    addDiff (id) {
-      this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let data = {}
-        data.id = id
-        data.isDifficulty = '1'
-        this.$http['put']('/events/item/', data).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.getDataList()
-            }
-          })
-        }).catch(() => {})
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        });
-      });
-    },
-    addTypi (id) {
-      this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let data = {}
-        data.id = id
-        data.isTypical = '1'
-        this.$http['put']('/events/item/', data).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.getDataList()
-            }
-          })
-        }).catch(() => {})
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        });
-      });
-    },
-    addAppealEnforcement () {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init()
-      })
-    },
-    btKeyUpItemContent (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.itemContent = e.target.value
-    }
-  }
-}
+	mixins: [mixinViewModule],
+	name: 'AppealList',
+	data() {
+		return {
+			categoryIds: [],
+			categoryOptions: [],
+			green,
+			red,
+			yellow,
+			mixinViewModuleOptions: {
+				getDataListURL: '/events/item/getItemAppealPage',
+				getDataListIsPage: true,
+				exportURL: '/events/item/exportItemAppealList',
+				exportMoudle: ''
+			},
+			dataForm: {
+				categoryValue: '',
+				id: '',
+				startTime: '',
+				endTime: '',
+				streetId: '',
+				communityId: '',
+				gridId: '',
+				itemCode: '',
+				itemContent: '',
+				nickName: '',
+				mobile: '',
+				appealType: 0,
+				evaluationScore: '',
+				itemHandleDeptId: '',
+				itemState: '',
+				processState: '',
+				appealSource:'',
+			},
+			ids: [],
+			options: [],
+			optionsDept: [],
+			addOrUpdateVisible: false,
+			pickerBeginDateBefore: {
+				disabledDate: time => {
+					let beginDateVal = this.dataForm.endTime;
+					if (beginDateVal) {
+						return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime();
+					}
+				}
+			},
+			pickerBeginDateAfter: {
+				disabledDate: time => {
+					let EndDateVal = this.dataForm.startTime;
+					if (EndDateVal) {
+						return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime();
+					}
+				}
+			}
+		};
+	},
+	components: {
+		AddOrUpdate
+	},
+	watch: {
+		ids: function(val) {
+			if (val.length === 0) {
+				this.dataForm.streetId = '';
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 1) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 2) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 3) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = this.ids[2];
+			}
+		}
+	},
+	created: function() {
+		this.getOptions();
+		this.getCategoryList();
+	},
+	methods: {
+		getCategoryList() {
+			// this.disabledCategory = true;
+			return this.$http
+				.get('/events/category/list', {
+					params: {
+						infoCode: 'A'
+					}
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					var data = res.data;
+
+					this.getSelectedNode(data, data);
+					this.categoryOptions = data;
+					// this.disabledCategory = false
+				})
+				.catch(() => {});
+		},
+		getSelectedNode(nodeData, parent) {
+			nodeData.forEach(item => {
+				if ('children' in item && item.children.length === 0) {
+					delete item.children;
+				} else if ('children' in item && item.children.length) {
+					this.getSelectedNode(item.children, item);
+				}
+			});
+		},
+		getOptions() {
+			this.$http
+				.get(`/sys/user/deptOptions/getByLoginUser`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.options = res.data.options;
+				})
+				.catch(() => {});
+			this.$http
+				.post(`/sys/dept/queryUserSysDeptTypeKey`, {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.optionsDept = res.data;
+				})
+				.catch(() => {});
+		},
+		stateFormat(row, column) {
+			if (row.itemState === 0) {
+				if (row.processState === '16') {
+					return '市区处理中';
+				}
+				if (row.evaluationState === '1') {
+					if (row.evaluationTime !== null && row.evaluationTime !== '') {
+						return '已评价';
+					} else {
+						return '待评价';
+					}
+				}
+				if (row.itemHandleDeptId === null || row.itemHandleDeptId === '0') {
+					return '街道处理中';
+				} else {
+					let itemStateDetail = '网格处理中';
+					this.optionsDept.filter(function(item) {
+						if (item.id === row.itemHandleDeptId) {
+							if (item.typeKey === 'grid_party') {
+								itemStateDetail = '网格处理中';
+							}
+							if (item.typeKey === 'community_party') {
+								itemStateDetail = '社区处理中';
+							}
+						}
+					});
+					return itemStateDetail;
+				}
+			} else if (row.itemState === 10) {
+				return '已结案';
+			}
+		},
+		dealAction (id,type) {
+		  this.$parent.selectComponent = 'AppealDetailView'
+		  this.$router.push({ path: '/events-appeal-peo', query: { id: id,type:type,infoCode:'A' } })
+		},
+		addDiff(id) {
+			this.$confirm('此操作将会标记该诉求为难点堵点, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isDifficulty = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addTypi(id) {
+			this.$confirm('此操作将会标记该诉求为典型案例, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					let data = {};
+					data.id = id;
+					data.isTypical = '1';
+					this.$http['put']('/events/item/', data)
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								return this.$message.error(res.msg);
+							}
+							this.$message({
+								message: this.$t('prompt.success'),
+								type: 'success',
+								duration: 500,
+								onClose: () => {
+									this.visible = false;
+									this.getDataList();
+								}
+							});
+						})
+						.catch(() => {});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消操作'
+					});
+				});
+		},
+		addAppealEnforcement() {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init();
+			});
+		},
+		btKeyUpItemContent(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.itemContent = e.target.value;
+		}
+	}
+};
 </script>
diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index 1d523c91..d57bcb41 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -274,6 +274,20 @@
                       :rows="6"
                       maxlength="300" v-model="postDataForm.handleAdviceRemark"  placeholder="请输入不予受理详细说明"></el-input>
            </el-form-item>
+           <el-form-item label="诉求标题:"   prop='title'>
+            <el-input v-model="postDataForm.title" placeholder="诉求的简要描述，100个字符以内。比如：居民反馈垃圾问题，则填写 “垃圾清理问题” "></el-input>
+          </el-form-item>
+          <el-form-item label="诉求性质:"  prop='nature' >
+            <!-- -->
+              <el-select  v-model="postDataForm.nature" placeholder="请选择">
+                <el-option
+                  v-for="item in selectOption"
+                  :label="item.label"
+                  :value="item.value"
+                  :key="item.value">
+                </el-option>
+              </el-select>
+          </el-form-item>
           <el-form-item label="办理人:" prop="handlePeopleName"  >
                   <el-input v-model="postDataForm.handlePeopleName"></el-input>
                   </el-form-item>
@@ -417,6 +431,7 @@ export default {
       innerVisible: false,
       showAdvice: true,
       typeKey: '', // 社区标识
+      selectOption:[{label:'资讯类',value:'01'},{label:'建议类',value:'02'},{label:'诉求类',value:'03'}],
       dataForm: {
         id: '',
         handlePeopleName: '',
@@ -463,7 +478,9 @@ export default {
         outHandleImagesPC: [],
         handleImages: [],
         outHandleImages: [],
-        categoryId: ''
+        categoryId: '',
+        title:'',
+        nature:''
       },
       deptResultDTOSVisible: false,
       evaluateDeptDTOSVisible: false,
@@ -608,6 +625,21 @@ export default {
             message: this.$t('validate.required'),
             trigger: 'blur'
           }
+        ],
+         nature:[
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+         title:[
+          {
+            required: true,
+            message: '请填写诉求标题，长度为0-100个字符',
+            trigger: 'blur',
+            max:100
+          }
         ]
       }
     }
@@ -1105,7 +1137,10 @@ export default {
         if (this.postDataForm.handleCategoryShow === '') {
           return this.$message.error('请选择处理选项')
         }
-
+        if (this.postDataForm.title === ''||this.postDataForm.title.length>100) {
+          return this.$message.error('请填写诉求标题，长度为0-100个字符')
+        }
+  
         if (this.postDataForm.handleAdviceRemark === '' && this.postDataForm.handleCategoryShow == '6') {
           return this.$message.error('请填写不予受理详细说明')
         }
@@ -1117,6 +1152,9 @@ export default {
         if (this.postDataForm.handlePeopleMobile === '') {
           return this.$message.error('请输入办理人办公电话！')
         }
+        if (this.postDataForm.nature === '') {
+          return this.$message.error('请选择诉求性质！')
+        }
         // }
         if (this.deptResultDTOSVisible) {
           if (
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
index aade0b4e..b57e25f1 100644
--- a/src/views/modules/events/item-deal-list.vue
+++ b/src/views/modules/events/item-deal-list.vue
@@ -1,424 +1,359 @@
 <template>
-    <el-card shadow="never" class="aui-card--fill">
-        <div class="mod-item__item}">
-            <el-form
-                    :inline="true"
-                    :model="dataForm"
-                    @keyup.enter.native="getDataListSearch()"
-            >
-                <el-form-item label="所属机构" label-width="100px">
-                    <el-cascader
-                            v-model="ids"
-                            :options="options"
-                            :props="{ checkStrictly: true }"
-                            clearable
-                            style="width:250px;"
-                    >
-                    </el-cascader>
-                </el-form-item>
-                <!--<el-form-item label="项目编号" prop="itemCode" label-width="100px">-->
-                    <!--<el-input-->
-                            <!--v-model="dataForm.itemCode"-->
-                            <!--placeholder="请输入项目编号"-->
-                            <!--clearable-->
-                            <!--@keyup.native="btKeyUpItemCode"-->
-                            <!--style="width:250px;"-->
-                    <!--&gt;</el-input>-->
-                <!--</el-form-item>-->
-                <el-form-item label="诉求内容" prop="itemCode">
-                    <el-input
-                            v-model="dataForm.itemContent"
-                            placeholder="请输入诉求内容"
-                            clearable
-                            @keyup.native="btKeyUpItemContent"
-                            style="width:200px;"
-                    ></el-input>
-                </el-form-item>
-                <br>
-                <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
-                    <el-input
-                            v-model="dataForm.nickName"
-                            placeholder="请输入联系人姓名"
-                            clearable
-                            @keyup.native="btKeyUpNickName"
-                            style="width:250px;"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item label="手机号" prop="itemCode">
-                    <el-input
-                            v-model="dataForm.mobile"
-                            placeholder="请输入手机号"
-                            clearable
-                            @keyup.native="btKeyUpMobile"
-                            style="width:250px;"
-                    ></el-input>
-                </el-form-item>
-                <br>
-                <div>
-                    <el-form-item label="上报时间" prop="startTime" label-width="100px">
-                        <el-date-picker
-                                v-model="dataForm.startTime"
-                                type="date"
-                                :picker-options="pickerBeginDateBefore"
-                                value-format="yyyy-MM-dd"
-                                format="yyyy-MM-dd"
-                                placeholder="选择日期时间"
-                                style="width:250px;" @change="changeTime"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="至" label-width="25px" prop="endTime">
-                        <el-date-picker
-                                v-model="dataForm.endTime"
-                                type="date"
-                                :picker-options="pickerBeginDateAfter"
-                                value-format="yyyy-MM-dd"
-                                format="yyyy-MM-dd"
-                                placeholder="选择日期时间"
-                                style="width:250px;" @change="changeTime"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
-                    </el-form-item>
-                  <el-form-item>
-                    <!-- <el-button type="success"
+	<el-card shadow="never" class="aui-card--fill">
+		<div class="mod-item__item}">
+			<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+				<el-form-item label="所属机构" label-width="100px">
+					<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px;"></el-cascader>
+				</el-form-item>
+				<!--<el-form-item label="项目编号" prop="itemCode" label-width="100px">-->
+				<!--<el-input-->
+				<!--v-model="dataForm.itemCode"-->
+				<!--placeholder="请输入项目编号"-->
+				<!--clearable-->
+				<!--@keyup.native="btKeyUpItemCode"-->
+				<!--style="width:250px;"-->
+				<!--&gt;</el-input>-->
+				<!--</el-form-item>-->
+				<el-form-item label="诉求内容" prop="itemCode">
+					<el-input v-model="dataForm.itemContent" placeholder="请输入诉求内容" clearable @keyup.native="btKeyUpItemContent" style="width:200px;"></el-input>
+				</el-form-item>
+				<br />
+				<el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
+					<el-input v-model="dataForm.nickName" placeholder="请输入联系人姓名" clearable @keyup.native="btKeyUpNickName" style="width:250px;"></el-input>
+				</el-form-item>
+				<el-form-item label="手机号" prop="itemCode">
+					<el-input v-model="dataForm.mobile" placeholder="请输入手机号" clearable @keyup.native="btKeyUpMobile" style="width:250px;"></el-input>
+				</el-form-item>
+				<br />
+				<div>
+					<el-form-item label="上报时间" prop="startTime" label-width="100px">
+						<el-date-picker
+							v-model="dataForm.startTime"
+							type="date"
+							:picker-options="pickerBeginDateBefore"
+							value-format="yyyy-MM-dd"
+							format="yyyy-MM-dd"
+							placeholder="选择日期时间"
+							style="width:250px;"
+							@change="changeTime"
+						></el-date-picker>
+					</el-form-item>
+					<el-form-item label="至" label-width="25px" prop="endTime">
+						<el-date-picker
+							v-model="dataForm.endTime"
+							type="date"
+							:picker-options="pickerBeginDateAfter"
+							value-format="yyyy-MM-dd"
+							format="yyyy-MM-dd"
+							placeholder="选择日期时间"
+							style="width:250px;"
+							@change="changeTime"
+						></el-date-picker>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="success" @click="getDataListSearch()" class="custom-button-default">{{ $t('query') }}</el-button>
+					</el-form-item>
+					<el-form-item>
+						<!-- <el-button type="success"
                         @click="exportHandle()" class="custom-button-modify">{{ $t('export') }}</el-button> -->
-                  </el-form-item>
-                </div>
-            </el-form>
-            <el-table
-                    v-loading="dataListLoading"
-                    :data="dataList"
-                    border
-                    @selection-change="dataListSelectionChangeHandle"
-                    style="width: 100%;"
-                    :row-class-name="tableRowClassName"
-            >
-                <el-table-column
-                        label=" "
-                        align="center"
-                        width="50"
-                >
-                    <template slot-scope="scope">
-                        <img :src="red" width="25" height="25" v-if="scope.row.lamp === '红灯'"/>
-                        <img :src="yellow" width="25" height="25" v-else-if="scope.row.lamp === '黄灯'"/>
-                        <img :src="green" width="25" height="25" v-else/>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        label="序号"
-                        type="index"
-                        show-overflow-tooltip
-                        align="center"
-                        width="50"
-                ></el-table-column>
-                <el-table-column
-                        prop="streetName"
-                        label="属事街道"
-                        header-align="center"
-                        width="120"
-                        align="center"
-                        show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="communityName"
-                        label="属事社区"
-                        header-align="center"
-                        width="130"
-                        align="center"
-                        show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="gridName"
-                        label="属事网格"
-                        header-align="center"
-                        width="140"
-                        align="center"
-                        show-overflow-tooltip
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="itemContent"
-                        label="诉求内容"
-                        header-align="center"
-                        min-width="400"
-                        align="left"
-                        show-overflow-tooltip
-                ></el-table-column>
-                <!--<el-table-column-->
-                        <!--prop="itemCode"-->
-                        <!--label="项目编号"-->
-                        <!--header-align="center"-->
-                        <!--width="150"-->
-                        <!--align="center"-->
-                <!--&gt;</el-table-column>-->
-                <el-table-column
-                        prop="createdTime"
-                        label="上报时间"
-                        header-align="center"
-                        width="180"
-                        align="center"
-                ></el-table-column>
-                <el-table-column
-                        prop="remainTime"
-                        label="事件时间"
-                        header-align="center"
-                        min-width="130"
-                        align="center"
-                        show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                        prop="nickName"
-                        label="联系人姓名"
-                        header-align="center"
-                        min-width="100"
-                        align="center"
-                        show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                        prop="mobile"
-                        label="手机号"
-                        header-align="center"
-                        min-width="120"
-                        align="center"
-                ></el-table-column>
-                <!--<el-table-column-->
-                        <!--prop="participantsNum"-->
-                        <!--label="参与人数"-->
-                        <!--header-align="center"-->
-                        <!--width="100"-->
-                        <!--align="center"-->
-                <!--&gt;</el-table-column>-->
-                <!--<el-table-column-->
-                        <!--prop="approveNum"-->
-                        <!--label="支持人数"-->
-                        <!--header-align="center"-->
-                        <!--width="100"-->
-                        <!--align="center"-->
-                <!--&gt;</el-table-column>-->
-                <!--<el-table-column-->
-                        <!--prop="opposeNum"-->
-                        <!--label="不支持人数"-->
-                        <!--header-align="center"-->
-                        <!--width="100"-->
-                        <!--align="center"-->
-                <!--&gt;</el-table-column>-->
-                <!--<el-table-column-->
-                        <!--prop="commentNum"-->
-                        <!--label="评论人数"-->
-                        <!--header-align="center"-->
-                        <!--width="100"-->
-                        <!--align="center"-->
-                <!--&gt;</el-table-column>-->
-                <!--<el-table-column-->
-                        <!--prop="browseNum"-->
-                        <!--label="浏览数"-->
-                        <!--header-align="center"-->
-                        <!--width="100"-->
-                        <!--align="center"-->
-                <!--&gt;</el-table-column>-->
-                <el-table-column
-                        :label="$t('handle')"
-                        fixed="right"
-                        header-align="center"
-                        align="center"
-                        width="150"
-                >
-                    <template slot-scope="scope">
-                        <el-button v-if="$hasPermission('events:item:deal')"
-                            type="text"
-                            size="small"
-                            class="custom-table-button-default"
-                            @click="dealAction(scope.row.id)">{{ $t('deal') }}
-                        </el-button>
-                        <!--<el-button type="text" size="small" @click="openHandle(scope.row.id)">{{ '操作' }}</el-button>-->
-                        <!-- 9-8现场屏蔽相关 -->
-                        <!-- <el-button :disabled="scope.row.isDelay === '1'" type="text" size="small" @click="openDialogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期' }}</el-button>
+					</el-form-item>
+				</div>
+			</el-form>
+			<el-table
+				v-loading="dataListLoading"
+				:data="dataList"
+				border
+				@selection-change="dataListSelectionChangeHandle"
+				style="width: 100%;"
+				:row-class-name="tableRowClassName"
+			>
+				<el-table-column label=" " align="center" width="50">
+					<template slot-scope="scope">
+						<img :src="red" width="25" height="25" v-if="scope.row.lamp === '红灯'" />
+						<img :src="yellow" width="25" height="25" v-else-if="scope.row.lamp === '黄灯'" />
+						<img :src="green" width="25" height="25" v-else />
+					</template>
+				</el-table-column>
+				<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+				<el-table-column prop="streetName" label="属事街道" header-align="center" width="120" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="communityName" label="属事社区" header-align="center" width="130" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gridName" label="属事网格" header-align="center" width="140" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="itemContent" label="诉求内容" header-align="center" min-width="400" align="left" show-overflow-tooltip></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="itemCode"-->
+				<!--label="项目编号"-->
+				<!--header-align="center"-->
+				<!--width="150"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<el-table-column prop="createdTime" label="上报时间" header-align="center" width="180" align="center"></el-table-column>
+				<el-table-column prop="remainTime" label="事件时间" header-align="center" min-width="130" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="联系人姓名" header-align="center" min-width="100" align="center" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="mobile" label="手机号" header-align="center" min-width="120" align="center"></el-table-column>
+				<el-table-column prop="repeatFlagName" label="重复案件" header-align="center" align="center"></el-table-column>
+				<!--<el-table-column-->
+				<!--prop="participantsNum"-->
+				<!--label="参与人数"-->
+				<!--header-align="center"-->
+				<!--width="100"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!--<el-table-column-->
+				<!--prop="approveNum"-->
+				<!--label="支持人数"-->
+				<!--header-align="center"-->
+				<!--width="100"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!--<el-table-column-->
+				<!--prop="opposeNum"-->
+				<!--label="不支持人数"-->
+				<!--header-align="center"-->
+				<!--width="100"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!--<el-table-column-->
+				<!--prop="commentNum"-->
+				<!--label="评论人数"-->
+				<!--header-align="center"-->
+				<!--width="100"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<!--<el-table-column-->
+				<!--prop="browseNum"-->
+				<!--label="浏览数"-->
+				<!--header-align="center"-->
+				<!--width="100"-->
+				<!--align="center"-->
+				<!--&gt;</el-table-column>-->
+				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+					<template slot-scope="scope">
+						<el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" class="custom-table-button-default" @click="dealAction(scope.row)">
+							{{ $t('deal') }}
+						</el-button>
+						<el-button type="text" size="small" class="custom-table-button-default" @click="repeat(scope.row)">
+							<span v-if="scope.row.repeatFlag == 0">标记重复</span>
+							<span v-if="scope.row.repeatFlag == 1">取消重复</span>
+						</el-button>
+						<!--<el-button type="text" size="small" @click="openHandle(scope.row.id)">{{ '操作' }}</el-button>-->
+						<!-- 9-8现场屏蔽相关 -->
+						<!-- <el-button :disabled="scope.row.isDelay === '1'" type="text" size="small" @click="openDialogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期' }}</el-button>
                         <el-button :disabled="scope.row.isDelay !== '1'" type="text" size="small" @click="openLogHandle(scope.row.id)" class="custom-table-button-default">{{ '延期记录' }}</el-button> -->
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                    :current-page="page"
-                    :page-sizes="[10, 20, 50, 100]"
-                    :page-size="limit"
-                    :total="total"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    @size-change="pageSizeChangeHandle"
-                    @current-change="pageCurrentChangeHandle"
-            >
-            </el-pagination>
-            <!-- 弹窗, 新增 / 修改 -->
-            <detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
-            <item-deal-handle v-if="handleVisible" ref="itemDealHandle" @refreshDataList="getDataList"></item-deal-handle>
-            <item-delay-dialog  v-if="handleDialogVisible" ref="itemDelayDialog" @refreshDataList="getDataList"></item-delay-dialog>
-            <item-delay-log-dialog  v-if="handleLogDialogVisible" ref="itemDelayLogDialog" @refreshDataList="getDataList"></item-delay-log-dialog>
-        </div>
-    </el-card>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				:current-page="page"
+				:page-sizes="[10, 20, 50, 100]"
+				:page-size="limit"
+				:total="total"
+				layout="total, sizes, prev, pager, next, jumper"
+				@size-change="pageSizeChangeHandle"
+				@current-change="pageCurrentChangeHandle"
+			></el-pagination>
+			<!-- 弹窗, 新增 / 修改 -->
+			<detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
+			<item-deal-handle v-if="handleVisible" ref="itemDealHandle" @refreshDataList="getDataList"></item-deal-handle>
+			<item-delay-dialog v-if="handleDialogVisible" ref="itemDelayDialog" @refreshDataList="getDataList"></item-delay-dialog>
+			<item-delay-log-dialog v-if="handleLogDialogVisible" ref="itemDelayLogDialog" @refreshDataList="getDataList"></item-delay-log-dialog>
+		</div>
+	</el-card>
 </template>
 
 <script>
-import green from '@/assets/img/green_img.png'
-import red from '@/assets/img/red_img.png'
-import yellow from '@/assets/img/yellow_img.png'
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './item-deal-detail'
-import ItemDealHandle from './item-deal-handle'
-import ItemDelayDialog from './item-delay-dialog'
-import ItemDelayLogDialog from './item-delay-log-dialog'
+import green from '@/assets/img/green_img.png';
+import red from '@/assets/img/red_img.png';
+import yellow from '@/assets/img/yellow_img.png';
+import mixinViewModule from '@/mixins/view-module';
+import Detail from './item-deal-detail';
+import ItemDealHandle from './item-deal-handle';
+import ItemDelayDialog from './item-delay-dialog';
+import ItemDelayLogDialog from './item-delay-log-dialog';
 export default {
-  mixins: [mixinViewModule],
-  name: 'ItemDealList',
-  data () {
-    return {
-      green,
-      red,
-      yellow,
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/page',
-        getDataListIsPage: true,
-        exportURL: '/events/item/unexport'
-      },
-      detailVisible: false,
-      dataForm: {
-        id: '',
-        itemState: '0',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: '',
-        itemContent: '',
-        nickName: '',
-        mobile: ''
+	mixins: [mixinViewModule],
+	name: 'ItemDealList',
+	data() {
+		return {
+			green,
+			red,
+			yellow,
+			mixinViewModuleOptions: {
+				getDataListURL: '/events/item/page',
+				getDataListIsPage: true,
+				exportURL: '/events/item/unexport'
+			},
+			detailVisible: false,
+			dataForm: {
+				id: '',
+				itemState: '0',
+				startTime: '',
+				endTime: '',
+				streetId: '',
+				communityId: '',
+				gridId: '',
+				itemCode: '',
+				itemContent: '',
+				nickName: '',
+				mobile: ''
+			},
+			handleVisible: false,
+			handleDialogVisible: false,
+			handleLogDialogVisible: false,
+			ids: [],
+			options: [],
+			pickerBeginDateBefore: {
+				disabledDate: time => {
+					let beginDateVal = this.dataForm.endTime;
+					if (beginDateVal) {
+						return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime();
+					}
+				}
+			},
+			pickerBeginDateAfter: {
+				disabledDate: time => {
+					let EndDateVal = this.dataForm.startTime;
+					if (EndDateVal) {
+						return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime();
+					}
+				}
+			}
+		};
+	},
+	components: {
+		Detail,
+		ItemDealHandle,
+		ItemDelayDialog,
+		ItemDelayLogDialog
+	},
+	created: function() {
+		this.getOptions();
+	},
+	watch: {
+		ids: function(val) {
+			if (val.length === 0) {
+				this.dataForm.streetId = '';
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 1) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = '';
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 2) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = '';
+			}
+			if (val.length === 3) {
+				this.dataForm.streetId = this.ids[0];
+				this.dataForm.communityId = this.ids[1];
+				this.dataForm.gridId = this.ids[2];
+			}
+		}
+	},
+	methods: {
+		tableRowClassName({ row, index }) {
+			if (row.lamp === '红灯') {
+				return 'success-row';
+			}
+			return '';
+		},
+		dealAction(row) {
+			this.$http
+				.get(`/events/PushToCity/receive`, {
+          params:{
+            processId: row.processId
+          } })
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+				})
+				.catch(() => {});
 
-      },
-      handleVisible: false,
-      handleDialogVisible: false,
-      handleLogDialogVisible: false,
-      ids: [],
-      options: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      }
-    }
-  },
-  components: {
-    Detail,
-    ItemDealHandle,
-    ItemDelayDialog,
-    ItemDelayLogDialog
-  },
-  created: function () {
-    this.getOptions()
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    tableRowClassName ({ row, index }) {
-      if (row.lamp === '红灯') {
-        return 'success-row'
-      }
-      return ''
-    },
-    dealAction (id) {
-      this.$parent.selectComponent = 'ItemDealDetailView'
-      this.$router.push({ path: '/events-item-deal', query: { id: id } })
-    },
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {
-        })
-    },
-    btKeyUpItemCode (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.itemCode = e.target.value
-    },
-    btKeyUpItemContent (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.itemContent = e.target.value
-    },
-    btKeyUpNickName (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.nickName = e.target.value
-    },
-    btKeyUpMobile (e) {
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
-    // openHandle (id) {
-    //   this.handleVisible = true
-    //   this.$nextTick(() => {
-    //     this.$refs.itemDealHandle.dataForm.id = id
-    //     this.$refs.itemDealHandle.init()
-    //   })
-    // },
-    openDialogHandle (id) {
-      this.handleDialogVisible = true
-      this.$nextTick(() => {
-        this.$refs.itemDelayDialog.dataForm.itemId = id
-        this.$refs.itemDelayDialog.init()
-      })
-    },
-    openLogHandle (id) {
-      this.handleLogDialogVisible = true
-      this.$nextTick(() => {
-        this.$refs.itemDelayLogDialog.dataForm.itemId = id
-        this.$refs.itemDelayLogDialog.init()
-      })
-    }
-  }
-}
+			this.$parent.selectComponent = 'ItemDealDetailView';
+			this.$router.push({ path: '/events-item-deal', query: { id: row.id } });
+		},
+		repeat(row) {
+			let str = '';
+			if (row.repeatFlag == 0) {
+				str = '此操作将会将此诉求标记为重复案件，是否继续？';
+			} else {
+				str = '此操作将会将此诉求取消重复案件标记，是否继续？';
+			}
+
+			this.$confirm(str, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				console.log(this.dataList);
+				//重复
+				this.$http
+					.post(`/events/item/changeRepeat`, { itemId: row.id, repeatFlag: Math.abs(row.repeatFlag - 1) })
+					.then(({ data: res }) => {
+						if (res.code !== 0) {
+							return this.$message.error(res.msg);
+						}
+						this.getDataListSearch();
+					})
+					.catch(() => {});
+			});
+		},
+		getOptions() {
+			this.$http
+				.get(`/sys/user/deptOptions/getByLoginUser`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					}
+					this.options = res.data.options;
+				})
+				.catch(() => {});
+		},
+		btKeyUpItemCode(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.itemCode = e.target.value;
+		},
+		btKeyUpItemContent(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.itemContent = e.target.value;
+		},
+		btKeyUpNickName(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.nickName = e.target.value;
+		},
+		btKeyUpMobile(e) {
+			e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '');
+			this.dataForm.mobile = e.target.value;
+		},
+		// openHandle (id) {
+		//   this.handleVisible = true
+		//   this.$nextTick(() => {
+		//     this.$refs.itemDealHandle.dataForm.id = id
+		//     this.$refs.itemDealHandle.init()
+		//   })
+		// },
+		openDialogHandle(id) {
+			this.handleDialogVisible = true;
+			this.$nextTick(() => {
+				this.$refs.itemDelayDialog.dataForm.itemId = id;
+				this.$refs.itemDelayDialog.init();
+			});
+		},
+		openLogHandle(id) {
+			this.handleLogDialogVisible = true;
+			this.$nextTick(() => {
+				this.$refs.itemDelayLogDialog.dataForm.itemId = id;
+				this.$refs.itemDelayLogDialog.init();
+			});
+		}
+	}
+};
 </script>
 <style>
-    .el-table .success-row {
-        background: oldlace;
-    }
+.el-table .success-row {
+	background: oldlace;
+}
 </style>