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

src/views/estate/car.vue

@@ -340,7 +340,7 @@
           console.log(JSON.stringify(this.form))
         })
       },
-      "form.parkinglotId"() {
+      "form.parkingLotId"() {
           console.log(JSON.stringify(this.form))
       }
     },

src/views/estate/parkingspace.vue

@@ -139,6 +139,7 @@
               prop: "residentialName",
               editDisplay: false,
               addDisplay: false,
+              viewDisplay: false,
             },
             {
               label: "所属小区",
@@ -147,7 +148,7 @@
               search: true,
               searchFilterable: true,
               remote: true,
-              cascaderItem: ['parkinglotId'],
+              cascaderItem: ['parkingLotId'],
               // dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
               dicUrl: "/api/cyzh-community/residential/select?size=500&name={{key}}",
               // dicFormatter:(res)=>{
@@ -164,7 +165,7 @@
                 trigger: "blur"
               }],
               hide: true,
-              viewDisplay: false
+              // viewDisplay: false
             },
             // {
             //   label: "机构路径",
@@ -177,12 +178,11 @@
             // },
             {
               label: "所属车场",
-              prop: "parkinglotId",
+              prop: "parkingLotId",
               type: "select",
               search: true,
               // dicFlag: false,
               // remote: true,
-              hide:true,
               dicUrl: "/api/cyzh-estate/parkinglot/list?size=100&residentialId={{key}}",
               props: {
                 label: 'parkName',

src/views/person/basicinfo.vue

@@ -839,6 +839,7 @@
           });
       },
       beforeOpen(done, type) {
+        this.residentialDisabled = false;
         if (["edit", "view"].includes(type)) {
           this.residentialDisabled = true;
           getDetail(this.form.id).then(res => {