前端代码合并提交

src/views/customer/customerRecharge.vue

@@ -34,6 +34,14 @@
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
+            prop="aMony"
+            label="充值前账户余额"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+               <span>{{scope.row.beforeMony-scope.row.rechargeMony| rounding}}</span>
+            </template>
+          </el-table-column>
+           <el-table-column
             prop="beforeMony"
             label="充值后账户余额"
             show-overflow-tooltip>

src/views/noCar/billway.vue

@@ -28,8 +28,8 @@
               
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                 <el-date-picker v-model="noCarWayBill.startBegin" type="daterange" 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="daterange" 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="daterange" 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="daterange" 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>
@@ -257,7 +257,8 @@ import XLSX from "xlsx";
            handleSelectionChange(value){
                        this.multipleSelection = value;
                        console.log(this.multipleSelection);
-                    },
+                      
+           },
          async updateStatus(){
              const formData = new FormData();
             formData.append('noCarWayBillStr', JSON.stringify(this.multipleSelection));

src/views/noCar/invoice.vue

@@ -9,15 +9,16 @@
               <el-upload
                 class="upload-demo"
                 ref="upload"
-                style="margin-bottom: 10px"
+                style="margin-bottom: 10px;display: inline-block"
                 action="http://invoice.back.jkcredit.com/dishonestuser/upload"
                 :on-preview="handlePreview"
                 :on-remove="handleRemove"
                 :on-change="handleSuccess"
                 :auto-upload="false">
-                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                <el-button slot="trigger"  size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
               </el-upload>
+              
             </div>
               <div class="demo-input-suffix">
                 <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
@@ -27,12 +28,15 @@
               </div>
               <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>
+                
               </div>
                <div class="demo-input-suffix" style="margin-top: 5px;margin-right: 10px;">
-                   <el-input  placeholder="发票代码" class="input-demo" v-model="formCondition.invoiceCode"></el-input>
+                  <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 style="margin-right: 1%;" @click="DownloadTemplate">查询模板下载</el-button>
-                <el-button type="success" style="margin-right: 1%;" @click="loadData">查询</el-button>
+                  <el-button type="success" style="margin-right: 1%;" @click="firstLoadData">查询</el-button>
+                <el-button style="margin-left: 1%;" @click="DownloadTemplate">查询模板下载</el-button>
+                
                 <el-button type="primary" style="margin-right: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
             </div>
@@ -225,7 +229,7 @@ import XLSX from "xlsx";
           }
         },
         created() {
-          this.heightt = tableHeight;
+          this.heightt = tableHeight-110;
           this.loadData();
         },
          filters: {
@@ -234,6 +238,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+           firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

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-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>
@@ -144,6 +144,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/platform/apply/already.vue

@@ -18,14 +18,14 @@
                 v-model="formList.startTime"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="选择开始日期时间"
+                placeholder="开票时间始"
                 style="margin-left: 1%;">
               </el-date-picker>
               <el-date-picker
                 v-model="formList.endTime"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="选择结束日期时间"
+                placeholder="开票时间止"
                 style="margin-left: 1%;">
               </el-date-picker>
               <el-button type="success" style="margin-left: 1%;" @click="queryLook" v-loading.fullscreen.lock="fullscreenLoading">查询</el-button>
@@ -153,6 +153,11 @@ export default{
     this.initCompanyList();
   },
   methods: {
+     firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.queryLook();
+          },
     // 查询已开发票数据
     async queryLook() {
       debugger;

src/views/platform/apply/apply.vue

@@ -46,12 +46,11 @@
           :data="usertabletwo"
           :height="heightt"
           border
-          tooltip-effect="dark">
+          tooltip-effect="dark"  @selection-change="handleSelectionChange">
           <el-table-column
-            label="车牌号码"
-            prop="plateNum"
-            show-overflow-tooltip>
-          </el-table-column>
+              type="selection"
+              width="55">
+        </el-table-column>
           <el-table-column
             prop="cardId"
             label="ETC卡号"
@@ -71,6 +70,9 @@
             prop="fee"
             label="交易金额"
             show-overflow-tooltip>
+             <template slot-scope="scope">
+               <span>{{scope.row.fee/100| rounding}}</span>
+            </template>
           </el-table-column>
         </el-table>
       </template>
@@ -89,6 +91,8 @@ export default{
       companyName: '',
        hightt:'0px',
       customerName:'',
+       multipleSelection: [],
+       carIdStr:'',
       // codeNumber: '',
       formList: {},
       companyList:[]
@@ -124,6 +128,10 @@ export default{
             }
             this.companyName = this.companyList[0]['companyName'];
     },
+     handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+                    },
     changeStartDate(value){
      var dd = new Date();
      dd.setDate(value.getDate()+90);
@@ -131,6 +139,18 @@ export default{
     },
     //申请开票
     async applyForTicket() {
+       if(this.multipleSelection.length>0){
+            this.carIdStr ='';
+            for(var i in this.multipleSelection){
+                           this.carIdStr+=this.multipleSelection[i]['cardId']+"#"+this.multipleSelection[i]['tradeId']+","
+            }
+        }else{
+           this.$message({
+              type: 'error',
+              message: '请选择需要开票的交易id'
+           });
+          return;
+        }
       this.startTime = (new Date(this.startTime)).getTime();
       this.endTime = (new Date(this.endTime)).getTime();
       this.formList.companyName = this.companyName;
@@ -138,6 +158,7 @@ export default{
       this.formList.carNum = this.carNum;
       this.formList.startTime = this.startTime;
       this.formList.endTime = this.endTime;
+       this.formList.carIdStr = this.carIdStr;
       const response = await this.$http.post(`/selfCar/applTradeList`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {

src/views/platform/invoice/invoice.vue

@@ -193,6 +193,11 @@ export default{
     this.loadData();
   },
   methods: {
+    firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
     // 列表展示
     async loadData() {
       this.formUserList.userId = sessionStorage.getItem('userId');

src/views/platform/waybill/history.vue

@@ -24,11 +24,10 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="用户名" class="input-demo" style="margin: 0;" v-model="customerName"></el-input>
               <el-input  placeholder="用户所在公司" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNum"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
-              <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="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -99,6 +98,7 @@
       <el-dialog
         @close="handleEditDialogClose"
         :visible.sync="addList"
+        class="ttt"
         style="font-size: 0px;">
         <template>
           <div class="tou">运单历史列表</div>
@@ -107,7 +107,17 @@
            <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="firstLoadData">查询</el-button>
+            <el-select v-model="success" placeholder="是否成功">
+                <el-option
+                  v-for="item in optionone"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+
+            <el-button type="success" style="margin-left: 1%;" @click="twoLoadData">查询</el-button>
+             <el-button type="success" style="margin-left: 1%;" @click="exportExcel">导出</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -164,14 +174,26 @@
             label="运单状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+               <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>
-              <span v-else-if="scope.row.billwayStatus == -2" 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>
@@ -196,6 +218,8 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -205,7 +229,8 @@ export default{
       customerName: '',
       companyName: '',
       billNum: '',
-      plateNumber: '',
+      plateNum: '',
+      success:'',
       taxPlayerCode: '',
        hightt:'0px',
       status: '',
@@ -253,7 +278,7 @@ export default{
         formData.append('size', this.pagesize);
         formData.append('customerName',this.formUserList.customerName);
          formData.append('company', this.companyName);
-        formData.append('batchNumer', this.batchNum);
+        formData.append('batchNumber', this.batchNum);
         formData.append('operType', 3);
         const response = await this.$http.post(`noCar/findBatchList`, formData);
         if (response.data.code === 0) {
@@ -295,6 +320,11 @@ export default{
       this.batchNumberQ = id;
       this.loadDataCar();
     },
+    twoLoadData(){
+            this.currenttwo = 1;
+            this.pagesizetwo = 8;
+            this.loadDataCar();
+          },
     // 查看历史数据
     async loadDataCar() {
        const formData = new FormData();
@@ -302,8 +332,10 @@ export default{
         formData.append('size', this.pagesizetwo);
         formData.append('customerName', this.formUserList.customerName);
         formData.append('batchNum', this.batchNumberQ);
-         formData.append('plateNumber', this.plateNumber);
-        formData.append('taxPlayerCode', this.taxPlayerCode);
+        formData.append('billNum', this.billNum);
+        formData.append('success', this.success);
+         formData.append('plateNum', this.plateNum);
+        formData.append('taxplayerCode', this.taxPlayerCode);
         formData.append('hisFlag', 1);
         const response = await this.$http.post(`noCar/findImportBillWay`, formData);
         if (response.data.code === 0) {
@@ -312,7 +344,43 @@ export default{
           this.totaltwo = response.data.data.total;
         }
     },
-   
+    async    exportExcel() {
+          let curr = this.currenttwo;
+      let pagesize1 = this.pagesizetwo;
+      this.currenttwo = 1; 
+      this.pagesizetwo = this.totaltwo;
+      await this.loadDataCar();
+      // 设置当前日期
+      let time = new Date();
+      //console.log(time);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
+      let day = time.getDate();
+      let name = "历史运单上传列表_"+year + "" + month + "" + day;
+      // console.log(name)
+      /* generate workbook object from table */
+      //  .table要导出的是哪一个表格
+      var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        //  name+'.xlsx'表示导出的excel表格名字
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          name + ".xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+       this.currenttwo = curr; 
+      this.pagesizetwo = pagesize1;
+      this.loadDataCar();
+      return wbout;
+    },
     // 清空表单数据
     handleEditDialogClose() {
       this.num = '';

src/views/platform/waybill/over.vue

@@ -26,11 +26,10 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="用户名" class="input-demo" style="margin: 0;" v-model="customerName"></el-input>
               <el-input  placeholder="用户所在公司" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNumer"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
-              <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="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -108,7 +107,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="firstLoadData">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="twoLoadData">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -133,13 +132,19 @@
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
-            prop="isSuccess"
             label="是否成功"
             show-overflow-tooltip>
             <template slot-scope="scope">
-                <span v-if="scope.row.isSuccess == 1">成功</span>
-                <span v-else-if="scope.row.isSuccess == 2">失败</span>
-            </template>
+              
+               <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>
@@ -168,8 +173,9 @@ export default{
       fullscreenLoading: false,
       customerName: '',
       companyName: '',
-      batchNumber: '',
+      batchNumer: '',
       batchNumberQ:'',
+      billNum:'',
       num: '',
       hightt:'0px',
       addList: false,
@@ -207,7 +213,7 @@ export default{
         formData.append('size', this.pagesize);
         formData.append('customerName',this.formUserList.customerName);
          formData.append('company', this.companyName);
-        formData.append('batchNumer', this.batchNumer);
+        formData.append('batchNumber', this.batchNumer);
         formData.append('operType', 2);
         const response = await this.$http.post(`noCar/findBatchList`, formData);
         if (response.data.code === 0) {
@@ -248,6 +254,11 @@ export default{
       this.batchNumberQ = id;
       this.loadDataCar();
     },
+     twoLoadData(){
+            this.currenttwo = 1;
+            this.pagesizetwo = 8;
+            this.loadDataCar();
+          },
     // 查看实时数据
     async loadDataCar() {
        const formData = new FormData();
@@ -255,8 +266,7 @@ export default{
         formData.append('size', this.pagesizetwo);
         formData.append('customerName', this.formUserList.customerName);
         formData.append('batchNumEnd', this.batchNumberQ);
-         formData.append('plateNumber', this.plateNumber);
-        formData.append('taxPlayerCode', this.taxPlayerCode);
+         formData.append('billNum', this.billNum);
         formData.append('hisFlag', 0);
         const response = await this.$http.post(`noCar/findImportBillWay`, formData);
         if (response.data.code === 0) {

src/views/platform/waybill/waybill.vue

@@ -25,11 +25,11 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="用户名" class="input-demo" style="margin: 0;" v-model="customerName"></el-input>
+            
               <el-input  placeholder="用户所在公司" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNum"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
-              <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="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -107,12 +107,22 @@
           <div class="line"></div>
           <div class="styleType">
             <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="plateNumber"></el-input>
             <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
-            <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
+             <el-select v-model="success" placeholder="是否成功">
+                <el-option
+                  v-for="item in optionone"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            <el-button type="success" style="margin-left: 1%;" @click="twoLoadData">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="exportExcel">导出</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
+            class="ttt"
             v-loading="loading"
             ref="multipleTable"
             :data="usertabletwo"
@@ -167,13 +177,24 @@
             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>
-              <span v-else-if="scope.row.billwayStatus == -2" 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>
@@ -198,6 +219,8 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -211,6 +234,7 @@ export default{
        hightt:'0px',
       status: '',
       addList: false,
+      success:'',
       current: 1,
       pagesize: 8,
       total: 0,
@@ -255,7 +279,7 @@ export default{
         formData.append('size', this.pagesize);
         formData.append('customerName',this.formUserList.customerName);
          formData.append('company', this.companyName);
-        formData.append('batchNumer', this.batchNum);
+        formData.append('batchNumber', this.batchNum);
         formData.append('operType', 1);
         const response = await this.$http.post(`noCar/findBatchList`, formData);
         if (response.data.code === 0) {
@@ -299,6 +323,11 @@ export default{
     handleEditDialogClose(){
        this.addList = false;
     },
+    twoLoadData(){
+            this.currenttwo = 1;
+            this.pagesizetwo = 8;
+            this.loadDataCar();
+          },
     // 查看实时数据
     async loadDataCar() {
     
@@ -307,7 +336,9 @@ export default{
         formData.append('size', this.pagesizetwo);
         formData.append('customerName', this.formUserList.customerName);
         formData.append('batchNum', this.batchNumberQ);
-         formData.append('plateNumber', this.plateNumber);
+        formData.append('billNum', this.billNum);
+        formData.append('success', this.success);
+         formData.append('plateNum', this.plateNumber);
         formData.append('taxPlayerCode', this.taxPlayerCode);
         formData.append('hisFlag', 0);
         const response = await this.$http.post(`noCar/findImportBillWay`, formData);
@@ -317,7 +348,43 @@ export default{
           this.totaltwo = response.data.data.total;
         }
     },
-  
+   async    exportExcel() {
+          let curr = this.currenttwo;
+      let pagesize1 = this.pagesizetwo;
+      this.currenttwo = 1; 
+      this.pagesizetwo = this.totaltwo;
+      await this.loadDataCar();
+      // 设置当前日期
+      let time = new Date();
+      //console.log(time);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
+      let day = time.getDate();
+      let name = "实时运单上传列表_"+year + "" + month + "" + day;
+      // console.log(name)
+      /* generate workbook object from table */
+      //  .table要导出的是哪一个表格
+      var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        //  name+'.xlsx'表示导出的excel表格名字
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          name + ".xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+       this.currenttwo = curr; 
+      this.pagesizetwo = pagesize1;
+      this.loadDataCar();
+      return wbout;
+    },
      handleRemove(file, fileList) {
       console.log(file, fileList);
     },

src/views/platform/waybillmanagement/waybillList.vue

@@ -15,8 +15,14 @@
               </el-select>
               <el-input  placeholder="运单编号" class="theinput" v-model="billNum"></el-input>
               <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-select v-model="success" placeholder="是否成功">
+                <el-option
+                  v-for="item in optionone"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
               <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> -->
@@ -185,6 +191,7 @@ export default{
       billStartTime: '',
       billEndTime: '',
       createStartTime: '',
+      success:'',
       createEndTime: '',
        hightt:'0px',
       // taxPlayerCode: '',
@@ -192,6 +199,13 @@ export default{
       currenttwo: 1,
       pagesizetwo: 8,
       totaltwo: 0,
+      optionone: [{
+        value: '1',
+        label: '成功'
+      }, {
+        value: '2',
+        label: '失败'
+      }],
       // batch: '',
       companyList:[],
       companyName:'',
@@ -216,7 +230,7 @@ export default{
       const formData = new FormData();
       formData.append('current', this.currenttwo);
       formData.append('size', this.pagesizetwo);
-      formData.append('isSuccess', 1);
+      formData.append('success', this.success);
       formData.append('customerName', this.customerName);
       formData.append('companyName', this.companyName);
       formData.append('billNum', this.billNum);

src/views/selfCar/calculateInfo.vue

@@ -7,10 +7,10 @@
                <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="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="计费开始" end-placeholder="计费结束"></el-date-picker>
+               <el-date-picker v-model="formCondition.calTime" type="monthrange" value-format="yyyy-MM" 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>
+               <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>
@@ -97,6 +97,11 @@ import XLSX from "xlsx";
             }
         },
         methods:{
+              firstLoadData(){
+            this.current = 1;
+            this.pagesize = 8;
+            this.loadData();
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/selfCar/invoice.vue

@@ -214,7 +214,7 @@ import XLSX from "xlsx";
           }
         },
         created() {
-          this.heightt = tableHeight;
+          this.heightt = tableHeight-100;
           this.loadData();
         },
         filters: {

src/views/selfCar/selfCarTrade.vue

@@ -18,7 +18,8 @@
                 :auto-upload="false">
                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
-                <el-button style="margin-left: 555px;" @click="DownloadTemplate">查询模板下载</el-button>
+                <el-button style="margin-left: 438px;" @click="DownloadTemplate">查询模板下载</el-button>
+                  <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
               </el-upload>
               </div>
@@ -32,8 +33,7 @@
                  <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="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>
+                 <el-button type="success" style="margin-left: 1%;" @click="update">更新</el-button>
               </div>
             </div>
           </el-col>
@@ -47,8 +47,13 @@
           ref="multipleTable"
           :data="selfcarTrade"
            :height="heightt"
+            
           border
-          tooltip-effect="dark">
+          tooltip-effect="dark" @selection-change="handleSelectionChange">
+           <el-table-column
+              type="selection"
+              width="55">
+               </el-table-column>
          <el-table-column
             label="企业编号"
             prop="companyNum"
@@ -125,6 +130,7 @@ import XLSX from "xlsx";
       export default {
         data(){
           return{
+            multipleSelection:[],
             formCondition:{
 
             },
@@ -139,7 +145,7 @@ import XLSX from "xlsx";
           }
         },
         created() {
-          this.heightt = tableHeight;
+          this.heightt = tableHeight-100;
           this.loadData();
         },
         filters: {
@@ -153,6 +159,17 @@ import XLSX from "xlsx";
             this.pagesize = 8;
             this.loadData();
           },
+          async update(){
+            if(this.multipleSelection.length == 0){return};
+             const formData = new FormData();
+            formData.append('selfCarTradesStr', JSON.stringify(this.multipleSelection));
+               const response = await this.$http.post(`selfCar/updateTrades`, formData);
+               this.loadData();
+                this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();
@@ -167,6 +184,10 @@ import XLSX from "xlsx";
               this.total = response.data.data.total;
             }
           },
+           handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+           },
             // 下载模板
           DownloadTemplate() {
             var url = hostUrl+"noCar/templateDownload?fileName=6"

src/views/selfCar/selfCarTradeException.vue

@@ -5,7 +5,7 @@
           <el-col :span="24">
             <div class="top">
                <div class="demo-input-suffix">
-               <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
+               <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.cardId"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="formCondition.companyReferencenum"></el-input>
                 <el-input  placeholder="交易id" class="input-demo" v-model="formCondition.tradeId"></el-input>
@@ -14,7 +14,7 @@
                  <!-- <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="firstLoadData">查询</el-button>
-               <el-button type="success" style="margin-left: 1%;" >更新状态(待确认)</el-button>
+               <el-button type="success" style="margin-left: 1%;"  @click="update">更新</el-button>
                             <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
             </div>
@@ -30,7 +30,11 @@
           :data="selfcarTrade"
           :height="heightt"
           border
-          tooltip-effect="dark">
+          tooltip-effect="dark" @selection-change="handleSelectionChange">
+          <el-table-column
+              type="selection"
+              width="55">
+               </el-table-column>
          <el-table-column
             label="企业编号"
             prop="companyNum"
@@ -38,7 +42,7 @@
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客户名称"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
@@ -77,7 +81,7 @@
             </template>
           </el-table-column>
            <el-table-column
-            prop="timeCount"
+            prop="days"
             label="超长时间(天)"
             show-overflow-tooltip>
           </el-table-column>
@@ -107,6 +111,7 @@ import XLSX from "xlsx";
               "exceptionFlag":1
             },
             selfcarTrade:[],
+             multipleSelection:[],
             current: 1,
             hightt:'0px',
             pagesize: 8,
@@ -142,6 +147,19 @@ import XLSX from "xlsx";
               this.total = response.data.data.total;
             }
           },
+           handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+           },
+            async update(){
+            if(this.multipleSelection.length == 0){return};
+               const response = await this.$http.post(`selfCar/updateTrades`, this.multipleSelection);
+               this.loadData();
+                this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+          },
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;