From b82cf2a0e1c546052c31da7705b0cad89b4a55cb Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 6 Jan 2022 17:28:39 +0800
Subject: [PATCH] 26419

---
 packages/3.0.0/AppReportAiWill/components/Detail.vue    | 8 ++++++--
 packages/3.0.0/AppReportAiWill/components/List.vue      | 3 +--
 packages/3.0.0/AppReportAiWill/components/Setting.vue   | 9 +++++----
 packages/3.0.0/AppVillagerDiscussion/components/Add.vue | 6 ++++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/3.0.0/AppReportAiWill/components/Detail.vue b/packages/3.0.0/AppReportAiWill/components/Detail.vue
index e9bcb7cc..01d2ad69 100644
--- a/packages/3.0.0/AppReportAiWill/components/Detail.vue
+++ b/packages/3.0.0/AppReportAiWill/components/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-detail class="reportAtWillDetail">
+  <ai-detail class="reportAtWillDetail" v-loading="isLoading">
     <template #title>
       <ai-title title="事件详情" isShowBack isShowBottomBorder  @onBackClick="cancel(false)">
         <template #rightBtn>
@@ -168,6 +168,7 @@
           girdMemberName: '',
           name: ''
         },
+        isLoading: true,
         name: '',
         detail: {},
         isShowUser: false,
@@ -188,7 +189,7 @@
           groupId: '',
           groupName: '',
           content: [],
-          eventStatus: ''
+          eventStatus: '2'
         }
       }
     },
@@ -224,7 +225,10 @@
             this.$nextTick(() => {
               this.initMap()
             })
+            this.isLoading = false
           }
+        }).catch(() => {
+          this.isLoading = false
         })
       },
 
diff --git a/packages/3.0.0/AppReportAiWill/components/List.vue b/packages/3.0.0/AppReportAiWill/components/List.vue
index f39449b5..44d53bea 100644
--- a/packages/3.0.0/AppReportAiWill/components/List.vue
+++ b/packages/3.0.0/AppReportAiWill/components/List.vue
@@ -80,8 +80,7 @@
           {prop: 'girdName', label: '所属网格', align: 'center'},
           {prop: 'name', label: '上报居民', align: 'center'},
           {prop: 'phone', label: '联系方式', align: 'center'},
-          {prop: 'handleUserName', label: '处理时长', align: 'center'},
-          {prop: 'handleTime', label: '处理时间', align: 'center'},
+          // {prop: 'handleUserName', label: '处理时长', align: 'center'},
           {slot: 'options'}
         ]
       },
diff --git a/packages/3.0.0/AppReportAiWill/components/Setting.vue b/packages/3.0.0/AppReportAiWill/components/Setting.vue
index 65bc8fdd..56a1195f 100644
--- a/packages/3.0.0/AppReportAiWill/components/Setting.vue
+++ b/packages/3.0.0/AppReportAiWill/components/Setting.vue
@@ -10,14 +10,14 @@
         </template>
         <template slot="right">
           <el-input
-            v-model="search.title"
+            v-model="search.groupName"
             class="search-input"
             size="small"
             @keyup.enter.native="search.current = 1, getList()"
-            placeholder="请输入事件分类"
+            placeholder="请输入事件分组名称"
             clearable
             @change="getList"
-            @clear="search.current = 1, search.title = '', getList()"
+            @clear="search.current = 1, search.groupName = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
@@ -79,7 +79,7 @@
         search: {
           current: 1,
           size: 10,
-          title: ''
+          groupName: ''
         },
         form: {
           groupName: '',
@@ -131,6 +131,7 @@
 
       onClose () {
         this.id = ''
+        this.form.showIndex = ''
         this.form.groupName = ''
       },
 
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/Add.vue b/packages/3.0.0/AppVillagerDiscussion/components/Add.vue
index d348b9dd..75aee348 100644
--- a/packages/3.0.0/AppVillagerDiscussion/components/Add.vue
+++ b/packages/3.0.0/AppVillagerDiscussion/components/Add.vue
@@ -175,6 +175,12 @@
                   item: this.keys[index]
                 }
               })
+
+              for (let v of this.form.voteItems) {
+                if (!v.content) {
+                  return this.$message.error(`请输入选项${v.item}的内容`)
+                }
+              }
             }
 
             this.instance.post(`/app/appvillagediscuss/addOrUpdate`, {