-
搜索结果
-
-
-
{{ item.name || item.address || '未命名地址' }}
-
{{ item.address || item.name || '-' }}
+
+
+
![]()
+
+
+ {{ item.name || item.address || '未命名地址' }}
+
+
+ 地址：{{ item.address || item.name || '-' }}
+
+
+
+
+
diff --git a/src/components/vehicle-attachment-upload/main.vue b/src/components/vehicle-attachment-upload/main.vue
index 436efec..81961de 100644
--- a/src/components/vehicle-attachment-upload/main.vue
+++ b/src/components/vehicle-attachment-upload/main.vue
@@ -212,7 +212,14 @@ export default {
.filter(Boolean);
},
acceptText() {
- return this.acceptedList.join(',');
+ return this.acceptedList
+ .map(item => {
+ const value = String(item).trim();
+ if (!value || value.includes('/') || value.startsWith('.')) return value;
+ return `.${value}`;
+ })
+ .filter(Boolean)
+ .join(',');
},
tipText() {
return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
@@ -304,12 +311,22 @@ export default {
});
},
handleSuccess(response, file, files) {
- if (!response || response.success === false || (response.code && response.code !== 200)) {
+ const code = response?.code;
+ const codeInvalid = code !== undefined && code !== null && code !== '' && Number(code) !== 200;
+ if (!response || response.success === false || codeInvalid) {
this.$message.error((response && response.msg) || '上传失败');
return;
}
- this.emitUploadFiles(this.multiple ? files : [file]);
- this.$emit('success', this.normalizeUploadFile(file));
+ if (file && !file.response) {
+ file.response = response;
+ }
+ const normalized = this.normalizeUploadFile(file, response);
+ if (!normalized.url) {
+ this.$message.error('上传成功但未返回文件地址');
+ return;
+ }
+ this.$emit('success', normalized);
+ this.emitUploadFiles(this.multiple ? files : [file], normalized);
this.$message.success('上传成功');
},
handleChange(file, files) {
@@ -323,35 +340,89 @@ export default {
this.emitUploadFiles(files);
return true;
},
- emitUploadFiles(files) {
- const list = files
- .filter(file => file.status === 'success' || this.getFileUrl(file))
- .map(this.normalizeUploadFile)
+ emitUploadFiles(files, preferredFile) {
+ const list = (files || [])
+ .filter(file => {
+ if (file?.status === 'fail') return false;
+ return (
+ file?.status === 'success' ||
+ this.getFileUrl(file) ||
+ file?.response?.data ||
+ file?.response?.link ||
+ file?.response
+ );
+ })
+ .map(file => this.normalizeUploadFile(file))
.filter(item => item.url);
- this.$emit('update:modelValue', list);
- this.$emit('change', list);
+
+ if (preferredFile?.url) {
+ const exists = list.some(
+ item =>
+ (preferredFile.uid && item.uid && String(item.uid) === String(preferredFile.uid)) ||
+ item.url === preferredFile.url
+ );
+ if (!exists) list.push(preferredFile);
+ }
+
+ const current = this.parseValue(this.modelValue).map(item => ({
+ ...item,
+ url: this.getFileUrl(item),
+ }));
+ const merged = [...current];
+ list.forEach(file => {
+ const index = merged.findIndex(
+ item =>
+ (file.uid && item.uid && String(item.uid) === String(file.uid)) ||
+ (file.url && this.getFileUrl(item) === file.url)
+ );
+ if (index >= 0) merged.splice(index, 1, { ...merged[index], ...file });
+ else merged.push(file);
+ });
+
+ const result = merged.filter(item => this.getFileUrl(item));
+ this.$emit('update:modelValue', result);
+ this.$emit('change', result);
},
- normalizeUploadFile(file) {
- const data = (file.response && file.response.data) || file.data || file;
- const url = data.link || data.url || data.domain || file.url || '';
+ normalizeUploadFile(file, responseOverride) {
+ const response = responseOverride || file?.response;
+ let data = {};
+ if (response && typeof response === 'object') {
+ if (response.data && typeof response.data === 'object') {
+ data = response.data;
+ } else if (response.link || response.url || response.domain) {
+ data = response;
+ }
+ }
+ if (!data.link && !data.url && !data.domain) {
+ data = file?.data && typeof file.data === 'object' ? file.data : file || {};
+ }
+ const url =
+ data.link ||
+ data.url ||
+ data.domain ||
+ data.fileLink ||
+ data.fileUrl ||
+ file?.url ||
+ file?.link ||
+ '';
const originalName =
data.originalName ||
- file.originalName ||
- file.name ||
+ file?.originalName ||
+ file?.name ||
data.name ||
this.getFileName(url) ||
'附件';
const extension = this.getExtension({ name: originalName, url });
return {
...data,
- uid: file.uid || data.uid,
+ uid: file?.uid || data.uid,
originalName,
name: originalName,
url,
link: data.link || url,
- size: data.size || data.attachSize || file.size || '',
+ size: data.size || data.attachSize || file?.size || '',
extension,
- mimeType: data.mimeType || data.contentType || file.raw?.type || MIME_MAP[extension] || '',
+ mimeType: data.mimeType || data.contentType || file?.raw?.type || MIME_MAP[extension] || '',
};
},
handlePreview(file) {
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 88425be..88c648f 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -1,6 +1,7 @@
FROM nginx
VOLUME /tmp
ENV LANG en_US.UTF-8
+ADD ./src/docker/nginx.conf /etc/nginx/conf.d/default.conf
ADD ./dist/ /usr/share/nginx/html/
EXPOSE 80
EXPOSE 443
\ No newline at end of file
diff --git a/src/docker/nginx.conf b/src/docker/nginx.conf
new file mode 100644
index 0000000..0155f82
--- /dev/null
+++ b/src/docker/nginx.conf
@@ -0,0 +1,19 @@
+server {
+ listen 80;
+ server_name localhost;
+ root /usr/share/nginx/html;
+ index index.html;
+
+ gzip on;
+ gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+ location /assets/ {
+ add_header Cache-Control "public, max-age=31536000, immutable";
+ try_files $uri =404;
+ }
+
+ location / {
+ add_header Cache-Control "no-store, no-cache, must-revalidate";
+ try_files $uri $uri/ /index.html;
+ }
+}
diff --git a/src/error.js b/src/error.js
index d2b5611..1c507e5 100644
--- a/src/error.js
+++ b/src/error.js
@@ -1,8 +1,12 @@
import store from './store';
+import { isChunkLoadError, reloadForChunkError } from './utils/chunk-reload';
export default {
install: app => {
app.config.errorHandler = (err, vm, info) => {
+ if (isChunkLoadError(err) && reloadForChunkError()) {
+ return;
+ }
store.commit('ADD_LOGS', {
type: 'error',
message: err.message,
diff --git a/src/main.js b/src/main.js
index 9e780e5..c53d2e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,5 @@
import { createApp } from 'vue';
+import { installChunkReload } from './utils/chunk-reload';
import website from './config/website';
import axios from './axios';
import router from './router/';
@@ -46,6 +47,7 @@ import sectionCard from './components/section-card/main.vue';
import mapSearchResults from './components/map-search-results/main.vue';
window.$crudCommon = crudCommon;
+installChunkReload();
debug();
window.axios = axios;
const app = createApp(App);
diff --git a/src/option/base/measurement-unit.js b/src/option/base/measurement-unit.js
index c135823..7c68b87 100644
--- a/src/option/base/measurement-unit.js
+++ b/src/option/base/measurement-unit.js
@@ -38,6 +38,21 @@ export const createOption = () => ({
menuWidth: 240,
menuFixed: 'right',
column: [
+ {
+ label: '计量单位编码',
+ prop: 'unitCode',
+ minWidth: 150,
+ span: 24,
+ search: true,
+ searchOrder: 4,
+ searchSpan: 6,
+ maxlength: 50,
+ showWordLimit: true,
+ rules: [
+ { required: true, message: '请输入计量单位编码', trigger: 'blur' },
+ { max: 50, message: '计量单位编码不能超过50个字', trigger: 'blur' },
+ ],
+ },
{
label: '计量单位',
prop: 'unitName',
diff --git a/src/option/business/shipping-template.js b/src/option/business/shipping-template.js
index eb90940..ad2f735 100644
--- a/src/option/business/shipping-template.js
+++ b/src/option/business/shipping-template.js
@@ -55,8 +55,8 @@ export const config = {
'templateType',
'transportType',
'createUserName',
- 'remark',
'updateTime',
+ 'remark',
'createTime',
],
exportColumns: [
@@ -65,8 +65,8 @@ export const config = {
{ prop: 'templateType', label: '模板类型' },
{ prop: 'transportType', label: '运输方式' },
{ prop: 'createUserName', label: '创建人' },
- { prop: 'remark', label: '备注' },
{ prop: 'updateTime', label: '更新时间' },
+ { prop: 'remark', label: '备注' },
{ prop: 'createTime', label: '创建时间' },
],
enableAllDept: false,
@@ -82,12 +82,14 @@ export const config = {
detailAttachmentDescriptionPlain: true,
enableTransportPlanForm: true,
enableShippingTemplateFreight: true,
- editableRoadAddress: true,
+ editableRoadAddress: false,
fixedTransportAddressType: true,
enableTemplateCodePreview: true,
attachmentTitle: '附件',
defaultForm: {
templateType: '运输计划',
+ transportType: '公路运输',
+ transportTypeName: '公路运输',
},
transportFormRequiredFields: [
['projectName', '项目'],
@@ -119,15 +121,16 @@ export const option = {
labelWidth: 0,
},
{
- label: '模板编号',
- prop: 'templateCode',
+ label: '模板类型',
+ prop: 'templateType',
+ type: 'select',
search: true,
- searchOrder: 4,
+ searchOrder: 2,
span: 8,
order: 390,
- minWidth: 170,
- disabled: true,
- placeholder: '系统自动生成',
+ dicData: templateTypeOptions,
+ minWidth: 120,
+ rules: selectRule('模板类型'),
display: true,
},
{
@@ -142,16 +145,15 @@ export const option = {
display: true,
},
{
- label: '模板类型',
- prop: 'templateType',
- type: 'select',
+ label: '模板编号',
+ prop: 'templateCode',
search: true,
- searchOrder: 2,
+ searchOrder: 4,
span: 8,
order: 370,
- dicData: templateTypeOptions,
- minWidth: 120,
- rules: selectRule('模板类型'),
+ minWidth: 170,
+ disabled: true,
+ placeholder: '系统自动生成',
display: true,
},
{
diff --git a/src/option/business/temporary-credit-limit.js b/src/option/business/temporary-credit-limit.js
index 4ad6fb4..eab56af 100644
--- a/src/option/business/temporary-credit-limit.js
+++ b/src/option/business/temporary-credit-limit.js
@@ -334,7 +334,7 @@ export const option = {
},
...auditColumns.map(column => ({ ...column, hide: true })),
])),
- dialogWidth: '96%',
+ dialogWidth: 1100,
menuFixed: 'right',
menuWidth: 320,
index: false,
diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js
index 45b9154..5fb8150 100644
--- a/src/option/business/transport-plan.js
+++ b/src/option/business/transport-plan.js
@@ -209,12 +209,12 @@ export const config = {
attachmentTitle: '附件',
searchRangeMap: {
planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
- planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
+ createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
},
actions: ['copy', 'complete'],
statusProp: 'businessStatus',
statusTextProp: 'businessStatusName',
- deleteStatus: ['draft', 'waiting_dispatch'],
+ deleteStatus: ['draft'],
editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
detailButton: true,
detailSections: [
@@ -341,6 +341,7 @@ export const option = {
{
label: '发货地址',
prop: 'departureAddress',
+ slot: true,
formslot: true,
search: true,
searchOrder: 7,
@@ -352,6 +353,7 @@ export const option = {
{
label: '到货地址',
prop: 'arrivalAddress',
+ slot: true,
formslot: true,
search: true,
searchOrder: 6,
@@ -577,8 +579,8 @@ export const option = {
viewDisplay: false,
},
{
- label: '计划结束日期',
- prop: 'planEndDateRange',
+ label: '创建时间',
+ prop: 'createTimeRange',
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js
index fe51191..c981066 100644
--- a/src/option/business/waybill-manage.js
+++ b/src/option/business/waybill-manage.js
@@ -543,7 +543,8 @@ export const option = {
prop: 'projectName',
formslot: true,
search: true,
- searchLabel: '项目',
+ searchLabel: '项目名称',
+ searchPlaceholder: '请选择或输入',
searchOrder: 22,
span: 6,
order: 890,
@@ -555,6 +556,7 @@ export const option = {
prop: 'customerName',
search: true,
searchLabel: '客户名称',
+ searchPlaceholder: '请选择或输入',
searchOrder: 21,
minWidth: 150,
addDisplay: false,
@@ -576,6 +578,7 @@ export const option = {
prop: 'driverName',
search: true,
searchLabel: '司机名称',
+ searchPlaceholder: '请选择或输入',
searchOrder: 14,
minWidth: 120,
display: false,
@@ -626,6 +629,7 @@ export const option = {
prop: 'carrierName',
search: true,
searchLabel: '承运商名称',
+ searchPlaceholder: '请选择或输入',
searchOrder: 15,
minWidth: 150,
display: false,
@@ -729,6 +733,7 @@ export const option = {
prop: 'planName',
formslot: true,
search: true,
+ searchPlaceholder: '请选择或输入',
searchOrder: 7,
span: 6,
order: 870,
@@ -738,6 +743,7 @@ export const option = {
label: '货物类型',
prop: 'cargoType',
search: true,
+ searchPlaceholder: '请选择或输入',
searchOrder: 18,
formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
minWidth: 130,
diff --git a/src/option/system/authlog.js b/src/option/system/authlog.js
index d550790..3e937f1 100644
--- a/src/option/system/authlog.js
+++ b/src/option/system/authlog.js
@@ -5,6 +5,7 @@ export const GRANT_TYPE_DIC = [
{ label: '社交登录', value: 'social' },
{ label: '客户端凭证', value: 'client_credentials' },
{ label: '刷新令牌', value: 'refresh_token' },
+ { label: '退出登录', value: 'logout' },
];
export const authLogOption = {
@@ -38,7 +39,7 @@ export const authLogOption = {
prop: 'realName',
},
{
- label: '授权类型',
+ label: '操作类型',
prop: 'grantType',
type: 'select',
search: true,
@@ -80,7 +81,7 @@ export const authLogOption = {
width: 120,
},
{
- label: '登录时间',
+ label: '操作时间',
prop: 'loginTime',
sortable: true,
span: 24,
diff --git a/src/option/system/user.js b/src/option/system/user.js
index 197198b..9cc07c3 100644
--- a/src/option/system/user.js
+++ b/src/option/system/user.js
@@ -1,12 +1,9 @@
import { getDeptLazyTree } from '@/api/system/dept';
+import { validateLoginPassword } from '@/utils/validate';
export const userOption = safe => {
const validatePass = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('请输入密码'));
- } else {
- callback();
- }
+ validateLoginPassword(rule, value, callback);
};
const validatePass2 = (rule, value, callback) => {
if (value === '') {
diff --git a/src/page/index/layout.vue b/src/page/index/layout.vue
index 0439730..f0531f9 100644
--- a/src/page/index/layout.vue
+++ b/src/page/index/layout.vue
@@ -1,7 +1,18 @@
-
+
+
+
diff --git a/src/page/login/facelogin.vue b/src/page/login/facelogin.vue
index e1da201..0c09cb7 100644
--- a/src/page/login/facelogin.vue
+++ b/src/page/login/facelogin.vue
@@ -13,8 +13,8 @@ export default {
data() {
return {
loginForm: {
- username: 'admin',
- password: '123456',
+ username: '',
+ password: '',
},
};
},
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index a9ee607..0ab99ca 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -24,6 +24,7 @@
-->
+
{{ mapStatus }}
@@ -270,6 +270,7 @@ import { createOption } from '@/option/base/common-address';
import { mapGetters } from 'vuex';
import { downloadXls } from '@/utils/util';
import { getToken } from '@/utils/auth';
+import { normalizeMapSearchResults } from '@/utils/map-search';
import { isMobile } from '@/utils/validate';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
@@ -1117,12 +1118,7 @@ export default {
this.ensureAmapGeocoder()
.then(() => this.runAmapGeocode('location', keyword))
.then(result => {
- this.mapSearchResults = (result.geocodes || []).map((item, index) => ({
- id: item.id || index,
- name: item.formattedAddress || keyword,
- address: item.formattedAddress || keyword,
- location: item.location,
- }));
+ this.mapSearchResults = normalizeMapSearchResults(result, keyword);
const point = this.resolveMapPoint(result);
if (!point) {
this.mapStatus = '未找到匹配地址';
diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue
index f4441bb..0ad39fe 100644
--- a/src/views/base/currency.vue
+++ b/src/views/base/currency.vue
@@ -326,7 +326,7 @@ export default {
propsHttp: {
res: 'data',
},
- tip: '请上传 .xls,.xlsx 标准格式文件',
+ tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
action: '/blade-system/currency/import-currency',
},
{
diff --git a/src/views/base/measurement-unit.vue b/src/views/base/measurement-unit.vue
index 11d1181..ebd7613 100644
--- a/src/views/base/measurement-unit.vue
+++ b/src/views/base/measurement-unit.vue
@@ -119,6 +119,7 @@ export default {
return this.isAdmin || this.permission?.[code] === true;
},
normalizeRow(row) {
+ row.unitCode = String(row.unitCode || '').trim();
row.unitName = String(row.unitName || '').trim();
row.dimension = String(row.dimension || '').trim();
row.remark = String(row.remark || '').trim();
diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue
index 125e786..06ede97 100644
--- a/src/views/base/port-terminal.vue
+++ b/src/views/base/port-terminal.vue
@@ -194,10 +194,11 @@
@@ -244,6 +245,13 @@
+
@@ -264,12 +272,16 @@ import { openImportDialog } from '@/utils/import-excel';
import { formatUpdateUserName } from '@/utils/audit';
import { getToken } from '@/utils/auth';
import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
const DEFAULT_COUNTRY_CODE = '+86';
const newLocal = '请选择类型';
export default {
+ components: {
+ AddressMapPicker,
+ },
data() {
const validateCode = (rule, value, callback) => {
const code = String(value || '').toUpperCase();
@@ -315,6 +327,7 @@ export default {
loading: true,
data: [],
excelBox: false,
+ addressMapPickerVisible: false,
excelForm: {},
portOptions: [],
countryOptions: [],
@@ -572,11 +585,11 @@ export default {
minWidth: 220,
overHidden: false,
order: 85,
- placeholder: '请输入',
+ placeholder: '点击选择地图地址',
maxlength: 255,
showWordLimit: true,
rules: [
- { required: true, message: '请输入详细地址', trigger: 'blur' },
+ { required: true, message: '请选择详细地址', trigger: 'change' },
{ max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
],
},
@@ -673,7 +686,7 @@ export default {
propsHttp: {
res: 'data',
},
- tip: '请上传 .xls,.xlsx 标准格式文件',
+ tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
accept: '.xls,.xlsx',
action: '/blade-system/port-terminal/import-port-terminal',
},
@@ -1040,6 +1053,21 @@ export default {
handleCoordinateInput(prop, value) {
this.form[prop] = normalizeCoordinateInput(value);
},
+ openAddressMapPicker() {
+ this.addressMapPickerVisible = true;
+ },
+ handleAddressMapConfirm(payload) {
+ const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+ if (selection.address) {
+ this.form.detailAddress = selection.address;
+ }
+ if (selection.longitude !== undefined && selection.longitude !== null && selection.longitude !== '') {
+ this.form.longitude = Number(selection.longitude).toFixed(6);
+ }
+ if (selection.latitude !== undefined && selection.latitude !== null && selection.latitude !== '') {
+ this.form.latitude = Number(selection.latitude).toFixed(6);
+ }
+ },
resolveCountryCode(country) {
if (!country) {
return Promise.resolve('');
@@ -1107,7 +1135,7 @@ export default {
return false;
}
if (isBlank(row.detailAddress)) {
- this.$message.warning('请输入详细地址');
+ this.$message.warning('请选择详细地址');
return false;
}
if (isBlank(row.longitude)) {
@@ -1399,6 +1427,15 @@ export default {
line-height: 20px;
padding: 4px 0;
}
+
+.detail-address-input {
+ cursor: pointer;
+
+ :deep(.el-input__wrapper),
+ :deep(.el-input__inner) {
+ cursor: pointer;
+ }
+}
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index af185a0..71ea562 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -3,21 +3,21 @@
:class="[
'waybill-manage-page',
{
- 'waybill-manage-page--form-page': isStandaloneWaybillFormPage,
- 'waybill-manage-page--detail-page': isStandaloneWaybillDetailPage,
+ 'waybill-manage-page--form-page': formPageLocked,
+ 'waybill-manage-page--detail-page': detailPageLocked,
},
]"
>
{{ transportMapStatus }}
@@ -3013,6 +3123,7 @@ import {
getList as getProjectList,
} from '@/api/business/project-apply';
import { getList as getLoadingList } from '@/api/business/loading-manage';
+import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
import { getList as getCommonRouteList } from '@/api/business/common-route';
import {
getDetail as getShippingPlanDetail,
@@ -3023,20 +3134,26 @@ import {
getList as getProcessConfigList,
getVoucherImages as getProcessConfigVoucherImages,
} from '@/api/business/process-config';
-import { getPunchRecords as getWaybillPunchRecords } from '@/api/business/waybill-manage';
+import { getPunchRecords as getWaybillPunchRecords, locateVehicle, trackVehicle } from '@/api/business/waybill-manage';
+import { getMkPublicDetail } from '@/api/mk-process';
import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import {
+ fetchDriversByCarrierOrganizations,
+} from '@/utils/carrier-org-resource';
import { getDictionary } from '@/api/system/dictbiz';
import { getDictionary as getSystemDictionary } from '@/api/system/dict';
import { addressTypeOptions } from '@/option/base/common-address';
import { packageOptions } from '@/option/business/common';
import { formatUpdateUserName } from '@/utils/audit';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
import { getToken } from '@/utils/auth';
import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
import { applyTableMenuWidth } from '@/utils/table-menu';
import { downloadFileByUrl, downloadXls } from '@/utils/util';
import { isMobile } from '@/utils/validate';
-import { InfoFilled, Location, OfficeBuilding, Rank, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
-import { ElImageViewer } from 'element-plus';
+import { InfoFilled, Location, OfficeBuilding, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
+import { ElAutocomplete, ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue';
import {
fallbackPlugin,
@@ -3211,7 +3328,6 @@ export default {
PageDetail,
InfoFilled,
WarnTriangleFilled,
- Rank,
ElImageViewer,
OpenFileViewer,
},
@@ -3284,8 +3400,22 @@ export default {
waybillRouteChangeNodes: [],
waybillRouteChangeRemark: '',
waybillRouteChangeRecords: [],
- waybillRouteChangeDragIndex: -1,
waybillRouteChangeSaving: false,
+ waybillLocateLoading: false,
+ waybillLocateInfo: null,
+ waybillLocateHint: '',
+ waybillLocateMapInstance: null,
+ waybillLocateMarker: null,
+ waybillLocateInfoWindow: null,
+ waybillTrackMode: '',
+ waybillTrackLoading: false,
+ waybillTrackInfo: null,
+ waybillTrackHint: '',
+ waybillTrackDateRange: [],
+ waybillTrackMapInstance: null,
+ waybillTrackPolyline: null,
+ waybillTrackStartMarker: null,
+ waybillTrackEndMarker: null,
mileageDialog: {
visible: false,
submitting: false,
@@ -3512,9 +3642,28 @@ export default {
selectionList: [],
attachmentUploadMode: false,
standaloneFormKey: '',
+ // 实例所属路由的路径快照：用于判断当前 $route 是否还是「本实例自己的路由」。
+ // 必须在 data 里初始化，不能放 created —— Vue 的 Options API 执行顺序是
+ // data → computed → watch(immediate) → created，放 created 会被首个
+ // immediate watcher 读到空值，把本该执行的首次加载也挡掉。
+ routePathLocked: this.$route.path,
+ // 页面形态（列表 / 独立表单页 / 独立详情页）在实例创建时锁定一次，之后不再随 $route 变化。
+ // 原因：标签页 keep-alive 只会让实例 deactivate，实例仍会随 $route（全局响应式）重新渲染；
+ // 若形态跟着路由翻回列表/弹窗态，缓存实例会渲染出 append-to-body 的 el-dialog —— 弹窗被
+ // Teleport 到 body 后，KeepAlive.deactivate 的 move 搬不动它，DOM 会永久残留在页面上，
+ // 表现为“从运单详情/独立表单离开后点其它菜单，详情弹窗又冒出来”。
+ formPageLocked: false,
+ detailPageLocked: false,
+ // 同上：表单模式（add / edit）也一次性锁定，避免缓存实例随 $route 变 query 导致 option 变形
+ formModeLocked: '',
};
},
created() {
+ this.formPageLocked = this.isStandaloneWaybillFormPage;
+ this.detailPageLocked = this.isStandaloneWaybillDetailPage;
+ this.formModeLocked = this.$route.query.mode || '';
+ if (this.isPublicWaybillView) return;
+ this.setupSearchAutocompletes();
if (this.config.enableAllDept && this.isAdmin) {
this.allDept = 1;
}
@@ -3538,6 +3687,14 @@ export default {
this.consumeTemplateCreatePayload();
}
},
+ // 标签切走（实例被 keep-alive 缓存）或销毁时，收起本页所有 append-to-body 的弹窗。
+ // 否则 Teleport 出去的弹窗 DOM 会一直留在 body 上，盖住后续打开的页面。
+ deactivated() {
+ this.closeInnerDialogs();
+ },
+ beforeUnmount() {
+ this.closeInnerDialogs();
+ },
computed: {
...mapGetters(['permission', 'userInfo']),
permissionList() {
@@ -3545,17 +3702,49 @@ export default {
addBtn: this.canCreate,
};
},
+ // 打卡时间轴按打卡时间先后展示：已打卡记录按打卡时间升序在前，
+ // 未打卡记录保持流程节点原顺序排在其后。
+ orderedWaybillPunchRecords() {
+ const records = Array.isArray(this.waybillPunchRecords) ? this.waybillPunchRecords : [];
+ return records
+ .map((record, index) => ({
+ record,
+ index,
+ punchedAt: this.waybillPunchRecordTimestamp(record),
+ }))
+ .sort((a, b) => {
+ const aPunched = a.punchedAt !== null;
+ const bPunched = b.punchedAt !== null;
+ if (aPunched && bPunched) return a.punchedAt - b.punchedAt || a.index - b.index;
+ if (aPunched !== bPunched) return aPunched ? -1 : 1;
+ return a.index - b.index;
+ })
+ .map(item => item.record);
+ },
isStandaloneWaybillPage() {
return this.standaloneFormPage && standaloneWaybillFormPaths.includes(this.$route.path);
},
isStandaloneWaybillFormPage() {
return this.isStandaloneWaybillPage && ['add', 'edit'].includes(this.$route.query.mode);
},
+ isPublicWaybillView() {
+ return this.$route.path === '/business/waybill-manage/public-view';
+ },
isStandaloneWaybillDetailPage() {
- return this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute;
+ return (
+ (this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute) ||
+ this.isPublicWaybillView
+ );
+ },
+ // 容器形态读实例创建时锁定的标志，不随 $route 翻转（详见 data 中 formPageLocked 的说明）
+ // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
+ // 被 keep-alive 缓存后如果 $route 已经跑到别的页面上，就不该再用「当前页面的 id」
+ // 去触发本实例的请求或跳转，否则会拿别的单据 id 查自己的接口。
+ isOwnedRouteActive() {
+ return this.$route.path === this.routePathLocked;
},
detailContainer() {
- return this.isStandaloneWaybillDetailPage ? 'PageDetail' : 'el-dialog';
+ return this.detailPageLocked ? 'PageDetail' : 'el-dialog';
},
formPageTitle() {
if (this.isStandaloneWaybillFormPage) {
@@ -3567,13 +3756,13 @@ export default {
return '';
},
crudContainer() {
- return this.isStandaloneWaybillFormPage ? 'PageAvueForm' : 'avue-crud';
+ return this.formPageLocked ? 'PageAvueForm' : 'avue-crud';
},
pageFormOption() {
- if (!this.isStandaloneWaybillFormPage) return this.option;
+ if (!this.formPageLocked) return this.option;
const base = {
...this.option,
- boxType: this.$route.query.mode === 'edit' ? 'edit' : 'add',
+ boxType: this.formModeLocked === 'edit' ? 'edit' : 'add',
menuBtn: true,
submitBtn: true,
emptyBtn: false,
@@ -3821,6 +4010,10 @@ export default {
detailId: {
immediate: true,
handler(id) {
+ // 宿主 view 传的是全局 $route.query.id / detailId，实例被缓存后仍会被重渲染，
+ // 必须确认当前路由还是自己的：否则跳到别的详情页时会把「别的单据 id」灌进来，
+ // 触发 openDetail 用错 id 查运单 → 报「运单管理不存在」。
+ if (!this.isOwnedRouteActive) return;
if (id !== undefined && id !== null && id !== '') {
this.$nextTick(() => this.openDetail({ id }));
}
@@ -3837,6 +4030,25 @@ export default {
},
},
methods: {
+ // 页面被 keep-alive 缓存/卸载时调用，关闭本页所有 append-to-body 的弹窗，
+ // 避免 Teleport 出去的 DOM 残留在 body 上盖住后续页面（详见 data 里的说明）。
+ closeInnerDialogs() {
+ this.detailBox = false;
+ this.mileageDialog.visible = false;
+ this.attachmentDocumentPreviewVisible = false;
+ this.attachmentImagePreviewVisible = false;
+ this.waybillRouteChangeBox = false;
+ this.waybillCommonAddressBox = false;
+ this.flowBox = false;
+ this.transportRouteBox = false;
+ this.transportAddressBox = false;
+ this.transportStationBox = false;
+ this.transportMapBox = false;
+ this.commonCargoBox = false;
+ this.cargoImportBox = false;
+ this.waybillProcessConfigBox = false;
+ this.excelBox = false;
+ },
initStandaloneFormPage() {
if (!this.isStandaloneWaybillFormPage) return;
const mode = this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -4110,8 +4322,12 @@ export default {
) {
return false;
}
+ // 进行中的运单隐藏取消（与 config.canCancel / isInProgressStatus 对齐）
+ if (typeof this.config.canCancel === 'function' && !this.config.canCancel(row)) {
+ return false;
+ }
const status = this.statusValue(row);
- return ['pending', 'processing', 'running'].includes(status);
+ return status === 'pending';
},
canComplete(row) {
if (
@@ -4342,6 +4558,42 @@ export default {
waybillIsCarrier(row = {}) {
return String(row.carrierTypeName || row.carrierType || '').trim() === '承运商';
},
+ waybillDetailTaskInfo(row = {}) {
+ return this.parseJsonObject(row.taskInfoJson || row.taskInfo || {});
+ },
+ waybillDetailMileage(row = {}) {
+ const taskInfo = this.waybillDetailTaskInfo(row);
+ const goodsRows = this.parseJsonArray(row.goodsJson);
+ const firstGoods = goodsRows[0] || {};
+ return this.normalizeMileageValue(
+ row.mileage || taskInfo.mileage || firstGoods.mileage || ''
+ );
+ },
+ waybillDetailEstimatedStartTime(row = {}) {
+ const taskInfo = this.waybillDetailTaskInfo(row);
+ const value =
+ row.estimatedStartTime ||
+ row.planStartDate ||
+ taskInfo.estimatedStartTime ||
+ taskInfo.planStartDate ||
+ '';
+ return this.formatWaybillDetailDate(value);
+ },
+ waybillDetailEstimatedEndTime(row = {}) {
+ const taskInfo = this.waybillDetailTaskInfo(row);
+ const value =
+ row.estimatedEndTime ||
+ row.planEndDate ||
+ taskInfo.estimatedEndTime ||
+ taskInfo.planEndDate ||
+ '';
+ return this.formatWaybillDetailDate(value);
+ },
+ formatWaybillDetailDate(value) {
+ const text = String(value || '').trim();
+ if (!text) return '';
+ return text.slice(0, 10);
+ },
waybillVehicleNoLabel(row = {}) {
return this.waybillIsRoadTransport(row) ? '车牌号' : '船/航/班列号';
},
@@ -4384,6 +4636,9 @@ export default {
},
openDetail(row) {
if (!this.isStandaloneWaybillDetailPage) {
+ // 已不在自己的路由上（被缓存后路由切走）：此时 row.id 极可能是别的单据的 id，
+ // 再 push 会生成一堆错误的「运单管理详情」标签
+ if (!this.isOwnedRouteActive) return;
this.$router.push({ path: standaloneWaybillDetailRoute, query: { id: row.id } });
return;
}
@@ -4400,14 +4655,19 @@ export default {
this.waybillVoucherFolder = null;
this.waybillVoucherFolderView = false;
this.waybillVoucherImagesLoaded = false;
- const request =
- typeof this.api.getDetail === 'function'
+ const request = this.isPublicWaybillView
+ ? getMkPublicDetail('waybill-manage', row.id)
+ : typeof this.api.getDetail === 'function'
? this.api.getDetail(row.id)
: Promise.resolve({ data: { data: row } });
request
.then(res => {
const detail = res?.data?.data || res?.data || row;
this.detailRow = detail;
+ if (this.isPublicWaybillView) {
+ this.applyFormDetail(detail);
+ return;
+ }
this.loadWaybillPunchRecords();
this.loadWaybillVoucherImages();
if (detail.contractId) {
@@ -4440,6 +4700,13 @@ export default {
});
},
closeDetail() {
+ this.destroyWaybillLocateMap();
+ this.destroyWaybillTrackMap();
+ this.waybillTrackMode = '';
+ this.waybillLocateInfo = null;
+ this.waybillLocateHint = '';
+ this.waybillTrackInfo = null;
+ this.waybillTrackHint = '';
if (this.isStandaloneWaybillDetailPage) {
this.$router.$avueRouter?.closeTag?.();
this.$router.push({ path: '/business/waybill-manage', query: {} });
@@ -4463,7 +4730,94 @@ export default {
this.$message.info('当前配载单暂无详情数据');
return;
}
- this.$router.push({ path: '/business/loading-manage', query: { detailId: id } });
+ this.$router.push({
+ path: '/business/loading-manage/detail',
+ query: { id, name: '配载单详情' },
+ });
+ },
+ waybillDetailCustomerLabel(row = {}) {
+ return row.customer || row.fullName || row.shortName || row.customerName || row.customerCode || '';
+ },
+ waybillDetailCustomerId(row = {}) {
+ return row.id || row.customerId || '';
+ },
+ canOpenWaybillDetailSummaryLink(prop) {
+ if (this.isPublicWaybillView) return false;
+ const row = this.detailRow || {};
+ const value = this.formatDetailValue(row, prop);
+ if (!value || value === '-') return false;
+ if (prop === 'customerName') return Boolean(row.customerName);
+ if (prop === 'contractNo') return Boolean(row.contractId);
+ if (prop === 'projectName') return Boolean(row.projectId);
+ return false;
+ },
+ handleWaybillDetailSummaryClick(prop) {
+ if (prop === 'customerName') return this.openWaybillDetailCustomer();
+ if (prop === 'contractNo') return this.openWaybillDetailContract();
+ if (prop === 'projectName') return this.openWaybillDetailProject();
+ },
+ async resolveWaybillDetailCustomerId() {
+ const row = this.detailRow || {};
+ if (row.customerId) return row.customerId;
+ const name = String(row.customerName || '').trim();
+ if (!name) return '';
+ if (row.projectId) {
+ try {
+ const res = await getProjectDetail(row.projectId);
+ const customers = this.parseJsonArray(res.data?.data?.customerJson);
+ const matched =
+ customers.find(item => this.waybillDetailCustomerLabel(item) === name) ||
+ customers.find(item => {
+ const label = this.waybillDetailCustomerLabel(item);
+ return label && (name.includes(label) || label.includes(name));
+ });
+ const id = this.waybillDetailCustomerId(matched);
+ if (id) return id;
+ } catch (error) {
+ // 项目客户解析失败时回退到客商档案检索
+ }
+ }
+ try {
+ const res = await getCustomerArchiveList(1, 20, { fullName: name });
+ const records = res.data?.data?.records || [];
+ const exact =
+ records.find(item => item.fullName === name || item.shortName === name) || records[0];
+ return exact?.id || '';
+ } catch (error) {
+ return '';
+ }
+ },
+ async openWaybillDetailCustomer() {
+ if (!this.detailRow?.customerName) return;
+ const customerId = await this.resolveWaybillDetailCustomerId();
+ if (!customerId) {
+ this.$message.warning('未找到对应客商档案，无法打开');
+ return;
+ }
+ this.$router.push({
+ path: '/vehicle/customer-archive/form',
+ query: { id: String(customerId), name: '查看客商档案', view: '1' },
+ });
+ },
+ openWaybillDetailContract() {
+ if (!this.detailRow?.contractId) {
+ this.$message.warning('合同信息缺失，无法打开');
+ return;
+ }
+ this.$router.push({
+ path: '/business/contract-manage/detail',
+ query: { id: this.detailRow.contractId, name: '合同详情' },
+ });
+ },
+ openWaybillDetailProject() {
+ if (!this.detailRow?.projectId) {
+ this.$message.warning('项目信息缺失，无法打开');
+ return;
+ }
+ this.$router.push({
+ path: '/business/project-apply/form',
+ query: { mode: 'view', id: this.detailRow.projectId, name: '查看项目管理' },
+ });
},
loadWaybillDetailProcessNodes(projectId) {
this.waybillDetailProcessNodes = [];
@@ -4492,6 +4846,19 @@ export default {
})
.catch(() => []);
},
+ // 解析打卡时间（支持常见日期字符串格式），未打卡或无有效时间返回 null
+ waybillPunchRecordTimestamp(record = {}) {
+ if (record.punched === false || record.statusName === '未打卡') return null;
+ const raw = record.punchTime || record.punchAt || record.punchDateTime || '';
+ const text = String(raw).trim();
+ if (!text) return null;
+ const parsed = this.$dayjs ? this.$dayjs(text) : null;
+ if (parsed && typeof parsed.isValid === 'function' && parsed.isValid()) {
+ return parsed.valueOf();
+ }
+ const fallback = new Date(text.replace(/-/g, '/')).getTime();
+ return Number.isNaN(fallback) ? null : fallback;
+ },
loadWaybillPunchRecords() {
const waybillId = this.detailRow?.id;
if (!waybillId || this.waybillPunchRecordsLoading) return;
@@ -4622,7 +4989,7 @@ export default {
: [];
},
openWaybillRouteChangeDialog() {
- if (!this.detailRow.id) return;
+ if (!this.detailRow.id || !this.canChangeWaybillRoute(this.detailRow)) return;
this.restoreWaybillRouteChangeRecords();
this.waybillRouteChangeTab = 'change';
this.waybillRouteChangeRemark = '';
@@ -4639,22 +5006,11 @@ export default {
this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
this.waybillRouteChangeBox = true;
},
- waybillRouteChangeTypeText(index) {
- if (index === 0) return '起';
- if (index === this.waybillRouteChangeNodes.length - 1) return '终';
- return '经';
- },
- handleWaybillRouteChangeDragStart(index) {
- this.waybillRouteChangeDragIndex = index;
- },
- handleWaybillRouteChangeDrop(index) {
- if (this.waybillRouteChangeDragIndex < 0 || this.waybillRouteChangeDragIndex === index)
- return;
- const nodes = [...this.waybillRouteChangeNodes];
- const [node] = nodes.splice(this.waybillRouteChangeDragIndex, 1);
- nodes.splice(index, 0, node);
- this.waybillRouteChangeNodes = nodes;
- this.waybillRouteChangeDragIndex = -1;
+ canChangeWaybillRoute(row = {}) {
+ const status = String(this.statusValue(row) || row.businessStatus || row.status || '');
+ if (status === 'completed') return false;
+ const statusName = String(row.businessStatusName || row.statusName || '');
+ return !statusName.includes('已完成');
},
updateWaybillRouteChangeNodes() {
this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
@@ -4703,9 +5059,8 @@ export default {
row.departureAddress !== row.originalDepartureAddress ||
row.arrivalAddress !== row.originalArrivalAddress;
const routeJson = JSON.stringify(this.waybillRouteChangeNodes);
- const originalRouteJson = this.detailRow.routeJson || '';
- if (!changed && routeJson === originalRouteJson && !this.waybillRouteChangeRemark) {
- this.$message.warning('请修改地址、调整路线或填写变更备注');
+ if (!changed && !this.waybillRouteChangeRemark) {
+ this.$message.warning('请修改地址或填写变更备注');
return;
}
if (typeof this.api.changeRoute !== 'function') {
@@ -4713,11 +5068,9 @@ export default {
return;
}
- const content = changed
- ? `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
- row.departureAddress || '-'
- }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
- : '调整运输路线顺序';
+ const content = `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
+ row.departureAddress || '-'
+ }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`;
const records = [
{
changeTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -4768,7 +5121,262 @@ export default {
}
},
handleWaybillTrackAction(action) {
- this.$message.info(action === 'playback' ? '暂无可回放的物流轨迹' : '暂无车辆实时定位数据');
+ if (action === 'playback') {
+ this.destroyWaybillLocateMap();
+ this.waybillTrackMode = 'playback';
+ this.waybillLocateInfo = null;
+ this.waybillLocateHint = '';
+ if (!Array.isArray(this.waybillTrackDateRange) || this.waybillTrackDateRange.length !== 2) {
+ this.waybillTrackDateRange = this.buildDefaultTrackDateRange();
+ }
+ this.loadWaybillTrack();
+ return;
+ }
+ this.destroyWaybillTrackMap();
+ this.waybillTrackMode = 'locate';
+ this.waybillTrackInfo = null;
+ this.waybillTrackHint = '';
+ this.loadWaybillLocate();
+ },
+ buildDefaultTrackDateRange() {
+ const pad = value => String(value).padStart(2, '0');
+ const formatDate = date =>
+ `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+ const today = new Date();
+ const yesterday = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 1);
+ return [formatDate(yesterday), formatDate(today)];
+ },
+ destroyWaybillLocateMap() {
+ if (this.waybillLocateMarker) {
+ this.waybillLocateMarker.setMap(null);
+ this.waybillLocateMarker = null;
+ }
+ if (this.waybillLocateInfoWindow) {
+ this.waybillLocateInfoWindow.close();
+ this.waybillLocateInfoWindow = null;
+ }
+ if (this.waybillLocateMapInstance) {
+ this.waybillLocateMapInstance.destroy();
+ this.waybillLocateMapInstance = null;
+ }
+ },
+ destroyWaybillTrackMap() {
+ if (this.waybillTrackPolyline) {
+ this.waybillTrackPolyline.setMap(null);
+ this.waybillTrackPolyline = null;
+ }
+ if (this.waybillTrackStartMarker) {
+ this.waybillTrackStartMarker.setMap(null);
+ this.waybillTrackStartMarker = null;
+ }
+ if (this.waybillTrackEndMarker) {
+ this.waybillTrackEndMarker.setMap(null);
+ this.waybillTrackEndMarker = null;
+ }
+ if (this.waybillTrackMapInstance) {
+ this.waybillTrackMapInstance.destroy();
+ this.waybillTrackMapInstance = null;
+ }
+ },
+ async loadWaybillLocate() {
+ const waybillId = this.detailRow?.id;
+ if (!waybillId) {
+ this.$message.warning('运单信息不完整');
+ return;
+ }
+ if (!this.detailRow.vehicleNo) {
+ this.$message.warning('运单未绑定车牌号，无法实时定位');
+ return;
+ }
+ this.waybillLocateLoading = true;
+ this.waybillLocateHint = '正在获取车辆实时定位...';
+ this.waybillLocateInfo = null;
+ try {
+ const locateApi =
+ typeof this.api.locateVehicle === 'function' ? this.api.locateVehicle : locateVehicle;
+ const res = await locateApi(waybillId);
+ const data = res?.data?.data || null;
+ if (!data || data.longitude == null || data.latitude == null) {
+ this.waybillLocateInfo = null;
+ this.waybillLocateHint = '暂无车辆实时定位数据';
+ this.$message.warning('暂无车辆实时定位数据');
+ return;
+ }
+ this.waybillLocateInfo = data;
+ this.waybillLocateHint = '';
+ await this.$nextTick();
+ await this.renderWaybillLocateMap(data);
+ } catch (error) {
+ this.waybillLocateInfo = null;
+ this.waybillLocateHint = '实时定位获取失败';
+ this.$message.error(error?.message || '实时定位获取失败');
+ } finally {
+ this.waybillLocateLoading = false;
+ }
+ },
+ async loadWaybillTrack() {
+ const waybillId = this.detailRow?.id;
+ if (!waybillId) {
+ this.$message.warning('运单信息不完整');
+ return;
+ }
+ if (!this.detailRow.vehicleNo) {
+ this.$message.warning('运单未绑定车牌号，无法查询历史轨迹');
+ return;
+ }
+ if (!Array.isArray(this.waybillTrackDateRange) || this.waybillTrackDateRange.length !== 2) {
+ this.waybillTrackDateRange = this.buildDefaultTrackDateRange();
+ }
+ const [startDate, endDate] = this.waybillTrackDateRange;
+ this.waybillTrackLoading = true;
+ this.waybillTrackHint = '正在获取历史轨迹...';
+ this.destroyWaybillTrackMap();
+ try {
+ const trackApi =
+ typeof this.api.trackVehicle === 'function' ? this.api.trackVehicle : trackVehicle;
+ const res = await trackApi(waybillId, startDate, endDate);
+ const data = res?.data?.data || null;
+ const points = Array.isArray(data?.points) ? data.points : [];
+ if (!data || points.length === 0) {
+ this.waybillTrackInfo = data || { total: 0, points: [] };
+ this.waybillTrackHint = '暂无可回放的物流轨迹';
+ this.$message.warning('暂无可回放的物流轨迹');
+ return;
+ }
+ this.waybillTrackInfo = data;
+ this.waybillTrackHint = '';
+ await this.$nextTick();
+ await this.renderWaybillTrackMap(points);
+ } catch (error) {
+ this.waybillTrackInfo = null;
+ this.waybillTrackHint = '历史轨迹获取失败';
+ this.$message.error(error?.message || '历史轨迹获取失败');
+ } finally {
+ this.waybillTrackLoading = false;
+ }
+ },
+ async renderWaybillLocateMap(locateInfo) {
+ const longitude = Number(locateInfo?.longitude);
+ const latitude = Number(locateInfo?.latitude);
+ if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
+ this.$message.warning('定位坐标无效，无法在地图上展示');
+ return;
+ }
+ try {
+ await this.loadAmap();
+ await this.$nextTick();
+ const container = this.$refs.waybillLocateMap;
+ if (!container || !window.AMap) {
+ this.$message.warning('高德地图容器未就绪');
+ return;
+ }
+ this.destroyWaybillLocateMap();
+ this.waybillLocateMapInstance = new window.AMap.Map(container, {
+ zoom: 15,
+ center: [longitude, latitude],
+ viewMode: '2D',
+ resizeEnable: true,
+ });
+ const content = [
+ `
`,
+ `
${locateInfo.vehicleNo || '车辆位置'}
`,
+ locateInfo.locateTime ? `
时间：${locateInfo.locateTime}
` : '',
+ locateInfo.address ? `
地址：${locateInfo.address}
` : '',
+ `
坐标：${longitude}, ${latitude}
`,
+ `
`,
+ ].join('');
+ this.waybillLocateInfoWindow = new window.AMap.InfoWindow({
+ content,
+ offset: new window.AMap.Pixel(0, -30),
+ });
+ this.waybillLocateMarker = new window.AMap.Marker({
+ position: [longitude, latitude],
+ title: locateInfo.vehicleNo || '车辆位置',
+ anchor: 'bottom-center',
+ });
+ this.waybillLocateMarker.on('click', () => {
+ this.waybillLocateInfoWindow.open(this.waybillLocateMapInstance, [longitude, latitude]);
+ });
+ this.waybillLocateMapInstance.add(this.waybillLocateMarker);
+ this.waybillLocateInfoWindow.open(this.waybillLocateMapInstance, [longitude, latitude]);
+ this.waybillLocateMapInstance.setFitView([this.waybillLocateMarker], false, [40, 40, 40, 40]);
+ setTimeout(() => {
+ this.waybillLocateMapInstance?.resize?.();
+ }, 80);
+ } catch (error) {
+ window.console.warn('实时定位地图渲染失败', error);
+ this.$message.error('高德地图渲染失败，请稍后重试');
+ }
+ },
+ async renderWaybillTrackMap(points) {
+ const path = (points || [])
+ .map(item => [Number(item.longitude), Number(item.latitude)])
+ .filter(item => Number.isFinite(item[0]) && Number.isFinite(item[1]));
+ if (!path.length) {
+ this.$message.warning('轨迹坐标无效，无法在地图上展示');
+ return;
+ }
+ try {
+ await this.loadAmap();
+ await this.$nextTick();
+ const container = this.$refs.waybillTrackMap;
+ if (!container || !window.AMap) {
+ this.$message.warning('高德地图容器未就绪');
+ return;
+ }
+ this.destroyWaybillTrackMap();
+ this.waybillTrackMapInstance = new window.AMap.Map(container, {
+ zoom: 12,
+ center: path[0],
+ viewMode: '2D',
+ resizeEnable: true,
+ });
+ this.waybillTrackPolyline = new window.AMap.Polyline({
+ path,
+ strokeColor: '#409eff',
+ strokeWeight: 6,
+ strokeOpacity: 0.9,
+ lineJoin: 'round',
+ lineCap: 'round',
+ showDir: path.length > 1,
+ });
+ this.waybillTrackStartMarker = new window.AMap.Marker({
+ position: path[0],
+ title: '起点',
+ anchor: 'bottom-center',
+ label: {
+ content: '起',
+ direction: 'top',
+ offset: new window.AMap.Pixel(0, -6),
+ },
+ });
+ this.waybillTrackEndMarker = new window.AMap.Marker({
+ position: path[path.length - 1],
+ title: '终点',
+ anchor: 'bottom-center',
+ label: {
+ content: '终',
+ direction: 'top',
+ offset: new window.AMap.Pixel(0, -6),
+ },
+ });
+ this.waybillTrackMapInstance.add([
+ this.waybillTrackPolyline,
+ this.waybillTrackStartMarker,
+ this.waybillTrackEndMarker,
+ ]);
+ this.waybillTrackMapInstance.setFitView(
+ [this.waybillTrackPolyline, this.waybillTrackStartMarker, this.waybillTrackEndMarker],
+ false,
+ [48, 48, 48, 48]
+ );
+ setTimeout(() => {
+ this.waybillTrackMapInstance?.resize?.();
+ }, 80);
+ } catch (error) {
+ window.console.warn('历史轨迹地图渲染失败', error);
+ this.$message.error('高德地图渲染失败，请稍后重试');
+ }
},
displayStatus(row, prop) {
const formatStatus = this.config.formatStatus;
@@ -4782,7 +5390,9 @@ export default {
: defaultText;
},
statusTagType(status) {
- if ([1, 'pending', 'processing', 'approved', 'change_approved'].includes(status)) {
+ if (
+ [1, 'pending', 'processing', 'running', 'approved', 'change_approved'].includes(status)
+ ) {
return 'success';
}
if ([2, 'cancelled', 'withdrawn', 'draft'].includes(status)) {
@@ -5053,11 +5663,23 @@ export default {
return;
}
this.getSaveRequest()(submitRow).then(
- () => {
- this.onLoad(this.page);
- this.$message({ type: 'success', message: '操作成功!' });
- done();
- if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+ res => {
+ const data = res.data?.data || {};
+ const id = data.id || submitRow.id;
+ const after = id
+ ? submitMkApprovalFlow({
+ bizType: 'waybill-manage',
+ formInstanceId: id,
+ subjectName: data.waybillNo || submitRow.waybillNo || '',
+ approvalStatus: data.approvalStatus || submitRow.approvalStatus || '',
+ })
+ : Promise.resolve();
+ return after.then(() => {
+ this.onLoad(this.page);
+ this.$message({ type: 'success', message: '提交成功!' });
+ done();
+ if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+ });
},
error => {
window.console.log(error);
@@ -5076,12 +5698,26 @@ export default {
? this.api.updateAttachments
: this.getSaveRequest();
request(submitRow).then(
- () => {
- this.attachmentUploadMode = false;
- this.onLoad(this.page);
- this.$message({ type: 'success', message: '操作成功!' });
- done();
- if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+ res => {
+ const skipMk = this.attachmentUploadMode;
+ const data = res.data?.data || {};
+ const id = data.id || submitRow.id;
+ const after =
+ skipMk || !id
+ ? Promise.resolve()
+ : submitMkApprovalFlow({
+ bizType: 'waybill-manage',
+ formInstanceId: id,
+ subjectName: data.waybillNo || submitRow.waybillNo || '',
+ approvalStatus: data.approvalStatus || submitRow.approvalStatus || '',
+ });
+ return after.then(() => {
+ this.attachmentUploadMode = false;
+ this.onLoad(this.page);
+ this.$message({ type: 'success', message: skipMk ? '操作成功!' : '提交成功!' });
+ done();
+ if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+ });
},
error => {
this.attachmentUploadMode = false;
@@ -5172,19 +5808,28 @@ export default {
if (type === 'add' && copyId) {
this.api.getDetail(copyId).then(res => {
const sourceData = res.data.data || {};
- // 清除不应该复制的字段
+ // 清除不应该复制的字段（业务状态与原运单保持一致）
delete sourceData.id;
delete sourceData.code;
delete sourceData.waybillNo;
delete sourceData.waybillStatus;
+ delete sourceData.driverAcceptStatus;
+ delete sourceData.driverAcceptTime;
+ delete sourceData.driverAcceptDriverId;
+ delete sourceData.driverRejectTime;
+ delete sourceData.driverRejectReason;
+ delete sourceData.loadingNo;
+ delete sourceData.masterNo;
delete sourceData.createTime;
delete sourceData.updateTime;
delete sourceData.createUser;
delete sourceData.updateUser;
delete sourceData.createDept;
+ delete sourceData.createUserName;
+ delete sourceData.updateUserName;
this.applyFormDetail(sourceData);
- // 标记为手工创建
+ // 标记为手工创建；业务状态沿用原运单
this.form.dataSource = '手工创建';
done();
});
@@ -5823,6 +6468,15 @@ export default {
this.form.carrierName = '';
this.form.carrierId = '';
this.form.carrierContractId = '';
+ this.form.driverId = '';
+ this.form.driverName = '';
+ this.form.driverPhone = '';
+ this.form.vehicleNo = '';
+ this.form.trailerVehicleNo = '';
+ this.form.escortName = '';
+ this.form.escortPhone = '';
+ this.taskDriverOptions = [];
+ this.taskEscortOptions = [];
if (nextValue === '承运商') {
this.form.trailerVehicleNo = '';
this.form.escortName = '';
@@ -6076,17 +6730,36 @@ export default {
this.form.carrierContractId = carrier?.carrierContractId || '';
this.form.carrierId = carrier?.carrierId || '';
this.form.carrierName = carrier?.carrierName || '';
- return;
+ } else {
+ this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
+ this.form.carrierName = value || '';
}
- this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
- this.form.carrierName = value || '';
+ // 承运商变更后清空司机/车辆，避免跨组织脏数据
+ this.form.driverId = '';
+ this.form.driverName = '';
+ this.form.driverPhone = '';
+ this.form.vehicleNo = '';
+ this.form.trailerVehicleNo = '';
+ this.form.escortName = '';
+ this.form.escortPhone = '';
+ this.taskDriverOptions = [];
+ this.taskEscortOptions = [];
+ },
+ getTaskCarrierFilter() {
+ return {
+ carrierId: this.form.carrierId || '',
+ carrierName: this.form.carrierName || '',
+ };
},
loadTaskDriverOptions() {
if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
this.taskDriverLoading = true;
- return getDriverList(1, 9999, { posts: '司机' })
- .then(res => {
- this.taskDriverOptions = extractRecords(res);
+ return fetchDriversByCarrierOrganizations(
+ { size: 9999, posts: '司机' },
+ this.getTaskCarrierFilter()
+ )
+ .then(records => {
+ this.taskDriverOptions = records;
return this.taskDriverOptions;
})
.finally(() => {
@@ -6095,10 +6768,17 @@ export default {
},
fetchTaskDriverSuggestions(queryString, callback) {
const keyword = String(queryString || '').trim();
+ const carrier = this.getTaskCarrierFilter();
+ if (!carrier.carrierId && !carrier.carrierName) {
+ callback([]);
+ return;
+ }
this.taskDriverLoading = true;
- getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
- .then(res => {
- const records = extractRecords(res);
+ fetchDriversByCarrierOrganizations(
+ { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+ carrier
+ )
+ .then(records => {
this.taskDriverOptions = records;
callback(
records.map(item => ({
@@ -6117,10 +6797,17 @@ export default {
},
fetchTaskEscortSuggestions(queryString, callback) {
const keyword = String(queryString || '').trim();
+ const carrier = this.getTaskCarrierFilter();
+ if (!carrier.carrierId && !carrier.carrierName) {
+ callback([]);
+ return;
+ }
this.taskEscortLoading = true;
- getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
- .then(res => {
- const records = extractRecords(res);
+ fetchDriversByCarrierOrganizations(
+ { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+ carrier
+ )
+ .then(records => {
this.taskEscortOptions = records;
callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
})
@@ -7260,12 +7947,7 @@ export default {
this.ensureTransportAmapGeocoder()
.then(() => this.runAmapGeocode('location', keyword))
.then(result => {
- this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
- id: item.id || index,
- name: item.formattedAddress || keyword,
- address: item.formattedAddress || keyword,
- location: item.location,
- }));
+ this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
const point = this.resolveMapPoint(result);
if (!point) {
this.transportMapStatus = '未找到匹配地址';
@@ -7888,6 +8570,123 @@ export default {
this.page.currentPage = 1;
this.onLoad(this.page);
},
+ setupSearchAutocompletes() {
+ const fields = [
+ {
+ prop: 'projectName',
+ placeholder: '请选择或输入项目名称',
+ fetch: (queryString, callback) =>
+ this.fetchSearchNameSuggestions(queryString, callback, {
+ request: keyword =>
+ getProjectList(1, 20, keyword ? { projectName: keyword } : {}),
+ getValue: item => item.projectName || item.name || '',
+ }),
+ },
+ {
+ prop: 'customerName',
+ placeholder: '请选择或输入客户名称',
+ fetch: (queryString, callback) =>
+ this.fetchSearchNameSuggestions(queryString, callback, {
+ request: keyword =>
+ getCustomerArchiveList(1, 20, {
+ ...(keyword ? { fullName: keyword } : {}),
+ customerType: '客户',
+ }),
+ getValue: item => item.fullName || item.customerName || item.name || '',
+ }),
+ },
+ {
+ prop: 'cargoType',
+ placeholder: '请选择或输入货物类型',
+ fetch: (queryString, callback) =>
+ this.fetchSearchNameSuggestions(queryString, callback, {
+ request: keyword =>
+ getCargoTypeList(1, 20, keyword ? { cargoName: keyword } : {}),
+ getValue: item => item.cargoName || item.typeName || item.name || item.label || '',
+ }),
+ },
+ {
+ prop: 'carrierName',
+ placeholder: '请选择或输入承运商名称',
+ fetch: (queryString, callback) =>
+ this.fetchSearchNameSuggestions(queryString, callback, {
+ request: keyword =>
+ getCustomerArchiveList(1, 20, {
+ ...(keyword ? { fullName: keyword } : {}),
+ customerType: '承运商',
+ }),
+ getValue: item =>
+ item.fullName || item.carrierName || item.customerName || item.name || '',
+ }),
+ },
+ {
+ prop: 'driverName',
+ placeholder: '请选择或输入司机名称',
+ fetch: (queryString, callback) =>
+ this.fetchSearchNameSuggestions(queryString, callback, {
+ request: keyword =>
+ getDriverList(1, 20, {
+ ...(keyword ? { driverName: keyword } : {}),
+ posts: '司机',
+ }),
+ getValue: item => item.driverName || item.name || '',
+ }),
+ },
+ {
+ prop: 'planName',
+ placeholder: '请选择或输入计划名称',
+ fetch: (queryString, callback) =>
+ this.fetchSearchNameSuggestions(queryString, callback, {
+ request: keyword =>
+ getShippingPlanList(1, 20, keyword ? { planName: keyword } : {}),
+ getValue: item => item.planName || item.name || '',
+ }),
+ },
+ ];
+ fields.forEach(field => {
+ const column = this.findColumn?.(this.option.column, field.prop);
+ if (!column) return;
+ column.searchPlaceholder = field.placeholder;
+ column.renderSearch = scope =>
+ this.renderSearchAutocomplete(scope, field.prop, field.placeholder, field.fetch);
+ });
+ },
+ renderSearchAutocomplete(scope, prop, placeholder, fetchSuggestions) {
+ return h(ElAutocomplete, {
+ modelValue: scope.row?.[prop] ?? '',
+ 'onUpdate:modelValue': value => {
+ if (scope.row) scope.row[prop] = value ?? '';
+ },
+ fetchSuggestions,
+ debounce: 300,
+ clearable: true,
+ triggerOnFocus: true,
+ placeholder,
+ style: 'width: 100%',
+ valueKey: 'value',
+ fitInputWidth: true,
+ });
+ },
+ fetchSearchNameSuggestions(queryString, callback, { request, getValue }) {
+ const keyword = String(queryString || '').trim();
+ Promise.resolve(request(keyword))
+ .then(res => {
+ const records = extractRecords(res);
+ const seen = new Set();
+ const options = [];
+ records.forEach(item => {
+ const value = String(getValue(item) || '').trim();
+ if (!value || seen.has(value)) return;
+ seen.add(value);
+ options.push({ ...item, value });
+ });
+ callback(options);
+ })
+ .catch(error => {
+ window.console.log(error);
+ callback([]);
+ });
+ },
searchChange(params, done) {
this.query = {
...params,
@@ -8056,7 +8855,7 @@ export default {
};
this.mileageForm = {
id: row.id,
- mileage: row.mileage === null || row.mileage === undefined ? '' : String(row.mileage),
+ mileage: this.normalizeMileageValue(row.mileage),
mileageRemark: row.mileageRemark || '',
};
this.$nextTick(() => this.$refs.mileageFormRef?.clearValidate());
@@ -8153,10 +8952,21 @@ export default {
},
fetchReassignDriverSuggestions(queryString, callback) {
const keyword = String(queryString || '').trim();
+ const row = this.reassignDrawer.row || {};
+ const carrier = {
+ carrierId: row.carrierId || '',
+ carrierName: row.carrierName || '',
+ };
+ if (!carrier.carrierId && !carrier.carrierName) {
+ callback([]);
+ return;
+ }
this.reassignDrawer.driverLoading = true;
- getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
- .then(res => {
- const records = extractRecords(res);
+ fetchDriversByCarrierOrganizations(
+ { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+ carrier
+ )
+ .then(records => {
this.reassignDriverOptions = records;
callback(
records.map(item => ({
@@ -9245,6 +10055,15 @@ export default {
strong {
font-size: 20px;
}
+
+ :deep(.el-tag) {
+ height: 28px;
+ padding: 0 12px;
+ border: 0;
+ border-radius: 8px;
+ font-size: 13px;
+ line-height: 28px;
+ }
}
&__waybill-route-change-link {
@@ -9281,7 +10100,12 @@ export default {
white-space: nowrap;
&.is-link {
+ display: inline;
+ justify-content: flex-start;
+ max-width: 100%;
color: #409eff;
+ font-weight: 500;
+ vertical-align: baseline;
}
}
@@ -9445,6 +10269,81 @@ export default {
border: 1px solid #eff1f7;
}
+ &__waybill-locate {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ }
+
+ &__waybill-locate-meta {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ gap: 8px 16px;
+ padding: 10px 12px;
+ border: 1px solid #eff1f7;
+ background: #fafafa;
+ color: #606266;
+ font-size: 13px;
+
+ span {
+ margin-right: 8px;
+ color: #909399;
+ }
+
+ strong {
+ color: #303133;
+ font-weight: 600;
+ }
+ }
+
+ &__waybill-locate-address {
+ grid-column: 1 / -1;
+ }
+
+ &__waybill-locate-map {
+ width: 100%;
+ min-height: 320px;
+ height: 320px;
+ border: 1px solid #eff1f7;
+ background: #f5f7fa;
+ }
+
+ &__waybill-locate-map--track {
+ min-height: 420px;
+ height: 420px;
+ }
+
+ &__waybill-map-tip {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ z-index: 2;
+ transform: translate(-50%, -50%);
+ padding: 8px 14px;
+ border-radius: 4px;
+ background: rgba(255, 255, 255, 0.92);
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
+ color: #909399;
+ font-size: 13px;
+ text-align: center;
+ pointer-events: none;
+ }
+
+ &__waybill-track-toolbar {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 10px;
+ align-items: center;
+ margin-bottom: 10px;
+ color: #606266;
+ font-size: 13px;
+ }
+
+ &__waybill-track-total {
+ color: #909399;
+ }
+
&__waybill-track-actions {
display: flex;
gap: 8px;
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index c325a2f..5d78d9e 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -70,7 +70,7 @@
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
- placeholder="YYYY-MM-DD"
+ placeholder="请输入"
/>
至
@@ -92,12 +92,12 @@