Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/using/query.vue

src/api/modules/using/query.js

@@ -1,4 +1,4 @@
-import {httpApi} from "../../request/httpApi";
+import { httpApi } from '../../request/httpApi'
 
 export default {
   //分页
@@ -8,7 +8,7 @@ async getarchiveQueryPage(form, msg = true) {
         method: 'get',
         params: form,
 
-    }, msg);
+    }, msg)
   },
   //获取目录树 /blade-manager/archiveTreeContract/getArchiveTreeByNodeType
   async getArchiveTreeByNodeType(form, msg = true) {
@@ -17,7 +17,7 @@ async getarchiveQueryPage(form, msg = true) {
         method: 'get',
         params: form,
 
-    }, msg);
+    }, msg)
   },
 //获取目录树子节点 GET/blade-manager/archiveTreeContract/getChildrenNodeByNodeId
   async getChildrenNodeByNodeId(form, msg = true) {
@@ -26,7 +26,7 @@ async getarchiveQueryPage(form, msg = true) {
         method: 'get',
         params: form,
 
-    }, msg);
+    }, msg)
   },
   //获取档案查询类别/blade-archive/archivesauto/getCarrierTypeByDict
   async getCarrierTypeByDict(form, msg = true) {
@@ -35,7 +35,7 @@ async getarchiveQueryPage(form, msg = true) {
         method: 'get',
         params: form,
 
-    }, msg);
+    }, msg)
   },
     //档案柜切换档案查看权限
     async getArchivesAuthByUser(form, msg = true) {
@@ -43,7 +43,7 @@ async getarchiveQueryPage(form, msg = true) {
             url: '/api/blade-archive/archivesauto/getArchivesAuthByUser',
             method: 'get',
             params: form,
-        }, msg);
+        }, msg)
     },
     //语音搜索接口
     async micSearchInfo(form, msg = true) {
@@ -51,7 +51,7 @@ async getarchiveQueryPage(form, msg = true) {
             url: '/api/blade-archive/archivesauto/search-info',
             method: 'post',
             data: form,
-        }, msg);
+        }, msg)
     },
     //查询案卷里的文件
     async getArchiveFileList(form, msg = true) {
@@ -59,6 +59,16 @@ async getarchiveQueryPage(form, msg = true) {
           url: '/api/blade-archive/archivesauto/getArchiveFileList',
           method: 'get',
           params: form,
-      }, msg);
+      }, msg)
+  },
+    //批量下载档案
+    async batchDownloadFileToZip(form, msg = true) {
+      return httpApi({
+          url: '/api/blade-archive/archivesauto/batchDownloadFileToZip',
+          method: 'post',
+          params: form,
+          responseType: 'blob',
+      }, msg)
   },
 }
+