Browse Source

前端代码合并提交

mashengyi 3 năm trước cách đây
mục cha
commit
3607162890

+ 2 - 2
src/config/globle.js

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

+ 17 - 2
src/views/noCar/billway.vue

@@ -16,6 +16,14 @@
                 :auto-upload="false">
                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
+              <el-select style="margin-left: 30px;" v-model="noCarWayBill.billwayStatus" placeholder="运单状态">
+                      <el-option
+                        v-for="item in tradeStatus"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                </el-select>
               </el-upload>
             </div>
               <div class="demo-input-suffix">
@@ -126,8 +134,8 @@
             <template slot-scope="scope">
               
                <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
-                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">失败</span>
-                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">指令上传失败</span>
+                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">上传失败</span>
+                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">结束指令上传失败</span>
               <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
@@ -190,6 +198,13 @@ import XLSX from "xlsx";
              formUserList: {
             "file": ""
             },
+            tradeStatus:[
+              {"label":"上传失败","value":"-2"},
+              {"label":"结束指令上传失败","value":"-3"},
+              {"label":"未结束","value":"1"},
+              {"label":"开票中","value":"2"},
+            {"label":"开票完成","value":"3"},
+            {"label":"超时运单","value":"4"}],
             multipleSelection: [],
              optionone: [{
               value: 0,

+ 28 - 1
src/views/noCar/billwayException.vue

@@ -11,6 +11,14 @@
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-date-picker v-model="noCarWayBill.endBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="指令结束始" end-placeholder="指令结束止"></el-date-picker>
+                  <el-select style="margin-left: 30px;" v-model="noCarWayBill.billwayStatus" placeholder="运单状态">
+                      <el-option
+                        v-for="item in tradeStatus"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                </el-select>
                 <!-- <el-date-picker v-model="noCarWayBill.startEnd" type="date" placeholder="开始指令上传时间止"></el-date-picker>
                  <el-date-picker v-model="noCarWayBill.startBegin"  type="date" placeholder="开始指令上传时间始"></el-date-picker> -->
                 <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>
@@ -69,7 +77,9 @@
             label="运单状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+               <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">上传失败</span>
+                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">结束指令上传失败</span>
               <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
@@ -88,6 +98,11 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="failReason"
+            label="失败原因"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             prop="hisFlag"
             label="运单类型"
             show-overflow-tooltip>
@@ -129,6 +144,13 @@ import XLSX from "xlsx";
               value: 1,
               label: '历史运单'
             }],
+            tradeStatus:[
+              {"label":"上传失败","value":"-2"},
+              {"label":"结束指令上传失败","value":"-3"},
+              {"label":"未结束","value":"1"},
+              {"label":"开票中","value":"2"},
+            {"label":"开票完成","value":"3"},
+            {"label":"超时运单","value":"4"}],
             billWayTable:[],
              hightt:'0px',
             current: 1,
@@ -166,6 +188,11 @@ import XLSX from "xlsx";
               this.total = response.data.data.total;
             }
           },
+          handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+                      
+           },
            async updateStatus(){
              const formData = new FormData();
             formData.append('noCarWayBillStr', JSON.stringify(this.multipleSelection));

+ 157 - 23
src/views/platform/apply/already.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-select v-model="formList.companyName" placeholder="请选择公司名称">
+              <el-select style="width:170px" v-model="formList.companyName" placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"
@@ -13,22 +13,11 @@
                   :value="item.companyName">
                 </el-option>
               </el-select>
-              <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="formList.carNum"></el-input>
-              <el-date-picker
-                v-model="formList.startTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="开票时间始"
-                style="margin-left: 1%;">
-              </el-date-picker>
-              <el-date-picker
-                v-model="formList.endTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="开票时间止"
-                style="margin-left: 1%;">
-              </el-date-picker>
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook" v-loading.fullscreen.lock="fullscreenLoading">查询</el-button>
+              <el-input  placeholder="请输入车牌号码" style="width:170px" class="input-demo" v-model="formList.carNum"></el-input>
+              <el-date-picker v-model="formList.invoiceMakeTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+                            <el-button type="success" style="margin-left: 1%;" @click="firstLoadData" v-loading.fullscreen.lock="fullscreenLoading">查询</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="queryLook" v-loading.fullscreen.lock="fullscreenLoading">更新</el-button>
+            <el-button type="primary"  @click="exportExcel">导出报表</el-button>
             </div>
           </el-col>
         </el-row>
@@ -57,6 +46,7 @@
           </el-table-column>
           <el-table-column
             label="价税合计(元)"
+             width="120"
             show-overflow-tooltip>
             <template slot-scope="scope" show-overflow-tooltip>
                 <span>{{scope.row.totalAmount / 100}}</span>
@@ -95,15 +85,18 @@
           <el-table-column
             prop="enStationName"
             label="入口收费站"
+             width="120"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="exStationName"
             label="出口收费站"
+             width="120"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             label="交易金额(元)"
+            width="120"
             show-overflow-tooltip>
             <template slot-scope="scope" show-overflow-tooltip>
                 <span>{{scope.row.fee / 100}}</span>
@@ -123,11 +116,24 @@
           </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>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -142,13 +148,17 @@ export default{
         "carNum": "",
         "startTime": "",
         "endTime": "",
+        "invoiceMakeTime":""
       },
+      current: 1,
+      pagesize: 8,
+      total:'',
       companyList:[]
 
     }
   },
   created() {
-    this.heightt = tableHeight;
+    this.heightt = tableHeight+20;
     this.formList.customerName = sessionStorage.getItem('userName');
     this.initCompanyList();
   },
@@ -156,15 +166,39 @@ export default{
      firstLoadData(){
             this.current = 1;
             this.pagesize = 8;
-            this.queryLook();
+            this.loadData();
+          },
+
+           // 列表展示
+          async loadData() {
+            const formData = new FormData();
+            formData.append('current', this.current);
+            formData.append('size', this.pagesize);
+            formData.append('customerName', this.formList.customerName);
+            formData.append('companyName', this.formList.companyName);
+            formData.append('plateNum', this.formList.carNum);
+            formData.append('invoiceMakeTime', this.formList.invoiceMakeTime);
+            const response = await this.$http.post('selfCar/findSelfCarInvoices', formData);
+            if (response.data.code === 0) {
+              this.usertabletwo = response.data.data.records;
+              this.total = response.data.data.total;
+            }
           },
     // 查询已开发票数据
     async queryLook() {
       debugger;
+       if(this.formList.invoiceMakeTime !=null && this.formList.invoiceMakeTime !=''){
+        
+         this.formList.startTime = this.formList.invoiceMakeTime[0];
+         this.formList.endTime = this.formList.invoiceMakeTime[1];
+       }
       const response = await this.$http.post(`/selfCar/findSelfcarInvoiceByTime`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0) {
-        this.usertabletwo = response.data.data;
+         this.$message({
+          type: 'success',
+          message: '更新成功'
+        });
       }else{
         this.$message.error(msg);
       }
@@ -175,12 +209,60 @@ export default{
               this.companyList = response.data.data;
             }
             this.formList.companyName = this.companyList[0]['companyName'];
+            this.loadData();
     },
     // 展示发票全部信息
     checkLook(user) {
       window.location.href= user;
     },
-
+ // 分页方法
+          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"),{ raw: true });
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        //  name+'.xlsx'表示导出的excel表格名字
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          name + ".xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+       this.current = curr; 
+      this.pagesize = pagesize1;
+      this.loadData();
+      return wbout;
+    },
   }
 };
 </script>
@@ -205,5 +287,57 @@ export default{
   width: 20%;
   margin-left: 1%;
 }
-
+.already {
+  border: 1px solid #d9d9d9;
+  border-radius: 10px;
+}
+.already .title {
+  font-size: 5px;
+  margin-bottom: 20px;
+}
+.already .top {
+  padding-top: 20px;
+  padding-left: 20px;
+}
+.already .text {
+  display: inline-block;
+  color: #000;
+  font-size: 16px ;
+  margin-left: 1%;
+}
+.already .input-demo {
+  display: inline-block;
+  width: 20%;
+  margin-left: 1%;
+}
+.already .block {
+  font-size: 5px;
+  text-align: center;
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
+.already .el-dialog {
+  width: 60%;
+}
+.already .el-dialog__header, .el-dialog__body {
+  padding: 0 20px;
+}
+.already .tou {
+  font-size: 20px;
+  height: 30px;
+  line-height: 30px;
+  padding-top: 15px;
+}
+.already .line {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  width: 100%;
+  height: 2px;
+  background-color: #d9d9d9;
+}
+.already .xinxi {
+  text-align: center;
+  margin: 15px auto;
+  font-size: 18px;
+}
 </style>

+ 3 - 3
src/views/platform/waybill/history.vue

@@ -174,9 +174,9 @@
             label="运单状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-               <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
-                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">失败</span>
-                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">指令上传失败</span>
+                <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">上传失败</span>
+                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">结束指令上传失败</span>
               <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>

+ 3 - 3
src/views/platform/waybill/waybill.vue

@@ -176,9 +176,9 @@
             label="运单状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
-                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">失败</span>
-                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">指令上传失败</span>
+               <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+                <span v-else-if="scope.row.billwayStatus == -2" style="color: red">上传失败</span>
+                 <span v-else-if="scope.row.billwayStatus == -3" style="color: red">结束指令上传失败</span>
               <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
               <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>

+ 16 - 37
src/views/selfCar/selfCarTrade.vue

@@ -4,7 +4,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              
+               <div class="top" >
                <span style="margin-top: 10px;margin-bottom: 10px;">导入文件:</span>
 
               <el-upload
@@ -18,26 +18,28 @@
                 :auto-upload="false">
                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
-                <el-button style="margin-left: 438px;" @click="DownloadTemplate">查询模板下载</el-button>
+                <el-select style="margin-left: 30px;" v-model="formCondition.status" placeholder="交易状态">
+                      <el-option
+                        v-for="item in tradeStatus"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                </el-select>
+                <el-button style="margin-left: 230px;" @click="DownloadTemplate">查询模板下载</el-button>
                   <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
               </el-upload>
-            
+              
+              </div>
                <div class="demo-input-suffix">
                <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.cardId"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="formCondition.companyReferencenum"></el-input>
                 <el-input  placeholder="交易id" class="input-demo" v-model="formCondition.tradeId"></el-input>
+                
               </div>
-              <div class="demo-input-suffix" style="margin-top: 5px;margin-left:12px;">
-                <el-select v-model="formCondition.status" placeholder="状态">
-                <el-option
-                  v-for="item in optionone"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <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="firstLoadData">查询</el-button>
@@ -140,21 +142,12 @@ import XLSX from "xlsx";
           return{
             multipleSelection:[],
             formCondition:{
-
+               status:'',
             },
-             optionone: [{
-              value: '1',
-              label: '代开票'
-            }, {
-              value: '2',
-              label: '开票中'
-            }, {
-              value: '3',
-              label: '已开票'
-            }],
             formUserList: {
             "file": ""
             },
+            tradeStatus:[{"label":"待开票","value":"1"},{"label":"开票中","value":"2"},{"label":"已开票","value":"3"}],
             selfcarTrade:[],
             hightt:'0px',
             current: 1,
@@ -224,20 +217,6 @@ import XLSX from "xlsx";
           },
                       // 批量上传模板信息
       async batchUpload() {
-           const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
-      let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
-       let AllUpExt = ".xlsx";
-       if( extName != AllUpExt){
-          this.$message.error('文件格式不正确!');
-          return false;
-    }
-
-      if (!isLt50M) {
-                this.$message.error('上传文件大小不能超过50MB!');
-                return false;
-       }
-       this.$message.success('系统正在努力接收中,过程大概需要几分钟的时间,请您耐心等待...');
-       
       this.fullscreenLoading = true;
       const formData = new FormData();
       formData.append('file', this.formUserList.file);

+ 9 - 0
src/views/selfCar/selfCarTradeException.vue

@@ -13,6 +13,14 @@
               <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-select style="margin-left: 30px;" v-model="formCondition.status" placeholder="交易状态">
+                      <el-option
+                        v-for="item in tradeStatus"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                </el-select>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;"  @click="update">更新</el-button>
                             <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
@@ -110,6 +118,7 @@ import XLSX from "xlsx";
             formCondition:{
               "exceptionFlag":1
             },
+             tradeStatus:[{"label":"待开票","value":"1"},{"label":"开票中","value":"2"},{"label":"已开票","value":"3"}],
             selfcarTrade:[],
              multipleSelection:[],
             current: 1,