From 5aa66196eb672dc963cb8a4045b54048eb2c120a Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Tue, 11 Apr 2023 18:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=96=87=E4=BB=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/paymentdoc/PaymentdocMessage.java   |  3 +++
 .../mapper/paymentdoc/PaymentdocMapper.xml    |  2 ++
 .../resources/templates/export/paymentDoc.ftl |  2 +-
 .../scm/basicInformation/paymentdoc/index.vue | 21 +++++++++++--------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocMessage.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocMessage.java
index 6b0b017e..d34cf4c1 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocMessage.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocMessage.java
@@ -14,6 +14,9 @@ public class PaymentdocMessage {
     /**付款请示**/
     private String customerName;
 
+    /**单据编号**/
+    private String documentNo;
+
     /**供应商名称**/
     private String supplierName;
 
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml
index 50d14b99..dafe7988 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml
@@ -41,11 +41,13 @@
         <result column="remark" property="remark"/>
         <result column="enclosure" property="enclosure"/>
         <result column="payType" property="payType"/>
+        <result column="documentNo" property="documentNo"/>
     </resultMap>
 
     <select id="getPaymentDocMessage" resultMap="getPaymentDocMessageMap">
         SELECT
             a.customer_name customerName,
+            a.document_no documentNo,
             b.supplier_name supplierName,
             a.ramount ramout,
             a.payment_amount paymentAmout,
diff --git a/SC-boot/linkage-scm/src/main/resources/templates/export/paymentDoc.ftl b/SC-boot/linkage-scm/src/main/resources/templates/export/paymentDoc.ftl
index 927cdb09..29b02daf 100644
--- a/SC-boot/linkage-scm/src/main/resources/templates/export/paymentDoc.ftl
+++ b/SC-boot/linkage-scm/src/main/resources/templates/export/paymentDoc.ftl
@@ -17,7 +17,7 @@
 <div id="app">
     <h1 style="text-align: center">${customerName!"城市矿产"}请示</h1>
     <p align="right">
-        流程编号：QS-CSKC-2023-000000066723
+        单据编号：${documentNo!"无"}
     </p>
     <div class="el-descriptions">
         <div class="el-descriptions__body">
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
index c1de4372..e0ae704c 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
@@ -316,6 +316,7 @@ import FlowBox from "@/views/workFlow/components/FlowBox";
 import JNPFForm from "./paymentForm";
 import ExportBox from "./ExportBox";
 import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import {getToken} from "@/utils/auth";
 
 export default {
   components: {
@@ -570,17 +571,19 @@ export default {
         .catch(() => {});
     },
     downPayment() {
-      if (!this.multipleSelectionItemt.length) {
-        this.$message({
-          type: "error",
-          message: "请选择一条数据",
-          duration: 2500,
-        });
-        return;
-      }
+      // if (!this.multipleSelectionItemt.length) {
+      //   this.$message({
+      //     type: "error",
+      //     message: "请选择一条数据",
+      //     duration: 2500,
+      //   });
+      //   return;
+      // }
       this.multipleSelectionItem.forEach((item, index) => {
         //console.log(this.$store.getters.token);
-        let url = "/api/info/getPaymentDocPdf/" + item.id+"?token="+this.$store.getters.token;
+        // let url = "/api/info/getPaymentDocPdf/" + item.id+"/"+this.$store.getters.token;
+        let url = "/api/info/getPaymentDocPdf/" + item.id+"/"+getToken();
+        // console.log(url);
         this.jnpf.downloadFile(url);
       });
     },