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

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

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)">
         <el-table-column label="与户主关系" slot="householdRelation" align="center" width="120">
           <template v-slot="{row}">
@@ -216,7 +217,7 @@ export default {
       },
       familyPage: {
         current: 1,
-        size: 10,
+        size: 100,
         total: 0
       },
       exportParams: {},

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++
           })

packages/processManagement/mattersConfig/components/applyForm.vue

@@ -278,6 +278,10 @@
                 })
               }
 
+              if (item.fieldDataType === '5') {
+                  item.defaultValue = []
+              }
+
               return {
                 ...item,
                 grid: 1

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) {