11

src/components/busManagement/BookAcar/components/JapanOrderDetailListNew.vue

@@ -14,23 +14,23 @@
   <table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
     <thead>
       <tr>
-        <th class="w120"  rowspan="2">{{$t('objFill.v101.busManagement.paichedh')}}</th>
+        <th class="w120" rowspan="2">{{$t('objFill.v101.busManagement.paichedh')}}</th>
         <th class="w150" rowspan="2">{{$t('objFill.v101.busManagement.chegongs')}}</th>
         <th class="w110" rowspan="2">{{$t('objFill.chepaihao')}}</th>
         <th class="w100" rowspan="2">{{$t('objFill.driver')}}</th>
         <th class="w100" rowspan="2">{{$t('objFill.chexing')}}</th>
         <th class="w100" colspan="3">{{$t('objFill.v101.busManagement.yongchexinzhi')}}</th>
         <th class="w150" rowspan="2">{{$t('objFill.v101.busManagement.shiyongdanw')}}</th>
-        <th class="w150"  rowspan="2">{{$t('objFill.v101.busManagement.yongchedd')}}</th>
-        <th class="w100"  rowspan="2">{{$t('objFill.yongcrq')}}</th>
-        <th class="w100"  rowspan="2">{{$t('ground.usebusTime')}}</th>
-        <th class="w100"  rowspan="2">{{$t('objFill.v101.busManagement.huancherq')}}</th>
-        <th class="w100"  rowspan="2">{{$t('objFill.v101.busManagement.huanchesj')}}</th>
+        <th class="w150" rowspan="2">{{$t('objFill.v101.busManagement.yongchedd')}}</th>
+        <th class="w100" rowspan="2">{{$t('objFill.yongcrq')}}</th>
+        <th class="w100" rowspan="2">{{$t('ground.usebusTime')}}</th>
+        <th class="w100" rowspan="2">{{$t('objFill.v101.busManagement.huancherq')}}</th>
+        <th class="w100" rowspan="2">{{$t('objFill.v101.busManagement.huanchesj')}}</th>
       </tr>
       <tr>
-        <th class="w50" >{{$t('objFill.pickup')}}</th>
-        <th class="w50" >{{$t('objFill.send')}}</th>
-         <th class="w50">{{$t('objFill.v101.busManagement.baoji')}}</th>
+        <th class="w50">{{$t('objFill.pickup')}}</th>
+        <th class="w50">{{$t('objFill.send')}}</th>
+        <th class="w50">{{$t('objFill.v101.busManagement.baoji')}}</th>
       </tr>
     </thead>
     <tbody v-for="(outItem,outindex) in OrderList" class="splitTrCss1" :key="outindex">

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

@@ -12,18 +12,18 @@
 </style>
 <template>
   <div class="japanorder">
-    <el-table :data="OrderList" style="width: 100%" height="250">
+    <el-table :data="OrderList" style="width: 100%" height="500">
       <el-table-column fixed prop="CustomerName" :label="$t('objFill.v101.busManagement.shiyongdanw')" width="150">
       </el-table-column>
       <el-table-column fixed :label="$t('objFill.v101.busManagement.yongchexinzhi')" width="165">
-        <el-table-column prop="UseType" :label="$t('objFill.v101.busManagement.pickup')" width="50">
+        <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.v101.busManagement.send')" width="50">
+        <el-table-column prop="UseType" :label="$t('objFill.send')" width="50">
           <template slot-scope="scope">
             <template v-if="scope.row.UseType==2">
               <span>√</span>

src/components/busManagement/JapanBusMonthFStatistics.vue

@@ -22,9 +22,11 @@
           </span>
         </li>
         <li><span><em>{{$t('pub.date')}}</em>
-            <el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
+            <el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date"
+              @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
             -
-            <el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
+            <el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date"
+              @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
           </span>
         </li>
         <li style="display:none"><span><em>{{$t('objFill.v101.busManagement.shifouwj')}}</em></span>
@@ -120,7 +122,11 @@
         "-" +
         myDate.getDate();
       this.msg.UseSTime = nowDate;
-      this.msg.UseETime = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
+      var currentDate = new Date(); // 获取当前时间
+      currentDate.setMonth(currentDate.getMonth() + 1); // 将当前时间的月份加1
+      this.msg.UseETime = currentDate.getFullYear() + "-" + parseInt(currentDate.getMonth() + 1) + "-" + currentDate
+        .getDate();
+
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;

src/components/busManagement/JapanBusMonthStatistics.vue

@@ -144,14 +144,13 @@
         "-" +
         myDate.getDate();
       this.msg.UseSTime = nowDate;
-      this.msg.UseETime =
-        myDate.getFullYear() +
-        "-" +
-        parseInt(myDate.getMonth() + 2) +
-        "-" +
-        myDate.getDate();
 
-     
+      var currentDate = new Date(); // 获取当前时间
+      currentDate.setMonth(currentDate.getMonth() + 1); // 将当前时间的月份加1
+      this.msg.UseETime = currentDate.getFullYear() + "-" + parseInt(currentDate.getMonth() + 1) + "-" + currentDate
+        .getDate();
+
+
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;

src/components/busManagement/JapanBusOrderMonthStatistics.vue

@@ -22,11 +22,11 @@
           </span>
         </li>
         <li><span><em>{{$t('pub.date')}}</em>
-            <el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" type="date"
-              @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
+            <el-date-picker v-model='msg.UseSTime' class='w135' value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+              type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
             -
-            <el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" type="date"
-              @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
+            <el-date-picker v-model='msg.UseETime' class='w135' value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+              type="date" @change="resetPageIndex()" clearable @clear="resetPageIndex()"></el-date-picker>
           </span>
         </li>
         <li style="display:none;"><span><em>{{$t('objFill.v101.busManagement.shifouwj')}}</em></span>
@@ -41,8 +41,9 @@
       </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>
+      {{$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>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
       :style="{height: boxHeight + 'px'}">
@@ -141,7 +142,10 @@
         "-" +
         myDate.getDate();
       this.msg.UseSTime = nowDate;
-      this.msg.UseETime = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
+      var currentDate = new Date(); // 获取当前时间
+      currentDate.setMonth(currentDate.getMonth() + 1); // 将当前时间的月份加1
+      this.msg.UseETime = currentDate.getFullYear() + "-" + parseInt(currentDate.getMonth() + 1) + "-" + currentDate
+        .getDate();
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;

src/components/busManagement/JapanBusOrderStatistics.vue

@@ -40,10 +40,7 @@
         </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> -->
+
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
       :style="{height: boxHeight + 'px'}">
       <OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading" @success="msg.pageIndex=1,GetList()">
@@ -126,7 +123,11 @@
         "-" +
         myDate.getDate();
       this.msg.UseSTime = nowDate;
-      this.msg.UseETime = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 2) + "-" + myDate.getDate();
+
+      var currentDate = new Date(); // 获取当前时间
+      currentDate.setMonth(currentDate.getMonth() + 1); // 将当前时间的月份加1
+      this.msg.UseETime = currentDate.getFullYear() + "-" + parseInt(currentDate.getMonth() + 1) + "-" + currentDate
+        .getDate();
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 210;
       this.boxHeight = height;