From f348dbdc3dc116ffcd85533204136423792cf766 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 11 Feb 2022 18:05:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=B8=E9=87=91=E9=B9=8F=E7=9A=84?=
 =?UTF-8?q?=E5=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppWalkask/AppWalkask.vue | 6 +++---
 src/saas/AppWalkask/detail.vue     | 2 +-
 src/saas/AppWalkask/selectType.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/saas/AppWalkask/AppWalkask.vue b/src/saas/AppWalkask/AppWalkask.vue
index f6ef1f10..c8c75b18 100644
--- a/src/saas/AppWalkask/AppWalkask.vue
+++ b/src/saas/AppWalkask/AppWalkask.vue
@@ -16,7 +16,7 @@
               <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.name }}</span>
-                  <span class="tags" v-if="item.menuLevel3Name">{{ item.menuLevel3Name }}</span>
+                  <span class="tags" v-if="item.applicationId">{{ $dict.getLabel('appSpecialTypeFive', item.applicationId) }}</span>
                   <span class="tags" v-if="item.reality">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
                 </div>
 
@@ -27,7 +27,7 @@
                 </div>
 
                 <div class="cards-bottom">
-                  <span>走访人：<AiOpenData v-if="user.createUserName" type="userName" :openid="user.createUserName" /></span>
+                  <span>走访人：<AiOpenData v-if="item.createUserName" type="userName" :openid="item.createUserName" style="display:inline-block;" /></span>
                   <span style="margin-left: 8px">{{ item.createTime }}</span>
                 </div>
               </template>
@@ -102,7 +102,7 @@ export default {
   onLoad() {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
-    this.$dict.load('realityStatus').then(() => {
+    this.$dict.load('realityStatus', 'appSpecialTypeFive').then(() => {
       this.getList()
     })
     uni.$on('updateList', () => {
diff --git a/src/saas/AppWalkask/detail.vue b/src/saas/AppWalkask/detail.vue
index 167cf8cd..67110d8c 100644
--- a/src/saas/AppWalkask/detail.vue
+++ b/src/saas/AppWalkask/detail.vue
@@ -19,7 +19,7 @@
 
       <div class="walk-item">
         <span>走访人员：</span>
-        <span><AiOpenData v-if="data.createUserName" type="userName" :openid="data.createUserName" /></span>
+        <span><AiOpenData v-if="data.createUserName" type="userName" :openid="data.createUserName" style="display:inline-block;" /></span>
       </div>
 
       <div class="walk-item">
diff --git a/src/saas/AppWalkask/selectType.vue b/src/saas/AppWalkask/selectType.vue
index bb8d02a1..69610084 100644
--- a/src/saas/AppWalkask/selectType.vue
+++ b/src/saas/AppWalkask/selectType.vue
@@ -40,7 +40,7 @@
 
             <div class="rights">
               <div class="applicationNames">{{ e.name }}</div>
-              <div class="idNumbers">{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}</div>
+              <div class="idNumbers">{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</div>
             </div>
           </div>
         </div>

From 36488afc784ad1f506511a1f7b961503c3bd0fcd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 11 Feb 2022 18:10:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=94=B6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppConflictMediation/Content.vue | 1 +
 src/saas/AppSpecialPeople/add.vue         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index 9e39f26d..bba0dcfe 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -67,6 +67,7 @@ export default {
     this.forms.groupName = option.groupName
     this.typeList()
     uni.$on('goback', (res) => {
+      console.log(res);
       this.selectUser = res
       if(res.name) {
         this.forms.name = res.name
diff --git a/src/saas/AppSpecialPeople/add.vue b/src/saas/AppSpecialPeople/add.vue
index e2525f46..33d466ec 100644
--- a/src/saas/AppSpecialPeople/add.vue
+++ b/src/saas/AppSpecialPeople/add.vue
@@ -495,6 +495,11 @@ export default {
       if (!this.form.areaName) {
         return this.$u.toast('请选择区域')
       }
+      if (this.form.userType == 1) {
+        if (!/^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/.test(this.form.income)){
+          return this.$u.toast('输入的数字不能超过10万')
+        }
+      }
 
       var urlList = ['app/appspecialdisabled/addOrUpdate', 'app/appspecialmental/addOrUpdate', 'app/appspecialadjustment/addOrUpdate',
         'app/appspecialdrug/addOrUpdate','app/appspecialprison/addOrUpdate']