货代 2024-3-28

src/api/iosBasicData/paymentSummary.js

@@ -67,3 +67,11 @@ export const financeStatisticsFinanceProfitSum = (params) => {
     params: params
   })
 }
+// 收付汇总合计详情
+export const financeStatisticsFeeSummarySum = (params) => {
+  return request({
+    url: '/api/blade-los/financeStatistics/feeSummarySum',
+    method: 'get',
+    params: params
+  })
+}

src/views/iosBasicData/financeProfit/index.vue

@@ -36,7 +36,7 @@
             </template>
             <template slot-scope="{disabled,size}" slot="billTypeSearch">
                 <avue-input-tree :check-strictly="true"
-                                 :tags="true"
+                                 :tags="true" tags
                                  multiple v-model="query.billType"
                                  placeholder="请选择业务类型"
                                  :dic="billTypeData" :style="{ width: '100%' }">
@@ -509,21 +509,6 @@
                 // 合计的配置项
                 commodityLabel:[
                     {
-                        id:1,
-                        label:'应付人民币',
-                        prop:'amountCr'
-                    },
-                    {
-                        id:2,
-                        label:'应付美元',
-                        prop:'amountCrUsd'
-                    },
-                    {
-                        id:3,
-                        label:'合计应付',
-                        prop:'amountCrLoc'
-                    },
-                    {
                         id:4,
                         label:'应收人民币',
                         prop:'amountDr'
@@ -554,6 +539,21 @@
                         prop:'realAmountDrLoc'
                     },
                     {
+                        id:1,
+                        label:'应付人民币',
+                        prop:'amountCr'
+                    },
+                    {
+                        id:2,
+                        label:'应付美元',
+                        prop:'amountCrUsd'
+                    },
+                    {
+                        id:3,
+                        label:'合计应付',
+                        prop:'amountCrLoc'
+                    },
+                    {
                         id:7,
                         label:'实付人民币',
                         prop:'realAmountCr'
@@ -761,6 +761,9 @@
             },
             onLoad(page, params = {}) {
                 this.loading = true;
+                if (Array.isArray(this.query.billType)) {
+                    this.query.billType = this.query.billType.join(',')
+                }
                 financeStatisticsFinanceProfit(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                     const data = res.data.data;
                     this.page.total = data.total;

src/views/iosBasicData/paymentSummary/index.vue

@@ -23,6 +23,20 @@
                 <el-button type="primary" size="small" plain >打印报表</el-button>
                 <el-button type="info" size="small" plain @click="designReportStart" >设计报表</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>
@@ -116,7 +130,7 @@
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
     import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
-    import {financeStatisticsFeeSummary} from "@/api/iosBasicData/paymentSummary"
+    import {financeStatisticsFeeSummary, financeStatisticsFeeSummarySum} from "@/api/iosBasicData/paymentSummary"
     import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
     import {getWorkDicts} from "@/api/system/dictbiz";
     import {getDeptLazyTree} from "@/api/system/dept";
@@ -197,7 +211,6 @@
                             prop: "amountNot",
                             overHidden:true,
                         },
-
                         {
                             label: "查询方式",
                             prop: "type",
@@ -308,6 +321,40 @@
                 srcIdData:[], // 业务员
                 srcforParameter:{key:'id', label:'cnName', value:'cnName'},
                 selectionList:[], // 多选数据
+                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",
+                    },
+                ],
 
             }
         },
@@ -542,6 +589,9 @@
                     this.page.total = data.total;
                     this.data = data.records;
                     this.loading = false;
+                    financeStatisticsFeeSummarySum(Object.assign(params, this.query)).then(re=>{
+                        this.commodityData = [re.data.data]
+                    })
                     this.selectionClear();
                 });
             },

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -88,6 +88,7 @@
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete" >一键删除</el-button>
+                                <el-button type="primary" plain size="small" @click="quickCopy" >快捷复制</el-button>
                             </template>
 
                             <!--<template slot="goodsId" slot-scope="{ row }">-->
@@ -2383,6 +2384,19 @@ export default {
         selectionContacts(list){
             this.selectionMultilist = list
         },
+        // 快捷复制
+        quickCopy(){
+            let temp = document.createElement("textarea")
+            let txt = `${this.form.customerName} ${this.form.businesDate}`
+            for (let item of this.form.orderItemsList) {
+                txt += `\n${item.goodsName} ${item.goodsNum}`
+            }
+            document.body.appendChild(temp)
+            temp.value = txt
+            temp.select()
+            document.execCommand("copy")
+            document.body.removeChild(temp)
+        },
         // 一键删除
         batchDelete(){
             if (this.selectionMultilist.length == 0) {

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -231,7 +231,8 @@ export default {
           label: '所属公司',
           prop: "salesCompanyName",
           overHidden: true,
-        }, {
+        },
+        {
           label: '业务对象',
           prop: "customerId",
           search: true,
@@ -243,7 +244,8 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&cname={{key}}',
-        }, {
+        },
+        {
           label: '业务员',
           disabled: false,
           prop: "salerId",
@@ -277,6 +279,10 @@ export default {
           prop: "numberRows",
           overHidden: true,
         }, {
+            label: '商品名称',
+            prop: "goodsNameJoin",
+            overHidden: true,
+        }, {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,