From 887e7b5e192dd79c65e4d1de2d1a0ba952089b2a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 20 Dec 2024 11:59:01 +0800
Subject: [PATCH] =?UTF-8?q?FWHL-89SCP=E9=92=88=E5=AF=B9=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=A0=A1=E9=AA=8C=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=90=8E=E6=9C=9F=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierdeliverRequestMain/index.ts   |  9 +++-
 .../ConfigGlobal/src/ConfigGlobal.vue         |  2 +-
 src/components/UploadFile/src/UploadFile.vue  | 45 +++++++++++++------
 .../supplierdeliverInspectionDetail.data.ts   |  4 ++
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts
index f4d4a7b20..55e68a727 100644
--- a/src/api/wms/supplierdeliverRequestMain/index.ts
+++ b/src/api/wms/supplierdeliverRequestMain/index.ts
@@ -129,4 +129,11 @@ export const deleteOldLabels = async (id) => {
 // 查看履历表
 export const querySupplierResume =  (asnNumber:string) => {
   return  request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber })
-}
\ No newline at end of file
+}
+
+
+// 校验是否上传成功
+export const checkUploadFileData = async (data) => {
+  return await request.post({ url: `/infra/file/uploadFileData`,data})
+}
+
diff --git a/src/components/ConfigGlobal/src/ConfigGlobal.vue b/src/components/ConfigGlobal/src/ConfigGlobal.vue
index a08739674..2f313d42c 100644
--- a/src/components/ConfigGlobal/src/ConfigGlobal.vue
+++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue
@@ -54,7 +54,7 @@ const currentLocale = computed(() => localeStore.currentLocale)
 <template>
   <ElConfigProvider
     :locale="currentLocale.elLocale"
-    :message="{ max: 1 }"
+    :message="{ max: 2 }"
     :namespace="variables.elNamespace"
     :size="size"
   >
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 7d64b8633..d6c2fda41 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -65,7 +65,7 @@ const props = defineProps({
   drag: propTypes.bool.def(false), // 拖拽上传
   isShowTip: propTypes.bool.def(true), // 是否显示提示
   isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
-  
+  checkUploadUrl:propTypes.func.def(), // 校验二次请求的接口
 })
 // ========== 上传相关 ==========
 const valueRef = ref(props.modelValue)
@@ -108,19 +108,38 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 //   uploadRef.value.data.path = uploadFile.name
 // }
 // 文件上传成功
-const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): void => {
+const handleFileSuccess: UploadProps['onSuccess'] = async (res: any,uploadFile: any): Promise<void> => {
+  console.log('文件上传成功',res)
   if(res&&res.code==0){
-    message.success(t('ts.上传成功'))
-    const fileListNew = fileList.value
-    fileListNew.pop()
-    fileList.value = fileListNew
-    uploadList.value.push({ name: uploadFile.name, url: res.data })
-    // 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
-      emit('update:modelValue', listToString(fileList.value),res,uploadFile)
+    if(res.data&&res.data.code==200&&props.checkUploadUrl){
+      let checkRes = await props.checkUploadUrl(res.data.data)
+      console.log('checkRes',checkRes)
+      console.log('fileList.value',fileList.value)
+      console.log('uploadFile',uploadFile)
+      ElMessage.closeAll()
+      if(checkRes['fileExists']=="YES"){
+        message.success(t('ts.上传成功'))
+      }else{
+
+        let findItem = fileList.value.find(item=>item.uid == uploadFile.uid)
+        if(findItem){
+          uploadRef?.value?.handleRemove(findItem)
+        }
+        message.error(checkRes['msg'])
+      }
+    }else{
+      message.success(t('ts.上传成功'))
+      const fileListNew = fileList.value
+      fileListNew.pop()
+      fileList.value = fileListNew
+      uploadList.value.push({ name: uploadFile.name, url: res.data })
+      // 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
+        emit('update:modelValue', listToString(fileList.value),res,uploadFile)
+      }
     }
   }else{
     message.error(res.msg)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index ab2006ea6..a43954d2d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import { getBaseUrl } from '@/utils/systemParam'
 
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -16,6 +18,8 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableName: 'SupplierdeliverInspectionDetail',
         },
         fileType:['pdf'],
+        updateUrl: getBaseUrl()+import.meta.env.VITE_API_URL+'/infra/file/uploadFile',
+        checkUploadUrl: SupplierdeliverRequestMainApi.checkUploadFileData,
         fileSize:100,
         limit:20000
       }