Merge pull request '月结客户出货统计对比功能' (#145) from master-dev into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/145
This commit is contained in:
wuteng
commit
6debc351fc
@ -7,11 +7,14 @@
|
||||
<el-form-item label="寄件时间" prop="createTime" label-width="68px">
|
||||
<elDateAdvPicker v-model="dateTimeRange" style="z-index:9999;width:260px" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户名称" prop="custNo" label-width="68px">
|
||||
<AllMonthpayAccountPicker v-model="queryParams.custNo" style="width:260px"></AllMonthpayAccountPicker>
|
||||
<el-form-item label="对比时间" prop="createTime" label-width="68px">
|
||||
<elDateAdvPicker v-model="dateTimeRangeCompare" style="z-index:9999;width:260px" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="客户名称" prop="custNo" >
|
||||
<AllMonthpayAccountPicker v-model="queryParams.custNo" style="width:100%"></AllMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="寄件国家" prop="sendCountry">
|
||||
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
|
||||
</el-form-item>
|
||||
@ -28,6 +31,9 @@
|
||||
<el-form-item label="销售支持" prop="salesSupport" >
|
||||
<EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport" ></EmpNamePicker3>
|
||||
</el-form-item>
|
||||
<el-form-item label=" " prop="statType" >
|
||||
<el-checkbox v-model="statType">查询时间对比</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</SearchForm>
|
||||
@ -74,58 +80,184 @@
|
||||
<el-table-column :label="$t('首次签约日期')" align="left" prop="firstSigningDay" width="110" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('总票数')" align="center" prop="totalTickets" width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,null)">{{ scope.row.totalTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,null)">{{ scope.row.totalTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.totalTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.totalTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.totalTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="140" sortable >
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.totalWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.totalWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.totalWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.totalWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" sortable />
|
||||
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="120" />
|
||||
<el-table-column :label="$t('快递')" align="center" prop="express" min-width="120" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="expressTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,1)">{{ scope.row.expressTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,1)">{{ scope.row.expressTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.expressTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.expressTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.expressTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="expressWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="expressWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.expressWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.expressWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.expressWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.expressWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('空运')" align="center" prop="air" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="airTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,2)">{{ scope.row.airTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,2)">{{ scope.row.airTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.airTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.airTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.airTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="airWeight" min-width="120" sortable/>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="airWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.airWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.airWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.airWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.airWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('陆运')" align="center" prop="land" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="landTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'3,5')">{{ scope.row.landTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'3,5')">{{ scope.row.landTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.landTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.landTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.landTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="landWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.landWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.landWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.landWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.landWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="landWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('进口')" align="center" prop="import" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="importTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'import')">{{ scope.row.importTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'import')">{{ scope.row.importTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.importTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.importTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.importTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="importWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.importWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.importWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.importWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.importWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="importWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('海运')" align="center" prop="sea" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="seaTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,4)">{{ scope.row.seaTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,4)">{{ scope.row.seaTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.seaTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.seaTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.seaTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="seaWeight" min-width="120" sortable/>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="seaWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.seaWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.seaWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.seaWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.seaWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('其他')" align="center" prop="other" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="otherTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'other')">{{ scope.row.otherTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'other')">{{ scope.row.otherTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.otherTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.otherTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.otherTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="otherWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.otherWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.otherWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.otherWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.otherWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="otherWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
|
||||
</xd-table>
|
||||
@ -166,7 +298,8 @@ export default {
|
||||
showSearch: true,
|
||||
// 创建时间搜索
|
||||
dateTimeRange:[],
|
||||
|
||||
// 对比时间
|
||||
dateTimeRangeCompare:[],
|
||||
// 总条数
|
||||
total: 0,
|
||||
recordTotal:0,
|
||||
@ -202,7 +335,7 @@ export default {
|
||||
id:null,
|
||||
titleView:"",
|
||||
openView: false,
|
||||
|
||||
statType:false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@ -247,6 +380,12 @@ export default {
|
||||
initQueryParams(){
|
||||
let thisQueryParams = {...this.queryParams};
|
||||
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRange,"SendDate");
|
||||
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRangeCompare,"CompareDate");
|
||||
if(this.statType == true){
|
||||
thisQueryParams.params.statType = 3;
|
||||
}else{
|
||||
thisQueryParams.params.statType = 1;
|
||||
}
|
||||
return thisQueryParams;
|
||||
},
|
||||
|
||||
@ -643,4 +782,25 @@ export default {
|
||||
vertical-align: top;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.flex-center{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 90%;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.icon-content{
|
||||
margin-left: 10px;
|
||||
margin-left: auto;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.el-icon-right{
|
||||
color: #409EFF;
|
||||
}
|
||||
.el-icon-top{
|
||||
color: #dd0c1e;
|
||||
}
|
||||
.el-icon-bottom{
|
||||
color: #12da33;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -4,14 +4,17 @@
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<!-- 查询条件：客户名称、寄件公司、销售联系人、回款联系人、运单号、账单号、账期月、收款时间、收款登记人、 -->
|
||||
<el-col :span="6">
|
||||
<el-form-item label="寄件时间" prop="createTime" label-width="68px">
|
||||
<el-form-item label="寄件时间" prop="createTime" label-width="68px">
|
||||
<elDateAdvPicker v-model="dateTimeRange" style="z-index:9999;width:260px" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户名称" prop="custNo" label-width="68px">
|
||||
<AllMonthpayAccountPicker v-model="queryParams.custNo" style="width:260px" ></AllMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="对比时间" prop="createTime" label-width="68px">
|
||||
<elDateAdvPicker v-model="dateTimeRangeCompare" style="z-index:9999;width:260px" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="客户名称" prop="custNo">
|
||||
<AllMonthpayAccountPicker v-model="queryParams.custNo" style="width:100%" ></AllMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="寄件国家" prop="sendCountry">
|
||||
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
|
||||
</el-form-item>
|
||||
@ -28,6 +31,9 @@
|
||||
<el-form-item label="销售支持" prop="salesSupport" >
|
||||
<EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport" ></EmpNamePicker3>
|
||||
</el-form-item>
|
||||
<el-form-item label=" " prop="statType" >
|
||||
<el-checkbox v-model="statType">查询时间对比</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</SearchForm>
|
||||
@ -74,74 +80,236 @@
|
||||
<el-table-column :label="$t('首次签约日期')" align="left" prop="firstSigningDay" width="110" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('总票数')" align="center" prop="totalTickets" width="110" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,null)">{{ scope.row.totalTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,null)">{{ scope.row.totalTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.totalTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.totalTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.totalTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="140" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.totalWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.totalWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.totalWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.totalWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" sortable/>
|
||||
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="120" />
|
||||
<el-table-column :label="$t('中国')" align="center" prop="china" min-width="120" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="chinaTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'0086')">{{ scope.row.chinaTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0086')">{{ scope.row.chinaTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.chinaTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.chinaTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.chinaTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="chinaWeight" min-width="120" sortable/>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="chinaWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.chinaWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.chinaWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.chinaWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.chinaWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('越南')" align="center" prop="vietnam" min-width="120" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="vietnamTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'0084')">{{ scope.row.vietnamTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0084')">{{ scope.row.vietnamTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.vietnamTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.vietnamTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.vietnamTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="vietnamWeight" min-width="120" sortable/>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="vietnamWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.vietnamWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.vietnamWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.vietnamWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.vietnamWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('柬埔寨')" align="center" prop="cambodia" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="cambodiaTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'0855')">{{ scope.row.cambodiaTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0855')">{{ scope.row.cambodiaTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.cambodiaTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.cambodiaTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.cambodiaTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="cambodiaWeight" min-width="120" sortable/>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="cambodiaWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.cambodiaWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.cambodiaWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.cambodiaWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.cambodiaWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('缅甸')" align="center" prop="myanmar" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="myanmarTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<span @click="handleShowBillList(scope.row,'0095')">{{ scope.row.myanmarTickets }}</span>
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0095')">{{ scope.row.myanmarTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.myanmarTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.myanmarTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.myanmarTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="myanmarWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.myanmarWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.myanmarWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.myanmarWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.myanmarWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="myanmarWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('孟加拉')" align="center" prop="bangladesh" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="bangladeshTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0880')">{{ scope.row.bangladeshTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.bangladeshTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.bangladeshTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.bangladeshTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="bangladeshWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.bangladeshWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.bangladeshWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.bangladeshWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.bangladeshWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="bangladeshWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('老挝')" align="center" prop="laos" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="laosTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0856')">{{ scope.row.laosTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.laosTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.laosTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.laosTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="laosWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.laosWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.laosWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.laosWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.laosWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="laosWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('泰国')" align="center" prop="thailand" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="thailandTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'0066')">{{ scope.row.thailandTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.thailandTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.thailandTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.thailandTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="thailandWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.thailandWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.thailandWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.thailandWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.thailandWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="thailandWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('其他')" align="center" prop="other" width="100" >
|
||||
<el-table-column :label="$t('票数')" align="center" prop="otherTickets" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span @click="handleShowBillList(scope.row,'other')">{{ scope.row.otherTickets }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.otherTicketsCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.otherTicketsCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.otherTicketsCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="otherWeight" min-width="120" sortable>
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-center">
|
||||
<span>{{ scope.row.otherWeight }}</span>
|
||||
<div class="icon-content" >
|
||||
<i class="el-icon-right" v-if="scope.row.otherWeightCompareFlag == 0" ></i>
|
||||
<i class="el-icon-top" v-if="scope.row.otherWeightCompareFlag == 1" ></i>
|
||||
<i class="el-icon-bottom" v-if="scope.row.otherWeightCompareFlag == 2"></i>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('实际重量')" align="center" prop="otherWeight" min-width="120" sortable/>
|
||||
</el-table-column>
|
||||
|
||||
</xd-table>
|
||||
@ -182,7 +350,8 @@ export default {
|
||||
showSearch: true,
|
||||
// 创建时间搜索
|
||||
dateTimeRange:[],
|
||||
|
||||
// 对比时间
|
||||
dateTimeRangeCompare:[],
|
||||
// 总条数
|
||||
total: 0,
|
||||
recordTotal:0,
|
||||
@ -218,7 +387,7 @@ export default {
|
||||
id:null,
|
||||
titleView:"",
|
||||
openView: false,
|
||||
|
||||
statType:false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@ -263,6 +432,12 @@ export default {
|
||||
initQueryParams(){
|
||||
let thisQueryParams = {...this.queryParams};
|
||||
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRange,"SendDate");
|
||||
thisQueryParams = this.addDateRange(thisQueryParams, this.dateTimeRangeCompare,"CompareDate");
|
||||
if(this.statType == true){
|
||||
thisQueryParams.params.statType = 4;
|
||||
}else{
|
||||
thisQueryParams.params.statType = 2;
|
||||
}
|
||||
return thisQueryParams;
|
||||
},
|
||||
|
||||
@ -712,4 +887,25 @@ export default {
|
||||
vertical-align: top;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.flex-center{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 90%;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.icon-content{
|
||||
margin-left: 10px;
|
||||
margin-left: auto;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.el-icon-right{
|
||||
color: #409EFF;
|
||||
}
|
||||
.el-icon-top{
|
||||
color: #dd0c1e;
|
||||
}
|
||||
.el-icon-bottom{
|
||||
color: #12da33;
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user