Merge remote-tracking branch 'origin/dev' into dev

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

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']

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', () => {

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">

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>