aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master-dev' (#156) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/156
This commit is contained in:
wuteng 2025-12-03 16:31:19 +08:00
commit 43883b3ac3
3 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue
View File

@ -1,5 +1,5 @@
<template>
<XdPageContainer id="BillPaybackSumQuery1" >
<XdPageContainer id="monthlyShipmentStatQuery" >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="90px" label-position="left" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 查询条件：客户名称、寄件公司、销售联系人、回款联系人、运单号、账单号、账期月、收款时间、收款登记人、 -->
@ -673,22 +673,31 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
})
let qExportParam=this.initQueryParams();
qExportParam.pageNum=1;
qExportParam.pageSize=10000;
this.download('emis/emisCustomerUser/exportMonthlyShipmentStat', {
...qExportParam
}, `按运输方式统计导出.xlsx`)
const $e = this.$refs['refTable'].$el
let $table = $e.querySelector('.el-table__fixed')
if(!$table) {
$table = $e
}
import('@/vendor/Export2Excel').then(excel => {
excel.table_to_book($table,"月结客户出货统计.xlsx");
loadingInstance.close()
})
loadingInstance.close();
// const loadingInstance = this.$loading({
// text: '正在导出...'
// })
// const $e = this.$refs['refTable'].$el
// let $table = $e.querySelector('.el-table__fixed')
// if(!$table) {
// $table = $e
// }
// import('@/vendor/Export2Excel').then(excel => {
// excel.table_to_book($table,"月结客户出货统计.xlsx");
// loadingInstance.close()
// })
// loadingInstance.close();
// let qExportParam = this.initQueryParams();;
// qExportParam.pageNum=1;
// qExportParam.pageSize=20000;

37
src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue
View File

@ -1,5 +1,5 @@
<template>
<XdPageContainer id="BillPaybackSumQuery1" >
<XdPageContainer id="monthlyShipmentStatReceiveCountryQuery" >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="90px" label-position="left" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 查询条件：客户名称、寄件公司、销售联系人、回款联系人、运单号、账单号、账期月、收款时间、收款登记人、 -->
@ -779,22 +779,31 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
})
let qExportParam=this.initQueryParams();
qExportParam.pageNum=1;
qExportParam.pageSize=10000;
this.download('emis/emisCustomerUser/exportMonthlyShipmentStat', {
...qExportParam
}, `按目的国家统计导出.xlsx`)
const $e = this.$refs['refTable'].$el
let $table = $e.querySelector('.el-table__fixed')
if(!$table) {
$table = $e
}
import('@/vendor/Export2Excel').then(excel => {
excel.table_to_book($table,"月结客户出货统计.xlsx");
loadingInstance.close()
})
loadingInstance.close();
// const loadingInstance = this.$loading({
// text: '正在导出...'
// })
// const $e = this.$refs['refTable'].$el
// let $table = $e.querySelector('.el-table__fixed')
// if(!$table) {
// $table = $e
// }
// import('@/vendor/Export2Excel').then(excel => {
// excel.table_to_book($table,"月结客户出货统计.xlsx");
// loadingInstance.close()
// })
// loadingInstance.close();
// let qExportParam = this.initQueryParams();;
// qExportParam.pageNum=1;
// qExportParam.pageSize=20000;

4
src/views/emis/emisTmsSiteBatchMiss/indexV2.vue
View File

@ -46,8 +46,8 @@
<el-option label="运单分批后未组完" :value="-6"></el-option>
<!-- <el-option label="其他" :value="-5"></el-option> -->
<el-option label="组批次完成" :value="-4"></el-option>
<!-- <el-option label="从未组批次" :value="-1"></el-option>
<el-option label="组批次错误" :value="-2"></el-option> -->
<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="1"></el-option>
<!-- <el-option label="漏组1批次" :value="1"></el-option>