Merge branch 'test' of http://gitlab.oytour.com/luochao/superman into hyy_test

src/components/busManagement/BusInfo.vue

@@ -157,25 +157,60 @@
       <el-form :model="PostData" :rules="rules" ref="PostData">
         <table class="bo_bus" cellspacing="1">
           <tr>
+            <th width="100">日期</th>
+            <th width="100">酒店名称</th>
+            <th width="400">用车计划</th>
             <th width="100">司机姓名</th>
             <th width="280">联系电话</th>
             <th width="50">车牌号码</th>
             <th width="120">供应商</th>
+            <th width="120">车辆类型</th>
             <th width="120">付款方式</th>
             <th width="200">订团号</th>
             <th width="250">司机住宿</th>
-            <th>泊车说明</th>
+            <th>泊车说明</th> 
             <th width="120">使用人数</th>
             <th>成本价</th>
             <th width="120">备注</th>
-            <th width="400">用车计划</th>
-            <th width="100">日期</th>
-            <th width="100">酒店名称</th>
-            <th width="120">车辆类型</th>
             <th width="120">停车场</th>
             <th width="120">小计</th>
           </tr>
           <tr v-for="(item,index) in PlanTableData">
+            <td>
+              <div class="w100">
+                {{item.PlanDateStr}}
+              </div>
+            </td>
+            <td>
+              <div class="w280">{{item.HotelName}}</div>
+            </td>
+            <td class="carPlanOne" :class="{'otherSpan':index!=0&&index!=PlanTableData.length-1}">
+              <div class="w320" v-for="(subItem,subIndex) in item.DetailList">
+                <em>
+                  <!--接机送机-->
+                  <el-select class="w150" placeholder="请选择" v-model="subItem.AirportPickUp" :disabled="forbidInput">
+                    <el-option :key="0" :value="0" label="请选择"></el-option>
+                    <el-option v-for="childitem in BusAirportPickUpList" :key="childitem.Id" :label="childitem.Name"
+                      :value="childitem.Id">
+                    </el-option>
+                  </el-select>
+                </em>
+                <!--用车类型-->
+                <span v-for="childItem in UseTypeArray" class="BusinfoSpan">
+                  <span v-if="childItem.Id==1" class="subName"
+                    :class="{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
+                    @click="UseTypeClick(childItem.Id,index,subIndex);getBusPrice(subItem)">{{childItem.Name}}</span>
+                </span>
+                <span style="width:30px;display:inline-block;" >
+                  <a v-if="subIndex>0" @click="DeleteSubItem(item,subIndex)" style="color:blue;cursor:pointer">删除</a>
+                </span>
+                <span style="display:inline-block;width:30px;margin-left:5px;">
+                  <span class="busAddbtn" v-if="subIndex==item.DetailList.length-1" @click="AddSubItem(item)" style="margin-bottom:10px;">
+                    <i class="iconfont icon-img_haha"></i>
+                  </span>
+                </span>
+              </div>
+            </td>
             <td>
               <el-input class="w100" v-model="item.DriverName"></el-input>
             </td>
@@ -195,6 +230,16 @@
                 </el-select>
               </div>
             </td>
+            <td>
+              <div class="w180">
+                <el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType"
+                  :disabled="forbidInput" @change='getBusPrice(item)'>
+                  <el-option :key="0" :value="0" label="请选择"></el-option>
+                  <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </div>
+            </td>
             <td>
               <div class="w120">
                 <el-select class='w100 sel' v-model='item.PayType' :placeholder="$t('pub.pleaseSel')">
@@ -247,51 +292,6 @@
                 <el-input class='w180' type="text" v-model="item.Remarks"></el-input>
               </div>
             </td>
-            <td class="carPlanOne" :class="{'otherSpan':index!=0&&index!=PlanTableData.length-1}">
-              <div class="w320" v-for="(subItem,subIndex) in item.DetailList">
-                <em>
-                  <!--接机送机-->
-                  <el-select class="w150" placeholder="请选择" v-model="subItem.AirportPickUp" :disabled="forbidInput">
-                    <el-option :key="0" :value="0" label="请选择"></el-option>
-                    <el-option v-for="childitem in BusAirportPickUpList" :key="childitem.Id" :label="childitem.Name"
-                      :value="childitem.Id">
-                    </el-option>
-                  </el-select>
-                </em>
-                <!--用车类型-->
-                <span v-for="childItem in UseTypeArray" class="BusinfoSpan">
-                  <span v-if="childItem.Id==1" class="subName"
-                    :class="{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
-                    @click="UseTypeClick(childItem.Id,index,subIndex);getBusPrice(subItem)">{{childItem.Name}}</span>
-                </span>
-                <span style="width:30px;display:inline-block;" >
-                  <a v-if="subIndex>0" @click="DeleteSubItem(item,subIndex)" style="color:blue;cursor:pointer">删除</a>
-                </span>
-                <span style="display:inline-block;width:30px;margin-left:5px;">
-                  <span class="busAddbtn" v-if="subIndex==item.DetailList.length-1" @click="AddSubItem(item)" style="margin-bottom:10px;">
-                    <i class="iconfont icon-img_haha"></i>
-                  </span>
-                </span>
-              </div>
-            </td>
-            <td>
-              <div class="w100">
-                {{item.PlanDateStr}}
-              </div>
-            </td>
-            <td>
-              <div class="w280">{{item.HotelName}}</div>
-            </td>
-            <td>
-              <div class="w180">
-                <el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType"
-                  :disabled="forbidInput" @change='getBusPrice(item)'>
-                  <el-option :key="0" :value="0" label="请选择"></el-option>
-                  <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
-                  </el-option>
-                </el-select>
-              </div>
-            </td>
             <td>
               <div class="w50">
                 {{item.IsHavearking=='0'?'无':'有'}}