-
@@ -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 @@
{
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: {