前端代码合并提交

src/config/globle.js

@@ -1,2 +1,3 @@
-window.hostUrl = "http://192.168.50.4:18080/";
-window.tableHeight =  (document.body.clientHeight*0.6-20)+"px";
+// window.hostUrl = "http://192.168.50.4:18080/";
+window.hostUrl = "http://127.0.0.1:18080/"
+window.tableHeight =  (document.body.clientHeight*0.6-20);

src/views/customer/Customer.vue

@@ -7,7 +7,7 @@
               <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
               <el-input  placeholder="主体名称" class="input-demo" v-model="formCondition.company"></el-input>
                <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.subCompany"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
              <!--         <el-button type="success" style="margin-left: 1%;" @click="addCustomerShow = true">添加</el-button>-->
                 <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
@@ -606,7 +606,9 @@
           </el-row> 
         </el-form>
         <div slot="footer" class="dialog-footer">
+          <el-button @click="customerRecquerry" type="primary">查询</el-button>
           <el-button @click="customerRecAdd" type="primary">保存</el-button>
+          
         </div>
       </el-dialog>
        <el-dialog
@@ -973,13 +975,36 @@ import XLSX from "xlsx";
             this.addCustomerRecShow1 =false;
             this.customerRec = {};
           },
+          async customerRecquerry(){
+            console.log(this.customerRec);
+            if(this.customerRec['companyName'] == null || this.customerRec['companyReferencenum'] == null){
+              this.$message({
+                      type: 'error',
+                      message: '需要填写公司名称和税号'
+                    });
+            }else{
+               const response = await this.$http.post(`customer/customeRecQueryUpper`, this.customerRec);
+               if (response.data.code === 0) {
+                    this.customerRec = response.data.data;
+              }else{
+                this.$message({
+                      type: 'error',
+                      message: '查询结果:'+response.data.msg+',未正常返回，请自行填写'
+                    });
+              }
+            }
+          },
           async customerRecAdd(){
             console.log(this.customerRec);
              this.$refs['recRuleForm'].validate(async (valid) => {
                if(valid){
                     const response = await this.$http.post(`customer/customerRecAdd`, this.customerRec);
                   if(response.data.code === 0) {
-                    this.loadData();
+                     
+                  const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":this.customer.customerName});
+                  if (response.data.code === 0) {
+                    this.customeRecQueryListTable = response.data.data;
+                  }
                     this.addCustomerRecShow1 = false;
                     this.$message({
                       type: 'success',
@@ -1045,6 +1070,11 @@ import XLSX from "xlsx";
             const token = sessionStorage.getItem('token');
             window.open(hostUrl+'customer/contractDownload?customerRecId='+this.customerRec['id']+'&token='+token);
           },
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/customer/custRecMoney.vue

@@ -6,7 +6,7 @@
             <div class="top">
                <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
                <el-input  placeholder="主体名称" class="input-demo" v-model="formCondition.company"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <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>
           </el-col>
@@ -95,6 +95,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/customer/custRecTime.vue

@@ -7,7 +7,7 @@
                <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
                 <el-input  placeholder="主体名称" class="input-demo" v-model="formCondition.companyBelongName"></el-input>
                <el-date-picker v-model="formCondition.serviceEndTime" type="daterange" 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="loadData">查询</el-button>
+               <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>
           </el-col>
@@ -99,6 +99,11 @@ import XLSX from "xlsx";
           this.loadData();
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/customer/customerRecharge.vue

@@ -6,7 +6,7 @@
             <div class="top">
                <el-input  placeholder="用户" class="input-demo" v-model="formCondition.customerName"></el-input>
                <el-input  placeholder="主体名称" class="input-demo" v-model="formCondition.companyName"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <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>
@@ -110,6 +110,11 @@ import XLSX from "xlsx";
               this.total = response.data.data.total;
             }
           },
+          firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;

src/views/noCar/billway.vue

@@ -35,7 +35,7 @@
                 <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>
                 <el-date-picker v-model="noCarWayBill.endEnd" type="date" placeholder="结束指令上传时间止"></el-date-picker> -->
                 
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;" @click="updateStatus">更新状态</el-button>
                
               </div>
@@ -123,15 +123,32 @@
           </el-table-column>
 
           <el-table-column
-            prop="billwayStatus"
             label="运单状态"
             show-overflow-tooltip>
-             <template slot-scope="scope">
-              <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+            <template slot-scope="scope">
+              
+               <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">失败</span>
+                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">指令上传失败</span>
               <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
-            </template>
+              </template>
+          </el-table-column>
+           <el-table-column
+            label="是否成功"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              
+               <span v-if="scope.row.billwayStatus == -2 || scope.row.billwayStatus == -3" style="color: red">失败</span>
+                <span v-else-if="scope.row.billwayStatus != -2 && scope.row.billwayStatus != -3" style="color: green">成功</span>
+               
+              </template>
+          </el-table-column>
+           <el-table-column
+            prop="failReason"
+            label="失败原因"
+            show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="updateTime"
@@ -201,6 +218,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/noCar/billwayException.vue

@@ -15,7 +15,7 @@
                  <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>
                 <el-date-picker v-model="noCarWayBill.endEnd" type="date" placeholder="结束指令上传时间止"></el-date-picker> -->
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;" @click="updateStatus">更新状态</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
@@ -147,6 +147,11 @@ import XLSX from "xlsx";
         },
         
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/noCar/calculateInfo.vue

@@ -14,7 +14,7 @@
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                 <el-date-picker v-model="formCondition.invoiceMakeTime" type="daterange" 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="daterange" 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="loadData">查询</el-button>
+                <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>
             </div>
@@ -115,6 +115,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/noCar/calculateInfostatis.vue

@@ -14,7 +14,7 @@
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                 <el-date-picker v-model="formCondition.invoiceMakeTime" type="daterange" 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="daterange" 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="loadData">查询</el-button>
+                <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>
             </div>
@@ -80,6 +80,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/platform/apply/selfCarTrade.vue

@@ -27,7 +27,7 @@
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" 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="daterange" 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="loadData">查询</el-button>
+               <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>
             </div>
@@ -140,6 +140,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+               firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/platform/car/carsuccess.vue

@@ -25,7 +25,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-              <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="exportOut">导出</el-button>
             </div>
           </el-col>
@@ -128,6 +128,11 @@ export default{
     this.loadData();
   },
   methods: {
+                   firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
     // 列表展示
     async loadData() {
             const formData = new FormData();

src/views/platform/car/carupload.vue

@@ -29,7 +29,7 @@
               <el-input  placeholder="用户所在公司" class="input-demo" v-model="userCompany"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNumber"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
        <!--        <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -262,6 +262,11 @@ export default{
     this.loadData();
   },
   methods: {
+                   firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.queryLook();
+          },
     // 列表展示
     async loadData() {
       this.formUserList.userId = sessionStorage.getItem('userId');

src/views/platform/carbinding/carbinding.vue

@@ -283,6 +283,7 @@ export default{
           type: 'success',
           message: '绑定成功'
         });
+        this.binDing=false;
       }else{
         this.$message.error(msg);
       }

src/views/platform/carbinding/carbindinglist.vue

@@ -6,7 +6,7 @@
           <el-col :span="24">
             <div class="top">
               <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="carNum"></el-input>
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
             </div>
           </el-col>
         </el-row>
@@ -90,6 +90,11 @@ export default{
     this.loadData();
   },
   methods: {
+     firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.queryLook();
+          },
     //数据加载
     async loadData() {
       this.formList.customerName = sessionStorage.getItem('userName');

src/views/platform/check/check.vue

@@ -9,7 +9,7 @@
             <el-input  placeholder="税号" class="input-demo" v-model="companyReferencenum"></el-input>
              <el-input  placeholder="发票抬头" class="input-demo" v-model="companyName"></el-input>
             <el-button type="success" style="margin-left: 1%;" @click="addList = true;">新增</el-button>
-            <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
           </div>
         </el-col>
       </el-row>
@@ -246,6 +246,11 @@
      this.loadData();
     },
     methods: {
+          firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.queryLook();
+          },
       // 列表展示
       async loadData() {
         this.customerName = sessionStorage.getItem('userName');

src/views/platform/invoice/list.vue

@@ -16,32 +16,8 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-date-picker
-                class="input-demo"
-                v-model="startTime"
-                type="datetime"
-                placeholder="选择开票开始时间">
-              </el-date-picker>
-
-              <el-date-picker
-                class="input-demo"
-                v-model="endTime"
-                type="datetime"
-                placeholder="选择开票结束时间">
-              </el-date-picker>
-               <el-date-picker
-                class="input-demo"
-                v-model="startTime"
-                type="datetime"
-                placeholder="选择扣费开始时间">
-              </el-date-picker>
-
-              <el-date-picker
-                class="input-demo"
-                v-model="endTime"
-                type="datetime"
-                placeholder="选择扣费结束时间">
-              </el-date-picker>
+              <el-date-picker style="margin-left:1%;" v-model="invoiceMakeTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+               <el-date-picker v-model="calculateTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
 
        
             </div>
@@ -60,7 +36,7 @@
                 </el-option>
               </el-select>
 
-              <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="exportOut">导出</el-button>
 <!--              <el-button type="success" style="margin-left: 1%;" @click="packDownload"-->
 <!--                         v-loading.fullscreen.lock="fullscreenLoading">打包下载-->
@@ -109,7 +85,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          :height="300"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -233,7 +209,7 @@ export default{
       loading: false,
       fullscreenLoading: false,
       addList: false,
-       hightt:'0px',
+       heightt:'0px',
       current: 1,
       pagesize: 8,
       total: 0,
@@ -244,7 +220,8 @@ export default{
       plateNum: "",
       invoiceNum: "",
       invoiceCode: "",
-      startTime: "",
+      invoiceMakeTime:'',
+      calculateTime:'',
       endTime: "",
       batchNumber: '',
       invoiceUrl: '',
@@ -258,10 +235,16 @@ export default{
     }
   },
   created() {
-    this.heightt = '150px';
+    this.heightt = tableHeight*0.5-50;
+    console.log(this.heightt)
     this.initCompanyList();
   },
   methods: {
+    firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
     // 列表展示
     async loadData() {
         const formData = new FormData();
@@ -272,8 +255,8 @@ export default{
         formData.append('companyName', this.taxPlayerCode);
         formData.append('invoiceNum', this.invoiceNum);
         formData.append('invoiceCode', this.invoiceCode);
-        //formData.append('startTime', this.startTime);
-        //formData.append('endTime', this.endTime);
+        formData.append('invoiceMakeTime', this.invoiceMakeTime);
+        formData.append('calculateTime', this.calculateTime);
         const response = await this.$http.post(`noCar/findNocarInvoices`, formData);
         if (response.data.code === 0) {
           this.loading = false;
@@ -311,8 +294,8 @@ export default{
         formData.append('invoiceNum', this.invoiceNum);
         formData.append('invoiceCode', this.invoiceCode);
         formData.append('batchNumber', this.batchNumber);
-        //formData.append('startTime', this.startTime);
-        //formData.append('endTime', this.endTime);
+          formData.append('invoiceMakeTime', this.invoiceMakeTime);
+        formData.append('calculateTime', this.calculateTime);
         const response = await this.$http.post(`noCar/findNocarInvoicesStatic`, formData);
         if (response.data.code === 0) {
           this.loading = false;

src/views/platform/waybill/history.vue

@@ -107,7 +107,7 @@
            <el-input  placeholder="运单编号" class="theinput" v-model="billNum"></el-input>
             <el-input  placeholder="车牌号" class="theinput" v-model="plateNum"></el-input>
             <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
-            <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -241,6 +241,11 @@ export default{
     this.loadData();
   },
   methods: {
+    firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
     // 列表展示
     async loadData() {
       const formData = new FormData();

src/views/platform/waybill/over.vue

@@ -108,7 +108,7 @@
           <div class="line"></div>
           <div class="styleType">
            <el-input  placeholder="运单编号" class="theinput" v-model="billNum"></el-input>
-            <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -195,6 +195,11 @@ export default{
     this.loadData();
   },
   methods: {
+    firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
     // 列表展示
     async loadData() {
        const formData = new FormData();

src/views/platform/waybill/waybill.vue

@@ -109,7 +109,7 @@
             <el-input  placeholder="运单编号" class="theinput" v-model="billNum"></el-input>
             <el-input  placeholder="车牌号" class="theinput" v-model="plateNum"></el-input>
             <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
-            <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -242,6 +242,11 @@ export default{
     this.loadData();
   },
   methods: {
+    firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
     // 列表展示
     async loadData() {
     

src/views/platform/waybillmanagement/noinvoice.vue

@@ -44,7 +44,7 @@
               </el-select> -->
             <!--   <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
               <el-input  placeholder="运单状态" class="theinput" v-model="status"></el-input> -->
-              <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="makeInvoice" v-loading.fullscreen.lock="fullscreenLoading">开票</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
@@ -195,6 +195,11 @@ export default{
    
   },
   methods: {
+    firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadDataCar();
+          },
     // 列表展示
     async loadDataCar() {
       const formData = new FormData();

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -62,7 +62,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-              <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -223,6 +223,11 @@ export default{
    
   },
   methods: {
+        firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadDataCar();
+          },
     // 列表展示
     async loadDataCar() {
       const formData = new FormData();

src/views/platform/waybillmanagement/waybillList.vue

@@ -17,7 +17,7 @@
               <el-input  placeholder="车牌号" class="theinput" v-model="plateNumber"></el-input>
             <!--   <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
               <el-input  placeholder="运单状态" class="theinput" v-model="status"></el-input> -->
-              <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="exportOut">导出</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
@@ -130,12 +130,30 @@
             label="运单状态"
             show-overflow-tooltip>
             <template slot-scope="scope">
+              
                <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">失败</span>
+                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">指令上传失败</span>
               <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
               </template>
           </el-table-column>
+           <el-table-column
+            label="是否成功"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              
+               <span v-if="scope.row.billwayStatus == -2 || scope.row.billwayStatus == -3" style="color: red">失败</span>
+                <span v-else-if="scope.row.billwayStatus != -2 && scope.row.billwayStatus != -3" style="color: green">成功</span>
+               
+              </template>
+          </el-table-column>
+           <el-table-column
+            prop="failReason"
+            label="失败原因"
+            show-overflow-tooltip>
+          </el-table-column>
           </el-table>
         </template>
 
@@ -188,6 +206,11 @@ export default{
    
   },
   methods: {
+        firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadDataCar();
+          },
     // 列表展示
     async loadDataCar() {
       const formData = new FormData();

src/views/selfCar/calculateInfo.vue

@@ -7,7 +7,7 @@
                <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customId"></el-input>
                <el-input  placeholder="税号" class="input-demo" v-model="formCondition.companyReferencenum"></el-input>
                <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.etcNum"></el-input>
-               <el-date-picker v-model="formCondition.calTime" type="monthrange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="计费开始" end-placeholder="计费结束"></el-date-picker>
+               <el-date-picker v-model="formCondition.calTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="计费开始" end-placeholder="计费结束"></el-date-picker>
             </div>
             <div class="top">
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
@@ -100,13 +100,15 @@ import XLSX from "xlsx";
           // 列表展示
           async loadData() {
             const formData = new FormData();
+            formData.append('current', this.current);
+            formData.append('size', this.pagesize);
              for(var i in this.formCondition){
                 formData.append(i,this.formCondition[i]);
             }
 
             const response = await this.$http.post(`selfCar/findSelfcarCalculateInfo`, formData);
             if (response.data.code === 0) {
-              this.calculateInfo = response.data.data;
+              this.calculateInfo = response.data.data.records;
             }
           },
           // 分页方法

src/views/selfCar/invoice.vue

@@ -32,7 +32,7 @@
                 <el-date-picker v-model="formCondition.invoiceMakeTime" type="daterange" 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="loadData">查询</el-button>
+                <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>
             </div>
@@ -223,6 +223,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/selfCar/selfCarTrade.vue

@@ -31,7 +31,7 @@
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" 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="daterange" 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="loadData">查询</el-button>
+                 <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                  <el-button type="success" style="margin-left: 1%;" >更新</el-button>
                               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
@@ -148,6 +148,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/selfCar/selfCarTradeException.vue

@@ -13,7 +13,7 @@
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <!-- <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" 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="daterange" 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="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;" >更新状态(待确认)</el-button>
                             <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
@@ -123,6 +123,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/selfCar/selfcarRec.vue

@@ -20,7 +20,7 @@
                         :value="item.value">
                       </el-option>
                 </el-select>
-                 <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+                 <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>
             </div>
@@ -168,6 +168,11 @@ import XLSX from "xlsx";
           this.loadData();
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/sys/user.vue

@@ -7,7 +7,7 @@
             <div class="top">
               <el-input  placeholder="用户" class="input-demo" v-model="userName"></el-input>
               <el-input  placeholder="企业名称" class="input-demo" v-model="company"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                 <el-button type="success" style="margin-left: 1%;" @click="addUserList = true">添加</el-button>
                                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
@@ -481,6 +481,11 @@ export default{
             });
           }
     },
+     firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.queryLook();
+          },
     // 列表展示
     async loadData() {
       const formData = new FormData();