Merge branch 'master' into test-dev

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

@@ -369,7 +369,10 @@ const submitUpload = async () => {
                   await sortFile()
                     emit('change', { type: 'success' })
 
-                  } else {
+                  } else if (code === 413) {
+                      window?.$message?.error('上传文件过大，请上传小于60M的文件')
+                  
+                    } else {
                     window?.$message?.error(msg || '操作失败')
 
                   }
@@ -387,6 +390,9 @@ const submitUpload = async () => {
                   await sortFile()
                       emit('change', { type: 'success' })
 
+                    } else if (code === 413) {
+                      window?.$message?.error('上传文件过大，请上传小于60M的文件')
+                  
                     } else {
                       window?.$message?.error(msg || '操作失败')
 
@@ -399,7 +405,7 @@ const submitUpload = async () => {
             await sortFile()
               emit('change', { type: 'success' })
         }
- 
+    subLoading.value = false
 }
 //上传文件后排序
 const sortFile = async ()=>{
@@ -431,7 +437,7 @@ const sortFile = async ()=>{
     contractId:uploadData.value.contractId,
     classify:uploadData.value.classify,
     projectId:uploadData.value.projectId,
-    type:uploadData.value.type,
+    type:2,
 
   }
       const { error, code, msg } = await (isListFile.value