From a3b633f510acddc3b19515d20471441b45de9a6d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 5 Jan 2022 17:31:25 +0800
Subject: [PATCH] 26364

---
 .../components/Detail.vue                     |  2 +-
 .../AppReportAiWill/AppReportAtWill.vue       | 51 +++----------------
 .../AppReportAiWill/reportAtWillDetail.vue    |  4 +-
 3 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue b/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
index 1c20f4d2..46383590 100644
--- a/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
+++ b/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
@@ -16,7 +16,7 @@
             <ai-info-item label="议事类型" :value="dict.getLabel('discussType', info.type)" isLine></ai-info-item>
             <ai-info-item label="是否匿名投票" v-if="info.type === '1'" :value="info.anonymous === '1' ? '是' : '否'"></ai-info-item>
             <ai-info-item label="投票方式" v-if="info.type === '1'" :value="info.voteType === '0' ? '单选' : '多选'"></ai-info-item>
-            <ai-info-item label="图片">
+            <ai-info-item label="图片" isLine>
               <ai-uploader
                 :instance="instance"
                 disabled
diff --git a/packages/wechat/AppReportAiWill/AppReportAtWill.vue b/packages/wechat/AppReportAiWill/AppReportAtWill.vue
index 697ea8c7..f4e9c1a7 100644
--- a/packages/wechat/AppReportAiWill/AppReportAtWill.vue
+++ b/packages/wechat/AppReportAiWill/AppReportAtWill.vue
@@ -26,31 +26,19 @@
               @change="page.current = 1, getTableData()">
               <el-option v-for="(op,i) in reportTypeOps" :key="i" v-bind="op"/>
             </el-select>
-            <el-date-picker
-              type="daterange"
-              v-model="search.dateRange"
-              size="small"
-              start-placeholder="上报开始时间"
-              end-placeholder="上报结束时间"
-              clearable
-              value-format="yyyy-MM-dd"
-              @change="page.current = 1, getTableData()"/>
           </template>
           <template #right>
             <el-input
               size="small"
               v-model="search.address"
               clearable suffix-icon="iconfont iconSearch"
-              placeholder="上报人/区域/事件描述"
+              placeholder="内容描述/上报居民/联系方式"
               @keyup.enter.native="page.current = 1, getTableData()"
               @clear="page.current = 1, getTableData(), search.address = ''" />
           </template>
         </ai-search-bar>
         
         <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getTableData">
-          <el-table-column slot="integral" label="信用积分" width="100" align="center">
-            <div class="table-options" slot-scope="{row}">{{ row.integral > 0 ? '+' + row.integral : row.integral }}</div>
-          </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" width="140" align="center">
             <div class="table-options" slot-scope="{row}">
               <el-button
@@ -118,37 +106,15 @@
     computed: {
       ...mapState(['user']),
       colConfigs() {
-        let _ = this
         return [
-          {prop: 'areaName', label: '区域'},
-          {
-            prop: 'reportType', label: '类型', render(h, {row}) {
-              return h('span', null, _.dict.getLabel("atWillReportType", row.reportType))
-            }
-          },
-          {prop: 'nickName', label: '上报人'},
-          {prop: 'explain', label: '事件描述'},
-          {prop: 'phone', label: '联系方式'},
-          {prop: 'createTime', label: '上报时间'},
-          {prop: 'handleUserName', label: '处理人'},
-          {
-            prop: 'status', label: '处理状态', render(h, {row}) {
-              return h('span', null, _.dict.getLabel("reportAtWillHandleStatus", row.status))
-            }
-          },
+          {prop: 'areaName', label: '上报时间'},
+          {prop: 'reportType', label: '内容描述' },
+          {prop: 'nickName', label: '事件类型'},
+          {prop: 'explain', label: '所属网格'},
+          {prop: 'phone', label: '上报居民'},
+          {prop: 'createTime', label: '联系方式'},
+          {prop: 'handleUserName', label: '处理时长'},
           {prop: 'handleTime', label: '处理时间'},
-          {
-            prop: 'publicityStatus',
-            label: '公示状态',
-            fixed: 'right',
-            align: 'center',
-            render: (h, { row }) => h('span',
-              {
-                style: {color: this.dict.getColor("reportAtWillPublicityStatus", row.publicityStatus)
-              }
-            }, this.dict.getLabel("reportAtWillPublicityStatus", row.publicityStatus))
-          },
-          {slot: 'integral'},
           {slot: 'options'}
         ]
       },
@@ -167,7 +133,6 @@
       this.areaId = this.user.info.areaId
       this.dict.load("reportAtWillPublicityStatus", "reportAtWillHandleStatus", "atWillReportType")
       this.getTableData()
-      // this.$route.query.id && this.showDetail(this.$route.query)
     },
 
     methods: {
diff --git a/packages/wechat/AppReportAiWill/reportAtWillDetail.vue b/packages/wechat/AppReportAiWill/reportAtWillDetail.vue
index 616762cc..27fded41 100644
--- a/packages/wechat/AppReportAiWill/reportAtWillDetail.vue
+++ b/packages/wechat/AppReportAiWill/reportAtWillDetail.vue
@@ -1,14 +1,12 @@
 <template>
   <section class="reportAtWillDetail">
     <ai-detail>
-
       <template #title>
         <ai-title
           title="事件详情"
           isShowBack
           isShowBottomBorder
-          @onBackClick="$emit('back')"
-        >
+          @onBackClick="$emit('back')">
           <template #rightBtn>
             <template v-if="hasHandled">
               <el-button