From 2e9f8da160ad58d0d3974c96349c2d60f78fbed0 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 15:41:08 +0800
Subject: [PATCH 01/14] 29740

---
 src/apps/AppHelpDeclaration/details.vue |  2 +-
 src/apps/AppHelpDeclaration/list.vue    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index 1f9a42a6..1fdd9f62 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -38,7 +38,7 @@
       </div>
       <div class="item">
         <label>所在地区</label>
-        <div>{{ data.areaName }}</div>
+        <div>{{ data.areaName }}{{ data.address }}</div>
       </div>
       <div class="items" v-if="data.files && data.files.length">
         <p>照片</p>
diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue
index 45f4e7e1..0a12abcd 100644
--- a/src/apps/AppHelpDeclaration/list.vue
+++ b/src/apps/AppHelpDeclaration/list.vue
@@ -13,16 +13,14 @@
               <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"></u-icon>
         </div>
         <div class="right">
-          <AiSelect dict="helpDeclarationReason" v-model="declareReason">
+          <AiSelect v-model="declareReason" :list="riskList">
             <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" @click="clearReason" color="#999" size="24"></u-icon>
           </AiSelect>
-          <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon>
-          <!-- style="margin-left: 4px;width: 14px; display:inline-block;" -->
         </div>
       </div>
     </AiTopFixed>
@@ -63,6 +61,7 @@ export default {
       areaName: '',
       declareReason: '',
       list: [],
+      riskList: [],
     }
   },
   computed: {
@@ -70,6 +69,11 @@ export default {
   },
   onShow() {
     this.$dict.load('helpDeclarationStatus').then(() => {
+      this.riskList = this.$dict.getDict('helpDeclarationReason').map((item) => ({
+        label: item.dictName,
+        value: item.dictValue
+      }))
+      this.riskList.unshift({label: "全部", value: ""})
       uni.$on('update', () => {
         this.getList()
       })

From 51a91e49e06d6a3099a3de1bff26a1775ac290bf Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 15:42:17 +0800
Subject: [PATCH 02/14] 29732

---
 src/apps/AppHelpDeclaration/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index 1fdd9f62..a0740cf7 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -91,7 +91,7 @@
       </div>
     </div>
 
-    <div class="fixedBtn" v-if="data.status == 0">
+    <div class="fixedBtn" v-if="data.status == 0 || data.status == 1">
       <div class="status00">
         <div class="columns" @click="toContent(1)">
           <span class="hint">转交事件</span>

From 0c513e498052e12a36b3e7b8358be550fe6d3849 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 15:54:51 +0800
Subject: [PATCH 03/14] 29723

---
 src/apps/AppHelpDeclaration/add.vue    | 11 ++++++-----
 src/apps/AppHelpDeclaration/result.vue |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/add.vue b/src/apps/AppHelpDeclaration/add.vue
index 25a9a06e..c69e50f0 100644
--- a/src/apps/AppHelpDeclaration/add.vue
+++ b/src/apps/AppHelpDeclaration/add.vue
@@ -12,13 +12,13 @@
         <div class="left">
           <span>*</span><span>申请人身份证号</span>
         </div>
-        <input type="number" class="right__text" v-model="form.idNumber" placeholder="请输入" maxlength="20"/>
+        <input type="text" class="right__text" v-model="form.idNumber" placeholder="请输入" maxlength="18"/>
       </div>
       <div class="item">
         <div class="left">
           <span>*</span><span>联系方式</span>
         </div>
-        <input type="number" class="right__text" v-model="form.phone" placeholder="请输入" maxlength="11"/>
+        <input type="tel" class="right__text" v-model="form.phone" placeholder="请输入" maxlength="11"/>
       </div>
     </div>
 
@@ -27,7 +27,7 @@
         <div class="left">
           <span>*</span><span>家庭人口数</span>
         </div>
-        <input type="number" class="right__text" v-model="form.householdNumber" placeholder="请输入" maxlength="10"/>
+        <input type="tel" class="right__text" v-model="form.householdNumber" placeholder="请输入" maxlength="10"/>
       </div>
       <div class="item">
         <div class="left">
@@ -56,7 +56,7 @@
         <div class="left">
           <span>*</span><span>返贫致贫风险说明</span>
         </div>
-        <input type="text" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险说明" maxlength="200"/>
+        <input type="text" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险" maxlength="200"/>
       </div>
       <div class="items">
         <div class="left">
@@ -76,6 +76,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   data() {
     return {
@@ -154,7 +155,7 @@ export default {
         }
       }
       if(!this.form.riskDescription) {
-        return this.$u.toast('请输入帮扶原因说明')
+        return this.$u.toast('请输入返贫致贫风险说明')
       }
 
       this.flag = true
diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue
index d67f92d7..bc077693 100644
--- a/src/apps/AppHelpDeclaration/result.vue
+++ b/src/apps/AppHelpDeclaration/result.vue
@@ -4,7 +4,7 @@
     <div class="type">
       <div class="left">
         <span>*</span>
-        <span v-if="status == 1">处理意见</span>
+        <span v-if="status == 1">转交给</span>
         <span v-if="status == 2">处理结果</span>
       </div>
       <div class="right">

From 2539690fbb8137e0d5bbc7b8738e26326dbc60c2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:02:40 +0800
Subject: [PATCH 04/14] 29731

---
 src/apps/AppHelpDeclaration/add.vue     | 4 ++++
 src/apps/AppHelpDeclaration/details.vue | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/add.vue b/src/apps/AppHelpDeclaration/add.vue
index c69e50f0..0184643d 100644
--- a/src/apps/AppHelpDeclaration/add.vue
+++ b/src/apps/AppHelpDeclaration/add.vue
@@ -110,6 +110,10 @@ export default {
     })
   },
 
+  computed: {
+    ...mapState(['user'])
+  },
+
   onShow() {
     document.title = '添加帮扶申报'
   },
diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index a0740cf7..83aeece5 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -30,7 +30,7 @@
       </div>
       <div class="item">
         <label>申报方式</label>
-        <div>自主申报</div>
+        <div>{{ $dict.getLabel('helpDeclarationType',data.declareType) }}</div>
       </div>
       <div class="item">
         <label>身份证号</label>
@@ -115,7 +115,7 @@ export default {
     }
   },
   onLoad(o) {
-    this.$dict.load('helpDeclarationStatus')
+    this.$dict.load('helpDeclarationStatus','helpDeclarationType')
     if (o.id) {
       this.id = o.id
       this.getDetail()

From d6550ddca67dc0aa68d3f07e01d72b12b6f8287a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:07:29 +0800
Subject: [PATCH 05/14] 29725

---
 src/apps/AppHelpDeclaration/result.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue
index bc077693..d6a318b2 100644
--- a/src/apps/AppHelpDeclaration/result.vue
+++ b/src/apps/AppHelpDeclaration/result.vue
@@ -23,10 +23,10 @@
 
     <div class="remark">
       <div class="top">
-        <span style="margin-right: 8px;"></span><span>办理意见</span>
+        <span>*</span><span>办理意见</span>
       </div>
       <div class="bottom">
-        <u-input type="textarea" v-model="description" placeholder="请写下你的办理意见" maxlength="500" height="200"/>
+        <u-input type="textarea" v-model="description" placeholder="请写下你的办理意见" maxlength="100" height="200" />
       </div>
     </div>
 
@@ -86,7 +86,10 @@ export default {
         if(!this.auditStatus) {
           return this.$u.toast('请选择处理结果')
         }
-      } 
+      }
+      if (!this.description) {
+        return this.$u.toast('请输入办理意见')
+      }
 
       let url = ''
       let form = {}
@@ -122,7 +125,7 @@ export default {
     }
   },
   onShow() {
-    document.title = this.checkType == 1? "处理意见":this.checkType == 2? "处理结果": ''
+    document.title = this.status == 1? "转交": "审核处理"
   }
 }
 </script>

From a36f69f1d412a81185da8be136aa96e22e703f6d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:10:00 +0800
Subject: [PATCH 06/14] 29734

---
 src/apps/AppHelpDeclaration/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue
index 0a12abcd..a4d2ad44 100644
--- a/src/apps/AppHelpDeclaration/list.vue
+++ b/src/apps/AppHelpDeclaration/list.vue
@@ -19,7 +19,7 @@
             <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" @click="clearReason" color="#999" size="24"></u-icon>
+            <!-- <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon> -->
           </AiSelect>
         </div>
       </div>

From 99fd9b4cddfe1fa9b6aad5330c4eda85c7bc01e7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:11:18 +0800
Subject: [PATCH 07/14] 29726

---
 src/apps/AppHelpDeclaration/result.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue
index d6a318b2..e654ee07 100644
--- a/src/apps/AppHelpDeclaration/result.vue
+++ b/src/apps/AppHelpDeclaration/result.vue
@@ -32,7 +32,7 @@
 
     <div class="picture">
       <div class="top">
-        <span style="margin-right: 8px"></span><span>图片上传<span style="color: #999;font-size:14px;">最多9张</span></span>
+        <span style="margin-right: 8px"></span><span>图片上传<span style="color: #999;font-size:14px;">(最多9张)</span></span>
       </div>
       <div class="bottom">
         <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>

From dc3f0129358fa7529a7269739d22f362f0a94a4e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:14:21 +0800
Subject: [PATCH 08/14] 29730

---
 src/apps/AppHelpDeclaration/add.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppHelpDeclaration/add.vue b/src/apps/AppHelpDeclaration/add.vue
index 0184643d..12878d04 100644
--- a/src/apps/AppHelpDeclaration/add.vue
+++ b/src/apps/AppHelpDeclaration/add.vue
@@ -56,7 +56,8 @@
         <div class="left">
           <span>*</span><span>返贫致贫风险说明</span>
         </div>
-        <input type="text" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险" maxlength="200"/>
+        <u-input type="textarea" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险"
+         placeholder-style="font-size: 14px;color: #999;" maxlength="500" auto-height/>
       </div>
       <div class="items">
         <div class="left">

From 4f1640637388a0efb57a09e61f765fc172e63bf3 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:21:11 +0800
Subject: [PATCH 09/14] 29749

---
 src/apps/AppHelpDeclaration/list.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue
index a4d2ad44..9164b9d6 100644
--- a/src/apps/AppHelpDeclaration/list.vue
+++ b/src/apps/AppHelpDeclaration/list.vue
@@ -15,7 +15,7 @@
           </AiAreaPicker>
         </div>
         <div class="right">
-          <AiSelect v-model="declareReason" :list="riskList">
+          <AiSelect v-model="declareReason" :list="riskList" @data="typeSelect">
             <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>
@@ -89,13 +89,19 @@ export default {
     },
 
     areaSelect(e) {
-      console.log(e);
       this.areaId =e
       this.$nextTick(() => {
         this.getList()
       })
     },
 
+    typeSelect(e) {
+      this.declareReason = e[0].value
+      this.current = 1,
+      this.list = [],
+      this.getList()
+    },
+
     clearArea() {
       this.areaId = '',
       this.areaName = '',

From b694a82eef334d7bf1d2a259de7e952216d6440c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:37:29 +0800
Subject: [PATCH 10/14] 119789

---
 src/apps/AppHelpDeclaration/list.vue | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue
index 9164b9d6..4c5b75ec 100644
--- a/src/apps/AppHelpDeclaration/list.vue
+++ b/src/apps/AppHelpDeclaration/list.vue
@@ -29,7 +29,10 @@
         <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
           <div class="top">
             <div class="title">{{ item.riskDescription }}</div>
-            <div class="time">{{ item.declareTime }}</div>
+
+            <div class="info"><span>申请人姓名</span><span>{{ item.createUserName }}</span></div>
+            <div class="info"><span>所在地区</span><span>{{ item.areaName }}{{ item.address }}</span></div>
+            <div class="info"><span>风险类型</span><span>{{ item.reason }}</span></div>
           </div>
           <div class="bottom">
             <span :style="{background: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}"></span>
@@ -231,11 +234,22 @@ export default {
           display:-webkit-box;
           -webkit-box-orient:vertical;
           -webkit-line-clamp:2;
+          margin-bottom: 24px;
         }
-        .time {
-          margin-top: 32px;
-          color: #999999;
-          font-size: 26px;
+        .info {
+          span:first-child {
+            color: #999999;
+            font-size: 26px;
+            display: inline-block;
+            width: 160px;
+          }
+          span:last-child {
+            display: inline-block;
+            width: calc(100% - 160px);
+            overflow:hidden; 
+            text-overflow:ellipsis;
+            white-space:nowrap;
+          }
         }
       }
       .bottom {

From 2f0a5c550fff5d934b120985600386fa28a033ea Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:44:50 +0800
Subject: [PATCH 11/14] 29727

---
 src/apps/AppHelpDeclaration/details.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index 83aeece5..6303d801 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -232,6 +232,13 @@ export default {
       div {
         margin-top: 32px;
       }
+      .picture {
+        img {
+          width: 200px;
+          height: 200px;
+          margin-right: 10px;
+        }
+      }
     }
     .status0 {
       color: #FF883C

From 031753b30b8f5b277b55bab03ee745c5e7046ef9 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:47:33 +0800
Subject: [PATCH 12/14] 119815

---
 src/apps/AppHelpDeclaration/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index 6303d801..f729d5a5 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -70,7 +70,7 @@
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
                   <span>{{ item.description }}</span>
-                  <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
+                  <div :style="{color: data.status == 0? '#FF883C':data.status == 1? '#1AAAFF': data.status==2? '#FF4466': '#42D784'}" style="font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('helpDeclarationStatus', item.status) }}
                   </div>
                 </div>

From 4cb6e27966bee86699e5cdfe9c7e11b8e771b3a5 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:54:32 +0800
Subject: [PATCH 13/14] 29750

---
 src/apps/AppHelpDeclaration/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index f729d5a5..77f96c36 100644
--- a/src/apps/AppHelpDeclaration/details.vue
+++ b/src/apps/AppHelpDeclaration/details.vue
@@ -85,7 +85,7 @@
           <div class="cardes-msg-top" v-if="item.doExplain">{{ item.doExplain }}</div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index"  @click="previewImage(item.files, e.url)" />
+            <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index"  @click="preview(item.files, e.url)" />
           </div>
         </div>
       </div>

From b9d0c8f323e69acf1a69ab9fe9cc886d50fc9833 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 20 May 2022 16:58:02 +0800
Subject: [PATCH 14/14] 29754

---
 src/apps/AppHelpDeclaration/details.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue
index 77f96c36..0eda2b81 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('helpDeclarationStatus', data.status) }})</span>
+          <span style="color: #999;"> ({{ $dict.getLabel('helpDeclarationStatus', data.status) }})</span>
         </div>
 
         <div class="cards" v-for="(item, index) in data.processList" :key="index">
@@ -70,7 +70,7 @@
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
                   <span>{{ item.description }}</span>
-                  <div :style="{color: data.status == 0? '#FF883C':data.status == 1? '#1AAAFF': data.status==2? '#FF4466': '#42D784'}" style="font-size: 16px; margin-top: 5px">
+                  <div :style="{color: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}" style="font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('helpDeclarationStatus', item.status) }}
                   </div>
                 </div>