Merge branch 'master' into feature/20261103-bfi-warehouse-web

# Conflicts:
#	src/option/settlement/formalSettlement.js

src/api/business/contract-manage.js

@@ -93,10 +93,10 @@ export const expireStats = params =>
     params,
   });
 
-/** 按合同负责部门预览下一合同编号 */
-export const nextContractNo = organizationId =>
+/** 按平台公司 + 业务部门预览下一合同编号 */
+export const nextContractNo = (organizationId, platformCompanyId) =>
   request({
     url: `${baseUrl}/next-contract-no`,
     method: 'get',
-    params: { organizationId },
+    params: { organizationId, platformCompanyId },
   });

src/api/common.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 import { ElLoading, ElMessage } from 'element-plus';
 
 /** 审核按钮统一超时：审批通过后可能同步推送金蝶等耗时操作，覆盖全局 10s */
-export const APPROVE_TIMEOUT = 30000;
+export const APPROVE_TIMEOUT = 60 * 1000;
 
 /**
  * 文件流返回

src/api/system/business-dept-config.js

@@ -0,0 +1,42 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-system/business-dept-config';
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+
+export const getDetail = id =>
+  request({
+    url: `${baseUrl}/detail`,
+    method: 'get',
+    params: { id },
+  });
+
+export const submit = row =>
+  request({
+    url: `${baseUrl}/submit`,
+    method: 'post',
+    data: row,
+  });
+
+export const remove = ids =>
+  request({
+    url: `${baseUrl}/remove`,
+    method: 'post',
+    params: { ids },
+  });
+
+export const getByPlatformDept = (platformCompanyId, businessDeptId) =>
+  request({
+    url: `${baseUrl}/by-platform-dept`,
+    method: 'get',
+    params: { platformCompanyId, businessDeptId },
+  });

src/api/system/business-process.js

@@ -12,6 +12,7 @@ export const MK_SUBMIT_TIMEOUT = 30000;
  * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
  * @param {string} [data.subject] 流程标题
  * @param {string} [data.bizType] 业务类型
+ * @param {Object} [data.tempVarData] MK 临时变量（如 { projectType }）
  */
 export const processSubmit = data => {
   return request({

src/api/vehicle/customer-archive.js

@@ -212,12 +212,11 @@ export const syncKingdee = id => {
 
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
-    url: '/blade-transport/baidu-ocr/recognize-url',
+    url: '/blade-transport/baidu-ocr/business-license',
     method: 'post',
     timeout: 60000,
     params: {
       imageUrl,
-      type: 'business_license',
     },
   });
 };