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

src/views/baseInfo/branchCompany/index.vue

@@ -51,12 +51,21 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="200" align="center" label="负责人联系方式">
+      <el-table-column width="150" align="center" label="负责人联系方式">
         <template scope="scope">
           <span>{{scope.row.leaderContactInfo}}</span>
         </template>
       </el-table-column>
-
+      <el-table-column width="150" align="center" label="租车客服电话">
+        <template scope="scope">
+          <span>{{scope.row.vehiceServicePhone}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="150" align="center" label="旅游客服电话">
+        <template scope="scope">
+          <span>{{scope.row.tourServicePhone}}</span>
+        </template>
+      </el-table-column>
       <el-table-column width="300" align="center" label="地址">
         <template scope="scope">
           <span>{{getAddrStr(scope.row) + scope.row.addrDetail}}</span>
@@ -144,6 +153,14 @@
           <el-input v-model="form.leaderContactInfo" placeholder="请输入负责人联系方式"></el-input>
         </el-form-item>
 
+        <el-form-item label="租车客服电话" prop="vehiceServicePhone">
+          <el-input v-model="form.vehiceServicePhone" placeholder="请输入租车客服电话"></el-input>
+        </el-form-item>
+
+        <el-form-item label="旅游客服电话" prop="tourServicePhone">
+          <el-input v-model="form.tourServicePhone" placeholder="请输入旅游客服电话"></el-input>
+        </el-form-item>
+
         <el-form-item label="地址" prop="addrDetail">
           <el-input v-model="form.addrDetail" placeholder="请输入详细地址"></el-input>
         </el-form-item>
@@ -213,7 +230,9 @@
           longitude: undefined,
           latitude: undefined,
           leaderContactInfo: undefined,
-          updateTime: undefined
+          updateTime: undefined,
+          vehiceServicePhone: undefined,
+          tourServicePhone: undefined
         },
         allZoneArr:[],//全部片区
         provinceRegions: [],//片区下省份数据
@@ -603,7 +622,9 @@
           longitude: undefined,
           latitude: undefined,
           leaderContactInfo: undefined,
-          updateTime: undefined
+          updateTime: undefined,
+          vehiceServicePhone: undefined,
+          tourServicePhone: undefined
         };
       }
     }