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

# Conflicts:
#	src/views/vehicle/customer-archive.vue

src/api/business/loading-manage.js

@@ -79,6 +79,15 @@ export const cancel = id =>
     },
   });
 
+export const start = id =>
+  request({
+    url: `${baseUrl}/start`,
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+
 export const complete = id =>
   request({
     url: `${baseUrl}/complete`,

src/api/business/project-apply.js

@@ -16,6 +16,7 @@ export const submit = api.submit;
 export const remove = api.remove;
 
 // 项目资金使用风险统计（高风险 / 中风险数量），供列表头部快速筛选标签使用
+// 暂未启用：后端 /fund-risk-stats 端点尚未实现，列表页已移除调用，等后端就绪后恢复
 export const getFundRiskStats = params =>
   request({
     url: `${baseUrl}/fund-risk-stats`,

src/api/business/waybill-manage.js

@@ -33,6 +33,25 @@ export const getPunchRecords = waybillId =>
     method: 'get',
     params: { waybillId },
   });
+
+/** 运单车辆实时定位 */
+export const locateVehicle = id =>
+  request({
+    url: `${baseUrl}/locate`,
+    method: 'post',
+    params: { id },
+    timeout: 60000,
+  });
+
+/** 运单车辆历史轨迹 */
+export const trackVehicle = (id, startDate, endDate) =>
+  request({
+    url: `${baseUrl}/track`,
+    method: 'post',
+    params: { id, startDate, endDate },
+    timeout: 60000,
+  });
+
 export const roadLoading = ids =>
   request({
     url: `${baseUrl}/road-loading`,

src/api/mk-process.js

@@ -0,0 +1,23 @@
+import request from '@/axios';
+
+export const getMkPublicDetail = (bizType, id) => {
+  return request({
+    url: `/blade-transport/mk-process/public/${bizType}/detail`,
+    method: 'get',
+    meta: {
+      isToken: false,
+    },
+    params: { id },
+  });
+};
+
+export const postMkPublicProcessMessage = (bizType, data) => {
+  return request({
+    url: `/blade-transport/mk-process/public/${bizType}/process-message`,
+    method: 'post',
+    meta: {
+      isToken: false,
+    },
+    data,
+  });
+};

src/api/payment/paymentApplication.js

@@ -26,7 +26,7 @@ export const syncKingdeeResult = () =>
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },
   { label: '进度预付', value: 'progress_advance' },
-  { label: '结算付款', value: 'settlement_payment' },
+  { label: '尾款付款', value: 'settlement_payment' },
 ];
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },

src/api/system/business-process.js

@@ -0,0 +1,31 @@
+import request from '@/axios';
+
+/**
+ * 调用 MK processSubmit 提交审核流
+ * @param {Object} data
+ * @param {string} data.templateCode 模板编码
+ * @param {string} data.submitIdentity 提交人（手机号）
+ * @param {string} data.loginName 登录账号（手机号）
+ * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} [data.subject] 流程标题
+ */
+export const processSubmit = data => {
+  return request({
+    url: '/blade-system/businessProcess/processSubmit',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 调用 MK processDelete 删除审核流（驳回后重新提交前使用）
+ * @param {Object} data
+ * @param {string} data.formInstanceId 业务表单实例 id
+ */
+export const processDelete = data => {
+  return request({
+    url: '/blade-system/businessProcess/processDelete',
+    method: 'post',
+    data,
+  });
+};

src/api/system/dept.js

@@ -41,6 +41,48 @@ export const add = row => {
   });
 };
 
+export const syncIamOrganizations = () => {
+  return request({
+    url: '/blade-system/dept/sync-iam-organizations',
+    method: 'post',
+  });
+};
+
+export const clearNonTopDept = signal => {
+  return request({
+    url: '/blade-system/dept/clear-non-top',
+    method: 'post',
+    timeout: 60000,
+    signal,
+  });
+};
+
+export const syncOaCompany = (current = 1, size = 20, signal) => {
+  return request({
+    url: '/blade-system/dept/sync-oa-company',
+    method: 'post',
+    params: {
+      current,
+      size,
+    },
+    timeout: 60000,
+    signal,
+  });
+};
+
+export const syncOaDepartment = (current = 1, size = 20, signal) => {
+  return request({
+    url: '/blade-system/dept/sync-oa-department',
+    method: 'post',
+    params: {
+      current,
+      size,
+    },
+    timeout: 60000,
+    signal,
+  });
+};
+
 export const update = row => {
   return request({
     url: '/blade-system/dept/submit',

src/api/system/user.js

@@ -31,6 +31,19 @@ export const add = row => {
   });
 };
 
+export const syncIamAccounts = (current = 1, size = 50, signal) => {
+  return request({
+    url: '/blade-system/user/sync-iam-accounts',
+    method: 'post',
+    params: {
+      current,
+      size,
+    },
+    timeout: 60000,
+    signal,
+  });
+};
+
 export const update = row => {
   return request({
     url: '/blade-system/user/update',

src/api/vehicle/customer-archive.js

@@ -22,6 +22,19 @@ export const getDetail = id => {
   });
 };
 
+export const getPublicDetail = id => {
+  return request({
+    url: '/blade-transport/customer-archive/public/detail',
+    method: 'get',
+    meta: {
+      isToken: false,
+    },
+    params: {
+      id,
+    },
+  });
+};
+
 export const getChangeRecordList = (customerId, current, size) => {
   return request({
     url: '/blade-transport/customer-archive/change-record/list',
@@ -34,6 +47,32 @@ export const getChangeRecordList = (customerId, current, size) => {
   });
 };
 
+export const getPublicChangeRecordList = (customerId, current, size) => {
+  return request({
+    url: '/blade-transport/customer-archive/public/change-record/list',
+    method: 'get',
+    meta: {
+      isToken: false,
+    },
+    params: {
+      customerId,
+      current,
+      size,
+    },
+  });
+};
+
+export const postPublicProcessMessage = data => {
+  return request({
+    url: '/blade-transport/customer-archive/public/process-message',
+    method: 'post',
+    meta: {
+      isToken: false,
+    },
+    data,
+  });
+};
+
 export const submit = row => {
   return request({
     url: '/blade-transport/customer-archive/submit',