Merge remote-tracking branch 'remotes/origin/developer' into developerC

src/main/java/com/caimei/modules/archive/service/CmOrderArchiveService.java

@@ -197,17 +197,6 @@ public class CmOrderArchiveService extends CrudService<CmOrderArchiveDao, CmOrde
         }
     }
 
-    public void downAllFile(Integer orderArchiveId, HttpServletRequest request, HttpServletResponse response) {
-        List<CmOrderArchiveFile> archiveFileList = cmOrderArchiveDao.getArchiveFileList(orderArchiveId);
-        archiveFileList.forEach(archiveFile->{
-            try {
-                downFile(Integer.parseInt(archiveFile.getId()), request, response);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
     public String getAllFileIds(Integer orderArchiveId) {
         return cmOrderArchiveDao.getAllFileIds(orderArchiveId);
     }

src/main/java/com/caimei/modules/archive/web/CmOrderArchiveController.java

@@ -129,12 +129,4 @@ public class CmOrderArchiveController extends BaseController {
 			e.printStackTrace();
 		}
 	}
-
-	/**
-	 * 下载该订单资料的所有文件
-	 */
-	@RequestMapping("/downAllFile")
-	public void downAllFile(Integer orderArchiveId, HttpServletRequest request, HttpServletResponse response) {
-		cmOrderArchiveService.downAllFile(orderArchiveId, request, response);
-	}
 }

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveFileList.jsp

@@ -49,9 +49,6 @@
                 }
             }
         }
-        /*function downAllFile(orderArchiveId) {
-            window.location.href = "${ctx}/archive/cmOrderArchive/downAllFile?orderArchiveId=" + orderArchiveId;
-        }*/
         function sleep(numberMillis) {
             var now = new Date();
             var exitTime = now.getTime() + numberMillis;

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveForm.jsp

@@ -321,7 +321,9 @@
 
 		//点击上传按钮后上传文件
 		$('#addSubmit').click(function () {
-			var files = $('#archiveFile').prop('files');
+			var filesById = document.getElementById('archiveFile');
+			var files = $('#archiveFile');
+			var fileList = files.prop('files');
 			var fileName = $('#uploadFileName').val();
 			if (files === '' || files.length == 0 || fileName == '') {
 				alertx('请选择上传文件');
@@ -331,7 +333,7 @@
 			var data = new FormData();
 			var orderArchiveId = $("#id").val();
 			var fileIds = $("#fileIds").val();
-			data.append('file', files[0]);
+			data.append('file', fileList[0]);
 			data.append('fileName', fileName);
 			data.append('orderArchiveId', orderArchiveId);
 			data.append('fileIds', fileIds);
@@ -345,7 +347,7 @@
 				dataType: "json",
 				success: function (res) {
 					if (res.success) {
-						files.value = '';
+						filesById.value = '';
 						renderFileList(res.archiveFile);
 						$('.upload-loading').hide();
 					} else {