前端代码合并提交

src/config/globle.js

@@ -1,4 +1,4 @@
-window.hostUrl = `http://127.0.0.1:18081/`;
+//window.hostUrl = `http://127.0.0.1:18081/`;
 //window.hostUrl = `http://192.168.50.4:18081/`;
-//window.hostUrl = `http://invoice.jkcredit.com:80/`;
+window.hostUrl = `http://invoice.jkcredit.com:80/`;
 window.tableHeight = (document.body.clientHeight * 0.6 - 20)

src/views/noCar/invoice.vue

@@ -73,6 +73,12 @@
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
+            prop="waybillNumAct"
+            label="拆分运单号"
+            width="100"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
             prop="buyerTaxpayerCode"
             label="购方税号"
             show-overflow-tooltip>
@@ -538,6 +544,7 @@ import XLSX from 'xlsx';
                       {'title': '企业编号', 'key': 'companyNum'},
                       {'title': '公司名称', 'key': 'buyerName'},
                       {'title': '运单号', 'key': 'waybillNum'},
+                      {'title': '拆分运单号', 'key': 'waybillNumAct'},
                       {'title': '购方税号', 'key': 'buyerTaxpayerCode'},
                       {'title': '车牌号码', 'key': 'plateNum'},
                       {'title': '运单开始时间', 'key': 'waybillStartTime'},

src/views/selfCar/calculateInfo.vue

@@ -11,7 +11,8 @@
                <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.etcNum"></el-input>
             </div>
             <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-               <el-date-picker v-model="formCondition.calTime" type="monthrange" value-format="yyyy-MM" range-separator="至" start-placeholder="计费开始" end-placeholder="计费结束"></el-date-picker>
+               <el-date-picker v-model="formCondition.calTime" type="monthrange" value-format="yyyy-MM" range-separator="至" start-placeholder="已计交易时间始" end-placeholder="已计交易时间止"></el-date-picker>
+               <el-date-picker v-model="formCondition.actCalTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
@@ -56,7 +57,12 @@
           </el-table-column>
           <el-table-column
             prop="calTime"
-            label="计费时间"
+            label="已计交易时间"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="actCalTime"
+            label="扣费时间"
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
@@ -86,6 +92,7 @@ export default {
         companyReferencenum: ``,
         etcNum: ``,
         calTime: ``,
+        actCalTime: '',
         companyLongName: ``
       },
       calculateInfo: [],
@@ -118,7 +125,8 @@ export default {
       formData.append(`companyName`, this.formCondition.companyName)
       formData.append(`companyReferencenum`, this.formCondition.companyReferencenum)
       formData.append(`etcNum`, this.formCondition.etcNum)
-      formData.append(`calTime`, this.formCondition.calTime)
+      formData.append(`calTime`, this.formCondition.calTime==null?'':this.formCondition.calTime)
+      formData.append(`actCalTime`, this.formCondition.actCalTime==null?'':this.formCondition.actCalTime)
       formData.append(`companyLongName`, this.formCondition.companyLongName)
 
       const response = await this.$http.post(`selfCar/findSelfcarCalculateInfo`, formData)

src/views/selfCar/invoice.vue

@@ -199,7 +199,13 @@
           </el-table-column>
            <el-table-column
             prop="calculateTime"
-            label="计费时间"
+            label="已计交易时间"
+            width="100"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="aclCalculateTime"
+            label="扣费时间"
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
@@ -460,7 +466,8 @@ export default {
         {'title': `税额(元)`, 'key': `totalTaxAmount`},
         {'title': `金额(元)`, 'key': `amount`},
         {'title': `税率`, 'key': `taxRate`},
-        {'title': `扣费时间`, 'key': `calculateTime`},
+        {'title': `已记交易时间`, 'key': `calculateTime`},
+        {'title': `扣费时间`, 'key': `aclCalculateTime`},
         {'title': `交易状态`, 'key': `tradeStatus`},
         {'title': `预览地址`, 'key': `invoiceHtmlUrl`},
         {'title': `下载地址`, 'key': `invoiceUrl`}