Merge remote-tracking branch 'origin/master'

src/views/customer/custRecTime.vue

@@ -6,7 +6,7 @@
             <div class="top">
                 <el-input  placeholder="主体名称" class="input-demo" v-model="formCondition.companyBelongName"></el-input>
                 <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
-               <el-date-picker v-model="formCondition.serviceEndTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="服务结束时间始" end-placeholder="服务结束时间止"></el-date-picker>
+               <el-date-picker v-model="formCondition.serviceEndTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="服务结束时间始" end-placeholder="服务结束时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
@@ -138,7 +138,7 @@ import XLSX from "xlsx";
           let curr = this.current;
       let pagesize1 = this.pagesize;
       this.current = 1;
-      this.pagesize = this.total;
+      this.pagesize = pagesize1;
       await this.loadData();
       // 设置当前日期
       let time = new Date();

src/views/noCar/billway.vue

@@ -30,8 +30,8 @@
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                 <el-input  placeholder="车牌号" class="input-demo" v-model="noCarWayBill.plateNum"></el-input>
-                 <el-date-picker v-model="noCarWayBill.startBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="运单上传开始指令始" end-placeholder="运单上传开始指令止"></el-date-picker>
-                 <el-date-picker v-model="noCarWayBill.endBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="运单上传结束指令始" end-placeholder="运单上传结束指令止"></el-date-picker>
+                 <el-date-picker v-model="noCarWayBill.startBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="运单上传开始指令始" end-placeholder="运单上传开始指令止"></el-date-picker>
+                 <el-date-picker v-model="noCarWayBill.endBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="运单上传结束指令始" end-placeholder="运单上传结束指令止"></el-date-picker>
                 <!-- <el-date-picker v-model="noCarWayBill.startEnd" type="date" placeholder="开始指令上传时间止"></el-date-picker>
                  <el-date-picker v-model="noCarWayBill.startBegin"  type="date" placeholder="开始指令上传时间始"></el-date-picker> -->
                 <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>

src/views/noCar/billwayException.vue

@@ -10,7 +10,7 @@
                 <el-input  placeholder="税号" class="input-demo" v-model="noCarWayBill.taxplayerCode"></el-input>
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                 <el-date-picker v-model="noCarWayBill.endBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="指令结束始" end-placeholder="指令结束止"></el-date-picker>
+                 <el-date-picker v-model="noCarWayBill.endBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="指令结束始" end-placeholder="指令结束止"></el-date-picker>
                   <!-- <el-select style="margin-left: 30px;" v-model="noCarWayBill.billwayStatus" placeholder="运单状态">
                       <el-option
                         v-for="item in tradeStatus"

src/views/noCar/calculateInfo.vue

@@ -13,8 +13,8 @@
 
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
-                <el-date-picker v-model="formCondition.calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="计费时间始" end-placeholder="计费时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="计费时间始" end-placeholder="计费时间止"></el-date-picker>
                 <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                       <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>

src/views/noCar/calculateInfostatis.vue

@@ -12,8 +12,8 @@
 
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
-                <el-date-picker v-model="formCondition.calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="计费时间始" end-placeholder="计费时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="计费时间始" end-placeholder="计费时间止"></el-date-picker>
                 <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                       <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>

src/views/noCar/invoice.vue

@@ -17,8 +17,8 @@
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-input  placeholder="车牌号" class="input-demo" v-model="formCondition.plateNum"></el-input>
-                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
-              <el-date-picker v-model="formCondition.calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+              <el-date-picker v-model="formCondition.calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
 
               </div>
                <div class="demo-input-suffix" style="margin-top: 5px;margin-right: 10px;">

src/views/noCar/nocarRec.vue

@@ -6,7 +6,7 @@
             <div class="top">
               <el-input  placeholder="公司名称" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="车牌号" class="input-demo" v-model="carNum"></el-input>
-              <el-date-picker v-model="startTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="备案时间始" end-placeholder="备案时间止"></el-date-picker>
+              <el-date-picker v-model="startTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="备案时间始" end-placeholder="备案时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>

src/views/platform/apply/already.vue

@@ -14,7 +14,7 @@
                 </el-option>
               </el-select>
               <el-input  placeholder="请输入车牌号码" style="width:170px" class="input-demo" v-model="formList.carNum"></el-input>
-              <el-date-picker v-model="formList.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+              <el-date-picker v-model="formList.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
                             <el-button type="success" style="margin-left: 1%;" @click="firstLoadData" v-loading.fullscreen.lock="fullscreenLoading">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="queryLook" v-loading.fullscreen.lock="fullscreenLoading">更新（取票）</el-button>
             <el-button type="primary"  @click="exportExcel">导出报表</el-button>

src/views/platform/apply/selfCarTrade.vue

@@ -27,8 +27,8 @@
                  <el-button type="success" style="margin-left: 1%;" @click="update">更新</el-button>
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                 <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
-                 <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
+                 <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
+                 <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                 <el-button type="success" style="margin-left: 1%;" @click="loadDataUpper">最新状态</el-button>
                               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>

src/views/platform/invoice/list.vue

@@ -16,8 +16,8 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-date-picker style="margin-left:1%;" v-model="invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
-               <el-date-picker v-model="calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
+              <el-date-picker style="margin-left:1%;" v-model="invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+               <el-date-picker v-model="calculateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
 
 
             </div>

src/views/selfCar/invoice.vue

@@ -17,7 +17,7 @@
                  <el-input  placeholder="交易id" class="input-demo" v-model="formCondition.tradeId"></el-input>
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.invoiceMakeTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
                 <el-input  placeholder="发票代码" class="input-demo" v-model="formCondition.invoiceCode"></el-input>
                 <el-input  placeholder="发票号码" class="input-demo" v-model="formCondition.invoiceNum"></el-input>
                 <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>

src/views/selfCar/selfCarTrade.vue

@@ -27,8 +27,8 @@
 
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                 <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
-                 <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
+                 <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
+                 <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                  <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                  <el-button type="success" style="margin-left: 1%;" @click="update">更新</el-button>
                   <el-button type="primary"  @click="exportExcel">导出报表</el-button>

src/views/selfCar/selfCarTradeException.vue

@@ -11,8 +11,8 @@
                 <el-input  placeholder="交易id" class="input-demo" v-model="formCondition.tradeId"></el-input>
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                 <!-- <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker> -->
-                 <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
+                 <!-- <el-date-picker v-model="formCondition.exTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker> -->
+                 <el-date-picker v-model="formCondition.aclTimeBegin" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                  <el-select style="margin-left: 30px;" v-model="formCondition.status" placeholder="交易状态">
                       <el-option
                         v-for="item in tradeStatus"