无车开票

src/views/platform/waybill/history.vue

@@ -24,11 +24,11 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="用户名" class="input-demo" style="margin: 0;" v-model="userName"></el-input>
-              <el-input  placeholder="用户所在公司" class="input-demo" v-model="userCompany"></el-input>
-              <el-input  placeholder="批次号" class="input-demo" v-model="batchNumber"></el-input>
+               <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="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
               <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -44,18 +44,18 @@
           height="370px"
           border
           tooltip-effect="dark">
-          <el-table-column
+           <el-table-column
             label="用户名"
-            prop="userName"
+            prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="用户手机号"
-            prop="userPhone"
+            prop="customerPhone"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="userCompany"
+            prop="company"
             label="用户所在公司"
             show-overflow-tooltip>
           </el-table-column>
@@ -75,7 +75,7 @@
             label="操作"
             width="80">
             <template slot-scope="scope" show-overflow-tooltip>
-              <span style="cursor:pointer;" @click="checkLook(scope.row.id)">查看</span>
+              <span style="cursor:pointer;" @click="checkLook(scope.row.batchNumber)">查看</span>
             </template>
           </el-table-column>
         </el-table>
@@ -103,19 +103,10 @@
           <div class="tou">运单历史列表</div>
           <div class="line"></div>
           <div class="styleType">
-            <el-input  placeholder="运单编号" class="theinput" v-model="num"></el-input>
-            <el-input  placeholder="车牌号" class="theinput" v-model="plateNumber"></el-input>
+           <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-input  placeholder="运单状态" class="theinput" v-model="status"></el-input>
-            <el-select v-model="isSuccess" 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="queryLookTwo">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -126,7 +117,7 @@
             tooltip-effect="dark">
           <el-table-column
             label="运单编号"
-            prop="num"
+            prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -171,26 +162,12 @@
             label="运单状态"
             show-overflow-tooltip>
             <template slot-scope="scope">
-                <span v-if="scope.row.status == 1">未结束</span>
-                <span v-else-if="scope.row.status == 2">已结束运单</span>
-                <span v-else-if="scope.row.status == 3">已开发票</span>
-                <span v-else-if="scope.row.status == 4">开票中</span>
-                <span v-else-if="scope.row.status == 9">状态错误</span>
+                <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>
           </el-table-column>
-           <el-table-column
-            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>
-          </el-table-column>
-          <el-table-column
-            prop="errorMsg"
-            label="失败原因"
-            show-overflow-tooltip>
-          </el-table-column>
           </el-table>
         </template>
 
@@ -217,9 +194,9 @@ export default{
       loading: false,
       fullscreenLoading: false,
       userName: '',
-      userCompany: '',
-      batchNumber: '',
-      num: '',
+      customerName: '',
+      companyName: '',
+      billNum: '',
       plateNumber: '',
       taxPlayerCode: '',
       status: '',
@@ -230,12 +207,12 @@ export default{
       currenttwo: 1,
       pagesizetwo: 8,
       totaltwo: 0,
-      batch: '',
-      batchId: '',
+      batchNum: '',
+      batchNumberQ:'',
       usertable: [],
       usertabletwo: [],
       formUserList: {
-       "userId": "",
+      "customerName": "",
        "file": "",
        "roleId": ""
       },
@@ -250,70 +227,25 @@ export default{
     }
   },
   created() {
+    this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
   },
   methods: {
     // 列表展示
     async loadData() {
-      this.formUserList.userId = sessionStorage.getItem('userId');
-      this.formUserList.roleId = sessionStorage.getItem('roleId');
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
+      const formData = new FormData();
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
-        formData.append('type', 3);
-        const response = await this.$http.post(`batch/list`, formData);
+        formData.append('customerName',this.formUserList.customerName);
+         formData.append('company', this.companyName);
+        formData.append('batchNumer', this.batchNum);
+        formData.append('operType', 3);
+        const response = await this.$http.post(`noCar/findBatchList`, 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('type', 3);
-        const response = await this.$http.post(`batch/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        };
-      };
-    },
-    //查询
-    async queryLook() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('type', 3);
-        formData.append('userName', this.userName);
-        formData.append('userCompany', this.userCompany);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`batch/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('type', 3);
-        formData.append('userName', this.userName);
-        formData.append('userCompany', this.userCompany);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`batch/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        };
-      };
     },
     // 下载模板
     DownloadTemplate() {
@@ -326,9 +258,9 @@ export default{
     async batchUpload() {
       this.fullscreenLoading = true;
       const formData = new FormData();
-      formData.append('userId', this.formUserList.userId);
+      formData.append('customerName', this.formUserList.customerName);
       formData.append('file', this.formUserList.file);
-      const response = await this.$http.post(`carFreeCarrierBill/historyBill`,formData);
+      const response = await this.$http.post(`noCar/batchImprotHistoryBillWay`,formData);
        var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
@@ -345,77 +277,27 @@ export default{
     // 查看批次数据
     async checkLook(id) {
       this.addList = true;
-      this.batchId = id;
+      this.batchNumberQ = id;
       this.loadDataCar();
     },
     // 查看历史数据
     async loadDataCar() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 2);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        };
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 2);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        };
-      };
-    },
-    //查询(二)
-    async queryLookTwo() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
+       const formData = new FormData();
         formData.append('current', this.currenttwo);
         formData.append('size', this.pagesizetwo);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 2);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
+        formData.append('customerName', this.formUserList.customerName);
+        formData.append('batchNum', this.batchNumberQ);
+         formData.append('plateNumber', this.plateNumber);
         formData.append('taxPlayerCode', this.taxPlayerCode);
-        formData.append('status', this.status);
-        formData.append('isSuccess', this.isSuccess);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
+        formData.append('hisFlag', 1);
+        const response = await this.$http.post(`noCar/findBillWay`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertabletwo = response.data.data.records;
           this.totaltwo = response.data.data.total;
-        };
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 2);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('taxPlayerCode', this.taxPlayerCode);
-        formData.append('status', this.status);
-        formData.append('isSuccess', this.isSuccess);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        };
-      };
+        }
     },
+   
     // 清空表单数据
     handleEditDialogClose() {
       this.num = '';
@@ -439,38 +321,22 @@ export default{
     // 分页方法
     handleSizeChange(val) {
       this.pagesize = val;
-      if(this.userName !== '' || this.userCompany !== '' || this.batchNumber !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+       this.loadData();
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
       this.current = val;
-      if(this.userName !== '' || this.userCompany !== '' || this.batchNumber !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+      this.loadData();
       console.log(`当前页: ${val}`);
     },
     handleSize(val) {
       this.pagesizetwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.taxPlayerCode !== '' || this.status !== '' || this.isSuccess !== '') {
-        this.queryLookTwo();
-      }else{
-        this.loadDataCar();
-      }
+      this.loadDataCar();
       console.log(`每页 ${val} 条`);
     },
     handleCurrent(val) {
       this.currenttwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.taxPlayerCode !== '' || this.status !== '' || this.isSuccess !== '') {
-        this.queryLookTwo();
-      }else{
-        this.loadDataCar();
-      }
+     this.loadDataCar();
       console.log(`当前页: ${val}`);
     }
   }

src/views/platform/waybill/over.vue

@@ -26,11 +26,11 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="用户名" class="input-demo" style="margin: 0;" v-model="userName"></el-input>
-              <el-input  placeholder="用户所在公司" class="input-demo" v-model="userCompany"></el-input>
-              <el-input  placeholder="批次号" class="input-demo" v-model="batchNumber"></el-input>
+               <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="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
               <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -47,18 +47,18 @@
           height="370px"
           border
           tooltip-effect="dark">
-          <el-table-column
+           <el-table-column
             label="用户名"
-            prop="userName"
+            prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="用户手机号"
-            prop="userPhone"
+            prop="customerPhone"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="userCompany"
+            prop="company"
             label="用户所在公司"
             show-overflow-tooltip>
           </el-table-column>
@@ -78,7 +78,7 @@
             label="操作"
             width="80">
             <template slot-scope="scope" show-overflow-tooltip>
-              <span style="cursor:pointer;" @click="checkLook(scope.row.id)">查看</span>
+              <span style="cursor:pointer;color: blue;" @click="checkLook(scope.row.batchNumber)">查看</span>
             </template>
           </el-table-column>
         </el-table>
@@ -106,8 +106,8 @@
           <div class="tou">运单列表</div>
           <div class="line"></div>
           <div class="styleType">
-            <el-input  placeholder="运单编号" class="theinput" v-model="num"></el-input>
-            <el-button type="success" style="margin-left: 1%;" @click="queryLookTwo">查询</el-button>
+           <el-input  placeholder="运单编号" class="theinput" v-model="billNum"></el-input>
+            <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -118,16 +118,16 @@
             tooltip-effect="dark">
           <el-table-column
             label="运单编号"
-            prop="num"
+            prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="realDestAddr"
+            prop="destAddr"
             label="目的地址"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="endTime"
+            prop="predictEndTime"
             label="结束时间"
             show-overflow-tooltip>
           </el-table-column>
@@ -165,9 +165,10 @@ export default{
     return {
       loading: false,
       fullscreenLoading: false,
-      userName: '',
-      userCompany: '',
+      customerName: '',
+      companyName: '',
       batchNumber: '',
+      batchNumberQ:'',
       num: '',
       addList: false,
       current: 1,
@@ -180,77 +181,32 @@ export default{
       usertable: [],
       usertabletwo: [],
       formUserList: {
-       "userId": "",
+       "customerName": "",
        "file": "",
        "roleId": ""
       },
     }
   },
   created() {
+     this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
   },
   methods: {
     // 列表展示
     async loadData() {
-      this.formUserList.userId = sessionStorage.getItem('userId');
-      this.formUserList.roleId = sessionStorage.getItem('roleId');
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
+       const formData = new FormData();
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
-        formData.append('type', 5);
-        const response = await this.$http.post(`batch/list`, formData);
+        formData.append('customerName',this.formUserList.customerName);
+         formData.append('company', this.companyName);
+        formData.append('batchNumer', this.batchNum);
+        formData.append('operType', 2);
+        const response = await this.$http.post(`noCar/findBatchList`, 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('type', 5);
-        const response = await this.$http.post(`batch/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        }
-      }
-    },
-    //查询
-    async queryLook() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('type', 5);
-        formData.append('userName', this.userName);
-        formData.append('userCompany', this.userCompany);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`batch/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('type', 5);
-        formData.append('userName', this.userName);
-        formData.append('userCompany', this.userCompany);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`batch/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        }
-      }
     },
     // 下载模板
     DownloadTemplate() {
@@ -263,9 +219,9 @@ export default{
     async batchUpload() {
       this.fullscreenLoading = true;
       const formData = new FormData();
-      formData.append('userId', this.formUserList.userId);
+      formData.append('customerName', this.formUserList.customerName);
       formData.append('file', this.formUserList.file);
-      const response = await this.$http.post(`carFreeCarrierBill/billEnd`,formData);
+      const response = await this.$http.post(`noCar/batchImprotEndBillWay`,formData);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
@@ -282,78 +238,29 @@ export default{
     // 查看批次数据
     async checkLook(id) {
       this.addList = true;
-      this.batchId = id;
+      this.batchNumberQ = id;
       this.loadDataCar();
     },
     // 查看实时数据
     async loadDataCar() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/endList`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
+       const formData = new FormData();
         formData.append('current', this.currenttwo);
         formData.append('size', this.pagesizetwo);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/endList`, formData);
+        formData.append('customerName', this.formUserList.customerName);
+        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);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertabletwo = response.data.data.records;
           this.totaltwo = response.data.data.total;
         }
-      }
-    },
-    //查询(二)
-    async queryLookTwo() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        formData.append('num', this.num);
-        const response = await this.$http.post(`carFreeCarrierBill/endList`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        formData.append('num', this.num);
-        const response = await this.$http.post(`carFreeCarrierBill/endList`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }
     },
     // 清空表单数据
     handleEditDialogClose() {
-      this.num = '';
-      this.plateNumber = '';
-      this.taxPlayerCode = '';
-      this.current = 1;
-      this.pagesize = 8;
-      this.currenttwo = 1;
-      this.pagesizetwo = 8;
+       this.addList = false;
     },
      handleRemove(file, fileList) {
       console.log(file, fileList);
@@ -368,38 +275,22 @@ export default{
     // 分页方法
     handleSizeChange(val) {
       this.pagesize = val;
-      if(this.userName !== '' || this.userCompany !== '' || this.batchNumber !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+       this.loadData();
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
       this.current = val;
-      if(this.userName !== '' || this.userCompany !== '' || this.batchNumber !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+       this.loadData();
       console.log(`当前页: ${val}`);
     },
     handleSize(val) {
       this.pagesizetwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.taxPlayerCode !== '' || this.status !== '') {
-        this.queryLookTwo();
-      }else{
-        this.loadDataCar();
-      };
+      this.loadDataCar();
       console.log(`每页 ${val} 条`);
     },
     handleCurrent(val) {
       this.currenttwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.taxPlayerCode !== '' || this.status !== '') {
-        this.queryLookTwo();
-      }else{
-        this.loadDataCar();
-      };
+      this.loadDataCar();
       console.log(`当前页: ${val}`);
     }
 

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="userName"></el-input>
-              <el-input  placeholder="用户所在公司" class="input-demo" v-model="userCompany"></el-input>
-              <el-input  placeholder="批次号" class="input-demo" v-model="batchNumber"></el-input>
+              <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="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
               <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -48,16 +48,16 @@
           tooltip-effect="dark">
           <el-table-column
             label="用户名"
-            prop="userName"
+            prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="用户手机号"
-            prop="userPhone"
+            prop="customerPhone"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="userCompany"
+            prop="company"
             label="用户所在公司"
             show-overflow-tooltip>
           </el-table-column>
@@ -77,7 +77,7 @@
             label="操作"
             width="80">
             <template slot-scope="scope" show-overflow-tooltip>
-              <span style="cursor:pointer;" @click="checkLook(scope.row.id)">查看</span>
+              <span style="cursor:pointer;color: blue;" @click="checkLook(scope.row.batchNumber)">查看</span>
             </template>
           </el-table-column>
         </el-table>
@@ -105,19 +105,10 @@
           <div class="tou">运单列表</div>
           <div class="line"></div>
           <div class="styleType">
-            <el-input  placeholder="运单编号" class="theinput" v-model="num"></el-input>
-            <el-input  placeholder="车牌号" class="theinput" v-model="plateNumber"></el-input>
+            <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-input  placeholder="运单状态" class="theinput" v-model="status"></el-input>
-            <el-select v-model="isSuccess" 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="queryLookTwo">查询</el-button>
+            <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
           </div>
           <el-table
@@ -128,7 +119,7 @@
             tooltip-effect="dark">
           <el-table-column
             label="运单编号"
-            prop="num"
+            prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -170,30 +161,16 @@
             </template>
           </el-table-column>
           <el-table-column
+            prop="billwayStatus"
             label="运单状态"
             show-overflow-tooltip>
-            <template slot-scope="scope">
-                <span v-if="scope.row.status == 1">未结束</span>
-                <span v-else-if="scope.row.status == 2">已结束运单</span>
-                <span v-else-if="scope.row.status == 3">已开发票</span>
-                <span v-else-if="scope.row.status == 4">开票中</span>
-                <span v-else-if="scope.row.status == 9">状态错误</span>
-              </template>
-          </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 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>
           </el-table-column>
-          <el-table-column
-            prop="errorMsg"
-            label="失败原因"
-            show-overflow-tooltip>
-          </el-table-column>
           </el-table>
         </template>
 
@@ -219,10 +196,9 @@ export default{
     return {
       loading: false,
       fullscreenLoading: false,
-      userName: '',
-      userCompany: '',
-      batchNumber: '',
-      num: '',
+      customerName: '',
+      companyName: '',
+      billNum: '',
       plateNumber: '',
       taxPlayerCode: '',
       status: '',
@@ -233,11 +209,12 @@ export default{
       currenttwo: 1,
       pagesizetwo: 8,
       totaltwo: 0,
-      batchId: '',
+      batchNum: '',
+      batchNumberQ:'',
       usertable: [],
       usertabletwo: [],
       formUserList: {
-       "userId": "",
+       "customerName": "",
        "file": "",
        "roleId": ""
       },
@@ -252,70 +229,26 @@ export default{
     }
   },
   created() {
+    this.formUserList.customerName = sessionStorage.getItem('userName');
     this.loadData();
   },
   methods: {
     // 列表展示
     async loadData() {
-      this.formUserList.userId = sessionStorage.getItem('userId');
-      this.formUserList.roleId = sessionStorage.getItem('roleId');
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('type', 2);
-        const response = await this.$http.post(`batch/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();
+    
+       const formData = new FormData();
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('type', 2);
-        const response = await this.$http.post(`batch/list`, formData);
+        formData.append('customerName',this.formUserList.customerName);
+         formData.append('company', this.companyName);
+        formData.append('batchNumer', this.batchNum);
+        formData.append('operType', 1);
+        const response = await this.$http.post(`noCar/findBatchList`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertable = response.data.data.records;
           this.total = response.data.data.total;
         }
-      }
-    },
-    //查询
-    async queryLook() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.current);
-        formData.append('size', this.pagesize);
-        formData.append('type', 2);
-        formData.append('userName', this.userName);
-        formData.append('userCompany', this.userCompany);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`batch/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('type', 2);
-        formData.append('userName', this.userName);
-        formData.append('userCompany', this.userCompany);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`batch/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertable = response.data.data.records;
-          this.total = response.data.data.total;
-        }
-      }
     },
     // 下载模板
     DownloadTemplate() {
@@ -328,7 +261,7 @@ export default{
     async batchUpload() {
       this.fullscreenLoading = true;
       const formData = new FormData();
-      formData.append('userId', this.formUserList.userId);
+      formData.append('customerName', this.formUserList.customerName);
       formData.append('file', this.formUserList.file);
       const response = await this.$http.post(`noCar/batchImprotBillWay`,formData);
       var {data: { code, msg, data }} = response;
@@ -347,87 +280,31 @@ export default{
     // 查看批次数据
     async checkLook(id) {
       this.addList = true;
-      this.batchId = id;
+      this.batchNumberQ = id;
       this.loadDataCar();
     },
+    handleEditDialogClose(){
+       this.addList = false;
+    },
     // 查看实时数据
     async loadDataCar() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
+    
         const formData = new FormData();
         formData.append('current', this.currenttwo);
         formData.append('size', this.pagesizetwo);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }
-    },
-    //查询(二)
-    async queryLookTwo() {
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
+        formData.append('customerName', this.formUserList.customerName);
+        formData.append('batchNum', this.batchNumberQ);
+         formData.append('plateNumber', this.plateNumber);
         formData.append('taxPlayerCode', this.taxPlayerCode);
-        formData.append('status', this.status);
-        formData.append('isSuccess', this.isSuccess);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
+        formData.append('hisFlag', 0);
+        const response = await this.$http.post(`noCar/findBillWay`, formData);
         if (response.data.code === 0) {
           this.loading = false;
           this.usertabletwo = response.data.data.records;
           this.totaltwo = response.data.data.total;
         }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('batchId', this.batchId);
-        formData.append('isHistory', 1);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('taxPlayerCode', this.taxPlayerCode);
-        formData.append('status', this.status);
-        formData.append('isSuccess', this.isSuccess);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }
-    },
-    // 清空表单数据
-    handleEditDialogClose() {
-      this.num = '';
-      this.plateNumber = '';
-      this.taxPlayerCode = '';
-      this.current = 1;
-      this.pagesize = 8;
-      this.currenttwo = 1;
-      this.pagesizetwo = 8;
     },
+  
      handleRemove(file, fileList) {
       console.log(file, fileList);
     },
@@ -441,38 +318,22 @@ export default{
     // 分页方法
     handleSizeChange(val) {
       this.pagesize = val;
-      if(this.userName !== '' || this.userCompany !== '' || this.batchNumber !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+       this.loadData();
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
       this.current = val;
-      if(this.userName !== '' || this.userCompany !== '' || this.batchNumber !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+      this.loadData();
       console.log(`当前页: ${val}`);
     },
     handleSize(val) {
       this.pagesizetwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.taxPlayerCode !== '' || this.status !== '' || this.isSuccess !== '') {
-        this.queryLookTwo();
-      }else{
-        this.loadDataCar();
-      };
+      this.loadDataCar();
       console.log(`每页 ${val} 条`);
     },
     handleCurrent(val) {
       this.currenttwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.taxPlayerCode !== '' || this.status !== '' || this.isSuccess !== '') {
-        this.queryLookTwo();
-      }else{
-        this.loadDataCar();
-      };
+     this.loadDataCar();
       console.log(`当前页: ${val}`);
     }
   }

src/views/platform/waybillmanagement/noinvoice.vue

@@ -1,23 +1,29 @@
 <template>
-  <div class="noinvoice">
+  <div class="trueinvoice">
     <!-- 头部细节部分 -->
       <div class="title">
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="运单编号" class="theinput" v-model="num"></el-input>
-              <el-input  placeholder="车牌号" class="theinput" v-model="plateNumber"></el-input>
-              <el-input  placeholder="批次号" class="theinput" v-model="batchNumber"></el-input>
-            <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
+              <el-select v-model="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="运单编号" class="input-demo" v-model="billNum"></el-input>
+              <el-input  placeholder="车牌号" class="input-demo" v-model="plateNumber"></el-input>
             </div>
           </el-col>
         </el-row>
 
-        <el-row>
+<el-row>
           <el-col :span="24">
             <div class="top">
               <label style="margin-left: 1%;">是否历史运单:</label>
-              <el-select v-model="isHistory" placeholder="请选择">
+              <el-select v-model="hisFlag" placeholder="请选择">
                 <el-option
                   v-for="item in optionone"
                   :key="item.value"
@@ -38,16 +44,16 @@
               </el-select> -->
             <!--   <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
               <el-input  placeholder="运单状态" class="theinput" v-model="status"></el-input> -->
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="makeInvoice" v-loading.fullscreen.lock="fullscreenLoading">开票</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
         </el-row>
-
       </div>
     <!-- 头部细节部分结束 -->
     <!-- 表格部分 -->
+          <!-- 表格部分 -->
         <template>
           <el-table
             v-loading="loading"
@@ -55,15 +61,10 @@
             :data="usertabletwo"
             height="370px"
             border
-            tooltip-effect="dark"
-            @selection-change="handleSelectionChange">
-          <el-table-column
-            type="selection"
-            width="40">
-          </el-table-column>
+            tooltip-effect="dark">
           <el-table-column
             label="运单编号"
-            prop="num"
+            prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -72,11 +73,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="batchNumber"
-            label="批次号"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             label="车牌号码"
             prop="plateNumber"
             show-overflow-tooltip>
@@ -127,14 +123,12 @@
             label="运单状态"
             show-overflow-tooltip>
             <template slot-scope="scope">
-                <span v-if="scope.row.status == 1">未结束</span>
-                <span v-else-if="scope.row.status == 2">已结束运单</span>
-                <span v-else-if="scope.row.status == 3">开票完成</span>
-                <span v-else-if="scope.row.status == 4">开票中</span>
-                <span v-else-if="scope.row.status == 9">状态错误</span>
-            </template>
+               <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>
           </el-table-column>
-
           </el-table>
         </template>
 
@@ -143,7 +137,7 @@
           @size-change="handleSize"
           @current-change="handleCurrent"
           :current-page="currenttwo"
-          :page-sizes="[20, 30, 40]"
+          :page-sizes="[6, 8, 10]"
           :page-size="pagesizetwo"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totaltwo">
@@ -158,171 +152,124 @@
 export default{
   data() {
     return {
+
       loading: false,
-      fullscreenLoading: false,
-      num: '',
+      hisFlag:'',
+      billNum: '',
       plateNumber: '',
       batchNumber: '',
-      isHistory: '',
-      status: '',
+      billStartTime: '',
+      billEndTime: '',
+      createStartTime: '',
+      createEndTime: '',
       // taxPlayerCode: '',
       // status: '',
       currenttwo: 1,
-      pagesizetwo: 20,
+      pagesizetwo: 8,
       totaltwo: 0,
-      optionone: [{
+      // batch: '',
+      companyList:[],
+      companyName:'',
+      usertabletwo: [],
+      customerName:'',
+       optionone: [{
           value: '1',
           label: '实时运单'
         }, {
           value: '2',
           label: '历史运单'
         }],
-      option: [{
-          value: '2',
-          label: '已结束运单'
-        }, {
-          value: '4',
-          label: '开票中'
-        }],
-      // batch: '',
-      usertabletwo: [],
-      multipleSelection: [],
-      formList: {
-        userId: '',
-        nums: []
-      },
-      formUserList: {
-       "userId": "",
-       "roleId": ""
-      },
     }
   },
   created() {
-   this.loadDataCar();
+     this.customerName = sessionStorage.getItem('userName');
+     this.initCompanyList();
+   
   },
   methods: {
     // 列表展示
     async loadDataCar() {
-      this.formUserList.userId = sessionStorage.getItem('userId');
-      this.formUserList.roleId = sessionStorage.getItem('roleId');
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('status', '2');
-        // formData.append('isSuccess', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/notFinish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('status', '2');
+      const formData = new FormData();
+      formData.append('current', this.currenttwo);
+      formData.append('size', this.pagesizetwo);
+      formData.append('isSuccess', 1);
+      formData.append('customerName', this.customerName);
+      formData.append('companyName', this.companyName);
+      formData.append('billNum', this.billNum);
+      formData.append('billwayStatus', 2);
+      formData.append('plateNumber', this.plateNumber);
+      formData.append('hisFlag', this.hisFlag);
+     // formData.append('batchNumber', this.batchNumber);
+     // formData.append('billStartTime', this.billStartTime);
+      //formData.append('billEndTime', this.billEndTime);
+      //formData.append('createStartTime', this.createStartTime);
+      //formData.append('createEndTime', this.createEndTime);
         // formData.append('isSuccess', 1);
-        formData.append('userId', this.formUserList.userId);
-        const response = await this.$http.post(`carFreeCarrierBill/notFinish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
+      const response = await this.$http.post(`noCar/findBillWay`, formData);
+      if (response.data.code === 0) {
+         this.loading = false;
+        this.usertabletwo = response.data.data.records;
+        this.totaltwo = response.data.data.total;
         }
-      }
     },
-    //查看
-    async queryLook() {
-      if(this.status == '' ) {
-        this.status = '2';
-      }
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        // formData.append('isSuccess', 1);
-        formData.append('num', this.num);
-        formData.append('status', this.status);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('isHistory', this.isHistory);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`carFreeCarrierBill/notFinish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        // formData.append('isSuccess', 1);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('num', this.num);
-        formData.append('status', this.status);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('isHistory', this.isHistory);
-        formData.append('batchNumber', this.batchNumber);
-        const response = await this.$http.post(`carFreeCarrierBill/notFinish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = 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.companyName = this.companyList[0]['companyName'];
+            this.loadDataCar();
     },
+    //查看
+   
+     //导出功能
+    exportOut() {
+      var url = `http://invoice.back.jkcredit.com/carFreeCarrierBill/billExport?&userId=${this.formUserList.userId}`;
 
-    //批量开票
+      window.location.href= url;
+    },
+ //批量开票
     async makeInvoice() {
-      this.fullscreenLoading = true;
-      this.formList.userId = Number(this.formUserList.userId);
-      for(var i = 0; i < this.multipleSelection.length; i++) {
-        this.formList.nums.push(this.multipleSelection[i].num);
-      }
-      // console.log(this.formList);
-      const formData = new FormData();
-        formData.append('userId', this.formList.userId);
-        formData.append('nums', this.formList.nums);
-      const response = await this.$http.post(`numInvoice/nums`, formData);
-        if (response.data.code === 0) {
-          this.$message({
+      this.$message({
             type: 'success',
-            message: '开票成功'
-          })
-          this.fullscreenLoading = false;
-          this.loadDataCar();
-          this.formList.nums = [];
-          // console.log(this.formList.nums);
-        }else{
-           this.fullscreenLoading = false;
-          this.$message({
-            type: 'error',
-            message: '开票失败'
+             message: '开票成功'
           })
-        }
-    },
-    // 点击表格选框时触发的事件
-    handleSelectionChange(val) {
-        this.multipleSelection = val;
+      // this.fullscreenLoading = true;
+      // this.formList.userId = Number(this.formUserList.userId);
+      // for(var i = 0; i < this.multipleSelection.length; i++) {
+      //   this.formList.nums.push(this.multipleSelection[i].num);
+      // }
+      // // console.log(this.formList);
+      // const formData = new FormData();
+      //   formData.append('userId', this.formList.userId);
+      //   formData.append('nums', this.formList.nums);
+      // const response = await this.$http.post(`numInvoice/nums`, formData);
+      //   if (response.data.code === 0) {
+      //     this.$message({
+      //       type: 'success',
+      //       message: '开票成功'
+      //     })
+      //     this.fullscreenLoading = false;
+      //     this.loadDataCar();
+      //     this.formList.nums = [];
+      //     // console.log(this.formList.nums);
+      //   }else{
+      //      this.fullscreenLoading = false;
+      //     this.$message({
+      //       type: 'error',
+      //       message: '开票失败'
+      //     })
+      //   }
     },
     // 分页方法
     handleSize(val) {
       this.pagesizetwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.isHistory !== '' || this.batchNumber !== '' || this.status !== '') {
-        this.queryLook();
-      }else{
-        this.loadDataCar();
-      };
+      this.loadDataCar();
       console.log(`每页 ${val} 条`);
     },
     handleCurrent(val) {
       this.currenttwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.isHistory !== '' || this.batchNumber !== '' || this.status !== '') {
-        this.queryLook();
-      }else{
-        this.loadDataCar();
-      };
+     this.loadDataCar();
       console.log(`当前页: ${val}`);
     }
   }
@@ -330,60 +277,60 @@ export default{
 </script>
 
 <style>
-.noinvoice {
+.trueinvoice {
   border: 1px solid #d9d9d9;
   border-radius: 10px;
 }
-.noinvoice .upload-demo {
+.trueinvoice .upload-demo {
   display: inline-block;
 }
-.noinvoice .title {
+.trueinvoice .title {
   font-size: 5px;
   margin-bottom: 20px;
 }
-.noinvoice .top {
+.trueinvoice .top {
   padding-top: 20px;
   padding-left: 20px;
 }
-.noinvoice .text {
+.trueinvoice .text {
   display: inline-block;
   color: #000;
   font-size: 16px ;
   margin-left: 1%;
 }
-.noinvoice .tou {
+.trueinvoice .tou {
   font-size: 20px;
   height: 30px;
   line-height: 30px;
   padding-top: 15px;
 }
-.noinvoice .line {
+.trueinvoice .line {
   margin-top: 15px;
   margin-bottom: 15px;
   width: 100%;
   height: 2px;
   background-color: #d9d9d9;
 }
-.noinvoice .theinput {
+.trueinvoice .theinput {
   display: inline-block;
   width: 20%;
 }
-.noinvoice .styleType {
+.trueinvoice .styleType {
   margin-top: 20px;
   margin-bottom: 20px;
 }
-.noinvoice .input-demo {
+.trueinvoice .input-demo {
   display: inline-block;
   width: 20%;
   margin-left: 1%;
 }
-.noinvoice .block {
+.trueinvoice .block {
   font-size: 5px;
   text-align: center;
   margin-top: 15px;
   margin-bottom: 20px;
 }
-.noinvoice .blocks {
+.trueinvoice .blocks {
   font-size: 5px;
   text-align: center;
   margin-top: 20px;

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -5,10 +5,17 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
+               <el-select v-model="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="运单编号" class="input-demo" v-model="num"></el-input>
               <el-input  placeholder="车牌号" class="input-demo" v-model="plateNumber"></el-input>
-              <el-input  placeholder="批次号" class="input-demo" v-model="batchNumber"></el-input>
-              <el-select v-model="isHistory" placeholder="是否历史运单">
+              <el-select v-model="hisFlag" placeholder="是否历史运单">
                 <el-option
                   v-for="item in optionone"
                   :key="item.value"
@@ -55,7 +62,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
               <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -63,6 +70,7 @@
       </div>
     <!-- 头部细节部分结束 -->
     <!-- 表格部分 -->
+          <!-- 表格部分 -->
         <template>
           <el-table
             v-loading="loading"
@@ -70,15 +78,10 @@
             :data="usertabletwo"
             height="370px"
             border
-            tooltip-effect="dark"
-            @selection-change="handleSelectionChange">
-          <el-table-column
-            type="selection"
-            width="40">
-          </el-table-column>
+            tooltip-effect="dark">
           <el-table-column
             label="运单编号"
-            prop="num"
+            prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -87,11 +90,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="batchNumber"
-            label="批次号"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             label="车牌号码"
             prop="plateNumber"
             show-overflow-tooltip>
@@ -142,11 +140,10 @@
             label="运单状态"
             show-overflow-tooltip>
             <template slot-scope="scope">
-                <span v-if="scope.row.status == 1">未结束</span>
-                <span v-else-if="scope.row.status == 2">已结束运单</span>
-                <span v-else-if="scope.row.status == 3">开票完成</span>
-                <span v-else-if="scope.row.status == 4">开票中</span>
-                <span v-else-if="scope.row.status == 9">状态错误</span>
+               <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>
           </el-table-column>
           </el-table>
@@ -157,13 +154,14 @@
           @size-change="handleSize"
           @current-change="handleCurrent"
           :current-page="currenttwo"
-          :page-sizes="[20, 30, 40]"
+          :page-sizes="[6, 8, 10]"
           :page-size="pagesizetwo"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totaltwo">
           </el-pagination>
         </div>
 
+
   </div>
 </template>
 
@@ -171,22 +169,28 @@
 export default{
   data() {
     return {
+
       loading: false,
-      fullscreenLoading: false,
-      flag: 0,
-      num: '',
+      hisFlag:'',
+      billNum: '',
       plateNumber: '',
       batchNumber: '',
-      isHistory: '',
-      isExport: '',
       startTime: '',
       endTime: '',
-      isLegacyData: '',
+      createStartTime: '',
+      createEndTime: '',
+      isLegacyData:'',
+      isExport:'',
       // taxPlayerCode: '',
       // status: '',
       currenttwo: 1,
-      pagesizetwo: 20,
+      pagesizetwo: 8,
       totaltwo: 0,
+      // batch: '',
+      companyList:[],
+      companyName:'',
+      usertabletwo: [],
+      customerName:'',
       optionone: [{
           value: '1',
           label: '实时运单'
@@ -208,139 +212,64 @@ export default{
           value: '2',
           label: '历史开票记录'
         }],
-      // batch: '',
-      usertabletwo: [],
-      multipleSelection: [],
-      formList: {
-        userId: '',
-        nums: []
-      },
-      formUserList: {
-       "userId": "",
-       "roleId": ""
-      },
     }
   },
   created() {
-   this.loadDataCar();
+     this.customerName = sessionStorage.getItem('userName');
+     this.initCompanyList();
+   
   },
   methods: {
     // 列表展示
     async loadDataCar() {
-      this.formUserList.userId = sessionStorage.getItem('userId');
-      this.formUserList.roleId = sessionStorage.getItem('roleId');
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
+      const formData = new FormData();
+      formData.append('current', this.currenttwo);
+      formData.append('size', this.pagesizetwo);
+      formData.append('customerName', this.customerName);
+      formData.append('companyName', this.companyName);
+      formData.append('billNum', this.billNum);
+      formData.append('plateNumber', this.plateNumber);
+      formData.append('billwayStatus', 3);
+      formData.append('hisFlag', this.hisFlag);
+     // formData.append('batchNumber', this.batchNumber);
+     // formData.append('billStartTime', this.billStartTime);
+      //formData.append('billEndTime', this.billEndTime);
+      //formData.append('createStartTime', this.createStartTime);
+      //formData.append('createEndTime', this.createEndTime);
         // formData.append('isSuccess', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/finish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
+      const response = await this.$http.post(`noCar/findBillWay`, formData);
+      if (response.data.code === 0) {
+         this.loading = false;
+        this.usertabletwo = response.data.data.records;
+        this.totaltwo = response.data.data.total;
         }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        // formData.append('isSuccess', 1);
-        formData.append('userId', this.formUserList.userId);
-        const response = await this.$http.post(`carFreeCarrierBill/finish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }
     },
-    //查看
-    async queryLook() {
-      if(this.startTime !== '' || this.endTime !== '') {
-        this.startTime = (new Date(this.startTime)).getTime();
-        this.endTime = (new Date(this.endTime)).getTime();
-      }
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        // formData.append('isSuccess', 1);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('isHistory', this.isHistory);
-        formData.append('isExport', this.isExport);
-        formData.append('batchNumber', this.batchNumber);
-        formData.append('startTime', this.startTime);
-        formData.append('endTime', this.endTime);
-        formData.append('isLegacyData', this.isLegacyData);
-        const response = await this.$http.post(`carFreeCarrierBill/finish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        // formData.append('isSuccess', 1);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('isHistory', this.isHistory);
-        formData.append('isExport', this.isExport);
-        formData.append('batchNumber', this.batchNumber);
-        formData.append('startTime', this.startTime);
-        formData.append('endTime', this.endTime);
-        formData.append('isLegacyData', this.isLegacyData);
-        const response = await this.$http.post(`carFreeCarrierBill/finish`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = 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.companyName = this.companyList[0]['companyName'];
+            this.loadDataCar();
     },
-    //打包下载
-    async packDownload() {
-      this.fullscreenLoading = true;
-      if(this.startTime !== '' || this.endTime !== '') {
-        this.startTime = (new Date(this.startTime)).getTime();
-        this.endTime = (new Date(this.endTime)).getTime();
-      }
-      this.formList.userId = Number(this.formUserList.userId);
-      for(var i = 0; i < this.multipleSelection.length; i++) {
-        this.formList.nums.push(this.multipleSelection[i].num);
-      }
-      // console.log(this.formList.nums);
-      var url = `http://invoice.back.jkcredit.com/package/download?&userId=${this.formList.userId}&nums=${this.formList.nums}&startTime=${this.startTime}&endTime=${this.endTime}`;
+    //查看
+   
+     //导出功能
+    exportOut() {
+      var url = `http://invoice.back.jkcredit.com/carFreeCarrierBill/billExport?&userId=${this.formUserList.userId}`;
+
       window.location.href= url;
-      this.loadDataCar();
-      this.formList.nums = [];
-      this.fullscreenLoading = false;
-      // console.log(this.formList.nums);
-    },
-    // 点击表格选框时触发的事件
-    handleSelectionChange(val) {
-        this.multipleSelection = val;
     },
+
     // 分页方法
     handleSize(val) {
       this.pagesizetwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.isHistory !== '' || this.isExport !== '' || this.batchNumber !== '' || this.startTime !== '' || this.endTime !== '') {
-        this.queryLook();
-      }else{
-        this.loadDataCar();
-      };
+      this.loadDataCar();
       console.log(`每页 ${val} 条`);
     },
     handleCurrent(val) {
       this.currenttwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.isHistory !== '' || this.isExport !== '' || this.batchNumber !== '' || this.startTime !== '' || this.endTime !== '') {
-        this.queryLook();
-      }else{
-        this.loadDataCar();
-      };
+     this.loadDataCar();
       console.log(`当前页: ${val}`);
     }
   }

src/views/platform/waybillmanagement/waybillList.vue

@@ -5,12 +5,19 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="运单编号" class="theinput" v-model="num"></el-input>
+              <el-select v-model="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="运单编号" class="theinput" v-model="billNum"></el-input>
               <el-input  placeholder="车牌号" class="theinput" v-model="plateNumber"></el-input>
-              <el-input  placeholder="批次号" class="theinput" v-model="batchNumber"></el-input>
             <!--   <el-input  placeholder="税号" class="theinput" v-model="taxPlayerCode"></el-input>
               <el-input  placeholder="运单状态" class="theinput" v-model="status"></el-input> -->
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="loadDataCar">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="exportOut">导出</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
@@ -63,7 +70,7 @@
             tooltip-effect="dark">
           <el-table-column
             label="运单编号"
-            prop="num"
+            prop="billNum"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -72,11 +79,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="batchNumber"
-            label="批次号"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             label="车牌号码"
             prop="plateNumber"
             show-overflow-tooltip>
@@ -127,22 +129,12 @@
             label="运单状态"
             show-overflow-tooltip>
             <template slot-scope="scope">
-                <span v-if="scope.row.status == 1">未结束</span>
-                <span v-else-if="scope.row.status == 2">已结束运单</span>
-                <span v-else-if="scope.row.status == 3">开票完成</span>
-                <span v-else-if="scope.row.status == 4">开票中</span>
-                <span v-else-if="scope.row.status == 9">状态错误</span>
+               <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>
           </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>
-          </el-table-column>
           </el-table>
         </template>
 
@@ -168,7 +160,7 @@ export default{
     return {
 
       loading: false,
-      num: '',
+      billNum: '',
       plateNumber: '',
       batchNumber: '',
       billStartTime: '',
@@ -181,98 +173,51 @@ export default{
       pagesizetwo: 8,
       totaltwo: 0,
       // batch: '',
+      companyList:[],
+      companyName:'',
       usertabletwo: [],
-      formUserList: {
-       "userId": "",
-       "roleId": ""
-      },
+      customerName:'',
     }
   },
   created() {
-   this.loadDataCar();
+     this.customerName = sessionStorage.getItem('userName');
+     this.initCompanyList();
+   
   },
   methods: {
     // 列表展示
     async loadDataCar() {
-      this.formUserList.userId = sessionStorage.getItem('userId');
-      this.formUserList.roleId = sessionStorage.getItem('roleId');
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        // formData.append('isSuccess', 1);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
+      const formData = new FormData();
+      formData.append('current', this.currenttwo);
+      formData.append('size', this.pagesizetwo);
+      formData.append('isSuccess', 1);
+      formData.append('customerName', this.customerName);
+      formData.append('companyName', this.companyName);
+      formData.append('billNum', this.billNum);
+      formData.append('plateNumber', this.plateNumber);
+     // formData.append('batchNumber', this.batchNumber);
+     // formData.append('billStartTime', this.billStartTime);
+      //formData.append('billEndTime', this.billEndTime);
+      //formData.append('createStartTime', this.createStartTime);
+      //formData.append('createEndTime', this.createEndTime);
         // formData.append('isSuccess', 1);
-        formData.append('userId', this.formUserList.userId);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-
+      const response = await this.$http.post(`noCar/findBillWay`, formData);
+      if (response.data.code === 0) {
+         this.loading = false;
+        this.usertabletwo = response.data.data.records;
+        this.totaltwo = response.data.data.total;
         }
-      }
     },
-    //查看
-    async queryLook() {
-      if(this.billStartTime !== '' || this.billEndTime !== '') {
-        this.billStartTime = (new Date(this.billStartTime)).getTime();
-        this.billEndTime = (new Date(this.billEndTime)).getTime();
-      }
-      if(this.createStartTime !== '' || this.createEndTime !== '') {
-        this.createStartTime = (new Date(this.createStartTime)).getTime();
-        this.createEndTime = (new Date(this.createEndTime)).getTime();
-      }
-
-      if(this.formUserList.roleId == 1) {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('isSuccess', 1);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('batchNumber', this.batchNumber);
-        formData.append('billStartTime', this.billStartTime);
-        formData.append('billEndTime', this.billEndTime);
-        formData.append('createStartTime', this.createStartTime);
-        formData.append('createEndTime', this.createEndTime);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = response.data.data.total;
-        }
-      }else {
-        const formData = new FormData();
-        formData.append('current', this.currenttwo);
-        formData.append('size', this.pagesizetwo);
-        formData.append('isSuccess', 1);
-        formData.append('userId', this.formUserList.userId);
-        formData.append('num', this.num);
-        formData.append('plateNumber', this.plateNumber);
-        formData.append('batchNumber', this.batchNumber);
-        formData.append('billStartTime', this.billStartTime);
-        formData.append('billEndTime', this.billEndTime);
-        formData.append('createStartTime', this.createStartTime);
-        formData.append('createEndTime', this.createEndTime);
-        const response = await this.$http.post(`carFreeCarrierBill/list`, formData);
-        if (response.data.code === 0) {
-          this.loading = false;
-          this.usertabletwo = response.data.data.records;
-          this.totaltwo = 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.companyName = this.companyList[0]['companyName'];
+            this.loadDataCar();
     },
+    //查看
+   
      //导出功能
     exportOut() {
       var url = `http://invoice.back.jkcredit.com/carFreeCarrierBill/billExport?&userId=${this.formUserList.userId}`;
@@ -283,20 +228,12 @@ export default{
     // 分页方法
     handleSize(val) {
       this.pagesizetwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.batchNumber !== '' || this.billStartTime !== '' || this.billEndTime !== '' || this.createStartTime !== '' || this.createEndTime !== '') {
-        this.queryLook();
-      }else{
-        this.loadDataCar();
-      };
+      this.loadDataCar();
       console.log(`每页 ${val} 条`);
     },
     handleCurrent(val) {
       this.currenttwo = val;
-      if(this.num !== '' || this.plateNumber !== '' || this.batchNumber !== '' || this.billStartTime !== '' || this.billEndTime !== '' || this.createStartTime !== '' || this.createEndTime !== '') {
-        this.queryLook();
-      }else{
-        this.loadDataCar();
-      };
+     this.loadDataCar();
       console.log(`当前页: ${val}`);
     }
   }