no message

src/components/busManagement/BookAcar/components/BookAcarOrder.vue

@@ -46,7 +46,7 @@
               <li>
                 <span>
                   <em>{{$t('OrderList.search.status')}}</em>
-                  <el-select v-model="msg.OrderStatus" class="w110 HworkInput">
+                  <el-select v-model="msg.OrderStatus" class="w210 HworkInput">
                     <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
                     <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
                   </el-select>
@@ -55,7 +55,7 @@
               <li v-if="Title!='销售'">
                 <span>
                   <em>业务员</em>
-                  <el-select  filterable  v-model='msg.EnterID'  class="w110">
+                  <el-select  filterable  v-model='msg.EnterID'  class="w210">
                       <el-option :value="0" label="不限"></el-option>
                       <el-option v-for='item in EmployeeList'
                           :label='item.EmName'
@@ -67,23 +67,23 @@
               </li>
               <li>
                 <span><em>{{$t('OrderList.search.orderNum')}}</em>
-                <el-input clearable type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w110"/>
+                <el-input clearable type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w210"/>
                 </span>
               </li>
               <li>
                 <span><em>订单ID</em>
-                <el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w110"/>
+                <el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w210"/>
                 </span>
               </li>
               <li>
                 <span><em>电话</em>
-                <el-input clearable v-model="msg.Mobile" placeholder="电话" class="w110"/>
+                <el-input clearable v-model="msg.Mobile" placeholder="电话" class="w210"/>
                 </span>
               </li>
               <li>
                 <span><em>客人姓/名</em>
-                <el-input clearable v-model="msg.SurName" placeholder="客人姓" class="w110"/>
-                <el-input clearable v-model="msg.Name" placeholder="客人名" class="w110"/>
+                <el-input clearable v-model="msg.SurName" placeholder="客人姓" class="w210"/>
+                <el-input clearable v-model="msg.Name" placeholder="客人名" class="w210"/>
                 </span>
               </li>
               <li>

src/components/busManagement/BookAcar/components/orderList.vue

@@ -461,7 +461,7 @@
           <div class="mb">
             <el-table :data="[item]" style="width:100%" border>
               <el-table-column
-                label="产品名称(日期)"
+                label="产品名称(下单日期)"
                 min-width="100"
                 style="background:#EAEAEA"
               >
@@ -479,14 +479,20 @@
                       {{scope.row.AirportName}}
                     </div>
                     <div class="text-grey-9 q-pt-xs">{{scope.row.FlightNumber}}</div>
-                    <div class="text-grey-6 q-pt-xs">
-                      {{scope.row.FlightTime}}
-                      {{scope.row.OrderType == 1?'抵达':'出发'}}
+                    <div class="text-grey-6 q-pt-xs" v-if="item.OrderType!=3">
+                      {{scope.row.OrderType == 1?'抵达时间':'出发时间'}}{{scope.row.FlightTime}}
+                      
                     </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="上下车地点" style="background:#EAEAEA">
                   <template slot-scope="scope">
+                    <div>
+                      预定时间：{{ scope.row.OrderDate }}
+                    </div>
+                    <div>
+                      车型：{{ scope.row.CarName }}
+                    </div>
                     <div v-if="scope.row.GetonAddress">
                       上车点：{{ scope.row.GetonAddress }}
                     </div>
@@ -537,6 +543,25 @@
                 </template>
             </el-table>
           </div>
+          <el-table :data="[item]" style="width:100%" border v-if="item.OrderStatus!=3">
+            <el-table-column label="实收" min-width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.Income ? scope.row.Income : "-" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="退款" min-width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="平台税金" min-width="100">
+              <template slot-scope="scope">
+                <span>{{
+                  scope.row.PlatformTax ? scope.row.PlatformTax : "-"
+                }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="row justify-sb mt mb20">
             <div class="column px15 bgf5 radius5 flex-g pa relative">
               <div class="fz12">收款单据</div>

src/components/busManagement/BookAcar/list.vue

@@ -232,8 +232,8 @@
                 <div class="listone-list">
                     <div class="list-left">
                         <h6 @click="showCardHandler(x)">{{x.Name}}
-                          <el-tag size="mini" type="warning"><template v-if="x.CarType==1">送机</template>
-                          <template v-if="x.CarType==2">接机</template>
+                          <el-tag size="mini" type="warning"><template v-if="x.CarType==1">接机</template>
+                          <template v-if="x.CarType==2">送机</template>
                           <template v-if="x.CarType==3">包车</template></el-tag>
                         </h6>
                         <div>