货代 2024-3-28

src/api/iosBasicData/paymentSummary.js

@@ -75,3 +75,19 @@ export const financeStatisticsFeeSummarySum = (params) => {
     params: params
   })
 }
+// 收付明细合计详情
+export const financeStatisticsFeeSummaryDetailSum = (params) => {
+  return request({
+    url: '/api/blade-los/financeStatistics/feeSummaryDetailSum',
+    method: 'get',
+    params: params
+  })
+}
+// 未收(付)明细表合计
+export const financeStatisticsFeeSummaryDetailNotSum = (params) => {
+  return request({
+    url: '/api/blade-los/financeStatistics/feeSummaryDetailNotSum',
+    method: 'get',
+    params: params
+  })
+}

src/views/iosBasicData/ComputationCenter/index.vue

@@ -243,7 +243,7 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                         },
                         {
                             label: "事由",
-                            prop: "collectionSituation",
+                            prop: "remarks",
                             overHidden:true,
                         },
                     ]

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -20,6 +20,20 @@
             <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-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>
@@ -86,7 +100,10 @@
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
-import { financeStatisticsFeeSummaryDetailNot} from "@/api/iosBasicData/paymentSummary"
+import {
+    financeStatisticsFeeSummaryDetailNot,
+    financeStatisticsFeeSummaryDetailNotSum
+} from "@/api/iosBasicData/paymentSummary"
 import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
 import {getWorkDicts} from "@/api/system/dictbiz";
 import {getDeptLazyTree} from "@/api/system/dept";
@@ -179,11 +196,6 @@ export default {
                         overHidden:true,
                     },
                     {
-                        label: "箱型箱量",
-                        prop: "quantityCntrDescr",
-                        overHidden:true,
-                    },
-                    {
                         label: "美元",
                         prop: "amountUsdNot",
                         overHidden:true,
@@ -199,7 +211,7 @@ export default {
                         overHidden:true,
                     },
                     {
-                        label: "开票RMB",
+                        label: "开票CNY",
                         prop: "amountInvoicing",
                         overHidden:true,
                     },
@@ -209,7 +221,7 @@ export default {
                         overHidden:true,
                     },
                     {
-                        label: "未开RMB",
+                        label: "未开CNY",
                         prop: "amountInvoicingNot",
                         overHidden:true,
                     },
@@ -318,6 +330,41 @@ export default {
             corpIdData:[], // 结算单位
             srcIdData:[], // 业务员
 
+            commodityData:[], // 合计数据
+            // 合计的配置项
+            commodityLabel:[
+                {
+                    id:1,
+                    label: "美元",
+                    prop: "amountUsdNot",
+                },
+                {
+                    id:2,
+                    label: "人民币",
+                    prop: "amountNot",
+                },
+                {
+                    id:3,
+                    label: "开票USD",
+                    prop: "amountInvoicingUsd",
+                },
+                {
+                    id:4,
+                    label: "开票CNY",
+                    prop: "amountInvoicing",
+                },
+                {
+                    id:5,
+                    label: "未开USD",
+                    prop: "amountInvoicingUsdNot",
+                },
+                {
+                    id:6,
+                    label: "未开CNY",
+                    prop: "amountInvoicingNot",
+                },
+            ],
+
         }
     },
     async created() {
@@ -474,6 +521,9 @@ export default {
                 this.page.total = data.total;
                 this.data = data.records;
                 this.loading = false;
+                financeStatisticsFeeSummaryDetailNotSum(Object.assign(params, this.query)).then(re=>{
+                    this.commodityData = [re.data.data]
+                })
                 this.selectionClear();
             });
         },

src/views/iosBasicData/paymentDetail/index.vue

@@ -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();
             });
         },

src/views/iosBasicData/paymentSummary/index.vue

@@ -503,6 +503,13 @@
                 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);
             },