前端修改

src/config/globle.js

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

src/main.js

@@ -9,8 +9,8 @@ import '@/assets/css/index.css';
 import moment from 'moment';
 import './config/rem.js';
 // import axios from 'axios';
-import myaxios from '@/plugins/MyAxios';
 import   './config/globle.js';
+import myaxios from '@/plugins/MyAxios';
 import MyBreadcrumb from '@/components/MyBreadcrumb';
 import 'babel-polyfill';
 

src/plugins/MyAxios.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 const MyAxios = {};
 MyAxios.install = function(Vue) {
-  axios.defaults.baseURL = 'http://127.0.0.1:18080/';
+  axios.defaults.baseURL = hostUrl;
   // axios.defaults.baseURL = 'http://222.35.31.66:18080/';
   axios.defaults.headers.common['app_id'] = 'RGZYQD'
   axios.interceptors.request.use(function (config) {

src/router/index.js

@@ -43,6 +43,7 @@ const Check = () => import('@/views/platform/check/check');
 const Apply = () => import('@/views/platform/apply/apply');
 const Already = () => import('@/views/platform/apply/already');
 const Packaging = () => import('@/views/platform/apply/packaging');
+const selfCarTradeP = () => import('@/views/platform/apply/selfCarTrade');
 
 const Carbinding = () => import('@/views/platform/carbinding/carbinding');
 const Carbindinglist = () => import('@/views/platform/carbinding/carbindinglist');
@@ -107,7 +108,7 @@ const router = new Router({
         {name: 'Apply', path: '/apply', component: Apply},
         {name: 'Already', path: '/already', component: Already},
         {name: 'Packaging', path: '/packaging', component: Packaging},
-
+        {name: 'selfCarTradeP', path: '/selfCarTradeP', component: selfCarTradeP},
         {name: 'Carbinding', path: '/carbinding', component: Carbinding},
         {name: 'Carbindinglist', path: '/carbindinglist', component: Carbindinglist},
 

src/views/Home.vue

@@ -389,6 +389,11 @@ export default {
               path:"apply",
               authName:"申请开票"
             },
+             {
+              id:1,
+              path:"selfCarTradeP",
+              authName:"交易查询"
+            },
             {
               id:2,
               path:"already",

src/views/customer/Customer.vue

@@ -4,7 +4,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customName"></el-input>
+              <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</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>
@@ -20,7 +20,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="coustomerTable"
-           height="370px"
+           :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -113,7 +113,7 @@
           <el-form-item label="客戶名称" prop="customerName">
             <el-input v-model="customer.customerName" auto-complete="off" placeholder="请输入用户名"></el-input>
           </el-form-item>
-           <el-form-item label="客户主体" prop="customerCompany">
+           <el-form-item label="客户主体" prop="customerCompany"> 
             <el-input v-model="customer.company" auto-complete="off" placeholder="请输入主体名称"></el-input>
           </el-form-item>
           <el-form-item label="业务类型" prop="bussinessType">
@@ -458,7 +458,9 @@
         <el-form
           label-position="right"
           label-width="80px"
-          :model="formUserList">
+           :rules="custRecAddrules"
+          ref="recRuleForm"
+          :model="customerRec">
           <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="客户名称">
@@ -466,55 +468,55 @@
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                   <el-form-item label-width=120px label="公司负责人">
+                   <el-form-item label-width=120px label="公司负责人" prop="companyLeader">
                    <el-input v-model="customerRec.companyLeader"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="负责人手机号">
+                <el-form-item  label-width=120px label="负责人手机号" prop="companyLeaderPhone">
                 <el-input v-model="customerRec.companyLeaderPhone" auto-complete="off"  ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                   <el-form-item label-width=120px label="公司名称">
+                   <el-form-item label-width=120px label="公司名称" prop="companyName">
                    <el-input v-model="customerRec.companyName"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="公司税号">
+                <el-form-item  label-width=120px label="公司税号" prop="companyReferencenum">
                 <el-input v-model="customerRec.companyReferencenum" auto-complete="off"  ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                   <el-form-item label-width=120px label="公司开户行">
+                   <el-form-item label-width=120px label="公司开户行" prop="companyOpenbank">
                    <el-input v-model="customerRec.companyOpenbank"  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
          <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="公司开户行账号">
+                <el-form-item  label-width=120px label="公司开户行账号" prop="companyOpenbankAcc">
                 <el-input v-model="customerRec.companyOpenbankAcc" auto-complete="off"  ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                   <el-form-item label-width=120px label="公司地址">
+                   <el-form-item label-width=120px label="公司地址" prop="companyAdress">
                    <el-input v-model="customerRec.companyAdress"  style="width: 100%" ></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
            <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="公司电话">
+                <el-form-item  label-width=120px label="公司电话" prop="companyPhone">
                 <el-input v-model="customerRec.companyPhone" auto-complete="off"  ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                   <el-form-item label-width=120px label="业务类型">
+                   <el-form-item label-width=120px label="业务类型" prop="bussinessType">
                    <el-select v-model="customerRec.bussinessType" placeholder="业务类型"  style="width: 100%">
                         <el-option
                           v-for="item in bussinessTypeList"
@@ -588,13 +590,13 @@
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="服务开始时间">
+                <el-form-item  label-width=120px label="服务开始时间" prop="serviceStartTime">
                 <!-- <el-input v-model="customerRec.serviceStartTime" auto-complete="off" ></el-input> -->
                 <el-date-picker v-model="customerRec.serviceStartTime" type="date" value-format="yyyy-MM-dd HH:mm:SS" placeholder="服务开始时间"></el-date-picker>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item  label-width=120px label="服务结束时间">
+                <el-form-item  label-width=120px label="服务结束时间" prop="serviceEndTime">
                 <!-- <el-input v-model="customerRec.serviceEndTime" auto-complete="off" ></el-input> -->
                  <el-date-picker v-model="customerRec.serviceEndTime" type="date" value-format="yyyy-MM-dd HH:mm:SS" placeholder="服务结束时间"></el-date-picker>
               </el-form-item>
@@ -642,6 +644,7 @@ import XLSX from "xlsx";
               customerName:'',
               startTime:''
             },
+            hightt:'0px',
             coustomerTable:[],
             coustomerCarTable:[],
             customeRecQueryListTable:[],
@@ -654,11 +657,65 @@ import XLSX from "xlsx";
                                 {id:5,name:"专线运输"},
                                 {id:6,name:"其他"}],
             serviceTypeList:[{id:1,name:"一级产品"},{id:2,name:"二级产品"},{id:3,name:"三级产品"}],                    
-            custAddrules: {
+            custAddrules: { 
               customerName: [
                 { required: true, message: '请输入', trigger: 'blur' },
                 { min: 3, max: 100, message: '长度在 3 到 100个字符', trigger: 'blur' }
+              ],
+               customerCompany: [
+                { required: true, message: '请输入', trigger: 'blur' },
+                { min: 3, max: 100, message: '长度在 3 到 300个字符', trigger: 'blur' }
+              ],
+               bussinessType: [
+                { required: true, message: '请输入', trigger: 'blur' },
               ]
+            }, 
+            custRecAddrules: { 
+              customerName: [
+                { required: true, message: '请输入', trigger: 'blur' },
+              ],
+               companyLeader: [
+                { required: true, message: '请输入', trigger: 'blur' },
+              ],
+               companyLeaderPhone: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyName: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyReferencenum: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyOpenbank: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyOpenbankAcc: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyAdress: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyPhone: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               bussinessType: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               companyType: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               operatingRangeType: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               serviceType: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               serviceStartTime: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ],
+               serviceEndTime: [
+                { required: true, message: '请输入', trigger: 'blur' },
+               ]
             },
             customerRec:{
 
@@ -714,6 +771,7 @@ import XLSX from "xlsx";
           }
         },
           created() {
+             this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -753,12 +811,12 @@ import XLSX from "xlsx";
           },
           httpRequest(data){　　// 没事儿就打印data看看呗　　　　//这是限制上传文件类型
               const isPFX = data.file.type === "application/pdf";
-              const isLt2M = data.file.size / 1024 / 1024 < 2;
+              const isLt2M = data.file.size / 1024 / 1024 < 10;
 
               if (!isPFX) {
                 this.$message.error("上传文件只能是pdf格式!");
               }else if (!isLt2M) {
-                this.$message.error("上传文件大小不能超过 2MB!");
+                this.$message.error("上传文件大小不能超过 10MB!");
               }else{
                 // 转base64
                 this.getBase64(data.file).then(resBase64 => {
@@ -912,7 +970,10 @@ import XLSX from "xlsx";
             this.customerRec = {};
           },
           async customerRecAdd(){
-             const response = await this.$http.post(`customer/customerRecAdd`, this.customerRec);
+            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();
                     this.addCustomerRecShow1 = false;
@@ -926,6 +987,9 @@ import XLSX from "xlsx";
                       message: '保存失败：'+response.data.msg
                     });
                   }
+               }
+             });
+             
           },
           generateWord(){
             const token = sessionStorage.getItem('token');
@@ -982,7 +1046,7 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            formData.append('customerName', this.formCondition.customerName);
             const response = await this.$http.post(`customer/findCustomer`, formData);
             if (response.data.code === 0) {
               this.coustomerTable = response.data.data.records;
@@ -999,7 +1063,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+     async exportExcel() {
+        let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -1026,6 +1095,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+      this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/customer/custRecMoney.vue

@@ -18,7 +18,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="customeRecMoneyListTable"
-           height="370px"
+           :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -74,15 +74,17 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              customrName:''
+              customerName:''
             },
             customeRecMoneyListTable:[],
+             hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
          filters: {
@@ -96,7 +98,7 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            formData.append('customerName', this.formCondition.customerName);
             const response = await this.$http.post(`customer/findCustomerMoney`, formData);
             if (response.data.code === 0) {
               this.customeRecMoneyListTable = response.data.data.records;
@@ -117,7 +119,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+      async   exportExcel() {
+        let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -144,6 +151,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/customer/custRecTime.vue

@@ -4,8 +4,8 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customName"></el-input>
-               <el-input  placeholder="到期日" class="input-demo" v-model="formCondition.endTime"></el-input>
+               <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
+               <el-date-picker v-model="formCondition.serviceEndTime" type="date" value-format="yyyy-MM-dd" placeholder="到期日"> </el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
@@ -19,7 +19,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="customeRecTimeListTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -82,16 +82,18 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              companyName:'',
-              endTime:''
+              customerName:'',
+              serviceEndTime:''
             },
             customeRecTimeListTable:[],
+             hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         methods:{
@@ -100,7 +102,8 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            formData.append('customerName', this.formCondition.customerName);
+            formData.append('serviceEndTime', this.formCondition.serviceEndTime);
             const response = await this.$http.post(`customer/findCustomerRecTimeList`, formData);
             if (response.data.code === 0) {
               this.customeRecTimeListTable = response.data.data.records;
@@ -118,7 +121,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+        async    exportExcel() {
+          let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -145,6 +153,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/customer/customerRecharge.vue

@@ -4,7 +4,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="用户" class="input-demo" v-model="formCondition.customName"></el-input>
+               <el-input  placeholder="用户" class="input-demo" v-model="formCondition.customerName"></el-input>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
@@ -19,7 +19,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="customerRechargeList"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -73,6 +73,7 @@ import XLSX from "xlsx";
             formCondition:{
               companyName:'',
             },
+            hightt:'0px',
             customerRechargeList:[],
             current: 1,
             pagesize: 8,
@@ -80,6 +81,7 @@ import XLSX from "xlsx";
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -93,7 +95,7 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            formData.append('customerName', this.formCondition.customerName);
             const response = await this.$http.post(`customer/findCustomerRecharge`, formData);
             if (response.data.code === 0) {
               this.customerRechargeList = response.data.data.records;
@@ -111,7 +113,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-            exportExcel() {
+     async exportExcel() {
+      let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -138,6 +145,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/manager/paramMagager.vue

@@ -24,7 +24,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -156,6 +156,7 @@ export default{
       paramValue: '',
       paramNote: '',
       current: 1,
+       hightt:'0px',
       pagesize: 8,
       formParamList: {
         "paramName":"",
@@ -170,6 +171,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.loadData();
   },
   methods: {
@@ -279,7 +281,12 @@ export default{
       console.log(`当前页: ${val}`);
     },
         // 导出表格所用
-    exportExcel() {
+    async exportExcel() {
+      let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.queryLook();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -306,6 +313,9 @@ export default{
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.queryLook();
       return wbout;
     },
 

src/views/noCar/billway.vue

@@ -31,7 +31,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="billWayTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -159,10 +159,13 @@ import XLSX from "xlsx";
             billWayTable:[],
             current: 1,
             pagesize: 8,
+             hightt:'0px',
             total:''
           }
         },
         created() {
+          //设置表格高度
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -212,35 +215,44 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-          exportExcel() {
-      // 设置当前日期
-      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(".table"));
-      /* 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);
-      }
-      return wbout;
-    },
+         async  exportExcel() {
+              let curr = this.current;
+              let pagesize1 = this.pagesize;
+
+              this.current = 1; 
+              this.pagesize = this.total;
+             await this.loadData();
+            // 设置当前日期
+            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(".table"));
+            /* 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.current = curr; 
+            this.pagesize = pagesize1;
+            this.loadData();
+            return wbout;
+          },
         }
       };
 </script>

src/views/noCar/billwayException.vue

@@ -30,7 +30,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="billWayTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -125,12 +125,14 @@ import XLSX from "xlsx";
               label: '历史运单'
             }],
             billWayTable:[],
+             hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -179,7 +181,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+       async     exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -206,6 +213,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/noCar/calculateInfo.vue

@@ -28,7 +28,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="calculateInfo"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -100,11 +100,13 @@ import XLSX from "xlsx";
             },
             calculateInfo:[],
             current: 1,
+             hightt:'0px',
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
          filters: {
@@ -139,7 +141,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-          exportExcel() {
+       async    exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -166,6 +173,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/noCar/hcInvoice.vue

@@ -20,7 +20,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="invoiceTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -81,10 +81,11 @@ import XLSX from "xlsx";
             formCondition:{
             },
            invoiceTable:[],
+            hightt:'0px',
           }
         },
         created() {
-          
+          this.heightt = tableHeight;
         },
         filters: {
             rounding (value) {
@@ -119,7 +120,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+       async     exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -146,6 +152,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/noCar/invoice.vue

@@ -28,7 +28,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="invoiceTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -181,12 +181,14 @@ import XLSX from "xlsx";
             formCondition:{
             },
            invoiceTable:[],
+            hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
          filters: {
@@ -220,7 +222,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-          exportExcel() {
+       async    exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -247,6 +254,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/noCar/nocarRec.vue

@@ -19,7 +19,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="nocarRecCarTable"
-           height="370px"
+         :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -124,12 +124,14 @@ import XLSX from "xlsx";
             nocarRecCarTable:[],
             companyName:'',
             carNum:'',
+             hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         methods:{
@@ -158,7 +160,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-          exportExcel() {
+       async    exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -185,6 +192,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/personal/personal.vue

@@ -8,7 +8,7 @@
               <div class="geren">个人中心</div>
               <div class="line"></div>
               <div class="from">
-                <table v-model="formUserList">
+                <table>
                   <tr>
                     <td><span>用户名</span></td>
                     <td><span>{{formUserList.userName}}</span></td>

src/views/platform/apply/already.vue

@@ -37,9 +37,10 @@
     <!-- 头部细节部分结束 -->
       <template>
         <el-table
+        class="table"
           ref="multipleTable"
           :data="usertabletwo"
-          height="370px"
+         :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -133,6 +134,7 @@ export default{
       fullscreenLoading: false,
       usertabletwo: [],
       roleId: '',
+       hightt:'0px',
       // codeNumber: '',
       formList: {
         "companyName": "",
@@ -146,6 +148,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.formList.customerName = sessionStorage.getItem('userName');
     this.initCompanyList();
   },

src/views/platform/apply/apply.vue

@@ -25,7 +25,8 @@
                 v-model="startTime"
                 type="datetime"
                 placeholder="选择开始日期时间"
-                style="margin-left: 1%;">
+                style="margin-left: 1%;"
+                @change="changeStartDate">
                </el-date-picker>
               <el-date-picker
                 v-model="endTime"
@@ -40,9 +41,10 @@
     <!-- 头部细节部分结束 -->
       <template>
         <el-table
+         class="table"
           ref="multipleTable"
           :data="usertabletwo"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -85,6 +87,7 @@ export default{
       startTime: '',
       endTime: '',
       companyName: '',
+       hightt:'0px',
       customerName:'',
       // codeNumber: '',
       formList: {},
@@ -92,6 +95,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.initCompanyList();
     this.customerName = sessionStorage.getItem('userName');
   },
@@ -120,6 +124,11 @@ export default{
             }
             this.companyName = this.companyList[0]['companyName'];
     },
+    changeStartDate(value){
+     var dd = new Date();
+     dd.setDate(value.getDate()+90);
+     this.endTime = dd;
+    },
     //申请开票
     async applyForTicket() {
       this.startTime = (new Date(this.startTime)).getTime();

src/views/platform/apply/packaging.vue

@@ -30,9 +30,10 @@
     <!-- 头部细节部分结束 -->
       <template>
         <el-table
+         class="table"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -74,6 +75,7 @@ export default{
     return {
       loading: false,
       usertable: [],
+       hightt:'0px',
       formPackList: {
         "customerName": "",
         "companyName": "",
@@ -83,6 +85,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.formPackList.customerName = sessionStorage.getItem('userName');
     this.initCompanyList();
     this.loadData();

src/views/platform/apply/selfCarTrade.vue

@@ -0,0 +1,270 @@
+<template>
+    <div class="billWay_container">
+      <div class="title">
+        <el-row>
+          <el-col :span="24">
+            <div class="top">
+               <div class="demo-input-suffix">
+                <el-select v-model="formCondition.companyName" placeholder="请选择公司名称">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.companyName">
+                </el-option>
+              </el-select>
+                <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-select v-model="formCondition.status" placeholder="交易状态">
+                <el-option
+                  v-for="item in statusList"
+                  :key="item.status"
+                  :label="item.statusName"
+                  :value="item.status">
+                </el-option>
+                 </el-select>
+              </div>
+              <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="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 表格部分 -->
+        <template>
+        <el-table
+          class="table"
+          v-loading="loading"
+          ref="multipleTable"
+          :data="selfcarTrade"
+           :height="heightt"
+          border
+          tooltip-effect="dark">
+           <el-table-column
+            prop="companyName"
+            label="客户名称"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="companyReferencenum"
+            label="公司税号"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="tradeId"
+            label="交易Id"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="cardId"
+            label="ETC卡号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="fee"
+            label="交易费用"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+               <span>{{scope.row.fee/100| rounding}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="exTime"
+            label="交易时间"
+            show-overflow-tooltip>
+          </el-table-column>
+
+           <el-table-column
+            prop="aclTime"
+            label="申请开票时间"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="status"
+            label="状态"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.status == 1" style="color: green">待开票</span>
+              <span v-else-if="scope.row.status == 2" style="color: red">开票中</span>
+              <span v-else-if="scope.row.status == 3" style="color: red">已开票</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+      <!-- 分页 -->
+      <div class="block">
+        <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="current"
+        :page-sizes="[6, 8, 10, 20, 50, 100]"
+        :page-size="pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+        </el-pagination>
+      </div>
+    </div>
+</template>
+<script type="text/javascript">
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+      export default {
+        data(){
+          return{
+            formCondition:{
+              customId:'',
+              status:2
+            },
+            statusList:[{status:1,statusName:"待开票"},{status:2,statusName:"开票中"},{status:3,statusName:"已开票"}],
+            companyList:[],
+            selfcarTrade:[],
+            hightt:'0px',
+            current: 1,
+            pagesize: 8,
+            total:''
+          }
+        },
+        created() {
+          this.formCondition.customId = sessionStorage.getItem('userName');
+          this.heightt = tableHeight;
+           this.initCompanyList();
+          this.loadData();
+        },
+        filters: {
+            rounding (value) {
+              return value.toFixed(2)
+            }
+        },
+        methods:{
+          // 列表展示
+          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/findTrades`, formData);
+            if (response.data.code === 0) {
+              this.selfcarTrade = response.data.data.records;
+              this.total = response.data.data.total;
+            }
+          },
+           async initCompanyList(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
+            if (response.data.code === 0) {
+              this.companyList = response.data.data;
+            }
+            this.formCondition.companyName = this.companyList[0]['companyName'];
+          },
+          // 分页方法
+          handleSizeChange(val) {
+            this.pagesize = val;
+            this.loadData();
+            console.log(`每页 ${val} 条`);
+          },
+          handleCurrentChange(val) {
+            this.current = val;
+              this.loadData();
+            // console.log(`当前页: ${val}`);
+          },
+       async     exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
+      // 设置当前日期
+      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(".table"));
+      /* 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.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
+      return wbout;
+    },
+        }
+      };
+</script>
+<style>
+.billWay_container {
+  border: 1px solid #d9d9d9;
+  border-radius: 10px;
+}
+.billWay_container .title {
+  font-size: 5px;
+  margin-bottom: 20px;
+}
+.billWay_container .top {
+  padding-top: 20px;
+  padding-left: 20px;
+}
+.billWay_container .text {
+  display: inline-block;
+  color: #000;
+  font-size: 16px ;
+  margin-left: 1%;
+}
+.billWay_container .input-demo {
+  display: inline-block;
+  width: 20%;
+  margin-left: 1%;
+}
+.billWay_container .block {
+  font-size: 5px;
+  text-align: center;
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
+.billWay_container .el-dialog {
+  width: 60%;
+}
+.billWay_container .el-dialog__header, .el-dialog__body {
+  padding: 0 20px;
+}
+.billWay_container .tou {
+  font-size: 20px;
+  height: 30px;
+  line-height: 30px;
+  padding-top: 15px;
+}
+.billWay_container .line {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  width: 100%;
+  height: 2px;
+  background-color: #d9d9d9;
+}
+.billWay_container .xinxi {
+  text-align: center;
+  margin: 15px auto;
+  font-size: 18px;
+}
+</style>

src/views/platform/car/carsuccess.vue

@@ -15,7 +15,7 @@
                 </el-option>
               </el-select>
               <label style="margin-left: 1%;">车牌号:</label>
-              <el-input  placeholder="车牌号" class="input-demo" v-model="carNum"></el-input>
+              <el-input  placeholder="车牌号" class="input-demo" v-model="formUserList.carNum"></el-input>
               <label style="margin-left: 1%;">备案结果:</label>
               <el-select v-model="formUserList.recStatus" placeholder="请选择备案结果">
                 <el-option
@@ -35,10 +35,11 @@
     <!-- 表格部分 -->
       <template>
         <el-table
+         class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -93,6 +94,8 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -105,6 +108,7 @@ export default{
           label: '失败'
         }],
       current: 1,
+       hightt:'0px',
       pagesize: 10,
       total: 0,
       usertable: [],
@@ -118,6 +122,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.initCompanyList();
     this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
@@ -143,57 +148,46 @@ export default{
             if (response.data.code === 0) {
               this.companyList = response.data.data;
             }
-            this.companyName = this.companyList[0]['companyName'];
-    },
-    //查询
-    async queryLook() {
-    
-
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('isSuccess', this.isSuccess);
-        formData.append('userCompany', this.userCompany);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('plateColor', this.plateColor);
-        formData.append('startTime', this.startTime);
-        formData.append('endTime', this.endTime);
-        const response = await this.$http.post(`carFreeCarrierRegister/list`, formData);
-          if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        };
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('isSuccess', this.isSuccess);
-        formData.append('userCompany', this.userCompany);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('plateColor', this.plateColor);
-        formData.append('startTime', this.startTime);
-        formData.append('endTime', this.endTime);
-        const response = await this.$http.post(`carFreeCarrierRegister/list`, formData);
-          if (response.data.code === 0) {
-            this.loading = false;
-            this.usertable = response.data.data.records;
-            this.total = response.data.data.total;
-        };
-      };
+            this.formUserList.companyName = this.companyList[0]['companyName'];
     },
     //导出功能
-    exportOut() {
-      var url = `http://invoice.back.jkcredit.com/carFreeCarrierRegister/export?userId=${this.formUserList.userId}`;
-      if (this.plateNumber !== '') {
-        url += `&plateNumber=${this.plateNumber}`;
-      }
-      if (this.isSuccess !== '') {
-        url += `&isSuccess=${this.isSuccess}`;
-      }
-      window.location.href= url;
+    async  exportOut() {
+      let curr = this.current;
+              let pagesize1 = this.pagesize;
+
+              this.current = 1; 
+              this.pagesize = this.total;
+             await this.loadData();
+            // 设置当前日期
+            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(".table"));
+            /* 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.current = curr; 
+            this.pagesize = pagesize1;
+            this.loadData();
+            return wbout;
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);

src/views/platform/car/carupload.vue

@@ -40,10 +40,11 @@
     <!-- 表格部分 -->
       <template>
         <el-table
+         class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+         :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -208,6 +209,7 @@ export default{
       fullscreenLoading: false,
       userName: '',
       userCompany: '',
+       hightt:'0px',
       batchNumber: '',
       userPhone: '',
       plateNumber: '',
@@ -256,6 +258,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.loadData();
   },
   methods: {

src/views/platform/carbinding/carbinding.vue

@@ -31,9 +31,10 @@
     <!-- 头部细节部分结束 -->
       <template>
         <el-table
+         class="table"
           ref="multipleTable"
           :data="usertabletwo"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark"
           @selection-change="handleSelectionChange">
@@ -140,6 +141,7 @@ export default{
           ],
         },
       binDing: false,
+       hightt:'0px',
       current: 1,
       pagesize: 8,
       total: 0,
@@ -195,6 +197,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.initCompanyList();
   },
   methods: {

src/views/platform/carbinding/carbindinglist.vue

@@ -14,10 +14,11 @@
     <!-- 头部细节部分结束 -->
       <template>
         <el-table
+        class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+         :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -76,6 +77,7 @@ export default{
       total: 0,
       usertable: [],
       carNum: '',
+      hightt:'0px',
       roleId: '',
       formList: {
         "companyName": "",
@@ -84,6 +86,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.loadData();
   },
   methods: {

src/views/platform/check/check.vue

@@ -19,10 +19,11 @@
     <!-- 表格部分 -->
     <template>
       <el-table
+       class="table"
         v-loading="loading"
         ref="multipleTable"
         :data="usertable"
-        height="370px"
+        :height="heightt"
         border
         tooltip-effect="dark">
         <el-table-column
@@ -219,6 +220,7 @@
         pagesize: 8,
         total: 0,
         usertable: [],
+         hightt:'0px',
         customerName: "",
         companyLeaderPhone: "",
         companyReferencenum: "",
@@ -240,6 +242,7 @@
       }
     },
     created() {
+      this.heightt = tableHeight;
      this.loadData();
     },
     methods: {

src/views/platform/invoice/invoice.vue

@@ -29,10 +29,11 @@
        <!-- 表格部分 -->
       <template>
         <el-table
+        class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -172,6 +173,7 @@ export default{
       usertabletwo: [],
       batchId: '',
       addList: false,
+       hightt:'0px',
       current: 1,
       pagesize: 8,
       total: 0,
@@ -187,6 +189,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.loadData();
   },
   methods: {

src/views/platform/invoice/list.vue

@@ -84,9 +84,11 @@
       <template>
         <div class="tou">运单发票列表</div>
         <el-table
+         class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -196,12 +198,15 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
       loading: false,
       fullscreenLoading: false,
       addList: false,
+       hightt:'0px',
       current: 1,
       pagesize: 8,
       total: 0,
@@ -225,6 +230,7 @@ export default{
     }
   },
   created() {
+    this.heightt = '150px';
     this.initCompanyList();
   },
   methods: {
@@ -281,6 +287,7 @@ export default{
         if (response.data.code === 0) {
           this.loading = false;
           var allmeter = response.data.data;
+          this.allmeterList = [];
           this.allmeterList.push(allmeter);
           console.log(this.allmeterList)
         };
@@ -290,15 +297,43 @@ export default{
       window.location.href= user;
     },
      //导出功能
-    exportOut() {
-      if(this.startTime !== '' || this.endTime !== '') {
-        this.startTime = (new Date(this.startTime)).getTime();
-        this.endTime = (new Date(this.endTime)).getTime();
-      }
+   async exportOut() {
+       let curr = this.current;
+              let pagesize1 = this.pagesize;
 
-      var url = `http://invoice.back.jkcredit.com/searchInvoiceResult/export?&userId=${this.formUserList.userId}&waybillNum=${this.waybillNum}&batchNumber=${this.batchNumber}&startTime=${this.startTime}&endTime=${this.endTime}`;
-
-      window.location.href= url;
+              this.current = 1; 
+              this.pagesize = this.total;
+             await this.loadData();
+            // 设置当前日期
+            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(".table"));
+            /* 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.current = curr; 
+            this.pagesize = pagesize1;
+            this.loadData();
+            return wbout;
     },
     // 分页方法
     handleSizeChange(val) {
@@ -345,9 +380,9 @@ export default{
   text-align: center;
   margin-bottom: 10px;
   font-size: 20px;
-  height: 30px;
-  line-height: 30px;
-  padding-top: 15px;
+  height: 20px;
+  line-height: 20px;
+  padding-top: 5px;
 }
 .list .line {
   margin-top: 15px;

src/views/platform/waybill/history.vue

@@ -38,10 +38,11 @@
     <!-- 表格部分 -->
       <template>
         <el-table
+         class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
            <el-table-column
@@ -115,19 +116,19 @@
             :data="usertabletwo"
             border
             tooltip-effect="dark">
-          <el-table-column
+         <el-table-column
             label="运单编号"
             prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="taxPlayerCode"
+            prop="taxplayerCode"
             label="税号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="车牌号码"
-            prop="plateNumber"
+            prop="plateNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -159,14 +160,21 @@
             </template>
           </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: 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>
+              <span v-else-if="scope.row.billwayStatus == -2" style="color: red">导入失败</span>
+            </template>
+          </el-table-column>
+           <el-table-column
+            prop="failReason"
+            label="失败原因"
+            show-overflow-tooltip>
           </el-table-column>
           </el-table>
         </template>
@@ -199,6 +207,7 @@ export default{
       billNum: '',
       plateNumber: '',
       taxPlayerCode: '',
+       hightt:'0px',
       status: '',
       addList: false,
       current: 1,
@@ -227,6 +236,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
   },
@@ -290,7 +300,7 @@ export default{
          formData.append('plateNumber', this.plateNumber);
         formData.append('taxPlayerCode', this.taxPlayerCode);
         formData.append('hisFlag', 1);
-        const response = await this.$http.post(`noCar/findBillWay`, formData);
+        const response = await this.$http.post(`noCar/findImportBillWay`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertabletwo = response.data.data.records;

src/views/platform/waybill/over.vue

@@ -41,10 +41,11 @@
     <!-- 表格部分 -->
       <template>
         <el-table
+         class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+         :height="heightt"
           border
           tooltip-effect="dark">
            <el-table-column
@@ -170,6 +171,7 @@ export default{
       batchNumber: '',
       batchNumberQ:'',
       num: '',
+      hightt:'0px',
       addList: false,
       current: 1,
       pagesize: 8,
@@ -188,6 +190,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
      this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
   },
@@ -249,8 +252,8 @@ export default{
         formData.append('batchNumEnd', this.batchNumberQ);
          formData.append('plateNumber', this.plateNumber);
         formData.append('taxPlayerCode', this.taxPlayerCode);
-        formData.append('hisFlag', 1);
-        const response = await this.$http.post(`noCar/findBillWay`, formData);
+        formData.append('hisFlag', 0);
+        const response = await this.$http.post(`noCar/findImportBillWay`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertabletwo = response.data.data.records;

src/views/platform/waybill/waybill.vue

@@ -40,10 +40,11 @@
     <!-- 表格部分 -->
       <template>
         <el-table
+         class="table"
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-          height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -123,13 +124,13 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="taxPlayerCode"
+            prop="taxplayerCode"
             label="税号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="车牌号码"
-            prop="plateNumber"
+            prop="plateNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -169,8 +170,14 @@
               <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
+            prop="failReason"
+            label="失败原因"
+            show-overflow-tooltip>
+          </el-table-column>
           </el-table>
         </template>
 
@@ -201,6 +208,7 @@ export default{
       billNum: '',
       plateNumber: '',
       taxPlayerCode: '',
+       hightt:'0px',
       status: '',
       addList: false,
       current: 1,
@@ -229,6 +237,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
     this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
   },
@@ -296,7 +305,7 @@ export default{
          formData.append('plateNumber', this.plateNumber);
         formData.append('taxPlayerCode', this.taxPlayerCode);
         formData.append('hisFlag', 0);
-        const response = await this.$http.post(`noCar/findBillWay`, formData);
+        const response = await this.$http.post(`noCar/findImportBillWay`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertabletwo = response.data.data.records;

src/views/platform/waybillmanagement/noinvoice.vue

@@ -56,10 +56,11 @@
           <!-- 表格部分 -->
         <template>
           <el-table
+           class="table"
             v-loading="loading"
             ref="multipleTable"
             :data="usertabletwo"
-            height="370px"
+            :height="heightt"
             border
             tooltip-effect="dark">
           <el-table-column
@@ -68,13 +69,13 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="taxPlayerCode"
+            prop="taxplayerCode"
             label="税号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="车牌号码"
-            prop="plateNumber"
+            prop="plateNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -158,6 +159,7 @@ export default{
       billNum: '',
       plateNumber: '',
       batchNumber: '',
+      hightt:'0px',
       billStartTime: '',
       billEndTime: '',
       createStartTime: '',
@@ -182,6 +184,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
      this.customerName = sessionStorage.getItem('userName');
      this.initCompanyList();
    

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -73,10 +73,11 @@
           <!-- 表格部分 -->
         <template>
           <el-table
+           class="table"
             v-loading="loading"
             ref="multipleTable"
             :data="usertabletwo"
-            height="370px"
+            :height="heightt"
             border
             tooltip-effect="dark">
           <el-table-column
@@ -85,13 +86,13 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="taxPlayerCode"
+            prop="taxplayerCode"
             label="税号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="车牌号码"
-            prop="plateNumber"
+            prop="plateNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -176,6 +177,7 @@ export default{
       plateNumber: '',
       batchNumber: '',
       startTime: '',
+      hightt:'0px',
       endTime: '',
       createStartTime: '',
       createEndTime: '',
@@ -215,6 +217,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
      this.customerName = sessionStorage.getItem('userName');
      this.initCompanyList();
    

src/views/platform/waybillmanagement/waybillList.vue

@@ -62,10 +62,11 @@
     <!-- 表格部分 -->
         <template>
           <el-table
+           class="table"
             v-loading="loading"
             ref="multipleTable"
             :data="usertabletwo"
-            height="370px"
+            :height="heightt"
             border
             tooltip-effect="dark">
           <el-table-column
@@ -74,13 +75,13 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="taxPlayerCode"
+            prop="taxplayerCode"
             label="税号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="车牌号码"
-            prop="plateNumber"
+            prop="plateNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -167,6 +168,7 @@ export default{
       billEndTime: '',
       createStartTime: '',
       createEndTime: '',
+       hightt:'0px',
       // taxPlayerCode: '',
       // status: '',
       currenttwo: 1,
@@ -180,6 +182,7 @@ export default{
     }
   },
   created() {
+    this.heightt = tableHeight;
      this.customerName = sessionStorage.getItem('userName');
      this.initCompanyList();
    

src/views/selfCar/calculateInfo.vue

@@ -23,7 +23,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="calculateInfo"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -81,12 +81,14 @@ import XLSX from "xlsx";
             formCondition:{
             },
             calculateInfo:[],
+             hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -118,7 +120,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+        async    exportExcel() {
+          let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -145,6 +152,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/selfCar/invoice.vue

@@ -28,7 +28,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="invoiceTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -171,12 +171,14 @@ import XLSX from "xlsx";
 
             },
            invoiceTable:[],
+            hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -210,7 +212,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+       async     exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -237,6 +244,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/selfCar/selfCarTrade.vue

@@ -28,7 +28,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="selfcarTrade"
-           height="370px"
+           :height="heightt"
           border
           tooltip-effect="dark">
          <el-table-column
@@ -111,12 +111,14 @@ import XLSX from "xlsx";
 
             },
             selfcarTrade:[],
+            hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -150,7 +152,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+       async     exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -177,6 +184,10 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+      
+      this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/selfCar/selfCarTradeException.vue

@@ -28,7 +28,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="selfcarTrade"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
          <el-table-column
@@ -103,11 +103,13 @@ import XLSX from "xlsx";
             },
             selfcarTrade:[],
             current: 1,
+            hightt:'0px',
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         filters: {
@@ -141,7 +143,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+       async  exportExcel() {
+         let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -168,6 +175,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/selfCar/selfcarRec.vue

@@ -34,7 +34,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="selfcarRecCarTable"
-           height="370px"
+          :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -148,12 +148,14 @@ import XLSX from "xlsx";
             formCondition:{
               businessType: "0"
             },
+             hightt:'0px',
             current: 1,
             pagesize: 8,
             total:''
           }
         },
         created() {
+          this.heightt = tableHeight;
           this.loadData();
         },
         methods:{
@@ -212,7 +214,12 @@ import XLSX from "xlsx";
               this.loadData();
             // console.log(`当前页: ${val}`);
           },
-           exportExcel() {
+        async    exportExcel() {
+          let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -239,6 +246,9 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },
         }

src/views/sys/user.vue

@@ -33,7 +33,7 @@
           v-loading="loading"
           ref="multipleTable"
           :data="usertable"
-           height="370px"
+           :height="heightt"
           border
           tooltip-effect="dark">
           <el-table-column
@@ -51,8 +51,8 @@
             prop="name"
             show-overflow-tooltip>
           </el-table-column>
-           </el-table-column>
-               <el-table-column
+          
+          <el-table-column
             label="手机号"
             prop="phone"
             show-overflow-tooltip>
@@ -384,6 +384,7 @@ export default{
       usertable: [],
       roleList: [],
       tempRole:[],
+      hightt:'0px',
       formUserList: {
         "userName":"",
         "password": "",
@@ -417,6 +418,7 @@ export default{
     }
   },
   created() {
+   this.heightt = tableHeight;
     this.loadRoleList();
     this.loadData();
   },
@@ -685,7 +687,12 @@ export default{
       console.log(`当前页: ${val}`);
     },
         // 导出表格所用
-    exportExcel() {
+   async exportExcel() {
+      let curr = this.current;
+      let pagesize1 = this.pagesize;
+      this.current = 1; 
+      this.pagesize = this.total;
+      await this.loadData();
       // 设置当前日期
       let time = new Date();
       //console.log(time);
@@ -712,6 +719,9 @@ export default{
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
+      this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
       return wbout;
     },