This commit is contained in:
linfso 2024-07-11 10:35:57 +08:00
parent 2ce4312c16
commit cbf9d77b88
5 changed files with 140 additions and 53 deletions

View File

@ -17,6 +17,14 @@ export function getQueryStatInfoMap(query) {
})
}
export function getMonthBillStatInfoMapList(query) {
return request({
url: '/emis/emisSettleSubBill/getMonthBillStatInfoMapList',
method: 'get',
params: query
})
}
// 查询结算子账单详细
export function getEmisSettleSubBill(id) {
return request({

View File

@ -1,6 +1,20 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
<el-tabs slot="pageHeader" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageHeader" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
size="mini" :maxShow="12" label-width="100px"
v-show="showSearch"
@search="handleQuery"
@ -95,19 +109,7 @@
</SearchForm>
<el-tabs slot="pageTabs" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
slot="pageContent"

View File

@ -1,6 +1,22 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
<el-tabs slot="pageHeader" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="月结统计" name="monthStat" v-if="actionType!=1">
</el-tab-pane>
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageHeader" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
size="mini" :maxShow="12" label-width="100px"
v-show="showSearch"
@search="handleQuery"
@ -95,21 +111,48 @@
</SearchForm>
<el-tabs slot="pageTabs" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<!-- 月结统计表 -->
<XdTable
v-if="activeTab=='monthStat'"
height="300px"
v-loading="loading"
border
size="mini"
storageName="monthBillStatInfoMapList_main"
:data="monthBillStatInfoMapList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getMonthBillStatInfoMapList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
@row-dblclick="getDetailList"
>
<div slot="toolbar">
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总票数')" align="center" prop="totalNum" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="parcelQty" min-width="100" />
<el-table-column :label="$t('总重量')" align="center" prop="totalBillWeight" min-width="100" />
<el-table-column :label="$t('总金额')" align="center" prop="totalFreight" min-width="150" />
</XdTable>
<XdTable
v-if="activeTab!='monthStat'"
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight-60)+'px'"
@ -473,6 +516,7 @@
<script>
import { listEmisSettleSubBill,
getQueryStatInfoMap,
getMonthBillStatInfoMapList,
delEmisSettleSubBill,
confirmBillByCenter,
cancelConfirmBillByCenter,
@ -572,6 +616,8 @@ export default {
// 结算子账单表格数据
emisSettleSubBillList: [],
monthBillStatInfoMapList:[],
actionType:null,
settleType:null,
@ -883,7 +929,13 @@ export default {
}
}
this.getList();
if(this.activeTab=='monthStat'){
this.getMonthBillStatInfoMapList();
}
else{
this.getList();
}
},
tableRowClassName({row, rowIndex}) {
@ -938,6 +990,27 @@ export default {
});
},
getMonthBillStatInfoMapList(){
this.loading = true;
this.queryParams.custNo=null;
this.queryParams.blConfirmCenter=1;
this.initQueryParams();
getMonthBillStatInfoMapList(this.queryParams).then(response => {
this.monthBillStatInfoMapList = response.rows;
this.total = response.total;
this.loading = false;
});
},
getDetailList(row, column, event) {
this.activeTab="waitConfirm";
this.queryParams.custNo=row.custNo;
this.getList();
},
//指定列求和
getSummaries(param) {
const { columns, data } = param;

View File

@ -1,6 +1,20 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
<el-tabs slot="pageHeader" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageHeader" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
size="mini" :maxShow="12" label-width="100px"
v-show="showSearch"
@search="handleQuery"
@ -95,19 +109,7 @@
</SearchForm>
<el-tabs slot="pageTabs" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
slot="pageContent"

View File

@ -1,6 +1,20 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
<el-tabs slot="pageHeader" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageHeader" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
size="mini" :maxShow="12" label-width="100px"
v-show="showSearch"
@search="handleQuery"
@ -95,19 +109,7 @@
</SearchForm>
<el-tabs slot="pageTabs" v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
</el-tabs>
<el-tabs slot="pageTabs" v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待合账" name="waitMerge" />
<!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
</el-tabs>
<XdTable
slot="pageContent"