md
This commit is contained in:
parent
d3f1c5b40c
commit
cd25736f40
@ -26,6 +26,18 @@ export function getTraceListByBillCode(query) {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export function queryLastRecord(billCode) {
|
||||
return request({
|
||||
url: '/emis/emisTmsScanRecord/queryLastRecord',
|
||||
method: 'get',
|
||||
params:{billCode:billCode}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// 签收异常数据对比
|
||||
export function queryStatList(query){
|
||||
return request({
|
||||
|
||||
7
src/vendor/Export2Excel.js
vendored
7
src/vendor/Export2Excel.js
vendored
@ -155,8 +155,11 @@ export function export_json_to_excel({header, data, filename='excel-list', autoW
|
||||
wb.SheetNames.push(ws_name);
|
||||
wb.Sheets[ws_name] = ws;
|
||||
|
||||
var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
|
||||
saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), filename + ".xlsx");
|
||||
// var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
|
||||
// saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), filename + ".xlsx");
|
||||
|
||||
XLSX.writeFile(wb, filename + ".xlsx", { compression: true });
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
<el-descriptions-item label="开户银行">{{ emisSettleInvoiceRecord.bankName }} {{ emisSettleInvoiceRecord.bankAccNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="开票类型" :span="1">
|
||||
<span v-if="emisSettleInvoiceRecord.invoiceType==1"> 增值税电子普通发票</span>
|
||||
<span v-if="emisSettleInvoiceRecord.invoiceType==2"> 增值税普通发票</span>
|
||||
<span v-if="emisSettleInvoiceRecord.invoiceType==3"> 增值税专用发票</span>
|
||||
<span v-if="emisSettleInvoiceRecord.invoiceType==2"> 增值税普通发票(纸质发票)</span>
|
||||
<span v-if="emisSettleInvoiceRecord.invoiceType==3"> 增值税专用发票(纸质发票)</span>
|
||||
<span v-if="emisSettleInvoiceRecord.invoiceType==9"> 其它手工开票</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="开票金额" :span="1">¥{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
|
||||
|
||||
@ -146,8 +146,8 @@
|
||||
</span>
|
||||
<el-select clearable v-model="form.invoiceType" placeholder="请选择" style="width:100%">
|
||||
<el-option label="增值税电子普通发票" :value="1"></el-option>
|
||||
<el-option label="增值税普通发票" :value="2"></el-option>
|
||||
<el-option label="增值税专用发票" :value="3"></el-option>
|
||||
<el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
|
||||
<el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
|
||||
<el-option label="其它手工发票" :value="9"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@ -47,8 +47,8 @@
|
||||
<el-form-item label="发票类型" prop="invoiceType">
|
||||
<el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
|
||||
<el-option label="增值税电子普通发票" :value="1"></el-option>
|
||||
<el-option label="增值税普通发票" :value="2"></el-option>
|
||||
<el-option label="增值税专用发票" :value="3"></el-option>
|
||||
<el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
|
||||
<el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
|
||||
<el-option label="其它手工开票" :value="9"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -220,8 +220,8 @@
|
||||
<el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工开票</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@ -47,8 +47,8 @@
|
||||
<el-form-item label="发票类型" prop="invoiceType">
|
||||
<el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
|
||||
<el-option label="增值税电子普通发票" :value="1"></el-option>
|
||||
<el-option label="增值税普通发票" :value="2"></el-option>
|
||||
<el-option label="增值税专用发票" :value="3"></el-option>
|
||||
<el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
|
||||
<el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
|
||||
<el-option label="其它手工开票" :value="9"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@ -54,8 +54,9 @@
|
||||
<el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
|
||||
<el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工发票</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('开票抬头')" align="center" prop="companyName" min-width="170" :show-overflow-tooltip="true" />
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="月结客户" prop="custNo">
|
||||
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
|
||||
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></EmisMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
<el-form-item label="付款方式" prop="paymentType" >
|
||||
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
|
||||
@ -289,6 +289,10 @@
|
||||
|
||||
:row-class-name="tableRowClassName"
|
||||
|
||||
:virtual-scroll="{itemSize: 10}"
|
||||
:data-options="{ cached: true }"
|
||||
|
||||
|
||||
>
|
||||
|
||||
<div slot="toolbar">
|
||||
@ -331,26 +335,25 @@
|
||||
</el-table-column>
|
||||
|
||||
|
||||
|
||||
<el-table-column :label="$t('快件跟踪')" align="left" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" >
|
||||
<template slot-scope="scope">
|
||||
<div >{{scope.row.lastTraceInfo}}</div>
|
||||
<div >{{ scope.row.lastTraceInfo }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- class="link-type" @click="handleShowTraceInfo(scope.row)" class="link-type" @click="handleShowTraceInfo(scope.row)" class="link-type" @click="handleShowTraceInfo(scope.row)" -->
|
||||
<el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.lastScanRecord!=null" >
|
||||
<div v-if="scope.row.lastScanDate!=null" >
|
||||
<div v-if="scope.row.blSign=='1'" >
|
||||
已签收
|
||||
</div>
|
||||
<div v-else >
|
||||
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
|
||||
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
|
||||
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
|
||||
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
|
||||
</span>
|
||||
<span v-else >
|
||||
{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}}天
|
||||
{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -569,6 +572,8 @@ import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
|
||||
|
||||
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
|
||||
|
||||
|
||||
import { queryLastRecord } from "@/api/emis/emisTmsScanRecord";
|
||||
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
|
||||
import { formatSearchStr,deepClone } from '@/utils/index'
|
||||
import clip from '@/utils/clipboard'
|
||||
@ -844,6 +849,10 @@ export default {
|
||||
onSalemanChange(){
|
||||
this.queryParams.sendSiteCode=null;
|
||||
},
|
||||
|
||||
onCustNoChange(){
|
||||
this.queryParams.sendSiteCode=null;
|
||||
},
|
||||
//标红table指定行
|
||||
tableRowClassName({row, rowIndex}) {
|
||||
|
||||
@ -897,6 +906,9 @@ export default {
|
||||
this.emisWaybillList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
|
||||
// 触发获取最后轨迹更新
|
||||
this.showLastTraceInfo();
|
||||
});
|
||||
|
||||
// 查询统计
|
||||
@ -906,6 +918,18 @@ export default {
|
||||
|
||||
},
|
||||
|
||||
showLastTraceInfo(){
|
||||
if(this.emisWaybillList&&this.emisWaybillList.length>0){
|
||||
this.emisWaybillList.forEach(item=>{
|
||||
queryLastRecord(item.billCode).then(response => {
|
||||
let data=response.data;
|
||||
item.lastTraceInfo=data.lastTraceInfo;
|
||||
item.lastScanDate=data.scanDate;
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
onDateSelect(value){
|
||||
// this.dateTimeRange=value;
|
||||
// scanDate
|
||||
|
||||
@ -573,6 +573,8 @@ import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
|
||||
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
|
||||
|
||||
|
||||
import { queryLastRecord } from "@/api/emis/emisTmsScanRecord";
|
||||
|
||||
|
||||
|
||||
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
|
||||
@ -905,6 +907,8 @@ export default {
|
||||
this.emisWaybillList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
|
||||
this.showLastTraceInfo();
|
||||
});
|
||||
|
||||
// 查询统计
|
||||
@ -913,6 +917,18 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
showLastTraceInfo(){
|
||||
if(this.emisWaybillList&&this.emisWaybillList.length>0){
|
||||
this.emisWaybillList.forEach(item=>{
|
||||
queryLastRecord(item.billCode).then(response => {
|
||||
let data=response.data;
|
||||
item.lastTraceInfo=data.lastTraceInfo;
|
||||
item.lastScanDate=data.scanDate;
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
onDateSelect(value){
|
||||
// this.dateTimeRange=value;
|
||||
// scanDate
|
||||
|
||||
Loading…
Reference in New Issue
Block a user