|
|
@@ -25,7 +25,7 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button @click="onClick">查询</el-button>
|
|
|
+ <el-button @click="getNoDetailsStament">查询</el-button>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" @click="exportAllReportToExcel"
|
|
|
@@ -73,8 +73,8 @@
|
|
|
:data="tableData"
|
|
|
ref="tableRef"
|
|
|
border
|
|
|
- stripe
|
|
|
- style="width: 100%; margin-top: 20px"
|
|
|
+ style="width: 100%; margin-top: 0px"
|
|
|
+ fit
|
|
|
max-height="500px"
|
|
|
:row-style="{ height: '30px' }"
|
|
|
:cell-style="{ fontWeight: '700' }"
|
|
|
@@ -138,6 +138,9 @@
|
|
|
width="100px"
|
|
|
align="center"
|
|
|
>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{(scope.row.loadingProportion*100).toFixed(2)}}%
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="realTonnage"
|
|
|
@@ -204,7 +207,7 @@
|
|
|
<el-table-column
|
|
|
prop="feeMake"
|
|
|
label="本月实际开票金额"
|
|
|
- width="100px"
|
|
|
+
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
@@ -373,6 +376,7 @@
|
|
|
</template>
|
|
|
<script>
|
|
|
import { getCookie } from "@/utils/util.js";
|
|
|
+import { sjTime } from "@/utils/sharedJsFile";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -494,7 +498,20 @@ export default {
|
|
|
onClick() {},
|
|
|
//获取未结算账单数据
|
|
|
getNoDetailsStament() {
|
|
|
- this.axios.post("/api/v1/bms/getShipFeeStatement").then(res => {
|
|
|
+ let startTime = null;
|
|
|
+ let endTime = null;
|
|
|
+ let map={con:this.shipName};
|
|
|
+ if (this.startTime) {
|
|
|
+ startTime = sjTime(this.startTime);
|
|
|
+ }
|
|
|
+ if (this.endTime) {
|
|
|
+ endTime = sjTime(this.endTime);
|
|
|
+ }
|
|
|
+ if(startTime && endTime && startTime < endTime){
|
|
|
+ map.startTime=startTime;
|
|
|
+ map.endTime=endTime;
|
|
|
+ }
|
|
|
+ this.axios.post("/api/v1/bms/getShipFeeStatement",map).then(res => {
|
|
|
console.log(res.data.data);
|
|
|
this.tableData = res.data.data;
|
|
|
this.computedTableData(this.tableData);
|
luobang