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

src/components/houseuser/houseuser-check.vue

@@ -291,7 +291,7 @@ export default {
   },
   methods: {
     reviewExamine(examine, done) {
-      if (examine == 2 && this.reviewDetail.checkOpinion.length == 0) {
+      if (examine == 2 && !this.reviewDetail.checkOpinion) {
         this.$message({
           type: "error",
           message: "请输入审核意见!"

src/views/estate/parkinglot.vue

@@ -45,6 +45,7 @@
   import {getList, getDetail, add, update, remove} from "@/api/estate/parkinglot";
   import {mapGetters} from "vuex";
   import editPolygonMap from "@/components/residential/editPolygonMap";
+  import {validatePhone} from "../../util/validator";
 
   export default {
     components: {
@@ -104,7 +105,14 @@
                 required: true,
                 message: "请输入车场唯一编号",
                 trigger: "blur"
-              }]
+              }],
+              hide: true
+            },
+            {
+              label: "所属社区",
+              prop: "agencyName",
+              editDisplay: false,
+              addDisplay: false
             },
             {
               label: "所属社区",
@@ -114,8 +122,8 @@
               filterable: true,
               cascaderItem: ['residentialId'],
               type: "select",
-              // remote: true,
-              dicUrl: "/api/cyzh-community/agency/list?size=9999",
+              remote: true,
+              dicUrl: "/api/cyzh-community/agency/list?size=500",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
@@ -127,18 +135,27 @@
                 required: true,
                 message: "请输入所属社区id",
                 trigger: "blur"
-              }]
+              }],
+              hide: true,
+              viewDisplay: false,
+            },
+            {
+              label: "所属小区",
+              prop: "residentialName",
+              editDisplay: false,
+              addDisplay: false
             },
             {
               label: "所属小区",
               prop: "residentialId",
               type: "select",
-              dicUrl: "/api/cyzh-community/residential/list?agencyId={{key}}&size=500",
+              dicUrl: "/api/cyzh-community/residential/list?size=500&agencyId={{key}}",
               dicFormatter:(res)=>{
                 return res.data.records;//返回字典的层级结构
               },
               // dicFlag: false,
               filterable: true,
+              filter: true,
               props: {
                 label: "name",
                 value: "id"
@@ -147,7 +164,9 @@
                 required: false,
                 message: "请输入所属小区id",
                 trigger: "blur"
-              }]
+              }],
+              hide: true,
+              viewDisplay: false
             },
             {
               label:'',
@@ -195,6 +214,9 @@
                 required: false,
                 message: "请输入车场联系方式",
                 trigger: "blur"
+              },{
+                validator: validatePhone,
+                trigger: "blur"
               }]
             },
             {
@@ -207,26 +229,26 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "免费分钟数	",
-              prop: "parkFreeTime",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入免费分钟数	",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "免费超时分钟数	",
-              prop: "parkFreeTimeout",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入免费超时分钟数	",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "免费分钟数	",
+            //   prop: "parkFreeTime",
+            //   hide: true,
+            //   rules: [{
+            //     required: false,
+            //     message: "请输入免费分钟数	",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "免费超时分钟数	",
+            //   prop: "parkFreeTimeout",
+            //   hide: true,
+            //   rules: [{
+            //     required: false,
+            //     message: "请输入免费超时分钟数	",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "车场收费说明	",
               prop: "chargesDesc",
@@ -237,46 +259,60 @@
                 trigger: "blur"
               }]
             },
+            // {
+            //   label: "停车场是否启用预定功能",
+            //   prop: "reserveStatus",
+            //   hide: true,
+            //   rules: [{
+            //     required: false,
+            //     message: "请输入停车场是否启用预定功能",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "停车场是否启用预定功能",
-              prop: "reserveStatus",
-              hide: true,
-              rules: [{
-                required: false,
-                message: "请输入停车场是否启用预定功能",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "注册时间	",
-              prop: "regTime",
+              label: "创建时间	",
+              prop: "createTime",
               type: 'date',
               valueFormat: 'yyyy-MM-dd',
               rules: [{
                 required: false,
-                message: "请输入注册时间	",
+                message: "创建时间	",
                 trigger: "blur"
-              }]
+              }],
+              disabled: true,
+              addDisplay: false,
+              editDisplay: false,
             },
+            // {
+            //   label: "注册时间	",
+            //   prop: "regTime",
+            //   type: 'date',
+            //   valueFormat: 'yyyy-MM-dd',
+            //   rules: [{
+            //     required: false,
+            //     message: "请输入注册时间	",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "停车场有效期止日	",
+            //   prop: "validTime",
+            //   hide: true,
+            //   type: 'date',
+            //   valueFormat: 'yyyy-MM-dd',
+            //   rules: [{
+            //     required: false,
+            //     message: "请输入停车场有效期止日	",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "停车场有效期止日	",
-              prop: "validTime",
-              hide: true,
-              type: 'date',
-              valueFormat: 'yyyy-MM-dd',
-              rules: [{
-                required: false,
-                message: "请输入停车场有效期止日	",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "停车场可容纳的车位总数",
+              label: "车位总数",
               prop: "spaceTotal",
               hide: true,
               rules: [{
                 required: false,
-                message: "请输入停车场可容纳的车位总数",
+                message: "请输入车位总数",
                 trigger: "blur"
               }]
             },
@@ -299,7 +335,10 @@
                 required: false,
                 message: "请输入空余车位",
                 trigger: "blur"
-              }]
+              }],
+              disabled: true,
+              editDisplay: false,
+              addDisplay: false,
             },
             {
               label: "机构路径",
@@ -339,10 +378,10 @@
       const tenantType = localStorage.getItem("tenantType");
       if (tenantType == 0){
         this.option.column[3].label = "所属社区"
-        this.option.column[4].label = "所属小区"
+        this.option.column[5].label = "所属小区"
       }else if (tenantType == 1){
         this.option.column[3].label = "所属园区"
-        this.option.column[4].label = "所属区域"
+        this.option.column[5].label = "所属区域"
       }
     },
     methods: {