车统计修改

src/components/busManagement/BookAcar/components/JapanMonthRunList.vue

@@ -75,10 +75,6 @@
 </style>
 <template>
   <div class="japanorder" v-if="OrderList.length>0">
-    <div>
-      <font class="jieji">接机 √</font> &nbsp;<font class="songji">送机 √</font>&nbsp;
-      <font class="yiriyou">一日游 √</font>
-    </div>
     <!--:height="tableHeight"-->
     <el-table ref="mytableJap" :data="OrderList" style="width: 100%" :loading="loading" key="index">
       <el-table-column fixed prop="SupplierName" :label="$t('objFill.v101.busManagement.chegongs')" width="150">

src/components/busManagement/BookAcar/components/JapanOrderList.vue

@@ -13,31 +13,10 @@
 <template>
   <div class="japanorder">
     <!--height="500"-->
-    <el-table :data="OrderList" style="width: 100%" >
-      <el-table-column fixed prop="CustomerName" :label="$t('objFill.v101.busManagement.shiyongdanw')" width="150">
+    <el-table :data="OrderList" style="width: 100%">
+      <el-table-column fixed prop="TCNUM" :label="$t('objFill.v101.CarDealerOrder.xitongtuanh')" width="130">
       </el-table-column>
-      <el-table-column fixed :label="$t('objFill.v101.busManagement.yongchexinzhi')" width="165">
-        <el-table-column prop="UseType" :label="$t('objFill.pickup')" width="50">
-          <template slot-scope="scope">
-            <template v-if="scope.row.UseType==1">
-              <span>√</span>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column prop="UseType" :label="$t('objFill.send')" width="50">
-          <template slot-scope="scope">
-            <template v-if="scope.row.UseType==2">
-              <span>√</span>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column prop="UseType" :label="$t('op.Onedaytour')" width="65">
-          <template slot-scope="scope">
-            <template v-if="scope.row.UseType==4">
-              <span>√</span>
-            </template>
-          </template>
-        </el-table-column>
+      <el-table-column fixed prop="CustomerName" :label="$t('objFill.v101.busManagement.shiyongdanw')" width="110">
       </el-table-column>
       <el-table-column fixed prop="GuestNum" :label="$t('admin.admin_personNumber')" width="80">
         <template slot-scope="scope">
@@ -48,28 +27,13 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column fixed :label="$t('objFill.v101.busManagement.yongchesd')" width="160">
-        <el-table-column prop="StartTime" :label="$t('objFill.v101.busManagement.chufayudin')" width="80">
-          <template slot-scope="scope">
-            <span>{{scope.row.StartTime}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="EndTime" :label="$t('objFill.v101.busManagement.jieshuyudin')" width="80">
-          <template slot-scope="scope">
-            <span>{{scope.row.EndTime}}</span>
-          </template>
-        </el-table-column>
+      <el-table-column :label="$t('objFill.v101.busManagement.yongchesd')" width="120">
         <template v-for="(item,index) in headerList">
-          <el-table-column :key="index" :prop="item.LabelValue" :label="item.LabelName" width="135" align="center">
+          <el-table-column :key="index" :prop="item.LabelValue" :label="item.LabelName" width="120" align="center">
             <template slot-scope="scope">
-              <template v-if="scope.row.OrderDayCalendar[index].UseState!=-1">
-                <el-tooltip class="item" effect="dark" placement="top">
-                  <div slot="content" style="width:200px;">{{scope.row.OrderDayCalendar[index].BusContent}}</div>
+              <template v-if="scope.row.OrderDayCalendar[index].OrderId>0">
                   <div>
-                    <span>{{scope.row.OrderDayCalendar[index].StartCity}}
-                      <template
-                        v-if="scope.row.OrderDayCalendar[index].StartCity&&scope.row.OrderDayCalendar[index].EndCity">--></template>
-                      {{scope.row.OrderDayCalendar[index].EndCity}}
+                    <span>{{scope.row.OrderDayCalendar[index].DriverName}}
                     </span>
                     <p>
                       <span style="color: #4BCA81;" v-if="(scope.row.OrderDayCalendar[index].UseState==2)">√</span>
@@ -77,7 +41,6 @@
                       <span style="color: #E95252;" v-else>×</span>
                     </p>
                   </div>
-                </el-tooltip>
               </template>
             </template>
           </el-table-column>

src/components/busManagement/JapanBusMonthStatistics.vue

@@ -42,13 +42,11 @@
         </li>
       </ul>
     </div>
-    <div class="mt10 fz14 color333 busIconStyle">
-      {{ $t("objFill.v101.busManagement.chelianzt") }}&nbsp;&nbsp;&nbsp;{{
-        $t("pub.sureBtn")
-      }}:<span style="color: #4bca81">√</span>{{ $t("visa.v_zanding") }}:<span
-        style="color: #ff6600">O</span>{{ $t("objFill.weicaozuo") }}:<span style="color: #e95252">X</span>
+    <div class="mt10 fz14 color333 busIconStyle" style="margin-bottom:10px;">
+      {{ $t("objFill.v101.busManagement.chelianzt") }}&nbsp;
+      <span class="jieji">接机 √</span> &nbsp;<span class="songji">送机 √</span>&nbsp;
+      <span class="yiriyou">一日游 √</span>
     </div>
-
     <OrderList v-if="DataList.length > 0" :pagesTitle="Title" :OrderList="DataList" :loading="loading"
       :tableHeight="tableHeight" @success="(msg.pageIndex = 1), GetList()">
     </OrderList>
@@ -268,4 +266,16 @@
     max-height: 350px;
   }
 
+  .busIconStyle .jieji {
+    color: #409eff;
+  }
+
+  .busIconStyle .songji {
+    color: #e6a23c;
+  }
+
+  .busIconStyle .yiriyou {
+    color: #67c23a;
+  }
+
 </style>

src/components/busManagement/JapanBusOrderMonthStatistics.vue

@@ -45,8 +45,9 @@
         style="color:#4BCA81 ;">√</span>{{$t('visa.v_zanding')}}:<span
         style="color: #ff6600;">O</span>{{$t('objFill.weicaozuo')}}:<span style="color:#E95252 ;">X</span>
     </div>
+    <!-- :style="{height: boxHeight + 'px'}"-->
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
-      :style="{height: boxHeight + 'px'}">
+     >
       <OrderList :pagesTitle="Title" :headerList="headerList" :OrderList="DataList" :loading="loading"
         @success="msg.pageIndex=1,GetList()">
       </OrderList>