Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/saber-community into master

src/components/houseuser/houseuser-check.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <avue-form :option="option" v-model="reviewDetail">
+    <avue-form :option="option" v-model="reviewDetail" ref="form">
     </avue-form>
     <div v-if="reviewType">
       <el-row>
@@ -31,210 +31,179 @@ export default {
         menuBtn: false,
         column: [
           {
-            label: "住户名字",
+            label: "住户姓名",
             prop: "name",
             disabled: true,
-            search: true,
-            rules: [{
-              required: true,
-              message: "请输入住户名字",
-              trigger: "blur"
-            }]
           },
           {
             label: "性别",
             prop: "sex",
-            width: 80,
+            type: "select",
+            dataType: "string",
             disabled: true,
-            dataType: 'number',
-            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
-            // props: {
-            //   label: "dictValue",
-            //   value: "dictKey"
-            // },
-            dicData:[
-              {
-                label: '未定义',
-                value: 0
-              },{
-                label: '男',
-                value: 1
-              },{
-                label: '女',
-                value: 2
-              }
-            ],
-            rules: [{
-              required: true,
-              message: "请输入性别  0-未定义  1-男 2-女",
-              trigger: "blur"
-            }]
+            hide: true,
+            width: 80,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
           },
           {
             label: "住户类型",
             prop: "type",
+            type: "select",
+            dataType: "string",
             disabled: true,
-            dataType: 'number',
+            hide: true,
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=household-type",
             props: {
               label: "dictValue",
               value: "dictKey"
             },
-            rules: [{
-              required: true,
-              message: "请输入住户类型 0-业主 1-成员 2-租户",
-              trigger: "blur"
-            }]
           },
           {
             label: "身份证",
             prop: "idCard",
             width: 150,
             disabled: true,
-            search: true,
-            rules: [{
-              required: true,
-              message: "请输入居民身份证",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属小区",
-            prop: "residentialId",
-            type: "select",
-            disabled: true,
-            search: true,
-            cascaderItem: ['buildingId'],
-            dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            // dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: true,
-              message: "请输入所属小区id",
-              trigger: "blur"
-            }]
           },
           {
             label: "小区名称",
             prop: "residentialName",
-            display: false,
-            hide: true,
-            rules: [{
-              required: true,
-              message: "请输入小区名称",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属楼栋",
-            prop: "buildingId",
-            type: "select",
+            editDisplay: false,
+            addDisplay: false,
             disabled: true,
-            search: true,
-            cascaderItem: ['unitId'],
-            dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: false,
-              message: "请输入楼栋id",
-              trigger: "blur"
-            }]
+            hide: true,
           },
+          // {
+          //   label: "所属小区",
+          //   prop: "residentialId",
+          //   type: "select",
+          //   disabled: true,
+          //   cascaderItem: ['buildingId'],
+          //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
+          //   dicFormatter:(res)=>{
+          //     return res.data.records;//返回字典的层级结构
+          //   },
+          //   // dicFlag: false,
+          //   filterable: true,
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入所属小区id",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "小区名称",
+          //   prop: "residentialName",
+          //   display: false,
+          //   hide: true,
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入小区名称",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "所属楼栋",
+          //   prop: "buildingId",
+          //   type: "select",
+          //   disabled: true,
+          //   search: true,
+          //   cascaderItem: ['unitId'],
+          //   dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
+          //   dicFormatter:(res)=>{
+          //     return res.data.records;//返回字典的层级结构
+          //   },
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请输入楼栋id",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: "楼栋名称",
             prop: "buildingName",
-            display: false,
-            hide: true,
-            rules: [{
-              required: true,
-              message: "请输入楼栋名称",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属单元",
-            prop: "unitId",
-            type: "select",
+            editDisplay: false,
+            addDisplay: false,
             disabled: true,
-            search: true,
-            cascaderItem: ['floorId'],
-            dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            dicFlag: false,
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: false,
-              message: "请输入所属单元id",
-              trigger: "blur"
-            }]
+            hide: true,
           },
+          // {
+          //   label: "所属单元",
+          //   prop: "unitId",
+          //   type: "select",
+          //   disabled: true,
+          //   search: true,
+          //   cascaderItem: ['floorId'],
+          //   dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
+          //   dicFormatter:(res)=>{
+          //     return res.data.records;//返回字典的层级结构
+          //   },
+          //   dicFlag: false,
+          //   filterable: true,
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请输入所属单元id",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: "单元名称",
             prop: "unitName",
-            display: false,
-            hide: true,
-            rules: [{
-              required: true,
-              message: "请输入单元名称",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "所属房间",
-            prop: "roomId",
-            type: "select",
+            editDisplay: false,
+            addDisplay: false,
             disabled: true,
-            search: true,
-            dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
-            dicFormatter:(res)=>{
-              return res.data.records;//返回字典的层级结构
-            },
-            filterable: true,
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: false,
-              message: "请输入所属房间id",
-              trigger: "blur"
-            }]
+            hide: true,
           },
+          // {
+          //   label: "所属房间",
+          //   prop: "roomId",
+          //   type: "select",
+          //   disabled: true,
+          //   search: true,
+          //   dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
+          //   dicFormatter:(res)=>{
+          //     return res.data.records;//返回字典的层级结构
+          //   },
+          //   filterable: true,
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请输入所属房间id",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
-            label: "所属房间名称",
+            label: "房间名称",
             prop: "roomName",
-            display: false,
+            editDisplay: false,
+            addDisplay: false,
+            disabled: true,
             hide: true,
-            rules: [{
-              required: true,
-              message: "请输入所属房间名称",
-              trigger: "blur"
-            }]
           },
           {
             label: "联系电话",
             prop: "tel",
+            editDisplay: false,
+            addDisplay: false,
             disabled: true,
-            search: true,
             rules: [{
               required: true,
               message: "请输入联系电话",
@@ -246,15 +215,10 @@ export default {
           {
             label: "审核状态",
             prop: "checkState",
-            search: true,
-            disabled: true,
             slot: true,
             type: 'select',
+            disabled: !this.reviewType,
             dicData:[
-              {
-                label: '未上传',
-                value: -1
-              },
               {
                 label: '待审核',
                 value: 0
@@ -266,11 +230,6 @@ export default {
                 value: 2
               }
             ],
-            rules: [{
-              required: true,
-              message: "请输入申请记录审核状态：-1：未上传，0-待审核 1-审核通过 2-审核不通过",
-              trigger: "blur"
-            }]
           },
           {
             label: "护照照片",
@@ -285,11 +244,6 @@ export default {
             },
             action: "/api/blade-resource/oss/endpoint/put-file",
             tip: '只能生产jpg/png图片，且不超过500kb',
-            rules: [{
-              required: false,
-              message: "请输入护照照片url（没有域名，nationality = 3时,国籍为海外）",
-              trigger: "blur"
-            }]
           },
           {
             label: "入境证明",
@@ -304,11 +258,6 @@ export default {
             },
             action: "/api/blade-resource/oss/endpoint/put-file",
             tip: '只能生产jpg/png图片，且不超过500kb',
-            rules: [{
-              required: false,
-              message: "请输入入境证明url（没有域名，nationality = 3时,国籍为海外）",
-              trigger: "blur"
-            }]
           },
           {
             label: "人脸图片uri",
@@ -324,11 +273,6 @@ export default {
             },
             action: "/api/blade-resource/oss/endpoint/put-file",
             tip: '只能生产jpg/png图片，且不超过500kb',
-            rules: [{
-              required: false,
-              message: "请输入人脸图片uri",
-              trigger: "blur"
-            }]
           },
           {
             label: "审核意见",

src/components/person-tags/adolescent-form.vue

@@ -222,6 +222,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/aids-form.vue

@@ -222,6 +222,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/allowancespeople-form.vue

@@ -222,6 +222,9 @@
                   },{
                     validator: validatePhone,
                     trigger: "blur"
+                  },{
+                    validator: validatePhone,
+                    trigger: "blur"
                   }]
                 },
                 {

src/components/person-tags/basicinfo-add.vue

@@ -10,6 +10,7 @@
 <script>
   import {add as addDisabler} from "@/api/person/disabler";
   import {update,add} from "@/api/person/basicinfo";
+  import {validatePhone} from "../../util/validator";
     export default {
       name: "basicinfo-add",
       data() {
@@ -217,6 +218,9 @@
                   required: true,
                   message: "请输入手机号码",
                   trigger: "blur"
+                },{
+                  validator: validatePhone,
+                  trigger: "blur"
                 }]
               },
               {

src/components/person-tags/correctionalStaff-form.vue

@@ -220,6 +220,9 @@
               },{
                 validator:validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/disabler-form.vue

@@ -222,6 +222,9 @@
               },{
                 validator:validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/disablerTags-detail.vue

@@ -79,6 +79,9 @@
                     required: false,
                     message: "请输入监护人电话",
                     trigger: "blur"
+                  },{
+                    validator: validatePhone,
+                    trigger: "blur"
                   }]
                 },
                 // {

src/components/person-tags/drug-form.vue

@@ -225,6 +225,7 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+                trigger: "blur"
               },{
                 validator: validatePhone,
                 trigger: "blur"

src/components/person-tags/elderTags-detail.vue

@@ -8,6 +8,7 @@
 
 <script>
   import {detailByParentId} from "@/api/person/elderlypeople";
+  import {validatePhone} from "../../util/validator";
   export default {
     name:'elderTags-detail',
     props:{
@@ -81,6 +82,9 @@
                     required: false,
                     message: "请输入紧急联系人电话",
                     trigger: "blur"
+                  },{
+                    validator: validatePhone,
+                    trigger: "blur"
                   }]
                 },
                 // {

src/components/person-tags/elderlyPeople-form.vue

@@ -220,6 +220,9 @@
                 required: true,
                 message: "请输入手机号码",
 
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               },{
                 validator: validatePhone,
                 trigger: "blur"

src/components/person-tags/establishFilecard-form.vue

@@ -220,6 +220,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/fertileWoman-form.vue

@@ -222,6 +222,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/prisoner-form.vue

@@ -220,6 +220,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/psychiatric-form.vue

@@ -220,6 +220,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/components/person-tags/veterans-form.vue

@@ -220,6 +220,9 @@
               },{
                 validator: validatePhone,
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/views/community/residentialManage.vue

@@ -281,26 +281,31 @@ export default {
         menuWidth:350,
         column: [
           {
-            label: "所属小区",
-            prop: "residentialId",
+            label: '所属小区',
+            prop: 'residentialName',
             disabled: true,
-            type:'select',
-            hide: true,
-            // slot: true,
-            dicUrl: "/api/cyzh-community/residential/list?size=500",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            dicFormatter: (res) => {
-              return res.data.records;
-            },
-            rules: [{
-              required: false,
-              message: "请选择所属小区",
-              trigger: "blur"
-            }]
           },
+          // {
+          //   label: "所属小区",
+          //   prop: "residentialId",
+          //   disabled: true,
+          //   type:'select',
+          //   hide: true,
+          //   // slot: true,
+          //   dicUrl: "/api/cyzh-community/residential/list?size=500",
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   dicFormatter: (res) => {
+          //     return res.data.records;
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请选择所属小区",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: '楼栋名称',
             prop: 'name',
@@ -399,27 +404,32 @@ export default {
         menuWidth:350,
         column: [
           {
-            label: "所属小区",
-            prop: "residentialId",
+            label: '所属小区',
+            prop: 'residentialName',
             disabled: true,
-            type:'select',
-            hide: true,
-            cascaderItem: ['buildingId'],
-            // slot: true,
-            dicUrl: "/api/cyzh-community/residential/list?size=500",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            dicFormatter: (res) => {
-              return res.data.records;
-            },
-            rules: [{
-              required: false,
-              message: "请选择所属小区",
-              trigger: "blur"
-            }]
           },
+          // {
+          //   label: "所属小区",
+          //   prop: "residentialId",
+          //   disabled: true,
+          //   type:'select',
+          //   hide: true,
+          //   cascaderItem: ['buildingId'],
+          //   // slot: true,
+          //   dicUrl: "/api/cyzh-community/residential/list?size=500",
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   dicFormatter: (res) => {
+          //     return res.data.records;
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请选择所属小区",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: "所属楼栋",
             prop: "buildingId",
@@ -485,7 +495,8 @@ export default {
               message: "请输入负责人电话",
               trigger: "blur"
             },{
-
+              validator: validatePhone,
+              trigger: "blur"
             }]
           }, {
             label: "建筑年代",
@@ -542,34 +553,39 @@ export default {
         menuWidth:350,
         column: [
           {
-            label: "所属小区",
-            prop: "residentialId",
+            label: '所属小区',
+            prop: 'residentialName',
             disabled: true,
-            type:'select',
-            hide: true,
-            // slot: true,
-            cascaderItem: ['buildingId'],
-            dicUrl: "/api/cyzh-community/residential/list?size=500",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            dicFormatter: (res) => {
-              return res.data.records;
-            },
-            rules: [{
-              required: false,
-              message: "请选择所属小区",
-              trigger: "blur"
-            }]
           },
+          // {
+          //   label: "所属小区",
+          //   prop: "residentialId",
+          //   disabled: true,
+          //   type:'select',
+          //   hide: true,
+          //   // slot: true,
+          //   cascaderItem: ['buildingId'],
+          //   dicUrl: "/api/cyzh-community/residential/list?size=500",
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   dicFormatter: (res) => {
+          //     return res.data.records;
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请选择所属小区",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: "所属楼栋",
             prop: "buildingId",
             // slot: true,
             type:'select',
             disabled: true,
-            dicUrl: `/api/cyzh-community/building/list?size=100&residentialId={{key}}`,
+            dicUrl: `/api/cyzh-community/building/list?size=100&residentialId=` + this.residentialId,
             props: {
               label: "name",
               value: "id"
@@ -579,7 +595,7 @@ export default {
             },
             rules: [{
               required: false,
-              message: "请选择所属小区",
+              message: "请选择所属楼栋",
               trigger: "blur"
             }]
           },
@@ -642,7 +658,7 @@ export default {
             dataType: "string",
             type: "year",
             rules: [{
-              required: true,
+              required: false,
               message: "请输入建筑年代",
               trigger: "blur"
             }]
@@ -653,7 +669,7 @@ export default {
             hide: true,
             display: false,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入产权性质",
               trigger: "blur"
             }]
@@ -674,7 +690,7 @@ export default {
               }
             ],
             rules: [{
-              required: true,
+              required: false,
               message: "请输入有无电梯",
               trigger: "blur"
             }]
@@ -719,30 +735,36 @@ export default {
         menuWidth:350,
         column: [
           {
-            label: "所属小区",
-            prop: "residentialId",
-            // slot: true,
-            type: "select",
-            hide: true,
+            label: '所属小区',
+            prop: 'residentialName',
             disabled: true,
-            cascaderIndex:0,
-            searchFilterable:true,
-            // dicUrl: "/grid/estate/getResidentialList",
-            dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}&size=500",
-            dicFormatter: (res)=>{
-              return res.data.records;
-            },
-            dicFlag: false,
-            props: {
-              label: "name",
-              value: "id"
-            },
-            rules: [{
-              required: false,
-              message: "请输入所属小区名称",
-              trigger: "blur"
-            }]
           },
+          // {
+          //   label: "所属小区",
+          //   prop: "residentialId",
+          //   // slot: true,
+          //   type: "select",
+          //   remote: true,
+          //   hide: true,
+          //   disabled: true,
+          //   cascaderIndex:0,
+          //   searchFilterable:true,
+          //   // dicUrl: "/grid/estate/getResidentialList",
+          //   dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}&size=500",
+          //   dicFormatter: (res)=>{
+          //     return res.data.records;
+          //   },
+          //   dicFlag: false,
+          //   props: {
+          //     label: "name",
+          //     value: "id"
+          //   },
+          //   rules: [{
+          //     required: false,
+          //     message: "请输入所属小区名称",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: "所属楼栋",
             prop: "buildingId",
@@ -763,7 +785,7 @@ export default {
             },
             rules: [{
               required: false,
-              message: "请输入所属单元名称",
+              message: "请输入所属楼栋",
               trigger: "blur"
             }]
           },
@@ -898,7 +920,7 @@ export default {
     };
   },
 
-  mounted() {
+  created() {
 
   },
   computed: {
@@ -1123,9 +1145,8 @@ export default {
       }
     },
     beforeOpen(done, type) {
-      console.log('------------->>>' + type);
-      console.log('------------->>>' + JSON.stringify(this.form));
       this.form["residentialId"] = this.residentialId;
+      this.form["residentialName"] = this.residentialName;
       this.form["buildingId"] = this.selectBuildingId;
       this.form["unitId"] = this.selectUnitId;
       this.form["floorId"] = this.selectFloorId;
@@ -1158,6 +1179,7 @@ export default {
       }else{
         this.form.pic = "/img/default/building.png"
       }
+      debugger
       done();
     },
 
@@ -1167,6 +1189,7 @@ export default {
       this.form = {
         type: this.typeBuilding,
         residentialId: this.residentialId,
+        residentialName: this.residentialName
       };
       params.residentialId = id;
       console.log("residential")
@@ -1213,6 +1236,7 @@ export default {
       this.form = {
         type: this.typeBuilding,
         residentialId: this.residentialId,
+        residentialName: this.residentialName,
       };
       this.$set(this, 'form', this.form);
       this.$set(this, 'option', this.optionBuilding);
@@ -1223,6 +1247,7 @@ export default {
       this.form = {
         type: this.typeUnit,
         residentialId: this.residentialId,
+        // residentialName: this.residentialName,
         buildingId: data.id
       };
       this.selectBuildingId = data.id;
@@ -1236,6 +1261,7 @@ export default {
       this.form = {
         type: this.typeFloor,
         residentialId: this.residentialId,
+        // residentialName: this.residentialName,
         buildingId: data.buildingId,
         unitId: data.id
       };
@@ -1250,6 +1276,7 @@ export default {
       this.form = {
         type: this.typeRoom,
         residentialId: this.residentialId,
+        // residentialName: this.residentialName,
         buildingId: data.buildingId,
         unitId: data.unitId,
         floorId: data.id

src/views/estate/applyuser.vue

@@ -116,21 +116,23 @@
               }]
             },
             {
-              label: "住户名字",
+              label: "住户姓名",
               prop: "name",
               search: true,
+              width: 100,
               rules: [{
                 required: true,
-                message: "请输入住户名字",
+                message: "请输入住户姓名",
                 trigger: "blur"
               }]
             },
             {
               label: "性别",
               prop: "sex",
-              width: 80,
+              width: 60,
+              display: false,
               type: 'select',
-              dataType: 'number',
+              dataType: 'string',
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=sex",
               props: {
                 label: "dictValue",
@@ -138,15 +140,17 @@
               },
               rules: [{
                 required: true,
-                message: "请输入性别  0-未定义  1-男 2-女",
+                message: "请输入性别 未定义 男 女",
                 trigger: "blur"
               }]
             },
             {
-              label: "住户类型",
+              label: "住户\n类型",
               prop: "type",
               type: 'select',
-              dataType: 'number',
+              display: false,
+              width: 60,
+              dataType: 'string',
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=household-type",
               props: {
                 label: "dictValue",
@@ -154,7 +158,7 @@
               },
               rules: [{
                 required: true,
-                message: "请输入住户类型 0-业主 1-成员 2-租户",
+                message: "请输入住户类型业主 成员 租户",
                 trigger: "blur"
               }]
             },
@@ -169,6 +173,17 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "所属小区",
+              prop: "residentialName",
+              addDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入小区名称",
+                trigger: "blur"
+              }]
+            },
             {
               label: "所属小区",
               prop: "residentialId",
@@ -194,17 +209,6 @@
               hide: true,
               viewDisplay: false
             },
-            {
-              label: "所属小区",
-              prop: "residentialName",
-              // display: false,
-              // hide: true,
-              rules: [{
-                required: true,
-                message: "请输入小区名称",
-                trigger: "blur"
-              }]
-            },
             {
               label: "所属楼栋",
               prop: "buildingId",
@@ -228,8 +232,9 @@
               viewDisplay: false
             },
             {
-              label: "所属楼栋",
+              label: "所属\n楼栋",
               prop: "buildingName",
+              width: 60,
               // display: false,
               // hide: true,
               rules: [{
@@ -263,8 +268,9 @@
               viewDisplay: false
             },
             {
-              label: "所属单元",
+              label: "所属\n单元",
               prop: "unitName",
+              width: 60,
               // display: false,
               // hide: true,
               rules: [{
@@ -277,6 +283,7 @@
               label: "所属房间",
               prop: "roomId",
               type: "select",
+              width: 60,
               search: true,
               dicUrl: "/api/cyzh-community/room/list?unitId={{key}}",
               dicFormatter:(res)=>{
@@ -296,8 +303,9 @@
               viewDisplay: false
             },
             {
-              label: "所属房间",
+              label: "所属\n房间",
               prop: "roomName",
+              width: 60,
               // display: false,
               // hide: true,
               rules: [{
@@ -310,6 +318,7 @@
               label: "联系电话",
               prop: "tel",
               search: true,
+              width: 100,
               rules: [{
                 required: true,
                 message: "请输入联系电话",
@@ -323,6 +332,7 @@
               prop: "createType",
               type: 'select',
               dataType: 'number',
+              width: 100,
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=create-type",
               props: {
                 label: "dictValue",
@@ -340,6 +350,7 @@
               search: true,
               editDisplay: false,
               slot: true,
+              width: 100,
               type: 'select',
               dicData:[
                 {
@@ -505,9 +516,10 @@
               }]
             },
             {
-              label: "审核人类型",
+              label: "审核人\n类型",
               prop: "operatorType",
               type: 'select',
+              width: 70,
               dicData:[
                 {
                   label: '无',

src/views/estate/bills.vue

@@ -122,7 +122,8 @@
               search: true,
               searchFilterable: true,
               cascaderItem: ['buildingId'],
-              dicUrl: "/api/cyzh-community/residential/select?agencyId={{key}}&&size=9999",
+              remote: true,
+              dicUrl: "/api/cyzh-community/residential/select?agencyId={{key}}&&size=500",
               // dicFormatter:(res)=>{
               //   return res.data.records;//返回字典的层级结构
               // },
@@ -145,7 +146,7 @@
               type: "select",
               search: true,
               cascaderItem: ['unitId'],
-              dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}&size=500`,
+              dicUrl: `/api/cyzh-community/building/list?residentialId={{key}}&size=100`,
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -167,7 +168,7 @@
               type: "select",
               search: true,
               cascaderItem: ['floorId'],
-              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}&size=500",
+              dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -190,7 +191,7 @@
               type: "select",
               search: true,
               cascaderItem: ['roomId'],
-              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=500",
+              dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -212,7 +213,7 @@
               // slot: true,
               type: "select",
               search: true,
-              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}&size=500",
+              dicUrl: "/api/cyzh-community/room/list?floorId={{key}}&size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },

src/views/estate/parkingspace.vue

@@ -131,14 +131,21 @@
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "所属小区",
+            //   prop: "residentialName",
+            //   editDisplay: false,
+            //   addDisplay: false,
+            // },
             {
               label: "所属小区",
               prop: "residentialId",
               type: "select",
               search: true,
               searchFilterable: true,
+              remote: true,
               // dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicUrl: "/api/cyzh-community/residential/select?size=9999",
+              dicUrl: "/api/cyzh-community/residential/select?size=500",
               // dicFormatter:(res)=>{
               //   return res.data.records;//返回字典的层级结构
               // },
@@ -151,7 +158,9 @@
                 required: true,
                 message: "请选择所属小区",
                 trigger: "blur"
-              }]
+              }],
+              // hide: true,
+              // viewDisplay: false
             },
             // {
             //   label: "机构路径",

src/views/person/adolescent.vue

@@ -65,6 +65,7 @@
   import {DIC} from "@/api/util/nation"
   import AdolescentForm from '@/components/person-tags/adolescent-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{AdolescentForm},

src/views/person/aids.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import AidsForm from '@/components/person-tags/aids-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{AidsForm},

src/views/person/basicinfo.vue

@@ -120,6 +120,7 @@
   // import HouseholdTagsDetail from "@/components/person-tags/householdTags-detail";
   // import EnterpriseStaffTagsDetail from "@/components/person-tags/enterpriseStaffTags-detail";
   import {DIC} from "@/api/util/nation"
+  import {validatePhone} from "../../util/validator";
 
   export default {
     // components: {ElderTagsForm, DisablerTagsForm,KeyPersonTagsForm,DisablerTagsDetail,ElderTagsDetail,KeypeopleTagsDetail},
@@ -407,6 +408,9 @@
                 required: true,
                 message: "请输入手机号码",
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/views/person/correctionalstaff.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import CorrectionalStaffForm from '@/components/person-tags/correctionalStaff-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{CorrectionalStaffForm},

src/views/person/disabler.vue

@@ -147,9 +147,6 @@
               rules: [{
                 required: true,
                 message: "请输入监护人电话",
-              },{
-                validator: validatePhone,
-                trigger: "blur"
               }]
             },
             {
@@ -498,6 +495,9 @@
                     required: true,
                     message: "请输入手机号码",
                     trigger: "blur"
+                  },{
+                    validator: validatePhone,
+                    trigger: "blur"
                   }]
                 },
                 {

src/views/person/drug.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import DrugForm from '@/components/person-tags/drug-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{DrugForm},

src/views/person/elderlypeople.vue

@@ -256,9 +256,6 @@
               rules: [{
                 required: true,
                 message: "请输入紧急联系人电话",
-              },{
-                validator: validatePhone,
-                trigger: "blur"
               }]
             },
           ]
@@ -473,6 +470,9 @@
                     required: true,
                     message: "请输入手机号码",
                     trigger: "blur"
+                  },{
+                    validator: validatePhone,
+                    trigger: "blur"
                   }]
                 },
                 {

src/views/person/establishfilecard.vue

@@ -162,9 +162,6 @@
               rules: [{
                 required: false,
                 message: "请输入帮扶干部电话",
-              },{
-                validator: validatePhone,
-                trigger: "blur"
               }]
             },
             {
@@ -510,6 +507,9 @@
                     required: true,
                     message: "请输入手机号码",
                     trigger: "blur"
+                  },{
+                    validator: validatePhone,
+                    trigger: "blur"
                   }]
                 },
                 {

src/views/person/fertilewoman.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import FertileWomanForm from '@/components/person-tags/fertileWoman-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{FertileWomanForm},

src/views/person/member.vue

@@ -34,6 +34,7 @@
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/person/member";
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     data() {
@@ -75,6 +76,9 @@
                 required: true,
                 message: "请输入成员手机号码",
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {

src/views/person/prisoner.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import PrisonerForm from '@/components/person-tags/prisoner-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{PrisonerForm},

src/views/person/psychiatric.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import PsychiatricForm from '@/components/person-tags/psychiatric-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{PsychiatricForm},

src/views/person/serveruser.vue

@@ -153,6 +153,12 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "所属小区",
+              prop: "residentialName",
+              editDisplay: false,
+              addDisplay: false,
+            },
             {
               label: "所属小区",
               prop: "residentialId",
@@ -160,7 +166,7 @@
               search: true,
               slot:true,
               remote: true,
-              dicUrl: "/api/cyzh-community/residential/list?size=500&name={{key}}",
+              dicUrl: "/api/cyzh-community/residential/list?size=500&id={{key}}",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -173,7 +179,9 @@
                 required: true,
                 message: "请输入所属小区",
                 trigger: "blur"
-              }]
+              }],
+              hide: true,
+              viewDisplay: false
             },
             // {
             //   label: "所属小区名称",
@@ -282,6 +290,7 @@
               prop: "beginDate",
               type:'datetime',
               labelWidth: 120,
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
               hide:true,
               rules: [{
                 required: false,
@@ -293,6 +302,7 @@
               label: "人脸截止时间",
               prop: "endDate",
               type:'datetime',
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
               hide:true,
               labelWidth: 120,
               rules: [{

src/views/person/veterans.vue

@@ -60,6 +60,7 @@
   import {DIC} from "@/api/util/nation"
   import VeteransForm from '@/components/person-tags/veterans-form';
   import {mapGetters} from "vuex";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components:{VeteransForm},