|
@@ -20,6 +20,23 @@
|
|
|
<template slot="menuLeft">
|
|
|
<el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
|
|
|
</template>
|
|
|
+ <template slot="header">
|
|
|
+ <el-table
|
|
|
+ :data="commodityData"
|
|
|
+ border
|
|
|
+ size="small"
|
|
|
+ @header-click="cellClick"
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ v-for="(item,index) in commodityLabel" :key="index"
|
|
|
+ :prop="item.prop"
|
|
|
+ show-overflow-tooltip
|
|
|
+ :label="item.label" />
|
|
|
+ </el-table>
|
|
|
+ </template>
|
|
|
+ <template slot="etdDate" slot-scope="{ row }">
|
|
|
+ <span>{{row.etdDate?row.etdDate.slice(0,10):''}}</span>
|
|
|
+ </template>
|
|
|
<template slot-scope="{disabled,size}" slot="dcSearch">
|
|
|
<el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
|
|
|
<el-radio v-model="query.dc" label="C" @input="dcInput" >应付</el-radio>
|
|
@@ -106,7 +123,10 @@
|
|
|
<script>
|
|
|
import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
|
|
|
import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
|
|
|
-import { financeStatisticsFeeSummaryDetail} from "@/api/iosBasicData/paymentSummary"
|
|
|
+import {
|
|
|
+ financeStatisticsFeeSummaryDetail,
|
|
|
+ financeStatisticsFeeSummaryDetailSum
|
|
|
+} from "@/api/iosBasicData/paymentSummary"
|
|
|
import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
|
|
|
import {getWorkDicts} from "@/api/system/dictbiz";
|
|
|
import {getDeptLazyTree} from "@/api/system/dept";
|
|
@@ -330,6 +350,61 @@ export default {
|
|
|
srcIdData:[], // 业务员
|
|
|
srcforParameter:{key:'id', label:'cnName', value:'cnName'},
|
|
|
|
|
|
+ commodityData:[], // 合计数据
|
|
|
+ // 合计的配置项
|
|
|
+ commodityLabel:[
|
|
|
+ {
|
|
|
+ id:1,
|
|
|
+ label: "应收美金",
|
|
|
+ prop: "amountUsd",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:2,
|
|
|
+ label: "应收人民币",
|
|
|
+ prop: "amount",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:3,
|
|
|
+ label: "已收款美金",
|
|
|
+ prop: "amountUsdAlready",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:4,
|
|
|
+ label: "已收款人民币",
|
|
|
+ prop: "amountAlready",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:5,
|
|
|
+ label: "未收款美金",
|
|
|
+ prop: "amountUsdNot",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:6,
|
|
|
+ label: "未收款人民币",
|
|
|
+ prop: "amountNot",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:7,
|
|
|
+ label: "开票美金",
|
|
|
+ prop: "amountInvoicingUsd",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:8,
|
|
|
+ label: "开票人民币",
|
|
|
+ prop: "amountInvoicing",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:9,
|
|
|
+ label: "未开美金",
|
|
|
+ prop: "amountInvoicingUsdNot",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id:10,
|
|
|
+ label: "未开人民币",
|
|
|
+ prop: "amountInvoicingNot",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
async created() {
|
|
@@ -467,6 +542,13 @@ export default {
|
|
|
this.findObject(this.option.column, "amountUsdNot").label = `未${dcName}款美金`
|
|
|
this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
|
|
|
|
|
|
+ this.findObject(this.commodityLabel, "amountUsd").label = `应${dcName}美金`
|
|
|
+ this.findObject(this.commodityLabel, "amount").label = `应${dcName}人民币`
|
|
|
+ this.findObject(this.commodityLabel, "amountUsdAlready").label = `已${dcName}款美金`
|
|
|
+ this.findObject(this.commodityLabel, "amountAlready").label = `已${dcName}款人民币`
|
|
|
+ this.findObject(this.commodityLabel, "amountUsdNot").label = `未${dcName}款美金`
|
|
|
+ this.findObject(this.commodityLabel, "amountNot").label = `未${dcName}款人民币`
|
|
|
+
|
|
|
this.page.currentPage = 1;
|
|
|
this.onLoad(this.page, this.query);
|
|
|
},
|
|
@@ -549,6 +631,9 @@ export default {
|
|
|
this.page.total = data.total;
|
|
|
this.data = data.records;
|
|
|
this.loading = false;
|
|
|
+ financeStatisticsFeeSummaryDetailSum(Object.assign(params, this.query)).then(re=>{
|
|
|
+ this.commodityData = [re.data.data]
|
|
|
+ })
|
|
|
this.selectionClear();
|
|
|
});
|
|
|
},
|