Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/vehicle/vehicleInfo/index.vue

@@ -338,7 +338,7 @@
           </el-button>
           <el-button size="small" class="el-button el-button--text el-button--small" @click="handleBookInfo(scope.row)">预订信息</el-button>
           <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDepartureLog(scope.row)">出车记录</el-button>
-          <el-button type="danger" size="small" @click="deleteHandler(scope.row)" style="margin-left:0px" v-if="vehicleInfo_btn_ret">删除</el-button>
+          <el-button  size="small" style="color:red;" @click="deleteHandler(scope.row)" class="el-button el-button--text el-button--small" v-if="vehicleInfo_btn_ret">删除</el-button>
 
         </template>
       </el-table-column>
@@ -488,10 +488,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="停靠分公司" v-if="dialogStatus=='update'" prop="parkBranchCompanyName">
-              <el-input  v-model="form.parkBranchCompanyName" placeholder="停靠分公司" readonly disabled></el-input>
-            </el-form-item>
-            <el-form-item label="停靠分公司" v-else-if="dialogStatus=='create'" prop="parkBranchCompanyName">
+            <!--<el-form-item label="停靠分公司" v-if="dialogStatus=='update'" prop="parkBranchCompanyName">-->
+              <!--<el-input  v-model="form.parkBranchCompanyName" placeholder="停靠分公司" readonly disabled></el-input>-->
+            <!--</el-form-item>-->
+            <!--v-else-if="dialogStatus=='create'"-->
+            <el-form-item label="停靠分公司"  prop="parkBranchCompanyName">
               <el-autocomplete
                 class="inline-input"
                 v-model="form.parkBranchCompanyName"