1、车场管理

src/views/accesscontrolmng/comps/door-device.vue

@@ -120,53 +120,6 @@ export default {
               trigger: "blur"
             }]
           },
-          {
-            label: "点位类型",
-            prop: "localType",
-            type: "select",
-            search: true,
-            searchSpan: 4,
-            width: 100,
-            align: "center",
-            slot: true,
-            dicData:[
-              {
-                label: "普通点位",
-                value: 1
-              },
-              {
-                label: "特殊点位",
-                value: 2
-              }
-            ],
-            rules: [{
-              required: true,
-              message: "请选择点位类型",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "进出方向",
-            prop: "isOut",
-            type: "select",
-            width: 80,
-            align: "center",
-            dicData:[
-              {
-                label: "进",
-                value: 1,
-              },
-              {
-                label: "出",
-                value: 2
-              }
-            ],
-            rules: [{
-              required: true,
-              message: "请输入进出方向",
-              trigger: "blur"
-            }]
-          },
           {
             label: "所属社区",
             prop: "agencyName",
@@ -356,6 +309,53 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label: "进出方向",
+            prop: "isOut",
+            type: "select",
+            width: 80,
+            align: "center",
+            dicData:[
+              {
+                label: "进",
+                value: 1,
+              },
+              {
+                label: "出",
+                value: 2
+              }
+            ],
+            rules: [{
+              required: true,
+              message: "请输入进出方向",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "点位类型",
+            prop: "localType",
+            type: "select",
+            search: true,
+            searchSpan: 4,
+            width: 100,
+            align: "center",
+            slot: true,
+            dicData:[
+              {
+                label: "普通点位",
+                value: 1
+              },
+              {
+                label: "特殊点位",
+                value: 2
+              }
+            ],
+            rules: [{
+              required: true,
+              message: "请选择点位类型",
+              trigger: "blur"
+            }]
+          },
           {
             label: "设备状态",
             prop: "deviceStatus",

src/views/estate/options/apply-user-option.js

@@ -18,7 +18,8 @@ import {
       selection: false,
       align:'center',
       dialogClickModal: false,
-      column: [{
+      column: [
+        {
           label: "住户id--修改时有值",
           prop: "userId",
           display: false,

src/views/parkingmng/option/parkinglotmng-option.js

@@ -9,32 +9,197 @@ export default (safe) => {
     labelWidth: 120,
     tip: false,
     searchShow: true,
-    searchMenuSpan: 6,
+    searchMenuSpan: 4,
     border: true,
     gutter:20,
     index: true,
     viewBtn: true,
     selection: true,
     dialogClickModal: false,
-    group: [{
+    column: [
+      {
+        label: "停车场名称",
+        prop: "parkName",
+        search: true,
+        searchLabelWidth: 100,
+        rules: [{
+          required: true,
+          message: "请输入停车场名称",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车场编号",
+        prop: "parkKey",
+        rules: [{
+          required: true,
+          message: "请输入车场唯一编号",
+          trigger: "blur"
+        }],
+        hide: true
+      },
+      {
+        label: "所属社区",
+        prop: "agencyId",
+        search: true,
+        searchFilterable: true,
+        filterable: true,
+        cascaderItem: ["residentialId"],
+        type: "select",
+        // remote: true,
+        dicUrl: "/api/cyzh-community/agency/list?size=500&name={{key}}",
+        dicFormatter:(res)=>{
+          return res.data.records;//返回字典的层级结构
+        },
+        props: {
+          label: "name",
+          value: "id"
+        },
+        rules: [{
+          required: true,
+          message: "请输入所属社区",
+          trigger: "change"
+        }],
+        hide: true,
+        viewDisplay: false,
+      },
+      {
+        label: "所属小区",
+        prop: "residentialId",
+        type: "select",
+        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"
+        },
+        rules: [{
+          required: true,
+          message: "请输入所属区域",
+          trigger: "blur"
+        }],
+        hide: true,
+        viewDisplay: false
+      },
+      {
+        label: "所属社区",
+        prop: "agencyName",
+        editDisplay: false,
+        addDisplay: false,
+      },
+      {
+        label: "所属小区",
+        prop: "residentialName",
+        editDisplay: false,
+        addDisplay: false
+      },
+      {
+        label:'',
+        prop:'mapSelect',
+        // row: true,
+        // span: 20,
+        formslot: true,
+        hide: true,
+      },
+      {
+        label: "车场纬度",
+        prop: "parkLatitude",
+        hide: true,
+        rules: [{
+          required: false,
+          message: "请输入车场纬度",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车场经度",
+        prop: "parkLongitude",
+        hide: true,
+        rules: [{
+          required: false,
+          message: "请输入车场经度",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车场地址",
+        prop: "parkAdd",
+        overHidden: true,
+        rules: [{
+          required: false,
+          message: "请输入车场地址",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车场联系方式",
+        prop: "parkTel",
+        hide: true,
+        rules: [{
+          required: false,
+          message: "请输入车场联系方式",
+          trigger: "blur"
+        },{
+          validator: validatePhone,
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车场联系人",
+        prop: "parkLinkman",
+        hide: true,
+        rules: [{
+          required: false,
+          message: "请输入车场联系人",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车场收费说明	",
+        prop: "chargesDesc",
+        hide: true,
+        rules: [{
+          required: false,
+          message: "请输入车场收费说明	",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "车位总数",
+        editDisplay: false,
+        addDisplay: false,
+        rules: [{
+          required: false,
+          message: "请输入车位总数",
+          trigger: "blur"
+        }]
+      },
+      {
+        label: "空余车位",
+        prop: "remainSpace",
+        rules: [{
+          required: false,
+          message: "请输入空余车位",
+          trigger: "blur"
+        }],
+        disabled: true,
+        editDisplay: false,
+        addDisplay: false,
+      },
+    ],
+    group: [
+      {
         label: '基本信息',
         prop: 'group1',
-        column: [{
-            label: "索引ID",
-            prop: "indexId",
-            hide: true,
-            display: false,
-            rules: [{
-              required: true,
-              message: "请输入索引ID",
-              trigger: "blur"
-            }]
-          },
+        column: [
           {
             label: "停车场名称",
             prop: "parkName",
-            search: true,
-            searchLabelWidth: 100,
             rules: [{
               required: true,
               message: "请输入停车场名称",
@@ -49,12 +214,10 @@ export default (safe) => {
               message: "请输入车场唯一编号",
               trigger: "blur"
             }],
-            hide: true
           },
           {
             label: "车场联系方式",
             prop: "parkTel",
-            hide: true,
             rules: [{
               required: false,
               message: "请输入车场联系方式",
@@ -74,127 +237,14 @@ export default (safe) => {
               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",
-            hide: true,
-            rules: [{
-              required: false,
-              message: "请输入车场收费说明	",
-              trigger: "blur"
-            }]
-          },
-          // {
-          //   label: "停车场是否启用预定功能",
-          //   prop: "reserveStatus",
-          //   hide: true,
-          //   rules: [{
-          //     required: false,
-          //     message: "请输入停车场是否启用预定功能",
-          //     trigger: "blur"
-          //   }]
-          // },
-          {
-            label: "创建时间	",
-            prop: "createTime",
-            type: 'date',
-            valueFormat: 'yyyy-MM-dd',
-            rules: [{
-              required: false,
-              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: "spaceTotal",
-            hide: true,
-            rules: [{
-              required: false,
-              message: "请输入车位总数",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "车牌地区简称	",
-            prop: "cityShortName",
-            hide: true,
-            display: false,
-            rules: [{
-              required: false,
-              message: "请输入车牌地区简称	",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "空余车位",
-            prop: "remainSpace",
-            hide: true,
-            rules: [{
-              required: false,
-              message: "请输入空余车位",
-              trigger: "blur"
-            }],
-            disabled: true,
-            editDisplay: false,
-            addDisplay: false,
-          }
         ]
       },
       {
         label: '位置信息',
         prop: 'group1',
         column: [{
-            label: "所属园区",
+            label: "所属社区",
             prop: "agencyId",
-            search: true,
-            searchFilterable: true,
             filterable: true,
             cascaderItem: ["residentialId"],
             type: "select",
@@ -209,26 +259,14 @@ export default (safe) => {
             },
             rules: [{
               required: true,
-              message: "请输入所属园区",
+              message: "请输入所属社区",
               trigger: "change"
             }],
             hide: true,
             viewDisplay: false,
           },
           {
-            label: "所属园区",
-            prop: "agencyName",
-            editDisplay: false,
-            addDisplay: false,
-          },
-          {
-            label: "所属区域",
-            prop: "residentialName",
-            editDisplay: false,
-            addDisplay: false
-          },
-          {
-            label: "所属区域",
+            label: "所属小区",
             prop: "residentialId",
             type: "select",
             dicUrl: "/api/cyzh-community/residential/list?size=500&agencyId={{key}}",
@@ -244,7 +282,7 @@ export default (safe) => {
             },
             rules: [{
               required: true,
-              message: "请输入所属区域",
+              message: "请输入所属小区",
               trigger: "blur"
             }],
             hide: true,
@@ -253,8 +291,6 @@ export default (safe) => {
           {
             label: '',
             prop: 'mapSelect',
-            // row: true,
-            // span: 20,
             formslot: true,
             hide: true,
           },