From 797a87b726af54b48d94f5e69b8dad89381b94e2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Sep 2024 17:01:02 +0800
Subject: [PATCH] =?UTF-8?q?HL-5863SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=8F=91=E8=B4=A7=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=87=AA=E6=A3=80=E6=8A=A5=E5=91=8A=E3=80=82?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9C=89=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                         | 7 ++++++-
 src/components/Detail/src/Detail.vue                       | 2 ++
 src/components/UploadFile/src/UploadFile.vue               | 3 ++-
 .../supplierdeliver/supplierdeliverRequestMain/index.vue   | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index e89826f8a..b64bcfa90 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" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="limit"
       @update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/>
       <!-- HL-5838 5条限制影响了供应商发货申请上传质检报告，这个限制没找到认领的需求，所以放开 -->
       <!-- @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/> -->
@@ -58,6 +58,11 @@ const props = defineProps({
       return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']
     }
   },
+  limit:{
+    type:Number,
+    required: false,
+    default:10
+  },
   fileSize:{
     type:Number,
     required: false,
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 53b17e764..2ff0914ea 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -115,6 +115,7 @@
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
                   :fileType="annexItem.fileType"
+                  :limit="annexItem.limit"
                   :fileSize="annexItem.fileSize"
                   :showAddBtn="!annexItem.hiddenUpload"
                   :showPreview="annexItem.showPreview"
@@ -600,6 +601,7 @@ const getAnnexFileList =  async (row) => {
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
         fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        limit:item.limit||10,
         fileSize:item.fileSize||5,
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index c56f679cb..f544907e5 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -114,7 +114,8 @@ const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any):
   fileListNew.pop()
   fileList.value = fileListNew
   uploadList.value.push({ name: uploadFile.name, url: res.data })
-  if (uploadList.value.length == uploadNumber.value) {
+  // if (uploadList.value.length == uploadNumber.value) {
+  if(fileList.value.every(it => it.status == 'success')) { 
     fileList.value = fileList.value.concat(uploadList.value)
     uploadList.value = []
     uploadNumber.value = 0
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index ca7ba8fc1..83576b36d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -223,6 +223,7 @@ const annexInspectionDetail = ref({
   hiddenUpload:false,
   hiddenDelete:false,
   fileType: ['pdf'],
+  limit:999999,
   align: 'left',
   //明细表数据
   subDetailTableData: {