Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/cyzh-park into master

src/views/parkingmng/parkingvehicleinrecord.vue

@@ -100,7 +100,7 @@
             //   editDisplay: false,
             // },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               // slot: true,
               search: true,
@@ -119,7 +119,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }],
               // hide: true,
@@ -132,7 +132,7 @@
             //   editDisplay: false,
             // },
             {
-              label: "所属区域",
+              label: "所属小区",
               prop: "residentialId",
               type: "select",
               search: true,
@@ -148,7 +148,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属区域",
+                message: "请选择所属小区",
                 trigger: "blur"
               }],
               // hide: true,
@@ -160,28 +160,28 @@
             //   addDisplay: false,
             //   editDisplay: false,
             // },
-            {
-              label: "所属企业",
-              prop: "enterpriseId",
-              type:'select',
-              slot:true,
-              dataType:'string',
-              dicUrl:'/api/cyzh-enterprise/enterprise/list?size=500',
-              dicFormatter:(res)=>{
-                return res.data.records;//返回字典的层级结构
-              },
-              props:{
-                label: "enterpriseName",
-                value: "id"
-              },
-              rules: [{
-                required: false,
-                message: "请输入企业",
-                trigger: "blur"
-              }],
-              // hide: true,
-              // viewDisplay: false
-            },
+            // {
+            //   label: "所属企业",
+            //   prop: "enterpriseId",
+            //   type:'select',
+            //   slot:true,
+            //   dataType:'string',
+            //   dicUrl:'/api/cyzh-enterprise/enterprise/list?size=500',
+            //   dicFormatter:(res)=>{
+            //     return res.data.records;//返回字典的层级结构
+            //   },
+            //   props:{
+            //     label: "enterpriseName",
+            //     value: "id"
+            //   },
+            //   rules: [{
+            //     required: false,
+            //     message: "请输入企业",
+            //     trigger: "blur"
+            //   }],
+            //   // hide: true,
+            //   // viewDisplay: false
+            // },
             {
               label: "车辆类型",
               prop: "carTypeNo",

src/views/parkingmng/parkingvehiclemng.vue

@@ -118,13 +118,13 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyName",
               editDisplay: false,
               addDisplay: false,
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               search: true,
               searchFilterable: true,
@@ -142,7 +142,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }],
               hide: true,
@@ -447,10 +447,10 @@
         agencyNameColumn.label = "所属园区";
         residentialNameColumn.label = "所属区域";
       } else { //园区
-        agencyColumn.label = "所属园区";
-        residentialColumn.label = "所属区域";
-        agencyNameColumn.label = "所属园区";
-        residentialNameColumn.label = "所属区域";
+        agencyColumn.label = "所属社区";
+        residentialColumn.label = "所属小区";
+        agencyNameColumn.label = "所属社区";
+        residentialNameColumn.label = "所属小区";
       }
     },
     methods: {

src/views/parkingmng/parkingvehicleoutrecord.vue

@@ -199,7 +199,7 @@
               }]
             },
             {
-              label: "所属园区",
+              label: "所属社区",
               prop: "agencyId",
               // slot: true,
               search: true,
@@ -218,12 +218,12 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属园区",
+                message: "请选择所属社区",
                 trigger: "blur"
               }]
             },
             {
-              label: "所属区域",
+              label: "所属小区",
               prop: "residentialId",
               // slot: true,
               type: "select",
@@ -241,7 +241,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择所属区域",
+                message: "请选择所属小区",
                 trigger: "blur"
               }]
             },
@@ -292,8 +292,8 @@
     created() {
       const tenantType = localStorage.getItem("tenantType");
       if (tenantType == 0){
-        this.option.column[13].label = "所属园区"
-        this.option.column[14].label = "所属区域"
+        this.option.column[13].label = "所属社区"
+        this.option.column[14].label = "所属小区"
       }else if (tenantType == 1){
         this.option.column[13].label = "所属园区"
         this.option.column[14].label = "所属区域"