From 24408f74d4cc377a66ee830dcb6002197fb4942c Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 5 Sep 2022 19:53:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=93=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/appeal-enforcement-add.vue |   6 +-
 .../events/item-examine-detail-view.vue       | 631 ++++++++++++++++++
 .../modules/events/item-examine-list.vue      | 117 +---
 src/views/modules/events/item-examine.vue     |   4 +-
 4 files changed, 642 insertions(+), 116 deletions(-)
 create mode 100644 src/views/modules/events/item-examine-detail-view.vue

diff --git a/src/views/modules/events/appeal-enforcement-add.vue b/src/views/modules/events/appeal-enforcement-add.vue
index 0be961cc..b3304631 100644
--- a/src/views/modules/events/appeal-enforcement-add.vue
+++ b/src/views/modules/events/appeal-enforcement-add.vue
@@ -48,8 +48,7 @@
       </el-form-item>
       <el-form-item label="事项类型"
                     prop="demand" label-width="120px">
-          <el-radio-group v-model="dataForm.lawType"
-              :disabled="!!dataForm.id">
+          <el-radio-group v-model="dataForm.lawType">
             <el-radio :label="0">计划事项</el-radio>
             <el-radio :label="1">临时事项</el-radio>
           </el-radio-group>
@@ -57,8 +56,7 @@
 
       <el-form-item label="与部门是否沟通"
                     prop="demand" label-width="120px">
-          <el-radio-group v-model="dataForm.isExchange"
-              :disabled="!!dataForm.id">
+          <el-radio-group v-model="dataForm.isExchange">
             <el-radio :label="0">已经沟通</el-radio>
             <el-radio :label="1">尚未沟通</el-radio>
           </el-radio-group>
diff --git a/src/views/modules/events/item-examine-detail-view.vue b/src/views/modules/events/item-examine-detail-view.vue
new file mode 100644
index 00000000..86f4e571
--- /dev/null
+++ b/src/views/modules/events/item-examine-detail-view.vue
@@ -0,0 +1,631 @@
+<template>
+  <div class="project-handle">
+    <div style="width: 100%; height: 100%;">
+      <div class="project-detail">
+        <div class="project-detail-tip">议题详情</div>
+        <el-form label-position="right"
+                 label-width="120px">
+          <el-form-item label="议题内容:"
+                        prop="eventContent">
+            <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.voice">
+              <audio controls style="height: 30px;">
+                <source :src="dataForm.voice" >
+              </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 label="上报时间:"
+                        prop="distributeTime">
+            <div>{{dataForm.distributeTime}}</div>
+          </el-form-item>
+          <el-form-item label="上报人:"
+                        prop="nickName">
+            <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="项目态度:">
+            <span>表达态度 {{dataForm.approveNum + dataForm.opposeNum + dataForm.commentNum}}</span>&nbsp;&nbsp;
+            <span>评论 {{dataForm.commentNum}}</span>&nbsp;&nbsp;
+            <span>支持 {{dataForm.approveNum}}</span>&nbsp;&nbsp;
+            <span>不支持 {{dataForm.opposeNum}}</span>
+          </el-form-item>
+          <el-form-item label="项目评论:">
+            <el-button type="text"
+                       @click="innerVisible = true">查看评论</el-button>
+          </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>
+        <el-timeline>
+          <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 class="handle-operation">
+        <div class="handle-operation-tip">处理操作</div>
+        <el-form ref="dataForm"
+                 label-width="120px"
+                 label-position="right"
+                 style="width: 720px;"
+                 :model="dataForm"
+                 :rules="dataRule">
+
+          <el-form-item label="审批"
+                    prop="checkFlag" label-width="120px">
+              <el-radio-group v-model="postDataForm.checkFlag">
+                <el-radio :label="0">同意</el-radio>
+                <el-radio :label="1">驳回</el-radio>
+              </el-radio-group>
+          </el-form-item>
+
+          <el-form-item  label="意见:" prop="outHandleAdvice">
+            <el-input v-model="postDataForm.outHandleAdvice"
+                      type="textarea"
+                      maxlength="100"
+                      show-word-limit
+                      placeholder="请输入"></el-input>
+          </el-form-item>
+
+          <el-form-item style="float: right;">
+            <el-button size="small"
+                       type="primary"
+                       :disabled="isAble"
+                       style="width: 95px"
+                       @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+            <el-button size="small"
+                       style="width: 95px"
+                       @click="backToItemDeal">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog width="90%"
+               title="评论"
+               :visible.sync="innerVisible"
+               append-to-body>
+      <el-table :data="commentsDTOs"
+                border
+                style="width: 100%;">
+        <el-table-column prop="user.userName"
+                         label="发言人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentTime"
+                         label="发言时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="content"
+                         label="发言内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="replyComment.userName"
+                         label="被回复人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="replyComment.content"
+                         label="被回复内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.shieldFlag === '0'"
+                       type="button"
+                       size="small"
+                       @click="deleteComment(scope.row.commentId)">屏蔽</el-button>
+            <el-button v-if="scope.row.shieldFlag === '1'"
+                       type="text"
+                       size="small">已屏蔽</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="pageIndex"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limitVal"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandleNew"
+                     @current-change="pageCurrentChangeHandleNew">
+      </el-pagination>
+    </el-dialog>
+  </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 debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+export default {
+  name: 'itemDealDetailView',
+  data () {
+    return {
+      map: '',
+      innerVisible: false,
+      dataForm: {
+        id: '',
+        nickName: '',
+        distributeTime: '',
+        itemContent: '',
+        images: [],
+        issueAddress: '',
+        handleProgressResultDTOS: [],
+        issueProgressResultDTOS: [],
+        outHandleAdvice: '',
+        issueLatitude: '',
+        issueLongitude: '',
+        voice: ''
+      },
+      isAble: false,
+      previewImgList: [],
+      commentsDTOs: [],
+      pageIndex: 0,
+      limitVal: 10,
+      total: null,
+      postDataForm: {
+        itemId: '',
+        checkFlag: 3,
+        outHandleAdvice: ''
+      },
+      timeLineList: [],
+      options: []
+    }
+  },
+  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 === 12) {
+          return '响应拟办'
+        } else if (item.state === 13) {
+          return '直接办理'
+        } else if (item.state === 5) {
+          return '不予受理'
+        } else if (item.state === 10) {
+          return '结案'
+        } else if (item.state === 11) {
+          return '结案申请'
+        } else if (item.state === 15) {
+          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 === 85) {
+          return '项目延期-审核通过'
+        } else if (item.state === 90) {
+          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 '转项目'
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        checkFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        outHandleAdvice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+
+  methods: {
+
+    backToItemDeal () {
+      this.$parent.selectComponent = 'ItemExamine'
+    },
+
+    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.isAble = false
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getCommentList()
+        }
+      })
+    },
+    clickImg (url) {
+      this.previewImgList = []
+      this.previewImgList.push(url)
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/events/item/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.dataForm.handleProgressResultDTOS.forEach((item, index, arr) => {
+          if (index === arr.length - 1) {
+            item.type = 'issue-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.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
+      }).catch(() => { })
+    },
+    deleteComment (val) {
+      this.$confirm('确定要屏蔽该评论吗？屏蔽后不可恢复。', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).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.getCommentList()
+            }
+          })
+        }).catch(() => { })
+      }).catch(() => {
+
+      })
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageIndex = 1
+      this.limitVal = val
+      this.getCommentList()
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageIndex = val
+      this.getCommentList()
+    },
+    // 评论
+    getCommentList () {
+      this.$http.get('/events/item/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.commentsDTOs = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.commentsDTOs = res.data.list
+        this.total = res.data.total
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.postDataForm.itemId = this.dataForm.id
+      console.log(this.postDataForm.checkFlag)
+      if (this.postDataForm.checkFlag === 3) {
+        return this.$message({
+          message: '请选择审批结果',
+          type: 'error',
+          duration: 2000,
+          onClose: () => {
+            return false
+          }
+        })
+      }
+
+      if (!this.postDataForm.outHandleAdvice) {
+        return this.$message({
+          message: '请填写意见',
+          type: 'error',
+          duration: 2000,
+          onClose: () => {
+            return false
+          }
+        })
+      }
+
+      this.isAble = true
+      // 将对象遍历成数组
+      this.$http['post'](
+        '/events/item/examineCase', 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 = 'ItemExamine'
+      }).catch(() => { })
+    }, 1000, { 'leading': true, 'trailing': false })
+
+  }
+}
+</script>
+
+<style>
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+</style>
+
+<style lang="scss">
+.project-handle {
+  .el-timeline {
+    padding-left: 9px;
+    font-size: 13px;
+  }
+  .el-textarea {
+    width: 600px !important;
+  }
+  .el-input {
+    width: 600px !important;
+  }
+}
+.el-form-item__label {
+  font-weight: bold;
+}
+</style>
+
+<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: 49%;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    padding: 10px;
+    padding-top: 20px;
+    float: left;
+    margin-bottom: 1%;
+    position: relative;
+    .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: 58%;
+      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: 40%;
+      height: 100%;
+      float: right;
+      .location {
+        height: 30px;
+        line-height: 30px;
+      }
+      #map {
+        width: 100%;
+        height: calc(100% - 30px);
+      }
+    }
+  }
+  .project-progress {
+    width: 20%;
+    height: 100%;
+    float: right;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    margin-left: 1%;
+    padding-top: 40px;
+    overflow-y: auto;
+    position: relative;
+    .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 {
+    padding-top: 20px;
+    box-sizing: border-box;
+    width: 79%;
+    height: 49%;
+    box-sizing: border-box;
+    border: 2px solid #ccc;
+    float: left;
+    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;
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/events/item-examine-list.vue b/src/views/modules/events/item-examine-list.vue
index da8938a6..0368a1c4 100644
--- a/src/views/modules/events/item-examine-list.vue
+++ b/src/views/modules/events/item-examine-list.vue
@@ -53,10 +53,6 @@
                     <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
@@ -81,13 +77,6 @@
                         align="left"
                         show-overflow-tooltip
                 ></el-table-column>
-<!--                <el-table-column-->
-<!--                        prop="itemCode"-->
-<!--                        label="项目编号"-->
-<!--                        header-align="center"-->
-<!--                        width="150"-->
-<!--                        align="center"-->
-<!--                ></el-table-column>-->
                 <el-table-column
                         prop="nickName"
                         label="提交人"
@@ -110,13 +99,6 @@
                         width="180"
                         align="center"
                 ></el-table-column>
-<!--                <el-table-column-->
-<!--                        prop="mobile"-->
-<!--                        label="提交人手机号"-->
-<!--                        header-align="center"-->
-<!--                        min-width="200"-->
-<!--                        align="center"-->
-<!--                ></el-table-column>-->
                 <el-table-column
                         :label="$t('handle')"
                         fixed="right"
@@ -125,15 +107,7 @@
                         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>-->
-<!--                        <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>-->
+                      <el-button type="text" size="small" @click="dealAction(scope.row.id)" class="custom-table-button-default">{{ '审批' }}</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -147,21 +121,12 @@
                     @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 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: 'ItemExamineList',
@@ -172,7 +137,6 @@ export default {
         getDataListIsPage: true,
         exportURL: '/events/item/unexport'
       },
-      detailVisible: false,
       dataForm: {
         id: '',
         itemState: '0',
@@ -183,13 +147,11 @@ export default {
         gridId: '',
         itemCode: '',
         itemContent: '',
-          userName: '',
+        userName: '',
         mobile: ''
 
       },
-      handleVisible: false,
-      handleDialogVisible: false,
-      handleLogDialogVisible: false,
+      endDialogVisible: false,
       ids: [],
       options: [],
       pickerBeginDateBefore: {
@@ -211,59 +173,17 @@ export default {
     }
   },
   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: {
     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
+      this.$parent.selectComponent = 'ItemExamineDealDetailView'
+      this.$router.push({ path: '/events-item-examine', query: { id: id } })
     },
+
     btKeyUpItemContent (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.itemContent = e.target.value
@@ -271,31 +191,6 @@ export default {
     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()
-      })
     }
   }
 }
diff --git a/src/views/modules/events/item-examine.vue b/src/views/modules/events/item-examine.vue
index 7667e431..2bafc074 100644
--- a/src/views/modules/events/item-examine.vue
+++ b/src/views/modules/events/item-examine.vue
@@ -6,6 +6,7 @@
 
 <script>
 import ItemExamine from './item-examine-list'
+import ItemExamineDealDetailView from './item-examine-detail-view'
 export default {
   data () {
     return {
@@ -13,7 +14,8 @@ export default {
     }
   },
   components: {
-    ItemExamine
+    ItemExamine,
+    ItemExamineDealDetailView
   }
 }
 </script>

From a6349859d6fa49c625c39296721d89d334c74925 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 5 Sep 2022 19:56:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/item-examine-detail-view.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/events/item-examine-detail-view.vue b/src/views/modules/events/item-examine-detail-view.vue
index 86f4e571..e7cb989b 100644
--- a/src/views/modules/events/item-examine-detail-view.vue
+++ b/src/views/modules/events/item-examine-detail-view.vue
@@ -463,8 +463,8 @@ export default {
           type: 'success',
           duration: 500,
           onClose: () => {
-            this.visible = false
-            this.$emit('refreshDataList')
+            // this.visible = false
+            // this.$emit('refreshDataList')
           }
         })
         this.$parent.selectComponent = 'ItemExamine'

From 74055e551dbc36320287d34b3cf6a63fc27e85d2 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 5 Sep 2022 21:29:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/appeal-detail-view.vue     | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/views/modules/events/appeal-detail-view.vue b/src/views/modules/events/appeal-detail-view.vue
index e9752ad2..5d6901ed 100644
--- a/src/views/modules/events/appeal-detail-view.vue
+++ b/src/views/modules/events/appeal-detail-view.vue
@@ -34,6 +34,73 @@
             <el-form-item label="所属类别:" prop="categoryName">
               <div>{{dataForm.categoryName}}</div>
             </el-form-item>
+
+            <el-form-item label="分类:" prop="categoryName">
+              <div>{{dataForm.peopleFlag == '0' ? '民生诉求' : dataForm.peopleFlag == '1' ? '发展诉求' : '执法诉求'}}</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.lawContent" label="诉求详情:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.lawContent}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.hostUnit" label="建议主办单位:" prop="assistUnit">
+              <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="assistUnit">
+              <div>{{dataForm.lawDetail.demand}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.lawType" label="事项类型:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.lawType == '0' ? '计划事项' : '临时事项'}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.isExchange" label="与部门是否沟通:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.isExchange == '0' ? '已经沟通' : '尚未沟通'}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerName" label="召集人姓名:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.convenerName}}</div>
+            </el-form-item>
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerJob" label="召集人职务:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.convenerJob}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.convenerMobile" label="召集人电话:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.convenerMobile}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactName" label="联系人姓名:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.contactName}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactJob" label="联系人职务:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.contactJob}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.contactMobile" label="联系人电话:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.contactMobile}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportTime" label="报到时间:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.reportTime}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.reportAddress" label="报道地点:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.reportAddress}}</div>
+            </el-form-item>
+
+            <el-form-item v-if="dataForm.lawDetail && dataForm.lawDetail.meetingName" label="会议名称:" prop="assistUnit">
+              <div>{{dataForm.lawDetail.meetingName}}</div>
+            </el-form-item>
           </el-form>
           <div class="container">
               <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.issueAddress}}</div>