Merge remote-tracking branch 'origin/master'

src/api/business/waybill-manage.js

@@ -36,6 +36,7 @@ export const roadLoading = ids =>
   });
 
 export const getImportBatches = params => request({ url: `${baseUrl}/import-batch/list`, method: 'get', params });
+export const getImportBatchNextCode = () => request({ url: `${baseUrl}/import-batch/next-code`, method: 'get' });
 export const getImportDetails = params => request({ url: `${baseUrl}/import-batch/details`, method: 'get', params });
 export const removeImportBatches = ids => request({ url: `${baseUrl}/import-batch/remove`, method: 'post', params: { ids } });
 export const getImportOptions = () => request({ url: `${baseUrl}/import-batch/options`, method: 'get' });

src/api/settlement/transportReconciliation.js

@@ -29,8 +29,8 @@ export const complete = id =>
   request({ url: `${baseUrl}/complete`, method: 'post', params: { id } });
 export const completeWithData = data =>
   request({ url: `${baseUrl}/complete-with-data`, method: 'post', data });
-export const template = mode =>
-  request({ url: `${baseUrl}/template`, method: 'get', params: { mode }, responseType: 'blob' });
+export const template = (mode, params) =>
+  request({ url: `${baseUrl}/template`, method: 'get', params: { mode, ...params }, responseType: 'blob' });
 
 const importFile = (url, id, file) => {
   const data = new FormData();