From 0dfc8213f906ce386719a099511aa574458f14ae Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 7 May 2024 14:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=8C=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue                       | 9 ++++++++-
 src/components/Detail/src/Detail.vue                     | 2 ++
 src/components/UploadFile/src/UploadFile.vue             | 2 +-
 .../supplierdeliverInspectionDetail.data.ts              | 1 +
 .../supplierdeliver/supplierdeliverRequestMain/index.vue | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index cb68ced7d..7d5f0e142 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" title="添加附件" :upData="upData" :limit="10"
         @update:modelValue="handleAnnexSuccess" v-if="annexData.annexList.length<5"/>
     </div>
     <div class="list">
@@ -48,6 +48,13 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  fileType:{
+    type:Array,
+    required: false,
+    default: () => {
+      return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']
+    }
+  },
   showPreview: {
     type: Boolean,
     required: false
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index ad389ea97..9ce1534df 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -103,6 +103,7 @@
             <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
+                  :fileType="annexItem.fileType"
                   :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
                   :hiddenDelete = "annexItem.hiddenDelete"
@@ -482,6 +483,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'],
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 33de112d5..05ce5f239 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -56,7 +56,7 @@ const props = defineProps({
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
   upData: propTypes.object.def(),
-  fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index e125b7976..34c890aa4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -15,6 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableId: '',
           tableName: 'SupplierdeliverInspectionDetail',
         },
+        fileType:['pdf','png','jpg','jpeg'],
         limit:1,
         fileSize:100
       }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 4002104d1..674cfb502 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -83,6 +83,7 @@
       tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
       showPreview:true, // 附件中是否展示预览按钮
+      fileType:['pdf','jpg','png','jpeg'],
       align:'left',
       //明细表数据
       subDetailTableData:{