1

src/utils/util.js

@@ -1,10 +1,13 @@
 import moment from "moment";
-import { post, get } from "@/utils/request";
+import {
+  post,
+  get
+} from "@/utils/request";
 import Cookies from "js-cookie";
 import html2Canvas from "html2canvas";
 import JsPDF from "jspdf";
 import * as toEnglish from "./ACapital.js";
-import  "./msyh-normal.js";
+import "./msyh-normal.js";
 
 //根据value值回显字典label值
 export function dictDataEcho(value, arr) {
@@ -129,25 +132,25 @@ export function calculationWeek(val, format) {
 }
 
 
-export function getPdf(title,num) {  
-  const element = document.getElementById("pdfDom");
+export function getPdf(title, num, domId = 'pdfDom') {
+  const element = document.getElementById(domId);
   var doc = new JsPDF("", "pt", "a4");
   //导出pdf的中文有乱码
   doc.internal.scaleFactor = 1
   //设置宽度
-  if(num) doc.internal.pageSize.width = num;
+  if (num) doc.internal.pageSize.width = num;
   //设置pdf边距
   doc.setFont("msyh");
   console.log('开始打印');
   doc.html(element, {
-    margin: [50,0,50,0],
+    margin: [50, 0, 50, 0],
     callback: function (doc) {
-      doc.save();
+      doc.save(title + '.pdf');
     },
   });
   return
   // pdfDom 这个就是你vue页面中定义的ID  比如<div id="pdfDom">  这个也要避下雷
-  
+
   window.pageYoffset = 0;
   document.documentElement.scrollTop = 0;
   document.body.scrollTop = 0;
@@ -442,4 +445,4 @@ export function NumberToChinese(m) {
   }
   result += result.charAt(result.length - 1) == "元" ? "整" : "";
   return result;
-}
+}

src/views/dataBoard/board/salesAnalysis/index.vue

@@ -498,6 +498,11 @@ const getData = () => {
   });
   proxy.post("/contract/countrySalesStatistics", queryForm).then((res) => {
     sourceList.value.scatterData = res;
+    //根据amount字段从大到小
+    res.sort((a, b) => b.amount - a.amount);
+    //截取前十条
+    if(res.length > 10) res = res.slice(0, 10);
+    
     optionOne.data.series[0].data = res.map((x) => ({
       value: x.amount,
       name: x.countryName,

src/views/salesMange/salesMange/performance/index.vue

@@ -66,7 +66,14 @@
             <el-table-column label="" prop="userName" width="120" />
           </el-table-column>
           <el-table-column label="销售合同金额">
-            <el-table-column label="" prop="contractAmount" width="120" />
+            <el-table-column label="" prop="contractAmount" width="120">
+              <template #default="{ row }">
+                <div style="width: 100%">
+                  {{ row.contractCurrency }}
+                  {{ moneyFormat(row.contractAmount, 2) }}
+                </div>
+              </template>
+            </el-table-column>
           </el-table-column>
           <el-table-column label="收入">
             <el-table-column
@@ -77,7 +84,14 @@
             <el-table-column label="其他收入" prop="otherIncome" width="120" />
           </el-table-column>
           <el-table-column label="采购合同金额">
-            <el-table-column label="" prop="purchaseAmount" width="120" />
+            <el-table-column label="" prop="purchaseAmount" width="120">
+              <template #default="{ row }">
+                <div style="width: 100%">
+                  {{ row.purchaseCurrency }}
+                  {{ moneyFormat(row.purchaseAmount, 2) }}
+                </div>
+              </template>
+            </el-table-column>
           </el-table-column>
           <el-table-column label="支出">
             <el-table-column label="支付货款" prop="payForGoods" width="120" />