1、车辆管理、住户审核等显示修复

src/components/houseuser/houseuser-check.vue

@@ -215,14 +215,14 @@ export default {
           {
             label: "审核状态",
             prop: "checkState",
-            slot: true,
             type: 'select',
             disabled: !this.reviewType,
             dicData:[
               {
                 label: '待审核',
                 value: 0
-              },{
+              },
+             {
                 label: '审核通过',
                 value: 1
               },{
@@ -230,6 +230,8 @@ export default {
                 value: 2
               }
             ],
+            viewDisplay: true,
+            display: false,
           },
           {
             label: "护照照片",
@@ -289,6 +291,13 @@ export default {
       }
     }
   },
+  created(){
+    if(this.reviewType){
+      this.option.column[9].display = false;
+    }else{
+      this.option.column[9].display = true;
+    }
+  },
   methods: {
     reviewExamine(examine, done) {
       if (examine == 2 && !this.reviewDetail.checkOpinion) {

src/views/estate/car.vue

@@ -44,6 +44,8 @@
   // import CyPersonFile from "../../components/file/cy-person-file";
   import {mapGetters} from "vuex";
   import {validatePhone} from "../../util/validator";
+  import {getList as getAgencyList} from "@/api/community/agency";
+  import {getList as getResidentialList} from "@/api/community/residential";
   // import CyExcelImport from "../../components/excel/cy-excel-import";
 
   export default {
@@ -102,6 +104,12 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "所属社区",
+              prop: "agencyName",
+              editDisplay: false,
+              addDisplay: false,
+            },
             {
               label: "所属社区",
               prop: "agencyId",
@@ -123,7 +131,15 @@
                 required: true,
                 message: "请选择所属社区",
                 trigger: "blur"
-              }]
+              }],
+              hide: true,
+              viewDisplay: false,
+            },
+            {
+              label: "所属小区",
+              prop: "residentialName",
+              editDisplay: false,
+              addDisplay: false
             },
             {
               label: "所属小区",
@@ -131,6 +147,7 @@
               type: "select",
               search: true,
               // dataType:'string',
+              cascaderItem: ["parkingLotId"],
               dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
@@ -145,15 +162,18 @@
                 required: true,
                 message: "请选择所属小区",
                 trigger: "blur"
-              }]
-            },{
+              }],
+              hide: true,
+              viewDisplay: false,
+            },
+            {
               label: "所属车场",
-              prop: "parkinglotId",
+              prop: "parkingLotId",
               type: "select",
               search: true,
               overHidden: true,
-              dicFlag: false,
               remote: true,
+              dicUrl: "/api/cyzh-estate/parkinglot/list?size=500&residentialId={{key}}",
               props: {
                 label: 'parkName',
                 value: 'id'
@@ -161,7 +181,7 @@
               dicFormatter: (res) => {
                 return res.data.records;
               },
-              dicUrl: "/api/cyzh-estate/parkinglot/list?size=10&residentialId={{key}}",
+
               rules: [{
                 require: true,
                 message: "请选择所属车场",
@@ -232,7 +252,7 @@
                 value: "dictKey",
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入燃油类别",
                 trigger: "blur"
               }]
@@ -305,6 +325,22 @@
         return ids.join(",");
       }
     },
+    watch: {
+      "form.agencyId"() {
+        getAgencyList(1, 10, {id: this.form.agencyId}).then(res => {
+          this.form.agencyName = res.data.data.records[0].name;
+        })
+      },
+      "form.residentialId"() {
+        getResidentialList(1, 10, {id: this.form.residentialId}).then(res => {
+          this.form.residentialName = res.data.data.records[0].name;
+          console.log(JSON.stringify(this.form))
+        })
+      },
+      "form.parkinglotId"() {
+          console.log(JSON.stringify(this.form))
+      }
+    },
     mounted() {
       let tenantType = localStorage.getItem("tenantType");
       const agencyColumn = this.findObject(this.option.column, "agencyId");

src/views/estate/parkinglot.vue

@@ -46,6 +46,8 @@
   import {mapGetters} from "vuex";
   import editPolygonMap from "@/components/residential/editPolygonMap";
   import {validatePhone} from "../../util/validator";
+  import {getList as getAgencyList} from "@/api/community/agency";
+  import {getList as getResidentialList} from "@/api/community/residential";
 
   export default {
     components: {
@@ -108,22 +110,16 @@
               }],
               hide: true
             },
-            {
-              label: "所属社区",
-              prop: "agencyName",
-              editDisplay: false,
-              addDisplay: false
-            },
             {
               label: "所属社区",
               prop: "agencyId",
               search: true,
               searchFilterable: true,
               filterable: true,
-              cascaderItem: ['residentialId'],
+              cascaderItem: ["residentialId"],
               type: "select",
-              remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?size=500",
+              // remote: true,
+              dicUrl: "/api/cyzh-community/agency/list?size=500&name={{key}}",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -161,13 +157,19 @@
                 value: "id"
               },
               rules: [{
-                required: false,
-                message: "请输入所属小区id",
+                required: true,
+                message: "请输入所属小区",
                 trigger: "blur"
               }],
               hide: true,
               viewDisplay: false
             },
+            {
+              label: "所属社区",
+              prop: "agencyName",
+              editDisplay: false,
+              addDisplay: false,
+            },
             {
               label:'',
               prop:'mapSelect',
@@ -340,17 +342,6 @@
               editDisplay: false,
               addDisplay: false,
             },
-            {
-              label: "机构路径",
-              prop: "orgPosition",
-              hide: true,
-              display: false,
-              rules: [{
-                required: false,
-                message: "请输入机构路径",
-                trigger: "blur"
-              }]
-            },
           ]
         },
         data: []
@@ -384,6 +375,18 @@
         this.option.column[5].label = "所属区域"
       }
     },
+    watch: {
+      "form.agencyId"() {
+        getAgencyList(1, 10, {id: this.form.agencyId}).then(res => {
+          this.form.agencyName = res.data.data.records[0].name;
+        })
+      },
+      "form.residentialId"() {
+        getResidentialList(1, 10, {id: this.form.residentialId}).then(res => {
+          this.form.residentialName = res.data.data.records[0].name;
+        })
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

src/views/estate/parkingspace.vue

@@ -33,6 +33,7 @@
 
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/estate/parkingspace";
+  import {getList as getResidentialList} from "@/api/community/residential";
   import {mapGetters} from "vuex";
 
   export default {
@@ -97,6 +98,7 @@
               label: "是否收费",
               prop: "isFree",
               type:"select",
+              value: 1,
               dicData:[
                 {
                   label:'是',
@@ -107,7 +109,7 @@
                 }
               ],
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入是否收费",
                 trigger: "blur"
               }]
@@ -116,6 +118,7 @@
               label: "是否室内",
               prop: "isIndoor",
               type:"select",
+              value: 1,
               dicData:[
                 {
                   label:'是',
@@ -126,17 +129,17 @@
                 }
               ],
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入是否室内",
                 trigger: "blur"
-              }]
+              }],
+            },
+            {
+              label: "所属小区",
+              prop: "residentialName",
+              editDisplay: false,
+              addDisplay: false,
             },
-            // {
-            //   label: "所属小区",
-            //   prop: "residentialName",
-            //   editDisplay: false,
-            //   addDisplay: false,
-            // },
             {
               label: "所属小区",
               prop: "residentialId",
@@ -144,8 +147,9 @@
               search: true,
               searchFilterable: true,
               remote: true,
+              cascaderItem: ['parkinglotId'],
               // dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}",
-              dicUrl: "/api/cyzh-community/residential/select?size=500",
+              dicUrl: "/api/cyzh-community/residential/select?size=500&name={{key}}",
               // dicFormatter:(res)=>{
               //   return res.data.records;//返回字典的层级结构
               // },
@@ -176,17 +180,19 @@
               prop: "parkinglotId",
               type: "select",
               search: true,
-              dicFlag: false,
-              remote: true,
+              // dicFlag: false,
+              // remote: true,
               hide:true,
+              dicUrl: "/api/cyzh-estate/parkinglot/list?size=100&residentialId={{key}}",
               props: {
                 label: 'parkName',
                 value: 'id'
               },
+              filterable: true,
+              searchFilterable: true,
               dicFormatter: (res) => {
                 return res.data.records;
               },
-              dicUrl: "/api/cyzh-estate/parkinglot/list?size=10&residentialId={{key}}",
               rules: [{
                 require: true,
                 message: "请选择所属车场",
@@ -197,6 +203,7 @@
               label: "是否占用",
               prop: "isUsed",
               type: "select",
+              value: 0,
               dicData: [{
                 label: "已占用",
                 value: 1
@@ -205,10 +212,10 @@
                 value: 0
               }],
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入是否占用: 1-已占用 0-未占用",
                 trigger: "blur"
-              }]
+              }],
             },
           ]
         },
@@ -241,6 +248,14 @@
         this.option.column[4].label = "所属区域"
       }
     },
+    watch: {
+      "form.residentialId"() {
+        getResidentialList(1, 10, {id: this.form.residentialId}).then(res => {
+          this.form.residentialName = res.data.data.records[0].name;
+          JSON.stringify()
+        })
+      }
+    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {

src/views/person/basicinfo.vue

@@ -234,7 +234,7 @@
               cascaderItem: ['residentialId'],
               type: "select",
               // remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?size=9999",
+              dicUrl: "/api/cyzh-community/agency/list?size=500",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },