Parcourir la source

1、bug修复

billisme il y a 4 ans
Parent
commit
031eb8f68e

+ 5 - 4
src/views/community/residentialManage.vue

@@ -482,7 +482,7 @@ export default {
             labelWidth: 110,
             hide: true,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入负责人姓名",
               trigger: "blur"
             }]
@@ -492,7 +492,7 @@ export default {
             labelWidth: 110,
             hide: true,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入负责人电话",
               trigger: "blur"
             },{
@@ -635,7 +635,7 @@ export default {
             prop: "personName",
             hide: true,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入负责人姓名",
               trigger: "blur"
             }]
@@ -645,7 +645,7 @@ export default {
             prop: "personTel",
             hide: true,
             rules: [{
-              required: true,
+              required: false,
               message: "请输入负责人电话",
             },{
               validator: validatePhone,
@@ -680,6 +680,7 @@ export default {
             prop: "includingElevator",
             hide: true,
             type: "select",
+            display: false,
             dicData: [
               {
                 label: "有",

+ 56 - 17
src/views/estate/car.vue

@@ -298,23 +298,6 @@
                 message: "请选择是否占用车位",
                 trigger: "blur"
               }]
-            },{
-              label: "车辆照片",
-              prop: "carImg",
-              listType: 'picture-img',
-              type: "upload",
-              hide: true,
-              propsHttp: {
-                res: "data",
-                url: "link"
-              },
-              //加水印
-              // canvasOption: {
-              //   text: 'bladex',
-              //   ratio: 0.1
-              // },
-              action: "/api/blade-resource/oss/endpoint/put-file",
-              tip: "只能上传jpg/png图片,且不超过500kb"
             },
             {
               label: "审核状态",
@@ -342,6 +325,62 @@
               }],
               addDisplay: false
             },
+            {
+              label: "车辆照片",
+              prop: "carImg",
+              listType: 'picture-img',
+              type: "upload",
+              hide: true,
+              propsHttp: {
+                res: "data",
+                url: "link"
+              },
+              //加水印
+              // canvasOption: {
+              //   text: 'bladex',
+              //   ratio: 0.1
+              // },
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              tip: "只能上传jpg/png图片,且不超过500kb"
+            },
+            {
+              label: "行驶证正面照",
+              prop: "vehicleDrivingLicense1",
+              listType: 'picture-img',
+              type: "upload",
+              labelWidth: 100,
+              hide: true,
+              propsHttp: {
+                res: "data",
+                url: "link"
+              },
+              //加水印
+              // canvasOption: {
+              //   text: 'bladex',
+              //   ratio: 0.1
+              // },
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              tip: "只能上传jpg/png图片,且不超过500kb"
+            },
+            {
+              label: "行驶证反面照",
+              prop: "vehicleDrivingLicense2",
+              listType: 'picture-img',
+              type: "upload",
+              labelWidth: 100,
+              hide: true,
+              propsHttp: {
+                res: "data",
+                url: "link"
+              },
+              //加水印
+              // canvasOption: {
+              //   text: 'bladex',
+              //   ratio: 0.1
+              // },
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              tip: "只能上传jpg/png图片,且不超过500kb"
+            }
           ]
         },
         data: []

+ 3 - 2
src/views/person/basicinfo.vue

@@ -683,8 +683,9 @@
       selectCallback(row){
         this.form.residentialId = row.id;
         this.form.residentialName = row.name;
-        if (this.option.column[6].prop == 'buildingId' && this.option.column[6].dicUrl.indexOf('residentialId') == -1){
-          this.option.column[6].dicUrl += '?residentialId=' + this.form.residentialId + '&size=100';
+        let buildingProp = this.findObject(this.option.column, "buildingId");
+        if (buildingProp.prop == 'buildingId' && buildingProp.dicUrl.indexOf('residentialId') == -1){
+          buildingProp.dicUrl += '?residentialId=' + this.form.residentialId + '&size=100';
         }
       },
       tagsFormOpen(type,row) {