From 20dbe700d2e5493e349cb2d6c5de61b3c3789acf Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 13 Dec 2024 14:06:14 +0800
Subject: [PATCH] =?UTF-8?q?YT-1640=EF=BC=9A=E3=80=90=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue                 |  2 +-
 src/locales/en-US.ts                                 |  2 ++
 src/locales/zh-CN.ts                                 |  2 ++
 .../supplierinvoiceRecordMain/index.vue              | 12 +++++++++++-
 .../supplierinvoiceRequestMain/index.vue             | 10 ++++++++--
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 00cc83a23..4e4dea19f 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -695,7 +695,7 @@ const getAnnexFileList =  async (row) => {
         annexList,
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
-        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg','ofd'],
         limit:item.limit||10,
         fileSize:item.fileSize||5,
         showPreview:item.showPreview||false, // 是否展示预览按钮
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index bde9ea22e..29c4bc725 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1056,6 +1056,8 @@ export default {
     合同附件:'Appendix to the contract',
     发票附件:'Invoice Attachment',
     货运单附件:'Attachment to the waybill',
+    发货单附件:'Dispatch note',
+    对账单附件:'Statement of account',
     其他附件:'Other Attachment',
     打印明细:'Print Detail',
     打印全部发货单:'Print all invoices',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index c0de5bab8..d899399f8 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1062,6 +1062,8 @@ export default {
     合同附件:'合同附件',
     发票附件:'发票附件',
     货运单附件:'货运单附件',
+    发货单附件:'发货单附件',
+    对账单附件:'对账单附件',
     其他附件:'其他附件',
     打印明细:'打印明细',
     打印全部发货单:'打印全部发货单',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index e35619051..8b9b6d9a1 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -86,7 +86,7 @@
         rowField:'annexMasterId',
       }],
     },{
-      label: t('ts.货运单附件'),
+      label: t('ts.发货单附件'),
       prop: 'Annex',
       tableName:'waybill',
       showDownload:true,
@@ -95,6 +95,16 @@
         queryField:'tableId',
         rowField:'annexMasterId',
       }],
+    },{
+      label: t('ts.对账单附件'),
+      prop: 'Annex',
+      tableName:'statement',
+      showDownload:true,
+      hiddenDelete:true,
+      queryParams:[{
+        queryField:'tableId',
+        rowField:'annexMasterId',
+      }],
     },{
       label: t('ts.其他附件'),
       prop: 'Annex',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 8f967cdf1..fc058e78a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1039,14 +1039,20 @@ const detailAnnexTable = ref([
     fileSize: 20,
     maxLength:1,
     limit:1,
-    fileType:['pdf']
+    fileType:['pdf','ofd']
   },
   {
-    label: t('ts.货运单附件'),
+    label: t('ts.发货单附件'),
     prop: 'Annex',
     tableName: 'waybill',
     fileSize: 20
   },
+  {
+    label: t('ts.对账单附件'),
+    prop: 'Annex',
+    tableName: 'statement',
+    fileSize: 20
+  },
   {
     label: t('ts.其他附件'),
     prop: 'Annex',