diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 00bf140f9..dc0f6fc36 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -589,25 +589,37 @@ const getAnnexFileList = async (row) => { const annexData = annexTableData.value.find(annex=>annex.label === item.label) let subDetailTableData = null if(annexData){ + // HL-5940 maxLength 是限制的列表最大数量 let hiddenUpload = false - if(item.maxLength&&annexList.length>=item.maxLength){ - hiddenUpload = true + if(item.maxLength){ + if(annexList.length>=item.maxLength){ + hiddenUpload = true + }else{ + hiddenUpload = false + } let findAnnex = annexTableData.value.find(item1=>item1.label==item.label) if(findAnnex){ findAnnex.hiddenUpload = hiddenUpload || item.hiddenUpload || false // 是否展示上传按钮 } } + annexData.annexList = annexList subDetailTableData = annexData.subDetailTableData }else{ + subDetailTableData = item?.subDetailTableData // HL-5940 maxLength 是限制的列表最大数量 let hiddenUpload = false - if(item.maxLength&&annexList.length>=item.maxLength){ - hiddenUpload = true + if(item.maxLength){ + if(annexList.length>=item.maxLength){ + hiddenUpload = true + }else{ + hiddenUpload = false + } } + annexTableData.value.push({ align:item.align, label: item.label, diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index f544907e5..d6fe4e53f 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -124,7 +124,7 @@ const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): } // 文件数超出提示 const handleExceed: UploadProps['onExceed'] = (): void => { - message.error(`${t('ts.上传文件数量不能过')}${props.limit}!`) + message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`) } // 上传错误提示 const excelUploadError: UploadProps['onError'] = (): void => { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 6eb1f7bde..da7d1e0fe 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -963,6 +963,7 @@ const detailAnnexTable = ref([ showDownload:true, fileSize: 20, maxLength:1, + limit:1, fileType:['pdf'] }, {