Merge remote-tracking branch 'origin/master'

src/api/business/transport-plan.js

@@ -35,3 +35,27 @@ export const importTransportPlan = ({
     timeout: 60000,
   });
 };
+
+export const validateTransportPlan = ({
+  file,
+  projectId,
+  projectName,
+  customerName,
+  contractId,
+  contractName,
+}) => {
+  const data = new FormData();
+  data.append('file', file);
+  data.append('projectId', projectId || '');
+  data.append('projectName', projectName || '');
+  data.append('customerName', customerName || '');
+  data.append('contractId', contractId || '');
+  data.append('contractName', contractName || '');
+  return request({
+    url: `${baseUrl}/validate-transport-plan`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 60000,
+  });
+};

src/api/business/voucher-manage.js

@@ -16,6 +16,13 @@ export const replaceFolder = (voucherId, plateNo, file) => {
   data.append('file', file);
   return request({ url: `${baseUrl}/folder-replace`, method: 'post', data });
 };
+export const replaceFolderByObject = (voucherId, plateNo, fileInfo) =>
+  request({
+    url: `${baseUrl}/folder-replace-object`,
+    method: 'post',
+    params: { voucherId, plateNo, ...fileInfo },
+    timeout: 120000,
+  });
 export const removeFolder = (voucherId, plateNo) =>
   request({ url: `${baseUrl}/folder-remove`, method: 'post', params: { voucherId, plateNo } });
 export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });

src/api/business/waybill-manage.js

@@ -41,4 +41,5 @@ export const removeImportBatches = ids => request({ url: `${baseUrl}/import-batc
 export const getImportOptions = () => request({ url: `${baseUrl}/import-batch/options`, method: 'get' });
 export const exportImportTemplate = () => request({ url: `${baseUrl}/import-batch/export-template`, method: 'get', responseType: 'blob' });
 export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data });
+export const validateImport = data => request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, responseType: 'blob' });
 export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });