+
查询
+ placeholder="输入地址关键词"
+ @keyup.enter="searchRouteChangeMap"
+ />
+
+ 搜索
+
-
选择
-
关闭
+
+
+ {{ routeChangeMapStatus
+ }} 行政区划：{{ routeChangeMapSelected.regionName }}
+
+
+ 取消
+
+ 确定
+
+
+
@@ -1488,14 +1709,19 @@ import { getList as getPlanList } from '@/api/business/transport-plan';
import {
getList as getWaybillList,
getDetail as getWaybillDetail,
+ getPunchRecords as getWaybillPunchRecords,
} from '@/api/business/waybill-manage';
import { getList as getContractList } from '@/api/business/contract-manage';
import { getParentOptions as getCargoTypeOptions } from '@/api/base/cargo-type';
import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
import { getList as getDriverList } from '@/api/transportCapacity/driver';
import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
-import { getList as getProcessConfigList } from '@/api/business/process-config';
-import { getList as getCommonAddressList } from '@/api/base/common-address';
+import {
+ getList as getProcessConfigList,
+ getDetail as getProcessConfigDetail,
+ getVoucherImages as getProcessConfigVoucherImages,
+} from '@/api/business/process-config';
+import VoucherExecutionDetail from './components/voucher-execution-detail.vue';
import {
carrierTypeOptions,
loadingManageConfig,
@@ -1504,9 +1730,10 @@ import {
} from '@/option/business/loading-manage';
import { option as waybillOption } from '@/option/business/waybill-manage';
import { ElMessage, ElMessageBox } from 'element-plus';
-import { Location, Rank, Refresh, Setting } from '@element-plus/icons-vue';
+import { Location, Rank, Refresh, Search, Setting } from '@element-plus/icons-vue';
import dayjs from 'dayjs';
import { isMobile } from '@/utils/validate';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
const defaultTransportType = '';
const defaultCandidateTransportType = '';
@@ -1598,6 +1825,21 @@ const normalizeLoadingMileage = value => {
return value;
};
+// 货物等业务字段用 -1 表示未填写，展示时留空
+const blankCargoSentinel = value => {
+ if (value === undefined || value === null || value === '') return '';
+ if (Number(value) === -1) return '';
+ return value;
+};
+
+const sanitizeCargoRow = (row = {}) => {
+ const result = { ...row };
+ Object.keys(result).forEach(key => {
+ result[key] = blankCargoSentinel(result[key]);
+ });
+ return result;
+};
+
// 提交时未填写里程传 null，禁止自动填充 -1
const toSubmitMileage = value => {
const normalized = normalizeLoadingMileage(value);
@@ -1611,6 +1853,14 @@ const createCopiedDialogForm = (detail = {}) => {
Object.keys(form).forEach(prop => {
if (Object.prototype.hasOwnProperty.call(detail, prop)) form[prop] = detail[prop];
});
+ let taskInfo = {};
+ try {
+ const parsed = JSON.parse(form.taskInfoJson || '{}');
+ taskInfo = parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+ } catch (error) {
+ taskInfo = {};
+ }
+ const { routeChangeRecords, ...copiedTaskInfo } = taskInfo;
return {
...form,
id: '',
@@ -1620,7 +1870,7 @@ const createCopiedDialogForm = (detail = {}) => {
dataSource: '手工创建',
currentProcessNode: '接单',
mileage: normalizeLoadingMileage(form.mileage),
- taskInfoJson: '',
+ taskInfoJson: JSON.stringify(copiedTaskInfo),
businessStatus: 'draft',
};
};
@@ -1680,12 +1930,15 @@ const uniqueText = (rows, prop) =>
export default {
components: {
Rank,
+ Search,
+ VoucherExecutionDetail,
},
data() {
return {
Rank,
Location,
Refresh,
+ Search,
Setting,
loading: false,
tableSize: 'default',
@@ -1740,9 +1993,22 @@ export default {
statusOptions: loadingStatusOptions,
dataSourceOptions: loadingManageConfig.dataSourceOptions,
config: loadingManageConfig,
- processNodes: [],
- processProjectId: '',
- processProjectOptions: [],
+ processDetailTab: 'punch',
+ processWaybillId: '',
+ processWaybillOptions: [],
+ punchRecords: [],
+ punchRecordsLoading: false,
+ driverUploads: [],
+ hasRelatedVoucher: false,
+ voucherImages: [],
+ voucherFolders: [],
+ voucherFolder: null,
+ voucherFolderView: false,
+ voucherImagesLoading: false,
+ voucherImagesLoaded: false,
+ attachmentImagePreviewVisible: false,
+ attachmentImagePreviewUrls: [],
+ attachmentImagePreviewIndex: 0,
routeChangeVisible: false,
routeChangeTab: 'change',
routeChangeRows: [],
@@ -1750,12 +2016,18 @@ export default {
routeChangeRemark: '',
routeChangeRecords: [],
routeChangeDragIndex: -1,
- commonAddressVisible: false,
- commonAddressLoading: false,
- commonAddressRows: [],
- commonAddressQuery: { addressName: '' },
- commonAddressPage: { currentPage: 1, pageSize: 10, total: 0 },
- commonAddressTarget: null,
+ routeChangeOriginalAddresses: [],
+ routeChangeOrderDirty: false,
+ routeChangeMapVisible: false,
+ routeChangeMapLoading: false,
+ routeChangeMapKeyword: '',
+ routeChangeMapStatus: '可搜索地址或点击地图选点',
+ routeChangeMapSelected: {},
+ routeChangeMapSearchResults: [],
+ routeChangeMapTarget: null,
+ routeChangeMapInstance: null,
+ routeChangeMapMarker: null,
+ routeChangeMapGeocoder: null,
detailAmap: null,
};
},
@@ -1763,6 +2035,24 @@ export default {
dialogReadonly() {
return this.dialogMode === 'view';
},
+ // 打卡时间轴：已打卡按时间升序，未打卡保持原节点顺序排在其后
+ orderedPunchRecords() {
+ const records = Array.isArray(this.punchRecords) ? this.punchRecords : [];
+ return records
+ .map((record, index) => ({
+ record,
+ index,
+ punchedAt: this.punchRecordTimestamp(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);
+ },
taskCarrierPlaceholder() {
if (!this.selectedWaybillRows.length) return '请先选择运单';
if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
@@ -1789,6 +2079,13 @@ export default {
isSelfCarrierDetail() {
return String(this.dialogForm.carrierType || '').trim() === '自运';
},
+ isCarrierExecutionVoucher() {
+ if (String(this.dialogForm.carrierType || '').trim() === '承运商') return true;
+ const waybill = (this.selectedWaybillRows || []).find(
+ item => String(item.id) === String(this.processWaybillId)
+ );
+ return String(waybill?.carrierTypeName || waybill?.carrierType || '').trim() === '承运商';
+ },
detailTaskMileage() {
return normalizeLoadingMileage(this.dialogForm.mileage);
},
@@ -2283,7 +2580,10 @@ export default {
ElMessage.info('当前子运单暂无详情数据');
return;
}
- this.$router.push({ path: '/business/waybill-manage/detail', query: { id } });
+ this.$router.push({
+ path: '/business/waybill-manage/detail',
+ query: { id, name: '运单详情' },
+ });
},
formatRouteAddress(row, type) {
const prefix =
@@ -2457,6 +2757,7 @@ export default {
if (status === 'draft') {
return [
{ type: 'edit', label: '编辑' },
+ { type: 'copy', label: '复制' },
{ type: 'delete', label: '删除' },
];
}
@@ -2468,24 +2769,36 @@ export default {
if (row.driverRejected) {
actions.push({ type: 'reassign', label: '重新派单' });
}
- actions.push({ type: 'edit', label: '编辑' }, { type: 'cancel', label: '取消' });
+ actions.push(
+ { type: 'edit', label: '编辑' },
+ { type: 'copy', label: '复制' },
+ { type: 'cancel', label: '取消' }
+ );
return actions;
}
if (status === 'running') {
return [
{ type: 'view', label: '详情' },
{ type: 'complete', label: '完成' },
+ { type: 'copy', label: '复制' },
];
}
if (status === 'completed' || status === 'cancelled') {
- return [{ type: 'view', label: '详情' }];
+ return [
+ { type: 'view', label: '详情' },
+ { type: 'copy', label: '复制' },
+ ];
}
- return [{ type: 'view', label: '详情' }];
+ return [
+ { type: 'view', label: '详情' },
+ { type: 'copy', label: '复制' },
+ ];
},
handleRowAction(type, row) {
const actionMap = {
view: () => this.gotoLoadingDetail(row),
edit: () => this.openLoadingDialog('edit', row),
+ copy: () => this.gotoLoadingCopy(row),
reassign: () => this.gotoLoadingReassign(row),
delete: () => this.deleteLoading(row),
start: () => this.startLoading(row),
@@ -2507,6 +2820,18 @@ export default {
query: { id, name: '配载单详情' },
});
},
+ // 复制：进入新增页并带回原配载数据
+ gotoLoadingCopy(row = {}) {
+ const id = row.id || row.loadingId || row.loadingManageId;
+ if (!id) {
+ ElMessage.warning('配载单不存在，无法复制');
+ return;
+ }
+ this.$router.push({
+ path: '/business/loading-manage/form',
+ query: { mode: 'add', copyId: id, name: '新增配载管理' },
+ });
+ },
// 重新派单改为独立页面
gotoLoadingReassign(row = {}) {
if (!row.id) {
@@ -2585,10 +2910,11 @@ export default {
this.dialogForm.waybillIdsJson,
this.dialogForm.loadingSubNos
);
- this.syncProcessProjectOptions();
+ this.syncProcessWaybillOptions();
this.restoreRouteAndCargo();
this.restoreRouteChangeRecords();
- await this.loadProcessNodes();
+ this.loadPunchRecords();
+ this.probeHasRelatedVoucher();
this.$nextTick(() => this.initDetailAmap());
await this.loadCandidateWaybills();
} else {
@@ -2622,23 +2948,39 @@ export default {
this.candidatePage.currentPage = 1;
this.candidatePage.total = 0;
this.candidateSearchVisible = false;
- this.processNodes = [];
- this.processProjectId = '';
- this.processProjectOptions = [];
+ this.processDetailTab = 'punch';
+ this.processWaybillId = '';
+ this.processWaybillOptions = [];
+ this.punchRecords = [];
+ this.driverUploads = [];
+ this.hasRelatedVoucher = false;
+ this.voucherImages = [];
+ this.voucherFolders = [];
+ this.voucherFolder = null;
+ this.voucherFolderView = false;
+ this.voucherImagesLoading = false;
+ this.voucherImagesLoaded = false;
+ this.attachmentImagePreviewVisible = false;
+ this.attachmentImagePreviewUrls = [];
+ this.attachmentImagePreviewIndex = 0;
},
// 离开本页（标签缓存/卸载）时收起页内子弹窗，避免 append-to-body 的弹窗 DOM 残留在 body 上
closeInnerDialogs() {
this.routeChangeVisible = false;
- this.commonAddressVisible = false;
+ this.routeChangeMapVisible = false;
this.candidateSearchVisible = false;
},
restoreRouteAndCargo() {
const routeRows = parseJsonArray(this.dialogForm.routeJson);
const cargoRows = parseJsonArray(this.dialogForm.goodsJson);
this.routeNodes = routeRows.length
- ? routeRows
+ ? this.syncRouteNodeLockedFlags(routeRows, this.selectedWaybillRows)
: this.buildRouteNodes(this.selectedWaybillRows);
- this.cargoRows = cargoRows.length ? cargoRows : this.buildCargoRows(this.selectedWaybillRows);
+ this.cargoRows = (cargoRows.length ? cargoRows : this.buildCargoRows(this.selectedWaybillRows)).map(
+ row => sanitizeCargoRow(row)
+ );
+ // 运单回填时 routeNodes 尚为空会清空发到货地，路线恢复后需再同步
+ this.syncRouteAddressFields();
},
restoreRouteChangeRecords() {
try {
@@ -2652,70 +2994,177 @@ export default {
this.routeChangeRecords = [];
}
},
- async loadProcessNodes() {
- if (!this.processProjectId) {
- this.processNodes = [];
+ syncProcessWaybillOptions() {
+ this.processWaybillOptions = (this.selectedWaybillRows || [])
+ .filter(row => row?.id)
+ .map(row => ({
+ id: row.id,
+ waybillNo: row.waybillNo || String(row.id),
+ }));
+ const currentExists = this.processWaybillOptions.some(
+ item => String(item.id) === String(this.processWaybillId)
+ );
+ this.processWaybillId = currentExists
+ ? this.processWaybillId
+ : this.processWaybillOptions[0]?.id || '';
+ this.processDetailTab = 'punch';
+ this.resetVoucherState();
+ },
+ resetVoucherState() {
+ this.hasRelatedVoucher = false;
+ this.voucherImages = [];
+ this.voucherFolders = [];
+ this.voucherFolder = null;
+ this.voucherFolderView = false;
+ this.voucherImagesLoading = false;
+ this.voucherImagesLoaded = false;
+ },
+ handleProcessWaybillChange() {
+ this.processDetailTab = 'punch';
+ this.resetVoucherState();
+ this.loadPunchRecords();
+ this.probeHasRelatedVoucher();
+ },
+ handleProcessDetailTabChange(tab) {
+ if (tab === 'punch' || tab === 'driverUpload') this.loadPunchRecords();
+ if (tab === 'batchSupplement') this.loadVoucherImages();
+ },
+ probeHasRelatedVoucher() {
+ const waybillId = this.processWaybillId;
+ const waybill = (this.selectedWaybillRows || []).find(
+ row => String(row.id) === String(waybillId)
+ );
+ const projectId = waybill?.projectId;
+ if (!waybillId || !projectId) {
+ this.hasRelatedVoucher = false;
return;
}
- try {
- const projectId = String(this.processProjectId);
- const rows = unwrapRecords(
- await getProcessConfigList(1, 100, { projectIds: projectId, status: 1 })
- );
- const config =
- rows.find(item => {
- const projectIds = String(item.projectIds || '')
+ getProcessConfigList(1, 100, { projectIds: projectId, status: 1 })
+ .then(res => {
+ const config = unwrapRecords(res).find(row => {
+ const projectIds = String(row.projectIds || '')
.split(',')
- .map(value => value.trim())
- .filter(Boolean);
- return projectIds.includes(projectId) && item.nodeConfigJson;
- }) || {};
- this.processNodes = this.parseProcessConfigNodes(config);
- } catch (error) {
- this.processNodes = [];
- }
- },
- syncProcessProjectOptions() {
- const projectMap = new Map();
- this.selectedWaybillRows.forEach(row => {
- const id = row.projectId;
- if (!id || projectMap.has(String(id))) return;
- projectMap.set(String(id), {
- id,
- projectName: row.projectName || row.projectNames || String(id),
+ .map(item => item.trim());
+ return projectIds.includes(String(projectId));
+ });
+ if (!config?.id) {
+ this.hasRelatedVoucher = false;
+ return null;
+ }
+ return getProcessConfigDetail(config.id, waybillId);
+ })
+ .then(detailRes => {
+ if (!detailRes) return;
+ const detail = detailRes?.data?.data || detailRes?.data || {};
+ this.hasRelatedVoucher = Boolean(detail.hasRelatedVoucher);
+ })
+ .catch(() => {
+ this.hasRelatedVoucher = false;
});
- });
- if (!projectMap.size && this.dialogForm.projectId) {
- projectMap.set(String(this.dialogForm.projectId), {
- id: this.dialogForm.projectId,
- projectName: this.dialogForm.projectName || String(this.dialogForm.projectId),
- });
- }
- this.processProjectOptions = [...projectMap.values()];
- this.processProjectId = this.processProjectOptions[0]?.id || '';
},
- parseProcessConfigNodes(config = {}) {
- let nodes = [];
- try {
- const parsed =
- typeof config.nodeConfigJson === 'string'
- ? JSON.parse(config.nodeConfigJson)
- : config.nodeConfigJson;
- nodes = Array.isArray(parsed) ? parsed : parsed?.nodes || [];
- } catch (error) {
- nodes = [];
- }
- const includedNodes = String(config.includedNodes || '')
- .split(',')
- .map(value => value.trim())
- .filter(Boolean);
- return nodes.filter(
- node =>
- node.enabled !== false && (!includedNodes.length || includedNodes.includes(node.name))
+ punchRecordTimestamp(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 = dayjs(text);
+ if (parsed.isValid()) return parsed.valueOf();
+ const fallback = new Date(text.replace(/-/g, '/')).getTime();
+ return Number.isNaN(fallback) ? null : fallback;
+ },
+ loadPunchRecords() {
+ const waybillId = this.processWaybillId;
+ if (!waybillId || this.punchRecordsLoading) return;
+ this.punchRecordsLoading = true;
+ getWaybillPunchRecords(waybillId)
+ .then(res => {
+ const data = res?.data?.data || res?.data || {};
+ this.punchRecords = Array.isArray(data.records) ? data.records : [];
+ this.driverUploads = Array.isArray(data.driverUploads) ? data.driverUploads : [];
+ if (data.hasRelatedVoucher) this.hasRelatedVoucher = true;
+ })
+ .catch(() => {
+ this.punchRecords = [];
+ this.driverUploads = [];
+ })
+ .finally(() => {
+ this.punchRecordsLoading = false;
+ });
+ },
+ previewDriverUploadPhoto(photos, index) {
+ const list = (photos || []).map(item => item?.url).filter(Boolean);
+ if (!list.length) return;
+ this.attachmentImagePreviewUrls = list;
+ this.attachmentImagePreviewIndex = Math.min(
+ Math.max(Number(index) || 0, 0),
+ list.length - 1
);
+ this.attachmentImagePreviewVisible = true;
},
- async handleProcessProjectChange() {
- await this.loadProcessNodes();
+ loadVoucherImages() {
+ if (!this.processWaybillId || this.voucherImagesLoading || this.voucherImagesLoaded) {
+ return;
+ }
+ this.voucherImagesLoading = true;
+ getProcessConfigVoucherImages(this.processWaybillId)
+ .then(res => {
+ this.voucherImages = unwrapRecords(res);
+ this.voucherFolders = this.voucherImages.filter(item => this.isVoucherFolder(item));
+ this.voucherFolder = null;
+ this.voucherFolderView = false;
+ if (this.voucherImages.length) this.hasRelatedVoucher = true;
+ this.voucherImagesLoaded = true;
+ })
+ .finally(() => {
+ this.voucherImagesLoading = false;
+ });
+ },
+ isVoucherFolder(item) {
+ return Boolean(item && (item.isFolder === true || item.type === 'folder'));
+ },
+ voucherFolderName(folder) {
+ return folder?.folderName || folder?.name || folder?.plateNo || '凭证文件夹';
+ },
+ openVoucherFolder(folder) {
+ if (!this.processWaybillId || !this.isVoucherFolder(folder)) return;
+ if (!folder.voucherId || !folder.folderName) {
+ ElMessage.warning('凭证文件夹信息不完整');
+ return;
+ }
+ this.voucherImagesLoading = true;
+ getProcessConfigVoucherImages(this.processWaybillId, {
+ voucherId: folder.voucherId,
+ folderName: folder.folderName,
+ })
+ .then(res => {
+ this.voucherFolder = folder;
+ this.voucherFolderView = true;
+ this.voucherImages = unwrapRecords(res).filter(item => !this.isVoucherFolder(item));
+ })
+ .finally(() => {
+ this.voucherImagesLoading = false;
+ });
+ },
+ backToVoucherFolders() {
+ this.voucherFolder = null;
+ this.voucherFolderView = false;
+ this.voucherImages = this.voucherFolders;
+ },
+ previewVoucherImage(index) {
+ const list = (this.voucherImages || [])
+ .filter(item => !this.isVoucherFolder(item))
+ .map(item => item?.url)
+ .filter(Boolean);
+ if (!list.length) return;
+ const current = this.voucherImages[index];
+ const currentUrl = current?.url;
+ const currentIndex = Math.max(
+ 0,
+ list.findIndex(url => url === currentUrl)
+ );
+ this.attachmentImagePreviewUrls = list;
+ this.attachmentImagePreviewIndex = currentIndex >= 0 ? currentIndex : 0;
+ this.attachmentImagePreviewVisible = true;
},
previewAttachment(file) {
if (!file.url) {
@@ -2760,9 +3209,6 @@ export default {
handleTrackAction(action) {
ElMessage.info(action === 'playback' ? '暂无可回放的物流轨迹' : '暂无车辆实时定位数据');
},
- handleProcessAction(action) {
- ElMessage.info(action === 'supplement' ? '补录执行功能暂未接入' : '批量补录功能暂未接入');
- },
openRouteChangeDialog() {
this.routeChangeTab = 'change';
this.routeChangeRemark = '';
@@ -2773,7 +3219,18 @@ export default {
departureAddress: row.departureAddress || row.departureName || '',
arrivalAddress: row.arrivalAddress || row.arrivalName || '',
}));
- this.routeChangeNodes = this.buildRouteNodes(this.routeChangeRows);
+ const builtNodes = this.buildRouteNodes(this.routeChangeRows);
+ this.routeChangeNodes = this.routeNodes.length
+ ? this.syncRouteNodeLockedFlags(
+ this.routeNodes.map(node => ({
+ ...node,
+ tags: [...(node.tags || [])],
+ })),
+ this.routeChangeRows
+ )
+ : builtNodes;
+ this.routeChangeOriginalAddresses = this.routeChangeNodes.map(node => node.address);
+ this.routeChangeOrderDirty = false;
this.routeChangeVisible = true;
},
routeChangeTypeText(index) {
@@ -2787,53 +3244,241 @@ export default {
return 'middle';
},
handleRouteChangeDragStart(index) {
+ if (this.isRouteChangeNodeLocked(this.routeChangeNodes[index])) {
+ this.routeChangeDragIndex = -1;
+ return;
+ }
this.routeChangeDragIndex = index;
},
handleRouteChangeDrop(index) {
if (this.routeChangeDragIndex < 0 || this.routeChangeDragIndex === index) return;
+ if (
+ this.isRouteChangeNodeLocked(this.routeChangeNodes[this.routeChangeDragIndex]) ||
+ this.isRouteChangeNodeLocked(this.routeChangeNodes[index])
+ ) {
+ this.routeChangeDragIndex = -1;
+ return;
+ }
const nodes = [...this.routeChangeNodes];
const [node] = nodes.splice(this.routeChangeDragIndex, 1);
nodes.splice(index, 0, node);
+ const originalLockedKeys = this.routeChangeNodes.map(item =>
+ this.isRouteChangeNodeLocked(item) ? item.key : null
+ );
+ const nextLockedKeys = nodes.map(item =>
+ this.isRouteChangeNodeLocked(item) ? item.key : null
+ );
+ if (
+ originalLockedKeys.some((key, lockedIndex) => key && key !== nextLockedKeys[lockedIndex])
+ ) {
+ ElMessage.warning('已完成运单对应的路线不可调整');
+ this.routeChangeDragIndex = -1;
+ return;
+ }
this.routeChangeNodes = nodes;
+ this.routeChangeOrderDirty = true;
this.routeChangeDragIndex = -1;
},
updateRouteChangeNodes() {
- this.routeChangeNodes = this.buildRouteNodes(this.routeChangeRows);
+ const previousAddresses = this.routeChangeNodes.map(node => node.address);
+ const builtNodes = this.buildRouteNodes(this.routeChangeRows);
+ const remaining = [...builtNodes];
+ const orderedNodes = [];
+ previousAddresses.forEach(address => {
+ const index = remaining.findIndex(node => node.address === address);
+ if (index >= 0) {
+ orderedNodes.push(remaining.splice(index, 1)[0]);
+ }
+ });
+ this.routeChangeNodes = [...orderedNodes, ...remaining];
},
- openCommonAddressDialog(row, field) {
- this.commonAddressTarget = { row, field };
- this.commonAddressQuery = { addressName: '' };
- this.commonAddressPage.currentPage = 1;
- this.commonAddressVisible = true;
- this.loadCommonAddresses();
+ isRouteChangeOrderChanged() {
+ if (!this.routeChangeOrderDirty) return false;
+ const currentAddresses = this.routeChangeNodes.map(node => node.address);
+ if (currentAddresses.length !== this.routeChangeOriginalAddresses.length) return true;
+ return currentAddresses.some(
+ (address, index) => address !== this.routeChangeOriginalAddresses[index]
+ );
},
- async loadCommonAddresses() {
- this.commonAddressLoading = true;
- try {
- const page = unwrapPage(
- await getCommonAddressList(
- this.commonAddressPage.currentPage,
- this.commonAddressPage.pageSize,
- { ...this.commonAddressQuery, allDept: 0 }
- )
- );
- this.commonAddressRows = page.records;
- this.commonAddressPage.total = page.total;
- } finally {
- this.commonAddressLoading = false;
+ formatRouteChangeOrderText(addresses = []) {
+ return addresses.filter(Boolean).join(' → ') || '-';
+ },
+ isWaybillCompleted(row = {}) {
+ const status = String(row.businessStatus || row.status || row.waybillStatus || '');
+ if (status === 'completed') return true;
+ const statusName = String(row.businessStatusName || row.statusName || '');
+ return statusName.includes('已完成');
+ },
+ isRouteChangeNodeLocked(node = {}) {
+ return Boolean(node?.locked);
+ },
+ syncRouteNodeLockedFlags(nodes = [], rows = this.selectedWaybillRows) {
+ return (nodes || []).map(node => {
+ const locked = (node.tags || []).some(tag => {
+ const match = String(tag).match(/^(装|卸)(\d+)$/);
+ if (!match) return false;
+ const row = rows[Number(match[2]) - 1];
+ return row ? this.isWaybillCompleted(row) : false;
+ });
+ return { ...node, locked };
+ });
+ },
+ openRouteChangeMapDialog(row, field) {
+ if (this.isWaybillCompleted(row)) return;
+ this.routeChangeMapTarget = { row, field };
+ this.routeChangeMapKeyword = row[`${field}Address`] || row[`${field}Name`] || '';
+ this.routeChangeMapSelected = {
+ longitude: row[`${field}Longitude`] || '',
+ latitude: row[`${field}Latitude`] || '',
+ detailAddress: this.routeChangeMapKeyword,
+ regionName: row[`${field}Name`] || '',
+ regionCode: row[`${field}RegionCode`] || '',
+ };
+ this.routeChangeMapSearchResults = [];
+ this.routeChangeMapStatus = this.routeChangeMapSelected.longitude
+ ? '已加载当前选点，可重新选点'
+ : '可搜索地址或点击地图选点';
+ this.routeChangeMapVisible = true;
+ },
+ initRouteChangeMap() {
+ this.loadDetailAmap()
+ .then(() =>
+ this.$nextTick(() => {
+ if (!this.$refs.routeChangeMap) return;
+ const center = this.routeChangeMapSelected.longitude
+ ? [
+ Number(this.routeChangeMapSelected.longitude),
+ Number(this.routeChangeMapSelected.latitude),
+ ]
+ : [116.40769, 39.89945];
+ if (!this.routeChangeMapInstance) {
+ this.routeChangeMapInstance = new window.AMap.Map(this.$refs.routeChangeMap, {
+ center,
+ zoom: this.routeChangeMapSelected.longitude ? 14 : 11,
+ });
+ window.AMap.plugin(['AMap.Geocoder'], () => {
+ this.routeChangeMapGeocoder = new window.AMap.Geocoder();
+ });
+ this.routeChangeMapInstance.on('click', event =>
+ this.pickRouteChangeMap(event.lnglat)
+ );
+ } else {
+ this.routeChangeMapInstance.resize();
+ }
+ if (this.routeChangeMapSelected.longitude) {
+ this.renderRouteChangeMapMarker(center);
+ }
+ })
+ )
+ .catch(() => ElMessage.error('高德地图组件加载失败'));
+ },
+ destroyRouteChangeMap() {
+ this.routeChangeMapMarker?.setMap?.(null);
+ this.routeChangeMapMarker = null;
+ this.routeChangeMapInstance?.destroy?.();
+ this.routeChangeMapInstance = null;
+ this.routeChangeMapGeocoder = null;
+ this.routeChangeMapSearchResults = [];
+ this.routeChangeMapTarget = null;
+ },
+ ensureRouteChangeMapGeocoder() {
+ if (this.routeChangeMapGeocoder) return Promise.resolve(this.routeChangeMapGeocoder);
+ return new Promise(resolve => {
+ window.AMap.plugin(['AMap.Geocoder'], () => {
+ this.routeChangeMapGeocoder = new window.AMap.Geocoder();
+ resolve(this.routeChangeMapGeocoder);
+ });
+ });
+ },
+ searchRouteChangeMap() {
+ const keyword = String(this.routeChangeMapKeyword || '').trim();
+ if (!keyword) {
+ ElMessage.warning('请输入地址关键词');
+ return;
+ }
+ if (this.routeChangeMapLoading) return;
+ this.routeChangeMapSearchResults = [];
+ this.routeChangeMapLoading = true;
+ this.loadDetailAmap()
+ .then(() => searchAmapPlaceText(keyword))
+ .then(pois => {
+ this.routeChangeMapSearchResults = normalizeMapSearchResults(pois, keyword);
+ const first = this.routeChangeMapSearchResults[0];
+ if (!first?.location) {
+ this.routeChangeMapStatus = '未找到匹配地址';
+ ElMessage.warning('地图搜索无匹配地址');
+ return;
+ }
+ return this.$nextTick().then(() => {
+ this.pickRouteChangeMap(first.location, first.address || first.name || keyword);
+ });
+ })
+ .catch(() => {
+ this.routeChangeMapStatus = '未找到匹配地址';
+ ElMessage.warning('地图搜索无匹配地址');
+ })
+ .finally(() => {
+ this.routeChangeMapLoading = false;
+ });
+ },
+ selectRouteChangeMapSearchResult(item) {
+ if (item?.location) {
+ this.pickRouteChangeMap(item.location, item.address || item.name || '');
}
},
- selectCommonAddress(address) {
- const target = this.commonAddressTarget;
- if (!target) return;
- target.row[`${target.field}Address`] =
- [address.regionName, address.detailAddress || address.addressName]
- .filter(Boolean)
- .join('') ||
- address.addressName ||
- '';
+ pickRouteChangeMap(point, keyword) {
+ const longitude = point.getLng ? point.getLng() : point.lng;
+ const latitude = point.getLat ? point.getLat() : point.lat;
+ this.routeChangeMapSelected = {
+ longitude,
+ latitude,
+ detailAddress: keyword || this.routeChangeMapKeyword,
+ regionName: '',
+ regionCode: '',
+ };
+ this.renderRouteChangeMapMarker([longitude, latitude]);
+ this.routeChangeMapStatus = '已选点，可确认回填';
+ this.ensureRouteChangeMapGeocoder().then(() => {
+ this.routeChangeMapGeocoder.getAddress([longitude, latitude], (status, result) => {
+ if (status !== 'complete') return;
+ const component = result.regeocode?.addressComponent || {};
+ this.routeChangeMapSelected = {
+ ...this.routeChangeMapSelected,
+ detailAddress:
+ result.regeocode?.formattedAddress || this.routeChangeMapSelected.detailAddress,
+ regionName: [component.province, component.city, component.district]
+ .filter(Boolean)
+ .join(''),
+ regionCode: component.adcode || '',
+ };
+ this.routeChangeMapKeyword = this.routeChangeMapSelected.detailAddress;
+ this.routeChangeMapStatus = '已解析地址，可确认回填';
+ });
+ });
+ },
+ renderRouteChangeMapMarker(position) {
+ if (!this.routeChangeMapInstance) return;
+ this.routeChangeMapMarker?.setMap?.(null);
+ this.routeChangeMapMarker = new window.AMap.Marker({ position });
+ this.routeChangeMapMarker.setMap(this.routeChangeMapInstance);
+ this.routeChangeMapInstance.setCenter(position);
+ },
+ confirmRouteChangeMap() {
+ const target = this.routeChangeMapTarget;
+ if (!target || !this.routeChangeMapSelected.longitude) return;
+ const { row, field } = target;
+ row[`${field}Address`] =
+ this.routeChangeMapSelected.detailAddress || this.routeChangeMapKeyword || '';
+ if (this.routeChangeMapSelected.regionName) {
+ row[`${field}Name`] = this.routeChangeMapSelected.regionName;
+ }
+ row[`${field}Longitude`] = this.routeChangeMapSelected.longitude;
+ row[`${field}Latitude`] = this.routeChangeMapSelected.latitude;
+ if (this.routeChangeMapSelected.regionCode) {
+ row[`${field}RegionCode`] = this.routeChangeMapSelected.regionCode;
+ }
this.updateRouteChangeNodes();
- this.commonAddressVisible = false;
+ this.routeChangeMapVisible = false;
},
async confirmRouteChange() {
const changeRows = this.routeChangeRows.filter(
@@ -2841,19 +3486,34 @@ export default {
row.departureAddress !== row.originalDepartureAddress ||
row.arrivalAddress !== row.originalArrivalAddress
);
- if (!changeRows.length && !this.routeChangeRemark) {
- ElMessage.warning('请修改地址或填写变更备注');
+ const orderChanged = this.isRouteChangeOrderChanged();
+ if (!changeRows.length && !orderChanged && !this.routeChangeRemark) {
+ ElMessage.warning('请修改地址、调整路线顺序或填写变更备注');
return;
}
- const content =
- changeRows
- .map(
- row =>
- `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress} → ${
- row.departureAddress
- }；到货地 ${row.originalArrivalAddress} → ${row.arrivalAddress}`
- )
- .join('；') || '调整运输路线顺序';
+ const contentParts = [];
+ if (changeRows.length) {
+ contentParts.push(
+ changeRows
+ .map(
+ row =>
+ `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress} → ${
+ row.departureAddress
+ }；到货地 ${row.originalArrivalAddress} → ${row.arrivalAddress}`
+ )
+ .join('；')
+ );
+ }
+ if (orderChanged) {
+ contentParts.push(
+ `路线顺序：${this.formatRouteChangeOrderText(
+ this.routeChangeOriginalAddresses
+ )} 调整为 ${this.formatRouteChangeOrderText(
+ this.routeChangeNodes.map(node => node.address)
+ )}`
+ );
+ }
+ const content = contentParts.join('；') || '调整运输路线顺序';
this.routeChangeRecords.unshift({
changeTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
changeUser: '当前用户',
@@ -2915,7 +3575,8 @@ export default {
try {
const query = {
...this.buildQueryParams(this.candidateQuery),
- businessStatus: 'pending',
+ // 待执行（需接单未接）与进行中（无需接单或已接单）均可配载
+ businessStatus: 'pending,running',
onlyUnassignedLoading: 1,
// 仅查当前账户所属组织及子组织下的运单
allDept: 0,
@@ -3035,22 +3696,41 @@ export default {
this.routeNodes = this.buildRouteNodes(rows);
}
this.cargoRows = this.buildCargoRows(rows);
- this.syncRouteAddressFields();
+ // 编辑回填阶段 routeNodes 尚未恢复时跳过，避免清空已有发到货地
+ if (rebuildRoute || this.routeNodes.length) {
+ this.syncRouteAddressFields();
+ }
},
buildRouteNodes(rows) {
const nodeMap = new Map();
- const appendNode = (address, displayAddress, tag) => {
+ const appendNode = (address, displayAddress, tag, locked) => {
if (!address) return;
- if (!nodeMap.has(address)) nodeMap.set(address, { address, displayAddress, tags: [] });
- nodeMap.get(address).tags.push(tag);
+ if (!nodeMap.has(address)) {
+ nodeMap.set(address, { address, displayAddress, tags: [], locked: false });
+ }
+ const node = nodeMap.get(address);
+ node.tags.push(tag);
+ if (locked) node.locked = true;
};
rows.forEach((row, rowIndex) => {
+ const locked = this.isWaybillCompleted(row);
const departure = row.departureAddress || row.departureName;
- appendNode(departure, this.formatCandidateAddress(row, 'departure'), `装${rowIndex + 1}`);
+ appendNode(
+ departure,
+ this.formatCandidateAddress(row, 'departure'),
+ `装${rowIndex + 1}`,
+ locked
+ );
});
rows.forEach((row, rowIndex) => {
+ const locked = this.isWaybillCompleted(row);
const arrival = row.arrivalAddress || row.arrivalName;
- appendNode(arrival, this.formatCandidateAddress(row, 'arrival'), `卸${rowIndex + 1}`);
+ appendNode(
+ arrival,
+ this.formatCandidateAddress(row, 'arrival'),
+ `卸${rowIndex + 1}`,
+ locked
+ );
});
return [...nodeMap.values()].map((node, index) => ({
...node,
@@ -3068,13 +3748,37 @@ export default {
return 'middle';
},
handleRouteDragStart(index) {
+ if (this.dialogReadonly || this.isRouteChangeNodeLocked(this.routeNodes[index])) {
+ this.routeDragIndex = -1;
+ return;
+ }
this.routeDragIndex = index;
},
handleRouteDrop(index) {
- if (this.routeDragIndex < 0 || this.routeDragIndex === index) return;
+ if (this.dialogReadonly || this.routeDragIndex < 0 || this.routeDragIndex === index) return;
+ if (
+ this.isRouteChangeNodeLocked(this.routeNodes[this.routeDragIndex]) ||
+ this.isRouteChangeNodeLocked(this.routeNodes[index])
+ ) {
+ this.routeDragIndex = -1;
+ return;
+ }
const rows = [...this.routeNodes];
const [target] = rows.splice(this.routeDragIndex, 1);
rows.splice(index, 0, target);
+ const originalLockedKeys = this.routeNodes.map(item =>
+ this.isRouteChangeNodeLocked(item) ? item.key : null
+ );
+ const nextLockedKeys = rows.map(item =>
+ this.isRouteChangeNodeLocked(item) ? item.key : null
+ );
+ if (
+ originalLockedKeys.some((key, lockedIndex) => key && key !== nextLockedKeys[lockedIndex])
+ ) {
+ ElMessage.warning('已完成运单对应的路线不可调整');
+ this.routeDragIndex = -1;
+ return;
+ }
this.routeDragIndex = -1;
if (!this.validateRouteEndpoints(rows)) return;
this.routeNodes = rows;
@@ -3112,7 +3816,7 @@ export default {
});
},
normalizeCargoRow(waybill, item = {}) {
- return {
+ return sanitizeCargoRow({
projectName: item.projectName || waybill.projectName || '',
cargoName: item.cargoName || item.goodsName || waybill.cargoName || '',
cargoType: item.cargoType || item.goodsType || waybill.cargoType || '',
@@ -3147,7 +3851,7 @@ export default {
waybill.specificationModel ||
'',
remark: item.remark || '',
- };
+ });
},
applyLoadingMileageFromDetail(form = this.dialogForm) {
let taskMileage = '';
@@ -3302,6 +4006,8 @@ export default {
};
this.applyLoadingMileageFromDetail(this.dialogForm);
ElMessage.success('暂存成功');
+ sessionStorage.setItem(loadingManageListRefreshKey, '1');
+ this.closeLoadingDialog();
this.loadTable();
} finally {
this.dialogSaving = '';
@@ -3944,6 +4650,12 @@ export default {
border: 1px solid #eff1f7;
background: #fff;
cursor: move;
+
+ &.is-locked {
+ cursor: not-allowed;
+ background: #f5f7fa;
+ color: #909399;
+ }
}
.loading-manage-dialog__route-handle {
@@ -4193,7 +4905,74 @@ export default {
gap: 8px;
}
.loading-detail__process-actions .el-select {
- width: 180px;
+ width: 200px;
+ }
+ .loading-detail__punch-record {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ }
+ .loading-detail__punch-record-title {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ font-size: 14px;
+ font-weight: 600;
+ color: #303133;
+ }
+ .loading-detail__punch-record-line {
+ font-size: 13px;
+ color: #606266;
+
+ span + span {
+ margin-left: 12px;
+ }
+ }
+ .loading-detail__punch-record-photos,
+ .loading-detail__driver-upload-grid,
+ .loading-detail__voucher-image-grid {
+ display: grid;
+ grid-template-columns: repeat(5, minmax(0, 1fr));
+ gap: 10px;
+ margin-top: 4px;
+ min-height: 80px;
+ }
+ .loading-detail__driver-upload-item,
+ .loading-detail__voucher-image-item {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ cursor: pointer;
+
+ .el-image {
+ display: block;
+ width: 100%;
+ aspect-ratio: 1;
+ border: 1px solid #eff1f7;
+ border-radius: 4px;
+ overflow: hidden;
+ background: #f5f7fa;
+ }
+ }
+ .loading-detail__voucher-image-item--folder .el-image {
+ aspect-ratio: auto;
+ padding: 12px;
+ background: transparent;
+ border: none;
+ }
+ .loading-detail__driver-upload-label,
+ .loading-detail__voucher-folder-name {
+ font-size: 12px;
+ color: #606266;
+ line-height: 18px;
+ text-align: center;
+ word-break: break-all;
+ }
+ .loading-detail__voucher-folder-toolbar {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-bottom: 8px;
}
.loading-detail__map {
width: 100%;
@@ -4201,12 +4980,25 @@ export default {
border: 1px solid #eff1f7;
}
}
+:global(.loading-route-change-dialog .el-dialog__body) {
+ background: #fff;
+}
.loading-route-change-dialog {
.loading-route-change-dialog__original {
color: #a8abb2;
line-height: 20px;
margin-bottom: 4px;
}
+ .loading-route-change-dialog__address-row {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ .el-input {
+ flex: 1;
+ min-width: 0;
+ }
+ }
.loading-route-change-dialog__location {
cursor: pointer;
color: #909399;
@@ -4227,6 +5019,16 @@ export default {
padding: 10px 12px;
background: #f5f6f7;
cursor: move;
+
+ &.is-locked {
+ cursor: not-allowed;
+ background: #eef0f3;
+ color: #909399;
+ }
+ }
+ .loading-route-change-dialog__route-handle-placeholder {
+ width: 14px;
+ height: 14px;
}
.loading-route-change-dialog__route-type {
width: 30px;
@@ -4255,13 +5057,26 @@ export default {
line-height: 22px;
}
}
-.loading-common-address-dialog__toolbar {
- display: flex;
- gap: 8px;
- margin-bottom: 12px;
-}
-.loading-common-address-dialog__toolbar .el-input {
- flex: 1;
+.loading-route-change-map-dialog {
+ .loading-route-change-map-dialog__toolbar {
+ display: flex;
+ gap: 8px;
+ margin-bottom: 12px;
+
+ .el-input {
+ flex: 1;
+ min-width: 0;
+ }
+ }
+ .loading-route-change-map-dialog__map {
+ width: 100%;
+ min-width: 0;
+ height: 440px;
+ }
+ .loading-route-change-map-dialog__status {
+ margin-top: 8px;
+ color: #606266;
+ }
}
:global(.loading-manage-form-page) {
width: 100%;
diff --git a/src/views/business/master-order.vue b/src/views/business/master-order.vue
index 5642ebf..64d5a94 100644
--- a/src/views/business/master-order.vue
+++ b/src/views/business/master-order.vue
@@ -70,6 +70,8 @@
{{ row.projectName || '-' }}
{{ timeRange(row) }}
{{ goodsSummary(row) }}
+
创建人：{{ row.createUserName || '-' }}
+
创建时间：{{ row.createTime || '-' }}
diff --git a/src/views/business/process-config.vue b/src/views/business/process-config.vue
index f3147c0..05ef0be 100644
--- a/src/views/business/process-config.vue
+++ b/src/views/business/process-config.vue
@@ -416,7 +416,7 @@ import { getList as getProjectList } from '@/api/business/project-apply';
import { getDeptTree } from '@/api/system/dept';
import { exportBlob } from '@/api/common';
import { config, option } from '@/option/business/process-config';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
import { mapGetters } from 'vuex';
import NProgress from 'nprogress';
@@ -524,10 +524,7 @@ export default {
};
},
isAdmin() {
- const authority = this.userInfo && this.userInfo.authority;
- return Array.isArray(authority)
- ? authority.includes('admin')
- : String(authority || '').includes('admin');
+ return isAdministrator(this.userInfo);
},
ids() {
return this.selectionList.map(item => item.id).join(',');
@@ -696,7 +693,7 @@ export default {
return getProjectList(1, 50, {
projectName: keyword,
approvalStatus: 'approved',
- allDept: 0,
+ allDept: this.isAdmin ? 1 : 0,
})
.then(res => {
const data = res.data.data || {};
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index a4a10f4..0b4dc50 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -911,9 +911,10 @@ import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
import { getDictionary as getSystemDictionary } from '@/api/system/dict';
import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
import { getList as getUserList } from '@/api/system/user';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
import { downloadFileByUrl, downloadXls } from '@/utils/util';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
import { ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue';
import PdfPreview from '@/components/pdf-preview/main.vue';
@@ -1008,6 +1009,10 @@ const attachmentViewerPlugins = [
fallbackPlugin(),
];
+const projectApplyListRoute = '/business/project-apply';
+const projectApplyFormRoute = '/business/project-apply/form';
+const projectApplyListRefreshKey = 'project-apply-list-refresh';
+
const otherAttachmentType = { label: '其他附件', value: '其他附件' };
const normalProjectAttachmentTypeOptions = [
@@ -1113,6 +1118,7 @@ export default {
// 否则 isProjectFormPage 变 false 后容器会从 div 切成 el-dialog（append-to-body），
// 盖住后续打开的页面（如客商档案）。
isFormPageInstance: false,
+ mkEnabled: false,
projectBox: false,
dialogType: 'add',
dialogReadonly: false,
@@ -1280,10 +1286,7 @@ export default {
};
},
isAdmin() {
- const authority = this.userInfo && this.userInfo.authority;
- return Array.isArray(authority)
- ? authority.includes('admin')
- : String(authority || '').includes('admin');
+ return isAdministrator(this.userInfo);
},
canViewAllDept() {
return this.isAdmin;
@@ -1358,16 +1361,26 @@ export default {
},
},
created() {
+ if (this.isAdmin) {
+ this.allDept = 1;
+ }
if (this.isPublicViewPage) {
this.isFormPageInstance = true;
this.openPublicProjectForm();
return;
}
+ loadMkEnabled()
+ .then(enabled => {
+ this.mkEnabled = !!enabled;
+ })
+ .catch(() => {
+ this.mkEnabled = false;
+ });
this.loadDeptOptions();
this.loadCargoTypeOptions();
this.loadTransportTypeOptions();
this.loadSettlementModeOptions();
- if (this.$route.path === '/business/project-apply/form') {
+ if (this.$route.path === projectApplyFormRoute) {
this.isFormPageInstance = true;
this.openProjectFormPage();
}
@@ -1377,10 +1390,32 @@ export default {
deactivated() {
this.closeInnerDialogs();
},
+ activated() {
+ if (this.isFormPageInstance || this.isPublicViewPage) return;
+ if (sessionStorage.getItem(projectApplyListRefreshKey)) {
+ sessionStorage.removeItem(projectApplyListRefreshKey);
+ this.onLoad(this.page, this.query);
+ }
+ },
beforeUnmount() {
this.closeInnerDialogs();
},
+ watch: {
+ $route(to, from) {
+ if (this.isFormPageInstance || this.isPublicViewPage) return;
+ if (
+ to.path === projectApplyListRoute &&
+ from?.path?.includes('/project-apply/form')
+ ) {
+ sessionStorage.removeItem(projectApplyListRefreshKey);
+ this.onLoad(this.page, this.query);
+ }
+ },
+ },
methods: {
+ markProjectApplyListNeedRefresh() {
+ sessionStorage.setItem(projectApplyListRefreshKey, '1');
+ },
closeInnerDialogs() {
this.changeRecordDetailVisible = false;
this.attachmentDocumentPreviewVisible = false;
@@ -1506,7 +1541,9 @@ export default {
},
closeProjectForm() {
if (this.isProjectFormPage) {
- this.$router.push('/business/project-apply');
+ this.markProjectApplyListNeedRefresh();
+ this.$router.$avueRouter?.closeTag?.();
+ this.$router.push(projectApplyListRoute);
} else {
this.projectBox = false;
}
@@ -1535,7 +1572,11 @@ export default {
);
},
customOperations(row) {
- return (this.config.operations || []).filter(operation => this.canOperation(operation, row));
+ return (this.config.operations || []).filter(operation => {
+ if (operation.mkOnly && !this.mkEnabled) return false;
+ if (operation.localOnly && this.mkEnabled) return false;
+ return this.canOperation(operation, row);
+ });
},
canOperation(operation, row) {
const permission = operation.permission || `${this.config.permission}_${operation.action}`;
@@ -1661,6 +1702,10 @@ export default {
this.openProjectDialog('change', row);
return;
}
+ if (operation.action === 'mkAudit') {
+ this.handleMkAudit(row);
+ return;
+ }
const run = value => {
const args = operation.prompt ? [row.id, value] : [row.id];
const request = () => this.api[operation.action](...args);
@@ -1668,7 +1713,7 @@ export default {
operation.action === 'submitApproval'
? submitMkApprovalFlow({
bizType: 'project-apply',
- formInstanceId: row.id,
+ bizId: row.id,
subjectName: row.projectName || '',
approvalStatus: row.approvalStatus || '',
}).then(() => request())
@@ -1697,6 +1742,24 @@ export default {
type: 'warning',
}).then(() => run());
},
+ handleMkAudit(row) {
+ if (!row?.id) {
+ this.$message.warning('项目ID为空，无法打开审核页');
+ return;
+ }
+ getMKApprovalUrl({ bizId: String(row.id) })
+ .then(res => {
+ const url = res?.data?.data;
+ if (!url) {
+ this.$message.error('获取审核跳转地址失败');
+ return;
+ }
+ window.open(url, '_blank');
+ })
+ .catch(() => {
+ this.$message.error('获取审核跳转地址失败');
+ });
+ },
buildExportParams() {
return {
...this.query,
@@ -1736,7 +1799,7 @@ export default {
else if (type === 'view') query.name = `查看${this.config.title}`;
else if (type === 'majorSupplement') query.name = '重大项目补录';
else if (type === 'change') query.name = '项目变更';
- this.$router.push({ path: '/business/project-apply/form', query });
+ this.$router.push({ path: projectApplyFormRoute, query });
},
resetProjectDialog() {
this.$refs.projectForm?.clearValidate();
@@ -1844,7 +1907,8 @@ export default {
const data = res.data?.data || {};
const id = data.id || this.form.id;
const name = data.projectName || this.form.projectName || '';
- const status = data.approvalStatus || this.form.approvalStatus || '';
+ // 必须用提交前状态：业务 submit 后可能已变成 reviewing，导致无法识别「通过后再提交」
+ const status = this.form.approvalStatus || data.approvalStatus || '';
if (!id) {
this.$message.success('操作成功!');
this.closeProjectForm();
@@ -1853,7 +1917,7 @@ export default {
}
return submitMkApprovalFlow({
bizType: 'project-apply',
- formInstanceId: id,
+ bizId: id,
subjectName: name,
approvalStatus: status,
}).then(() => {
@@ -1924,7 +1988,7 @@ export default {
const id = this.form.id;
return submitMkApprovalFlow({
bizType: 'project-apply',
- formInstanceId: id,
+ bizId: id,
subjectName: this.form.projectName || '',
approvalStatus: this.form.approvalStatus || 'change_rejected',
}).then(() => {
diff --git a/src/views/business/temporary-credit-limit.vue b/src/views/business/temporary-credit-limit.vue
index 490706f..0fdb589 100644
--- a/src/views/business/temporary-credit-limit.vue
+++ b/src/views/business/temporary-credit-limit.vue
@@ -309,7 +309,7 @@ import {
getList as getProjectList,
} from '@/api/business/project-apply';
import { config, option } from '@/option/business/temporary-credit-limit';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
import { downloadFileByUrl, downloadXls } from '@/utils/util';
import { ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue';
@@ -423,10 +423,7 @@ export default {
return String(width);
},
isAdmin() {
- const authority = this.userInfo?.authority;
- return Array.isArray(authority)
- ? authority.includes('admin')
- : String(authority || '').includes('admin');
+ return isAdministrator(this.userInfo);
},
canCreate() {
return this.hasPermission(`${this.config.permission}_add`);
@@ -537,7 +534,11 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
this.api
- .getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+ .getList(page.currentPage, page.pageSize, {
+ ...params,
+ ...this.query,
+ allDept: this.isAdmin ? 1 : 0,
+ })
.then(res => {
const result = res.data?.data || {};
this.page.total = result.total || 0;
@@ -942,7 +943,7 @@ export default {
NProgress.start();
exportBlob(
this.config.exportUrl,
- { ...this.query, ids: this.ids, [this.website.tokenHeader]: getToken() },
+ { ...this.query, allDept: this.isAdmin ? 1 : 0, ids: this.ids, [this.website.tokenHeader]: getToken() },
{ feedback: true }
)
.then(res => {
diff --git a/src/views/business/voucher-manage-detail.vue b/src/views/business/voucher-manage-detail.vue
index 5b68a91..3d77c96 100644
--- a/src/views/business/voucher-manage-detail.vue
+++ b/src/views/business/voucher-manage-detail.vue
@@ -45,6 +45,7 @@ import { useStore } from 'vuex';
import { ElMessage, ElMessageBox } from 'element-plus';
import md5 from 'js-md5';
import * as api from '@/api/business/voucher-manage';
+import { isAdministrator } from '@/utils/auth';
const route = useRoute();
const router = useRouter();
@@ -52,9 +53,7 @@ const store = useStore();
const voucherId = route.query.id;
const isSuperAdmin = computed(() => {
const authority = store.getters.userInfo?.authority;
- return Array.isArray(authority)
- ? authority.includes('admin')
- : String(authority || '').includes('admin');
+ return isAdministrator({ authority });
});
const loading = ref(false), rows = ref([]), voucher = ref({ voucherBatchNo: route.query.batchNo || '' });
const page = reactive({ current: 1, size: 10, total: 0 });
diff --git a/src/views/business/voucher-manage.vue b/src/views/business/voucher-manage.vue
index ef6c6dd..522196e 100644
--- a/src/views/business/voucher-manage.vue
+++ b/src/views/business/voucher-manage.vue
@@ -101,7 +101,8 @@
prop="relatedWaybillCount"
label="凭证已关联数量"
width="125"
- />
+ />
+
store.getters.permission);
const userInfo = computed(() => store.getters.userInfo);
-const isAdmin = computed(() => userInfo.value?.authority?.includes('admin'));
+const isAdmin = computed(() => checkAdministrator(userInfo.value));
const hasPermission = code => {
if (isAdmin.value) return true;
return permission.value?.[code] === true;
diff --git a/src/views/business/waybill-import-form.vue b/src/views/business/waybill-import-form.vue
index e2c978d..59d405b 100644
--- a/src/views/business/waybill-import-form.vue
+++ b/src/views/business/waybill-import-form.vue
@@ -1,12 +1,17 @@
- 新建导入
+ {{ pageTitle }}
diff --git a/src/views/wel/components/section-business.vue b/src/views/wel/components/section-business.vue
new file mode 100644
index 0000000..9322f72
--- /dev/null
+++ b/src/views/wel/components/section-business.vue
@@ -0,0 +1,164 @@
+
+
+
+ 业务单元情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wel/components/section-finance.vue b/src/views/wel/components/section-finance.vue
new file mode 100644
index 0000000..59a6dfd
--- /dev/null
+++ b/src/views/wel/components/section-finance.vue
@@ -0,0 +1,68 @@
+
+
+
+ 财务情况
+
+
+
+
+
+
+
+ 主营业务收入/费用趋势
+ 万元
+
+
+
+ 车队与线路
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wel/components/section-kpi.vue b/src/views/wel/components/section-kpi.vue
new file mode 100644
index 0000000..074fcd6
--- /dev/null
+++ b/src/views/wel/components/section-kpi.vue
@@ -0,0 +1,183 @@
+
+
+
+ 核心经营指标
+
+
+
+
+
+
+
+ {{ card.label }}
+
+ 环比 {{ card.trend >= 0 ? '+' : '' }}{{ card.trend }}%
+
+
+
+ {{ card.value }}{{ card.unit }}
+
+
+ -
+ {{ s.name }}
+ {{ s.value }}
+
+ {{ s.change >= 0 ? '↑' : '↓' }} {{ Math.abs(s.change) }}%
+
+
+
+
+ 项目情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wel/components/section-structure.vue b/src/views/wel/components/section-structure.vue
new file mode 100644
index 0000000..d8e3504
--- /dev/null
+++ b/src/views/wel/components/section-structure.vue
@@ -0,0 +1,114 @@
+
+
+
+ 运输结构
+
+
+
+
+
+
+
+
{{ c.label }}
+
+ {{ c.value }}{{ c.unit }}
+
+
+ 环比 {{ c.change >= 0 ? '+' : '' }}{{ c.change }}%
+
+
+
+ {{ d.title }}
+ {{ d.unit }}
+
+
+
+ 车务管理
+
+
+
+
+
+
+
+
{{ c.label }}
+
+ {{ c.value }}{{ c.unit }}
+
+
+ 环比 {{ c.change >= 0 ? '+' : '' }}{{ c.change }}%
+
+
+ 统计时间
+
+
+
+
+
+
+
+ {{ conditionLabel }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wel/dashboard.scss b/src/views/wel/dashboard.scss
new file mode 100644
index 0000000..519aa48
--- /dev/null
+++ b/src/views/wel/dashboard.scss
@@ -0,0 +1,96 @@
+/* 首页看板公共样式：各板块组件 scoped 引入 */
+.wel-card {
+ background: #ffffff;
+ border-radius: 10px;
+ padding: 16px 20px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+
+.wel-sec__head {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ gap: 8px;
+ margin-bottom: 14px;
+}
+
+.wel-sec__title {
+ font-size: 15px;
+ font-weight: 600;
+ color: #303133;
+}
+
+.wel-filter {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ flex-wrap: wrap;
+}
+
+.wel-filter__label {
+ font-size: 13px;
+ color: #909399;
+ white-space: nowrap;
+}
+
+.wel-filter .el-select {
+ width: 120px;
+}
+
+.panel-title {
+ display: flex;
+ align-items: baseline;
+ gap: 6px;
+ font-size: 14px;
+ font-weight: 600;
+ color: #303133;
+ margin-bottom: 10px;
+
+ .panel-title__unit {
+ font-size: 12px;
+ font-weight: 400;
+ color: #909399;
+ }
+}
+
+.mini-card {
+ background: #ffffff;
+ border-radius: 10px;
+ padding: 14px 18px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+
+ .mini-card__label {
+ font-size: 13px;
+ color: #909399;
+ margin-bottom: 6px;
+ }
+
+ .mini-card__value {
+ font-size: 22px;
+ font-weight: 700;
+ color: #303133;
+ line-height: 1.2;
+ }
+
+ .mini-card__unit {
+ font-size: 12px;
+ font-weight: 400;
+ color: #909399;
+ margin-left: 4px;
+ }
+
+ .mini-card__trend {
+ font-size: 12px;
+ margin-top: 4px;
+ color: #909399;
+
+ &.is-up {
+ color: #f04747;
+ }
+
+ &.is-down {
+ color: #2ba471;
+ }
+ }
+}
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 1f3a13e..5ceea6a 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1,788 +1,56 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 你好，{{ userName }}👋
-
-
- TMS-ERP 货运管理系统 · {{ todayText }}
-
-
-
-
-
- 新建运单
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
{{ m.label }}
-
- {{ m.value }}{{ m.unit }}
-
-
-
-
-
- {{ Math.abs(m.trend) }}%
- {{ m.sub }}
-
-
-
-
-
-
-
-
-
- 运单量趋势
-
-
-
-
-
{{ b.value }}
-
-
{{ b.label }}
-
-
-
-
- 货物类型分布
-
-
-
-
-
-
{{ donutTotal }}
-
总运单
-
-
-
- -
-
- {{ s.name }}
- {{ s.value }}%
-
-
-
-
-
-
-
-
-
-
- 运输方式占比
-
-
-
-
{{ t.name }}
-
-
{{ t.value }}%
-
-
-
-
- 预警提醒
-
-
-
- -
-
-
-
{{ a.title }}
-
{{ a.desc }}
-
{{ a.time }}
-
-
-
-
-
-
+