Merge remote-tracking branch 'refs/remotes/origin/master' into feature/bfi-api-rate

# Conflicts:
#	pnpm-lock.yaml
#	src/axios.js
#	src/views/settlement/formal-settlement.vue
#	src/views/vehicle/customer-archive.vue

src/api/business/process-config.js

@@ -22,6 +22,18 @@ export const getVoucherImages = (waybillId, params = {}) =>
       ...params,
     },
   });
+export const getVoucherFolders = waybillId =>
+  request({
+    url: '/blade-transport/process-config/voucher-folders',
+    method: 'get',
+    params: { waybillId },
+  });
+export const getVoucherFolderDetail = (voucherId, plateNo) =>
+  request({
+    url: '/blade-transport/process-config/voucher-folder-detail',
+    method: 'get',
+    params: { voucherId, plateNo },
+  });
 export const submit = api.submit;
 export const remove = api.remove;
 export const copy = api.copy;

src/api/business/waybill-manage.js

@@ -67,6 +67,16 @@ export const getImportDetails = params => request({ url: `${baseUrl}/import-batc
 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' });
 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 });
+export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data, timeout: 120000 });
+export const validateImport = data =>
+  request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, timeout: 120000 });
+export const exportImportFailures = data =>
+  request({
+    url: `${baseUrl}/import-batch/export-failures`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 120000,
+  });
+export const confirmImport = data =>
+  request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });

src/api/system/business-process.js

@@ -6,8 +6,9 @@ import request from '@/axios';
  * @param {string} data.templateCode 模板编码
  * @param {string} data.submitIdentity 提交人（手机号）
  * @param {string} data.loginName 登录账号（手机号）
- * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
  * @param {string} [data.subject] 流程标题
+ * @param {string} [data.bizType] 业务类型
  */
 export const processSubmit = data => {
   return request({
@@ -20,7 +21,7 @@ export const processSubmit = data => {
 /**
  * 调用 MK processDelete 删除审核流（驳回后重新提交前使用）
  * @param {Object} data
- * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} data.bizId 业务主键
  */
 export const processDelete = data => {
   return request({
@@ -29,3 +30,30 @@ export const processDelete = data => {
     data,
   });
 };
+
+/**
+ * 查询 MK 流程实例是否仍存在（有数据则无需删除/重新提交）
+ * @param {Object} params
+ * @param {string} params.bizId 业务主键
+ */
+export const hasMkProcessInstance = params => {
+  return request({
+    url: '/blade-system/businessProcess/hasMkProcessInstance',
+    method: 'get',
+    params,
+  });
+};
+
+/**
+ * 获取 MK 审批页跳转链接（后端按 thirdParty.mk 配置拼接，含 SSO）
+ * @param {Object} params
+ * @param {string} [params.bizId] 业务 id（如客商 id）
+ * @param {string} [params.processInstanceId] 流程实例 id
+ */
+export const getMKApprovalUrl = params => {
+  return request({
+    url: '/blade-system/businessProcess/getMKApprovalUrl',
+    method: 'get',
+    params,
+  });
+};