Merge remote-tracking branch 'origin/base-modify' into base-modify

src/views/baseInfo/branchCompany/companyInfoModal.vue

@@ -418,10 +418,12 @@
             let arr = info.images.split(",");//图片
             let temp = [];
             for(let i = 0; i < arr.length; i++){
-              let p = {
-                url: arr[i]
+              if(arr[i]){
+                let p = {
+                  url: arr[i]
+                }
+                temp.push(p);
               }
-              temp.push(p);
             }
             t.fileList2 = temp;
             this.activeName2 = "first";
@@ -466,7 +468,7 @@
                 });
                 return;
               }
-              if(!this.form.images){
+              if(this.fileList2.length<=0){
                 this.tabName = "second";
                 this.$notify({
                   title: '警告',

src/views/vehicle/smallProgram/bookingManagement.vue

@@ -39,6 +39,16 @@
         <template scope="scope">
           <span>{{scope.row.provinceName}}-{{scope.row.cityName}}</span>
         </template>
+        <el-table-column align="center" label="取车分公司" width="200">
+          <template scope="scope">
+            <span>{{scope.row.companyName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="还车分公司" width="200">
+          <template scope="scope">
+            <span>{{scope.row.arrivalCompanyName}}</span>
+          </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column align="center" label="车辆型号" width="300">
         <template scope="scope">