Selaa lähdekoodia

前端代码合并提交

mashengyi 3 vuotta sitten
vanhempi
commit
5cc5c83f0b

+ 2 - 2
src/views/Home.vue

@@ -214,11 +214,11 @@ export default {
               path:"selfCarTrade",
               authName:"交易查询"
             },{
-              id:2,
+              id:3,
               path:"selfCarTradeException",
               authName:"异常交易查询"
             },{
-              id:3,
+              id:4,
               path:"selfInvoice",
               authName:"发票查询"
             }

+ 36 - 12
src/views/noCar/calculateInfo.vue

@@ -4,11 +4,19 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
-               <el-input  placeholder="开始时间" class="input-demo" v-model="formCondition.satrtTime"></el-input>
-               <el-input  placeholder="结束时间" class="input-demo" v-model="formCondition.endTime"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
-               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+               <div class="demo-input-suffix">
+                <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customId"></el-input>
+
+                <el-input  placeholder="购方税号" class="input-demo" v-model="formCondition.buyerTaxpayerCode"></el-input>
+                 <el-input  placeholder="购方名称" class="input-demo" v-model="formCondition.buyerName"></el-input>
+
+              </div>
+              <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
+                <el-date-picker v-model="formCondition.invoiceMakeTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+                <el-date-picker v-model="formCondition.calculateTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="计费时间始" end-placeholder="计费时间止"></el-date-picker>
+                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+                      <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -24,13 +32,23 @@
           border
           tooltip-effect="dark">
           <el-table-column
+            prop="companyNum"
+            label="企业编号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             label="客户名称"
             prop="customId"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
-            prop="companyNum"
-            label="公司名称"
+            label="购方名称"
+            prop="buyerName"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            label="购方税号"
+            prop="buyerTaxpayerCode"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -48,8 +66,13 @@
             label="计费时间"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="invoiceMakeTime"
+            label="开票时间"
+            show-overflow-tooltip>
+          </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -71,8 +94,6 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              companyName:'',
-              etcNum:''
             },
             calculateInfo:[],
             current: 1,
@@ -89,13 +110,16 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            for(var i in this.formCondition){
+                formData.append(i,this.formCondition[i]);
+            }
             const response = await this.$http.post(`noCar/findNocarCalculateInfo`, formData);
             if (response.data.code === 0) {
               this.calculateInfo = response.data.data.records;
               this.total = response.data.data.total;
             }
           },
+
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;
@@ -193,4 +217,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

+ 49 - 27
src/views/selfCar/invoice.vue

@@ -4,9 +4,19 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
-               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+             <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.buyerTaxpayerCode"></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: 10px;">
+                <el-date-picker v-model="formCondition.invoiceMakeTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
+                <el-input  placeholder="发票代码" class="input-demo" v-model="formCondition.invoiceCode"></el-input>
+                <el-input  placeholder="发票号码" class="input-demo" v-model="formCondition.invoiceNum"></el-input>
+                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+                               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -22,13 +32,23 @@
           border
           tooltip-effect="dark">
           <el-table-column
-            label="客户名称"
-            prop="customerName"
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客户名称"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="buyerTaxpayerCode"
+            label="购方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="plateNum"
+            label="车牌号"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
@@ -57,11 +77,11 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="invoiceUrl"
-            label="下载地址"
+            prop="exTime"
+            label="交易时间"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="enStation"
             label="入口收费站"
             width="100"
@@ -74,16 +94,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="exTime"
-            label="交易时间"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="plateNum"
-            label="车牌号"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             prop="sellerName"
             label="销方名称"
             show-overflow-tooltip>
@@ -92,6 +102,16 @@
             prop="sellerTaxpayerCode"
             label="销方税号"
             show-overflow-tooltip>
+          </el-table-column> -->
+          <el-table-column
+            prop="totalAmount"
+            label="价税合计"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="totalTaxAmount"
+            label="税额"
+            show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="fee"
@@ -104,17 +124,17 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="totalTaxAmount"
-            label="税额"
+            prop="invoiceHtmlUrl"
+            label="预览地址"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="totalAmount"
-            label="价税合计"
+            prop="invoiceUrl"
+            label="下载地址"
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -136,7 +156,7 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              companyName:''
+
             },
            invoiceTable:[],
             current: 1,
@@ -153,7 +173,9 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            for(var i in this.formCondition){
+                formData.append(i,this.formCondition[i]);
+            }
             const response = await this.$http.post('selfCar/findSelfCarInvoices', formData);
             if (response.data.code === 0) {
               this.invoiceTable = response.data.data.records;
@@ -257,4 +279,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

+ 19 - 7
src/views/selfCar/selfCarTrade.vue

@@ -4,9 +4,19 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
+               <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: 10px;">
+                 <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
+                 <el-date-picker v-model="formCondition.aclTimeBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
-               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+               <el-button type="success" style="margin-left: 1%;" >更新状态(待确认)</el-button>
+                              <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -56,7 +66,7 @@
             label="交易时间"
             show-overflow-tooltip>
           </el-table-column>
-         
+
            <el-table-column
             prop="aclTime"
             label="申请开票时间"
@@ -73,7 +83,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -95,7 +105,7 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              companyName:''
+
             },
             selfcarTrade:[],
             current: 1,
@@ -112,7 +122,9 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            for(var i in this.formCondition){
+                formData.append(i,this.formCondition[i]);
+            }
             const response = await this.$http.post(`selfCar/findTrades`, formData);
             if (response.data.code === 0) {
               this.selfcarTrade = response.data.data.records;
@@ -216,4 +228,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

+ 40 - 30
src/views/selfCar/selfCarTradeException.vue

@@ -4,9 +4,19 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
+               <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: 10px;">
+                 <!-- <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker> -->
+                 <el-date-picker v-model="formCondition.aclTimeBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="申请开票时间始" end-placeholder="申请开票时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
-               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+               <el-button type="success" style="margin-left: 1%;" >更新状态(待确认)</el-button>
+                            <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -17,59 +27,57 @@
           class="table"
           v-loading="loading"
           ref="multipleTable"
-          :data="nocarTrade"
+          :data="selfcarTrade"
            height="370px"
           border
           tooltip-effect="dark">
-          <el-table-column
-            label="客户名称"
-            prop="customId"
+         <el-table-column
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客户名称"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cardId"
-            label="ETC卡号"
+           <el-table-column
+            prop="companyReferencenum"
+            label="公司税号"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+           <el-table-column
             prop="tradeId"
             label="交易Id"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="exTime"
-            label="交易时间"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="fee"
-            label="交易费用"
+            prop="cardId"
+            label="ETC卡号"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="aclTime"
-            label="开票时间"
+            label="申请开票时间"
             show-overflow-tooltip>
-            
           </el-table-column>
           <el-table-column
             prop="status"
             label="状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.status == 0" style="color: green">未开票</span>
-              <span v-else-if="scope.row.status == 1" style="color: red">开票中</span>
-              <span v-else-if="scope.row.status == 2" style="color: red">成功开票</span>
-              <span v-else-if="scope.row.status == 3" style="color: red">取票成功</span>
+              <span v-if="scope.row.status == 1" style="color: green">待开票</span>
+              <span v-else-if="scope.row.status == 2" style="color: red">开票中</span>
+              <span v-else-if="scope.row.status == 3" style="color: red">已开票</span>
             </template>
           </el-table-column>
+           <el-table-column
+            prop="timeCount"
+            label="超长时间(天)"
+            show-overflow-tooltip>
+          </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -91,9 +99,9 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              companyName:''
+              "exceptionFlag":1
             },
-            nocarTrade:[],
+            selfcarTrade:[],
             current: 1,
             pagesize: 8,
             total:''
@@ -108,10 +116,12 @@ import XLSX from "xlsx";
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            for(var i in this.formCondition){
+                formData.append(i,this.formCondition[i]);
+            }
             const response = await this.$http.post(`selfCar/findTrades`, formData);
             if (response.data.code === 0) {
-              this.coustomerTable = response.data.data.records;
+              this.selfcarTrade = response.data.data.records;
               this.total = response.data.data.total;
             }
           },
@@ -212,4 +222,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>