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'] 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 @@ @@ -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 @@
走访人员: - +
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 @@
{{ e.name }}
-
{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}
+
{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}