1、支部、车辆、住户、项目管理

src/views/enterprise/project.vue

@@ -75,11 +75,13 @@
               prop: "enterpriseId",
               type:'select',
               search:true,
-              dicUrl:'/api/cyzh-enterprise/enterprise/list?size=500',
+              remote: true,
+              dicUrl:'/api/cyzh-enterprise/enterprise/list?size=500&enterpriseName={{key}}',
               props: {
                 label: "enterpriseName",
                 value: "id"
               },
+              filterable: true,
               dicFormatter: (res)=>{
                 return res.data.records;
               },

src/views/enterprise/staff.vue

@@ -248,9 +248,11 @@
               prop: "phone",
               hide: true,
               rules: [{
-                required: false,
+                required: true,
                 message: "请输入手机",
                 trigger: "blur",
+              },{
+                trigger: "blur",
                 validator: validatePhone
               }]
             },

src/views/estate/car.vue

@@ -348,12 +348,18 @@
       let tenantType = localStorage.getItem("tenantType");
       const agencyColumn = this.findObject(this.option.column, "agencyId");
       const residentialColumn = this.findObject(this.option.column, "residentialId");
+      const agencyNameColumn = this.findObject(this.option.column, "agencyName");
+      const residentialNameColumn = this.findObject(this.option.column, "residentialName");
       if (tenantType == 1) { //园区
         agencyColumn.label = "所属园区";
         residentialColumn.label = "所属区域";
+        agencyNameColumn.label = "所属园区";
+        residentialNameColumn.label = "所属区域";
       } else { //社区
         agencyColumn.label = "所属社区";
         residentialColumn.label = "所属小区";
+        agencyNameColumn.label = "所属社区";
+        residentialNameColumn.label = "所属小区";
       }
     },
     methods: {

src/views/party/branch.vue

@@ -203,8 +203,6 @@
               viewDisplay:false,
               remote: true,
               span: 24,
-              // dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              // dicUrl: "/api/cyzh-community/residential/list?size=500",
               dicUrl: "/api/cyzh-community/agency/list?size=100",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
@@ -280,15 +278,15 @@
           let resourceIds = this.findObject(this.option.column, "resourceIds");
           if (val == 1) {
             this.option.column[7].props.label="name"
-            resourceIds.dicUrl = `/api/cyzh-community/agency/list?size=500&name={{key}}`
+            resourceIds.dicUrl = `/api/cyzh-community/agency/list?size=100&name={{key}}`
           } else if (val==2){
             this.option.column[7].props.label="name"
-            resourceIds.dicUrl = "/api/cyzh-community/residentail/list?size=9999";
+            resourceIds.dicUrl = "/api/cyzh-community/residentail/list?size=100&name={{key}}";
           }else if(val==3){
             this.option.column[7].props.label="name"
-            resourceIds.dicUrl = `/api/cyzh-community/agency/list?size=500&name={{key}}`
+            resourceIds.dicUrl = `/api/cyzh-community/agency/list?size=100&name={{key}}`
           }else{
-            resourceIds.dicUrl = "/api/cyzh-enterprise/enterprise/list?size=500";
+            resourceIds.dicUrl = "/api/cyzh-enterprise/enterprise/list?size=100&enterpriseName={{key}}";
             this.option.column[7].props.label="enterpriseName"
           }
         }

src/views/person/basicinfo.vue

@@ -216,6 +216,22 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "住户类型",
+              prop: "type",
+              type: 'select',
+              dataType:"number",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=household-type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请选择住户类型",
+                trigger: "blur"
+              }]
+            },
             {
               label: "照片",
               prop: "imageUri",