地接车控页面调整

src/components/busManagement/BusInfo.vue

@@ -217,7 +217,6 @@
           <el-table-column fixed :label="$t('hotel.hotel_name')" prop="HotelName" min-width="200"></el-table-column>
           <el-table-column fixed :label="$t('sm.yongchejihua')" min-width="180">
             <template slot-scope="scope">
-              <!-- {{scope.$index+1}}  -->
               <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_ap_`+subIndex">
                 <em>
                   <!--接机送机-->
@@ -268,6 +267,17 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column :label="$t('hotel.hotel_Supplier')" min-width="150">
+            <template slot-scope="scope">
+              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bps_`+subIndex">
+                <el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusCompany">
+                  <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
+                  <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
+                  </el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('ground.sijiName')" min-width="120">
             <template slot-scope="scope">
               <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpd_`+subIndex">
@@ -289,17 +299,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('hotel.hotel_Supplier')" min-width="150">
-            <template slot-scope="scope">
-              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bps_`+subIndex">
-                <el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusCompany">
-                  <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
-                  <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
-                  </el-option>
-                </el-select>
-              </div>
-            </template>
-          </el-table-column>
+
           <el-table-column :label="$t('ground.busType')" min-width="150">
             <template slot-scope="scope">
               <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_b_`+subIndex">
@@ -329,7 +329,7 @@
               </div>
             </template>
           </el-table-column>
-
+          <!--订团号-->
           <el-table-column :label="$t('ground.dingtuanhao')" min-width="180">
             <template slot-scope="scope">
               <div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" :key="`bpo_bo_`+subIndex">
@@ -710,7 +710,11 @@
             if (res.data.resultCode == 1) {
               this.BusTypeList = res.data.data;
               this.BusTypeList.forEach(item => {
-                item['newName'] = item.AreaTypeStr + '-' + item.BusTypeStr
+                var tempStr = item.AreaTypeStr;
+                if (item.BusTypeStr) {
+                  tempStr += '-' + item.BusTypeStr;
+                }
+                item['newName'] = tempStr + '(' + item.UseNum + '座)';
               });
             }
           },

src/components/busManagement/busUsePrice.vue

@@ -387,7 +387,7 @@
           <el-col :span="5">
             <el-form-item :label="$t('ground.busType')" prop="BusType">
               <el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="addMsg.BusType">
-                <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
+                <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name+`(`+item.SeatNum+`座)`" :value="item.Id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -415,7 +415,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item :label="$t('ground.AlldayPrice')" prop="AllDayPrice">
+            <el-form-item :label="$t('ground.AllDayPrice')" prop="AllDayPrice">
               <el-input v-model="addMsg.AllDayPrice" @keyup.native="checkPrice(addMsg,'AllDayPrice')"></el-input>
             </el-form-item>
           </el-col>