From 40f8cf498488007d72bcbb3fffba2800c3bd2994 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 25 Feb 2022 14:31:19 +0800 Subject: [PATCH 1/5] 27622 --- .../processManagement/mattersConfig/components/applyForm.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/processManagement/mattersConfig/components/applyForm.vue b/packages/processManagement/mattersConfig/components/applyForm.vue index a37e4723..2ecf7166 100644 --- a/packages/processManagement/mattersConfig/components/applyForm.vue +++ b/packages/processManagement/mattersConfig/components/applyForm.vue @@ -278,6 +278,10 @@ }) } + if (item.fieldDataType === '5') { + item.defaultValue = [] + } + return { ...item, grid: 1 From 769e12aac186607b7d867ae4660b2cef788759a2 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 25 Feb 2022 14:33:10 +0800 Subject: [PATCH 2/5] 27653 --- .../processManagement/mattersConfig/components/addConfig.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/processManagement/mattersConfig/components/addConfig.vue b/packages/processManagement/mattersConfig/components/addConfig.vue index 037d9f3c..0a565652 100644 --- a/packages/processManagement/mattersConfig/components/addConfig.vue +++ b/packages/processManagement/mattersConfig/components/addConfig.vue @@ -90,6 +90,9 @@ export default { break case 1: this.$refs['applyForm'].onConfirm().then(res => { + if (!res.length) { + return this.$message.error('表单配置不能为空') + } this.tableFieldInfos = res this.activeStep++ }) From c5fa3901e14d9602e7ca7bba57b6b29364a39af6 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 25 Feb 2022 14:35:48 +0800 Subject: [PATCH 3/5] 27582 --- project/shandong10086/apps/shandong/AppResident/auditList.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/shandong10086/apps/shandong/AppResident/auditList.vue b/project/shandong10086/apps/shandong/AppResident/auditList.vue index c4433de6..b7c2a87d 100644 --- a/project/shandong10086/apps/shandong/AppResident/auditList.vue +++ b/project/shandong10086/apps/shandong/AppResident/auditList.vue @@ -149,7 +149,8 @@ this.instance.post(`/app/appresident/list`, null, { params: { ...this.search, - areaId: this.areaId + areaId: this.areaId, + source: 1 } }).then(res => { if (res.code == 0) { From 845019c1c3cbf3313ab15f3ea15f7d4be057564d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 25 Feb 2022 14:38:38 +0800 Subject: [PATCH 4/5] 27681 --- packages/3.0.0/AppConvenienceAddressBook/components/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue index 71d68325..4a48d8f4 100644 --- a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue +++ b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue @@ -51,7 +51,7 @@ class="search-input" size="small" @keyup.enter.native="search.current = 1, getList()" - placeholder="请输入名称/电话" + placeholder="请输入名称/电话/类型" clearable @change="getList" @clear="search.current = 1, search.name = '', getList()" From cbc608e3dd7f31bbbdc16854da976977bf31baee Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 25 Feb 2022 14:40:28 +0800 Subject: [PATCH 5/5] 27707 --- packages/creditScore/scoreFamily/AppScoreFamily.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/creditScore/scoreFamily/AppScoreFamily.vue b/packages/creditScore/scoreFamily/AppScoreFamily.vue index ef40f0f8..a05b20ab 100644 --- a/packages/creditScore/scoreFamily/AppScoreFamily.vue +++ b/packages/creditScore/scoreFamily/AppScoreFamily.vue @@ -146,6 +146,7 @@ :total="familyPage.total" :current.sync="familyPage.current" :size.sync="familyPage.size" + :isShowPagination="false" @getList="familyMember(rowInfo)">