From 6ad5a6a070998eebca353e44b80677a5cee1bb9a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 09:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E7=90=86=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppHelpDeclaration/details.vue |  2 +-
 src/apps/AppHelpDeclaration/list.vue    | 32 ++++++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index c415547b..a6eb1013 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -53,7 +53,7 @@
       <div class="plan">
         <div class="nav">
           <span>办理进度</span>
-          <span> ({{ $dict.getLabel('clapEventStatus', data.eventStatus) }})</span>
+          <span> ({{ $dict.getLabel('helpDeclarationStatus', data.status) }})</span>
         </div>
 
         <div class="cards" v-for="(item, index) in data.processList" :key="index">
diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue
index d77fbb3e..1e521853 100644
--- a/src/apps/AppHelpDeclaration/list.vue
+++ b/src/apps/AppHelpDeclaration/list.vue
@@ -5,24 +5,24 @@
         <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
       </div>
       <div class="select-box">
-        <div class="left">
+        <div class="left" style="display: flex;">
           <!--  :areaId="user.areaId" @select="areaSelect" select-root -->
           <AiAreaPicker v-model="areaId" :name.sync="areaName" >
-            <div style="display: flex;">
+            <div>
               <span v-if="areaName" style="color:#333;fontSize: 14px;" class="areaName">{{ areaName }}</span>
               <span v-else style="color: #999;fontSize: 14px;" class="areaName">所在地区</span>
-              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
-              <u-icon name="close-circle" v-if="areaId" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
+              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect(e)"></u-icon>
             </div>
           </AiAreaPicker>
+          <u-icon name="close-circle" v-if="areaId" @click="clearArea" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
         </div>
-        <div class="right">
-          <AiSelect dict="helpDeclarationReason" v-model="declareReason">
+        <div class="right" style="display: flex;">
+          <AiSelect dict="helpDeclarationReason" v-model="declareReason" >
             <span v-if="!declareReason" style="color: #999;">风险类型</span>
             <span v-else>{{ $dict.getLabel('helpDeclarationReason', declareReason) }}</span>
             <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
-            <u-icon name="close-circle" v-if="declareReason" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
           </AiSelect>
+          <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24" style="margin-left: 4px;width: 14px;"></u-icon>
         </div>
       </div>
     </AiTopFixed>
@@ -57,11 +57,11 @@ export default {
     return {
       tabs: ['全部待办','办理历史'],
       tabIndex: 0,
-      list: [],
       current: 1,
       areaId: '',
       areaName: '',
       declareReason: '',
+      list: [],
     }
   },
   onShow() {
@@ -80,12 +80,26 @@ export default {
       this.getList()
     },
 
+    clearArea() {
+      this.declareReason = '',
+      this.current = 1,
+      this.list = [],
+      this.getList()
+    },
+
+    clearReason() {
+      this.areaId = '',
+      this.current = 1,
+      this.list = [],
+      this.getList()
+    },
+
     getList() {
       this.$http.post('/app/apphelpdeclarationinfo/listByEw',null,{
         params: {
           current: this.current,
-          areaId: this.areaId,
           searchType: this.tabIndex,
+          areaId: this.areaId,
           declareReason: this.declareReason  // 风险类型
         }
       }).then((res) => {