Merge branch 'master' into test-dev

src/views/data-fill/components/HcUpload.vue

@@ -320,75 +320,85 @@ const beforesubmitUpload = () => {
 }
 const subLoading = ref(false)
 const submitUpload = async () => {
-  if (!typevalue.value && !autoUpload.value && !isListFile.value) {
-    window.$message.warning('请先选择附件类型')
-    return
-  }
-
-  // 确保所有文件都有 sort 参数
-  fileListData.value = fileListData.value.map((file, index) => ({
-    ...file,
-    sort: index + q,
-  }))
-
-  // 创建 FormData 对象
-  const formData = new FormData()
-//   // 1. 添加多个文件（后端接收的是 files[] 数组）
-  fileListData.value.forEach((file) => {
-
-    
-  if (file.raw !== undefined) {
-      formData.append('files', file.raw) // 确保 file.raw 是 File 对象
-    }
-  })
-
-console.log( fileListData.value, ' fileListData.value')
-
-
-  // 3. 发送请求
- subLoading.value = true
-   if (isListFile.value) {
-          // 2. 添加其他参数
-  formData.append('classify', uploadData.value.classify)
-  formData.append('pkeyId', uploadData.value.pkeyId)
-    formData.append('nodeId', uploadData.value.nodeId)
-    formData.append('type', 2)
-  formData.append('contractId', uploadData.value.contractId)
-    formData.append('projectId', uploadData.value.projectId)
-    const { error, code, msg } = await wbsApi.addBussFile(formData) // 修改这里
-        uploadDisabled.value = false
-     subLoading.value = false
-    if (!error && code === 200) {
-      window?.$message?.success('上传成功') 
-     await sortFile()
-      emit('change', { type: 'success' })
-
-    } else {
-      window?.$message?.error(msg || '操作失败')
-
-    }
-  } else {
-      // 2. 添加其他参数
-  formData.append('classify', uploadData.value.classify)
-  formData.append('nodeId', uploadData.value.nodeId)
-  formData.append('type', uploadData.value.type)
-  formData.append('contractId', uploadData.value.contractId)
-    const { error, code, msg } = await wbsApi.addBussFileNode(formData) // 修改这里
-        uploadDisabled.value = false
-        subLoading.value = false
-    if (!error && code === 200) {
-      window?.$message?.success('上传成功') 
-     await sortFile()
-      emit('change', { type: 'success' })
-
-    } else {
-      window?.$message?.error(msg || '操作失败')
-
-    }
-  }
+     
+          if (fileListData.value.length === 0) {
+            window.$message.warning('请先上传文件')
+            return
+          }
+
+          // 确保所有文件都有 sort 参数
+          fileListData.value = fileListData.value.map((file, index) => ({
+            ...file,
+            sort: index + q,
+          }))
+
+          // 创建 FormData 对象
+          const formData = new FormData()
+        //   // 1. 添加多个文件（后端接收的是 files[] 数组）
+          fileListData.value.forEach((file) => {
 
- 
+            
+          if (file.raw !== undefined) {
+              formData.append('files', file.raw) // 确保 file.raw 是 File 对象
+            }
+          })
+          function hasFileFields(formData) {
+            for (let [key, value] of formData.entries()) {
+                if (value instanceof File || value instanceof Blob) {
+                    return true
+                }
+            }
+            return false
+        }
+        if (hasFileFields(formData)) {
+            console.log('formData 包含文件字段')
+              subLoading.value = true
+              if (isListFile.value) {
+                        // 2. 添加其他参数
+                  formData.append('classify', uploadData.value.classify)
+                  formData.append('pkeyId', uploadData.value.pkeyId)
+                  formData.append('nodeId', uploadData.value.nodeId)
+                  formData.append('type', 2)
+                  formData.append('contractId', uploadData.value.contractId)
+                  formData.append('projectId', uploadData.value.projectId)
+                  const { error, code, msg } = await wbsApi.addBussFile(formData) // 修改这里
+                  uploadDisabled.value = false
+                  subLoading.value = false
+                  if (!error && code === 200) {
+                    window?.$message?.success('上传成功') 
+                  await sortFile()
+                    emit('change', { type: 'success' })
+
+                  } else {
+                    window?.$message?.error(msg || '操作失败')
+
+                  }
+                } else {
+                    // 2. 添加其他参数
+                  formData.append('classify', uploadData.value.classify)
+                  formData.append('nodeId', uploadData.value.nodeId)
+                  formData.append('type', uploadData.value.type)
+                  formData.append('contractId', uploadData.value.contractId)
+                  const { error, code, msg } = await wbsApi.addBussFileNode(formData) // 修改这里
+                        uploadDisabled.value = false
+                        subLoading.value = false
+                  if (!error && code === 200) {
+                  window?.$message?.success('上传成功') 
+                  await sortFile()
+                      emit('change', { type: 'success' })
+
+                    } else {
+                      window?.$message?.error(msg || '操作失败')
+
+                    }
+                }
 
+        } else {
+            console.log('formData 不包含文件字段')
+            // 处理没有文件字段的情况
+            await sortFile()
+              emit('change', { type: 'success' })
+        }
  
 }
 //上传文件后排序
@@ -406,7 +416,6 @@ const sortFile = async ()=>{
   })
   let obj1 = {
     list:list,
-   
     nodeId:uploadData.value.nodeId,
     contractId:uploadData.value.contractId,
     classify:uploadData.value.classify,
@@ -425,7 +434,7 @@ const sortFile = async ()=>{
     type:uploadData.value.type,
 
   }
-          const { error, code, msg } = await (isListFile.value
+      const { error, code, msg } = await (isListFile.value
             ? wbsApi.addFileSort(obj1)
             : wbsApi.addFileSort(obj2))
         uploadDisabled.value = false

src/views/data-fill/wbs.vue

@@ -1334,7 +1334,7 @@
                 :is-canupload="false"
                 action="#"
                 accept="application/pdf"
-                accept-tip="允许格式：pdf"
+                accept-tip="允许格式pdf， 文件大小 小于 60MB"
                 :auto-upload="false"
                 :typevalue="typevalue"
                 @change="uploadChange"