From 2a903b2cb4c168da4209eaf8fd8c8482f72db497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=86=95?= Date: Wed, 1 Apr 2026 13:27:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(web):=20=E8=B0=83=E6=8B=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=A1=A5=E5=85=85=E8=BF=90=E7=BB=B4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E5=B9=B6=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补充调拨管理的运维调拨方/接收方编辑原型,并同步列表操作按钮与需求说明,便于按审批状态演示不同操作入口。 Made-with: Cursor --- .../车辆业务/调拨管理-运维(接收)-编辑.jsx | 534 +++++++++++ .../车辆业务/调拨管理-运维(调拨方)-编辑.jsx | 633 +++++++++++++ web端/运维管理/车辆业务/调拨管理.jsx | 841 +++++++++--------- 3 files changed, 1583 insertions(+), 425 deletions(-) create mode 100644 web端/运维管理/车辆业务/调拨管理-运维(接收)-编辑.jsx create mode 100644 web端/运维管理/车辆业务/调拨管理-运维(调拨方)-编辑.jsx diff --git a/web端/运维管理/车辆业务/调拨管理-运维(接收)-编辑.jsx b/web端/运维管理/车辆业务/调拨管理-运维(接收)-编辑.jsx new file mode 100644 index 0000000..951bf81 --- /dev/null +++ b/web端/运维管理/车辆业务/调拨管理-运维(接收)-编辑.jsx @@ -0,0 +1,534 @@ +// 【重要】必须使用 const Component 作为组件变量名 +// 运维管理 - 车辆业务 - 调拨管理 - 运维(接收)-编辑 +// 参照“调拨管理-接收信息-第三方运输”生成,默认反写已保存数据 + +const Component = function () { + var useState = React.useState; + var useMemo = React.useMemo; + var useCallback = React.useCallback; + + var antd = window.antd; + var App = antd.App; + var Breadcrumb = antd.Breadcrumb; + var Button = antd.Button; + var Card = antd.Card; + var DatePicker = antd.DatePicker; + var Input = antd.Input; + var Modal = antd.Modal; + var Select = antd.Select; + var Table = antd.Table; + var message = antd.message; + + function filterOption(input, option) { + var label = (option && (option.label || option.children)) || ''; + return String(label).toLowerCase().indexOf(String(input || '').toLowerCase()) >= 0; + } + + var METHOD_THIRD = '第三方运输'; + + function parseDateValue(s) { + var str = String(s || '').trim(); + if (!str) return null; + try { + if (window.dayjs) return window.dayjs(str); + } catch (e1) {} + try { + if (window.moment) return window.moment(str, ['YYYY-MM-DD', 'YYYY-MM-DD HH:mm'], true); + } catch (e2) {} + return null; + } + + function getMockSnapshot() { + return { + transferId: 'TP202603310008', + savedAt: '2026-04-01 15:20', + transferDateStr: '2026-03-31', + departRegionText: '广东省-广州市', + receiveRegionText: '浙江省-嘉兴市', + reason: '华南业务增量,需将车辆调至华东仓储节点保障运力。', + method: METHOD_THIRD, + transportLeader: '刘振华', + transportPhone: '13901234567', + transportCost: '8650.50', + transportContractFileLabel: '顺达物流有限公司运输合同.pdf', + receivePersonName: '王芳', + receiveInfo: { + receiveTime: '2026-04-02', + receiveAreaType: '停车场', + receiveParking: 'p3', + receiveAddress: '' + }, + transferVehicles: [ + { id: 1, brand: '小鹏', model: 'P7', plateNo: '浙A11111', departParking: '西湖景区停车场' }, + { id: 2, brand: '蔚来', model: 'ET5', plateNo: '浙B22222', departParking: '宁波江北停车场' } + ] + }; + } + + var layoutStyle = { padding: '16px 24px 88px 24px', background: '#f5f5f5', minHeight: '100vh' }; + var labelStyle = { marginBottom: 6, fontSize: 14, color: 'rgba(0,0,0,0.65)' }; + var formItemStyle = { marginBottom: 12 }; + var controlStyle = { width: '100%' }; + var readOnlyStyle = { background: 'rgba(0,0,0,0.02)' }; + var reqStarStyle = { color: '#ff4d4f', marginRight: 4 }; + var reqStar = React.createElement('span', { style: reqStarStyle }, '*'); + + var snapshot = useMemo(function () { + return getMockSnapshot(); + }, []); + + function buildVehicleRows(snap) { + return (snap.transferVehicles || []).map(function (r) { + return { + id: r.id, + brand: r.brand, + model: r.model, + plateNo: r.plateNo, + departParking: r.departParking || '' + }; + }); + } + + var receiveTimeState = useState(parseDateValue(snapshot.receiveInfo && snapshot.receiveInfo.receiveTime)); + var receiveTime = receiveTimeState[0]; + var setReceiveTime = receiveTimeState[1]; + + var receiveAreaTypeState = useState(snapshot.receiveInfo && snapshot.receiveInfo.receiveAreaType ? snapshot.receiveInfo.receiveAreaType : undefined); + var receiveAreaType = receiveAreaTypeState[0]; + var setReceiveAreaType = receiveAreaTypeState[1]; + + var receiveParkingState = useState(snapshot.receiveInfo && snapshot.receiveInfo.receiveParking ? snapshot.receiveInfo.receiveParking : undefined); + var receiveParking = receiveParkingState[0]; + var setReceiveParking = receiveParkingState[1]; + + var receiveAddressState = useState(snapshot.receiveInfo && snapshot.receiveInfo.receiveAddress ? snapshot.receiveInfo.receiveAddress : ''); + var receiveAddress = receiveAddressState[0]; + var setReceiveAddress = receiveAddressState[1]; + + var vehiclesState = useState(function () { + return buildVehicleRows(snapshot); + }); + var vehicles = vehiclesState[0]; + + var savedAtState = useState(snapshot.savedAt); + var savedAt = savedAtState[0]; + var setSavedAt = savedAtState[1]; + + var parkingOptions = useMemo(function () { + return [ + { value: 'p1', label: '西湖景区停车场' }, + { value: 'p2', label: '宁波江北停车场' }, + { value: 'p3', label: '张江园区停车场' }, + { value: 'p4', label: '天河智慧停车场' } + ]; + }, []); + + var errorsState = useState({}); + var errors = errorsState[0]; + var setErrors = errorsState[1]; + + var requirementModalState = useState(false); + var requirementModalOpen = requirementModalState[0]; + var setRequirementModalOpen = requirementModalState[1]; + + var attachmentPreviewState = useState(false); + var attachmentPreviewOpen = attachmentPreviewState[0]; + var setAttachmentPreviewOpen = attachmentPreviewState[1]; + + var requirementDocContent = [ + '一个「数字化资产ONEOS运管平台」中的「调拨管理」「运维(接收)-编辑」模块', + '', + '页面参照「调拨管理-接收信息-第三方运输」生成,进入页面时反写已保存的接收信息,并支持继续编辑。', + '', + '1.调拨情况:调拨日期、出发区域、接收区域、调拨原因为只读反写;', + '2.调拨信息:调拨方式、运输负责人、运输方联系方式、运输费用、运输合同附件、接收人员为只读反写;', + '3.接收信息:接收时间、接收区域、停车场/停车地址可编辑;', + '4.底部按钮:提交、保存、取消。保存不校验必填项,提交校验必填项。' + ].join('\n'); + + function formatCostYuan(costStr) { + var s = String(costStr == null ? '' : costStr).trim(); + if (!s) return '—'; + return s + '元'; + } + + function contractDisplay(label) { + var s = String(label == null ? '' : label).trim(); + return s ? s : '无'; + } + + function canPreviewAttachment(label) { + var s = String(label == null ? '' : label).trim(); + if (!s) return false; + var lower = s.toLowerCase(); + return lower.endsWith('.pdf') || lower.endsWith('.doc') || lower.endsWith('.docx'); + } + + function runValidate() { + var e = {}; + if (!receiveTime) e.receiveTime = '请选择接收时间'; + if (!receiveAreaType) e.receiveAreaType = '请选择接收区域'; + if (receiveAreaType === '停车场') { + if (!receiveParking) e.receiveParking = '请选择停车场'; + } + if (receiveAreaType === '其他') { + if (!String(receiveAddress || '').trim()) e.receiveAddress = '请输入停车地址'; + } + setErrors(e); + return { ok: Object.keys(e).length === 0, err: e }; + } + + var handleSubmit = useCallback(function () { + var result = runValidate(); + if (!result.ok) { + message.error('请完善必填项'); + return; + } + Modal.confirm({ + title: '确认提交?', + content: '提交后将进入后续流程(原型)。', + okText: '提交', + cancelText: '取消', + onOk: function () { + message.success('已提交(原型)'); + } + }); + }, [receiveTime, receiveAreaType, receiveParking, receiveAddress]); + + var handleSave = useCallback(function () { + var nowStr = ''; + try { + if (window.dayjs) nowStr = window.dayjs().format('YYYY-MM-DD HH:mm'); + } catch (e1) {} + try { + if (!nowStr && window.moment) nowStr = window.moment().format('YYYY-MM-DD HH:mm'); + } catch (e2) {} + if (!nowStr) nowStr = '刚刚'; + setSavedAt(nowStr); + message.success('已保存(原型:不校验必填项)'); + }, []); + + var handleCancel = useCallback(function () { + Modal.confirm({ + title: '是否确认取消', + content: '未保存的修改将丢失,是否确认?', + okText: '确认', + cancelText: '取消', + onOk: function () { + message.info('返回上一页(原型)'); + } + }); + }, []); + + var vehicleColumns = useMemo(function () { + return [ + { + title: '品牌', + key: 'brand', + width: 120, + render: function (_, r) { + return React.createElement(Input, { value: r.brand || '', readOnly: true, style: readOnlyStyle }); + } + }, + { + title: '型号', + key: 'model', + width: 120, + render: function (_, r) { + return React.createElement(Input, { value: r.model || '', readOnly: true, style: readOnlyStyle }); + } + }, + { + title: '车牌号', + key: 'plateNo', + width: 140, + render: function (_, r) { + return React.createElement(Input, { value: r.plateNo || '', readOnly: true, style: readOnlyStyle }); + } + }, + { + title: '出发停车场', + key: 'departParking', + width: 180, + render: function (_, r) { + return React.createElement(Input, { value: r.departParking || '', readOnly: true, style: readOnlyStyle }); + } + } + ]; + }, []); + + var costText = formatCostYuan(snapshot.transportCost); + var contractText = contractDisplay(snapshot.transportContractFileLabel); + var canPreview = canPreviewAttachment(snapshot.transportContractFileLabel); + + return React.createElement( + App, + null, + React.createElement( + 'div', + { style: layoutStyle }, + React.createElement( + 'div', + { + style: { + display: 'flex', + alignItems: 'center', + justifyContent: 'space-between', + marginBottom: 8, + flexWrap: 'wrap', + gap: 8 + } + }, + React.createElement(Breadcrumb, { + items: [{ title: '运维管理' }, { title: '车辆业务' }, { title: '调拨管理' }, { title: '运维(接收)-编辑' }] + }), + React.createElement(Button, { type: 'link', style: { padding: 0 }, onClick: function () { setRequirementModalOpen(true); } }, '查看需求说明') + ), + React.createElement( + 'div', + { style: { marginBottom: 16, color: 'rgba(0,0,0,0.65)', fontSize: 12 } }, + '调拨单号:', + snapshot.transferId, + ' | ', + '保存状态:', + savedAt ? ('已保存(' + savedAt + ')') : '未保存' + ), + + React.createElement( + Modal, + { + title: '需求说明', + open: requirementModalOpen, + onCancel: function () { setRequirementModalOpen(false); }, + width: 760, + footer: React.createElement(Button, { onClick: function () { setRequirementModalOpen(false); } }, '关闭'), + bodyStyle: { maxHeight: '70vh', overflow: 'auto' } + }, + React.createElement('div', { style: { whiteSpace: 'pre-wrap', fontSize: 13, lineHeight: 1.65, color: 'rgba(0,0,0,0.85)' } }, requirementDocContent) + ), + + React.createElement( + Modal, + { + title: '附件预览', + open: attachmentPreviewOpen, + onCancel: function () { setAttachmentPreviewOpen(false); }, + width: 820, + footer: React.createElement(Button, { onClick: function () { setAttachmentPreviewOpen(false); } }, '关闭'), + bodyStyle: { maxHeight: '70vh', overflow: 'auto' } + }, + React.createElement( + 'div', + { style: { fontSize: 13, lineHeight: 1.65, color: 'rgba(0,0,0,0.85)' } }, + React.createElement('div', { style: { marginBottom: 8 } }, '文件:', snapshot.transportContractFileLabel || '无'), + React.createElement( + 'div', + { style: { padding: 12, background: 'rgba(0,0,0,0.02)', border: '1px solid #f0f0f0', borderRadius: 8 } }, + '原型预览:此处展示附件内容预览区域。对接后可通过文件 URL 进行在线预览或下载。' + ) + ) + ), + + React.createElement( + Card, + { title: '调拨情况', style: { marginBottom: 16 } }, + React.createElement( + 'div', + { style: { display: 'grid', gridTemplateColumns: '1fr 1fr 1fr', gap: '16px 24px', alignItems: 'start' } }, + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '调拨日期'), + React.createElement(Input, { value: snapshot.transferDateStr, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '出发区域'), + React.createElement(Input, { value: snapshot.departRegionText, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '接收区域'), + React.createElement(Input, { value: snapshot.receiveRegionText, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: Object.assign({}, formItemStyle, { gridColumn: 'span 3' }) }, + React.createElement('div', { style: labelStyle }, '调拨原因'), + React.createElement(Input.TextArea, { value: snapshot.reason, readOnly: true, style: readOnlyStyle, autoSize: { minRows: 3, maxRows: 6 } }) + ) + ) + ), + + React.createElement( + Card, + { title: '调拨信息', style: { marginBottom: 16 } }, + React.createElement( + 'div', + { style: { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '16px 24px', alignItems: 'start' } }, + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '调拨方式'), + React.createElement(Input, { value: snapshot.method, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '运输负责人'), + React.createElement(Input, { value: snapshot.transportLeader, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '运输方联系方式'), + React.createElement(Input, { value: snapshot.transportPhone, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '运输费用'), + React.createElement(Input, { value: costText, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: Object.assign({}, formItemStyle, { gridColumn: 'span 2' }) }, + React.createElement('div', { style: labelStyle }, '运输合同附件'), + canPreview + ? React.createElement( + 'div', + { style: { display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' } }, + React.createElement(Button, { type: 'link', style: { padding: 0 }, onClick: function () { setAttachmentPreviewOpen(true); } }, contractText) + ) + : React.createElement(Input, { value: contractText, readOnly: true, style: readOnlyStyle }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '接收人员'), + React.createElement(Input, { value: snapshot.receivePersonName, readOnly: true, style: readOnlyStyle }) + ) + ) + ), + + React.createElement( + Card, + { title: '接收信息', style: { marginBottom: 16 } }, + React.createElement( + 'div', + { style: { display: 'grid', gridTemplateColumns: '1fr 1fr 1fr', gap: '16px 24px', alignItems: 'start' } }, + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '接收时间'), + React.createElement(DatePicker, { + style: controlStyle, + format: 'YYYY-MM-DD', + placeholder: '请选择接收时间', + value: receiveTime, + onChange: function (v) { + setReceiveTime(v); + }, + status: errors.receiveTime ? 'error' : undefined + }), + errors.receiveTime ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.receiveTime) : null + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '接收区域'), + React.createElement(Select, { + placeholder: '请选择接收区域', + style: controlStyle, + value: receiveAreaType, + onChange: function (v) { + setReceiveAreaType(v); + setReceiveParking(undefined); + setReceiveAddress(''); + }, + allowClear: true, + options: [{ value: '停车场', label: '停车场' }, { value: '其他', label: '其他' }], + status: errors.receiveAreaType ? 'error' : undefined + }), + errors.receiveAreaType ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.receiveAreaType) : null + ), + receiveAreaType === '停车场' + ? React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '停车场'), + React.createElement(Select, { + placeholder: '请选择停车场', + style: controlStyle, + value: receiveParking, + onChange: function (v) { setReceiveParking(v); }, + allowClear: true, + showSearch: true, + options: parkingOptions, + filterOption: filterOption, + status: errors.receiveParking ? 'error' : undefined + }), + errors.receiveParking ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.receiveParking) : null + ) + : receiveAreaType === '其他' + ? React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '停车地址'), + React.createElement(Input, { + placeholder: '请输入停车地址', + style: controlStyle, + value: receiveAddress, + onChange: function (e) { setReceiveAddress(e.target.value); }, + status: errors.receiveAddress ? 'error' : undefined + }), + errors.receiveAddress ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.receiveAddress) : null + ) + : React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '停车场/停车地址'), + React.createElement(Input, { placeholder: '请先选择接收区域', style: controlStyle, disabled: true }) + ) + ) + ), + + React.createElement( + Card, + { title: '调拨车辆清单', style: { marginBottom: 16 } }, + React.createElement(Table, { + rowKey: 'id', + columns: vehicleColumns, + dataSource: vehicles, + size: 'small', + pagination: false + }) + ), + + React.createElement('div', { style: { height: 56 } }), + React.createElement( + 'div', + { + style: { + position: 'fixed', + left: 0, + right: 0, + bottom: 0, + padding: '12px 24px', + background: '#fff', + borderTop: '1px solid #f0f0f0', + display: 'flex', + gap: 8, + zIndex: 10 + } + }, + React.createElement(Button, { type: 'primary', onClick: handleSubmit }, '提交'), + React.createElement(Button, { onClick: handleSave }, '保存'), + React.createElement(Button, { onClick: handleCancel }, '取消') + ) + ) + ); +}; + diff --git a/web端/运维管理/车辆业务/调拨管理-运维(调拨方)-编辑.jsx b/web端/运维管理/车辆业务/调拨管理-运维(调拨方)-编辑.jsx new file mode 100644 index 0000000..48984cd --- /dev/null +++ b/web端/运维管理/车辆业务/调拨管理-运维(调拨方)-编辑.jsx @@ -0,0 +1,633 @@ +// 【重要】必须使用 const Component 作为组件变量名 +// 运维管理 - 车辆业务 - 调拨管理 - 运维(调拨方)-编辑(参照“调拨信息”页生成) + +const Component = function () { + var useState = React.useState; + var useMemo = React.useMemo; + var useCallback = React.useCallback; + + var antd = window.antd; + var App = antd.App; + var Breadcrumb = antd.Breadcrumb; + var Button = antd.Button; + var Card = antd.Card; + var Input = antd.Input; + var Modal = antd.Modal; + var Select = antd.Select; + var Table = antd.Table; + var Upload = antd.Upload; + var message = antd.message; + + var METHOD_DRIVER = '司机运输'; + var METHOD_THIRD = '第三方运输'; + var PLATE_ELIGIBLE_STATUS = '可运营'; + + function filterOption(input, option) { + var label = (option && (option.label || option.children)) || ''; + return String(label).toLowerCase().indexOf(String(input || '').toLowerCase()) >= 0; + } + + var layoutStyle = { padding: '16px 24px 88px 24px', background: '#f5f5f5', minHeight: '100vh' }; + var labelStyle = { marginBottom: 6, fontSize: 14, color: 'rgba(0,0,0,0.65)' }; + var formItemStyle = { marginBottom: 12 }; + var controlStyle = { width: '100%' }; + var readOnlyStyle = { background: 'rgba(0,0,0,0.02)' }; + var reqStarStyle = { color: '#ff4d4f', marginRight: 4 }; + var reqStar = React.createElement('span', { style: reqStarStyle }, '*'); + + var regionOptions = useMemo(function () { + return [ + { value: 'zhejiang', label: '浙江省', children: [{ value: 'hangzhou', label: '杭州市' }, { value: 'ningbo', label: '宁波市' }, { value: 'jiaxing', label: '嘉兴市' }] }, + { value: 'shanghai', label: '上海市', children: [{ value: 'shanghai', label: '上海市' }] }, + { value: 'guangdong', label: '广东省', children: [{ value: 'guangzhou', label: '广州市' }, { value: 'shenzhen', label: '深圳市' }, { value: 'dongguan', label: '东莞市' }] } + ]; + }, []); + + function regionValueToProvinceCityLabel(values) { + if (!values || values.length < 2) return ''; + var i; + var p = null; + for (i = 0; i < regionOptions.length; i++) { + if (regionOptions[i].value === values[0]) { + p = regionOptions[i]; + break; + } + } + if (!p || !p.children) return ''; + var c = null; + for (i = 0; i < p.children.length; i++) { + if (p.children[i].value === values[1]) { + c = p.children[i]; + break; + } + } + if (!c) return p.label; + return p.label + '-' + c.label; + } + + var vehicleDb = useMemo(function () { + return [ + { plateNo: '粤A12345', status: '可运营', brand: '东风', model: 'DFH1180', dashboardH2Unit: 'MPa', currentParking: '天河智慧停车场' }, + { plateNo: '粤B11111', status: '可运营', brand: '比亚迪', model: '汉', dashboardH2Unit: '%', currentParking: '南山科技园停车场' }, + { plateNo: '浙A11111', status: '可运营', brand: '小鹏', model: 'P7', dashboardH2Unit: '%', currentParking: '西湖景区停车场' }, + { plateNo: '浙B22222', status: '可运营', brand: '蔚来', model: 'ET5', dashboardH2Unit: 'MPa', currentParking: '宁波江北停车场' }, + { plateNo: '沪A30003', status: '可运营', brand: '福田', model: 'BJ1180', dashboardH2Unit: 'MPa', currentParking: '张江园区停车场' }, + { plateNo: '粤C99999', status: '维修中', brand: '东风', model: 'DFH1180', dashboardH2Unit: 'MPa', currentParking: '白云维修基地停车场' } + ]; + }, []); + + var plateOptionsEligible = useMemo(function () { + return vehicleDb + .filter(function (v) { + return v.status === PLATE_ELIGIBLE_STATUS; + }) + .map(function (v) { + return { value: v.plateNo, label: v.plateNo }; + }); + }, [vehicleDb]); + + function lookupVehicle(plateNo) { + return vehicleDb.find(function (x) { + return x.plateNo === plateNo; + }); + } + + function buildVehicleRowsFromSnapshot(snap) { + return snap.vehicles.map(function (r) { + var v = r.plateNo ? lookupVehicle(r.plateNo) : null; + return { + id: r.id, + brand: r.brand, + model: r.model, + plateNo: r.plateNo, + h2Unit: v && v.dashboardH2Unit ? v.dashboardH2Unit : '%', + departParking: v && v.currentParking ? v.currentParking : '', + departMileageKm: '', + departHydrogen: '', + departElectricKwh: '' + }; + }); + } + + /** 原型:模拟从“调拨管理列表/详情”进入本页 */ + var mockFromTransfer = useMemo(function () { + return { + transferId: 'TP202603310001', + transferDateStr: '2026-03-31', + departRegionValues: ['guangdong', 'guangzhou'], + receiveRegionValues: ['zhejiang', 'jiaxing'], + reason: '华南业务增量,需将车辆调至华东仓储节点保障运力。', + vehicles: [ + { id: 1, brand: '小鹏', model: 'P7', plateNo: '浙A11111' }, + { id: 2, brand: '蔚来', model: 'ET5', plateNo: '浙B22222' } + ] + }; + }, []); + + var snapshotState = useState(mockFromTransfer); + var snapshot = snapshotState[0]; + + var vehiclesState = useState(function () { + return buildVehicleRowsFromSnapshot(mockFromTransfer); + }); + var vehicles = vehiclesState[0]; + var setVehicles = vehiclesState[1]; + + var infoState = useState({ + method: undefined, + transportLeader: '', + transportPhone: '', + transportCost: '', + receivePerson: undefined + }); + var info = infoState[0]; + var setInfo = infoState[1]; + + var fileListState = useState([]); + var fileList = fileListState[0]; + var setFileList = fileListState[1]; + + var errorsState = useState({}); + var errors = errorsState[0]; + var setErrors = errorsState[1]; + + var requirementModalState = useState(false); + var requirementModalOpen = requirementModalState[0]; + var setRequirementModalOpen = requirementModalState[1]; + + var requirementDocContent = [ + '一个「数字化资产ONEOS运管平台」中的「调拨管理」「运维(调拨方)-编辑」模块', + '', + '页面参照「调拨管理-调拨信息」生成,用于运维侧(调拨方)补充/修改调拨信息并提交审核。', + '', + '1.调拨情况:反写调拨日期/出发区域/接收区域/调拨原因;', + '2.调拨信息:调拨方式、运输负责人、运输方联系方式、(第三方运输时)运输费用与合同附件、接收人员;', + '3.调拨车辆清单:车牌号可编辑;司机运输时需填写出发里程/氢量/电量;', + '4.底部按钮:提交审核、保存、取消(原型)。' + ].join('\n'); + + var methodOptions = useMemo(function () { + return [ + { value: METHOD_DRIVER, label: METHOD_DRIVER }, + { value: METHOD_THIRD, label: METHOD_THIRD } + ]; + }, []); + + var opsStaffOptions = useMemo(function () { + return [ + { value: 'zm', label: '张明(运维一部-现场工程师)' }, + { value: 'wf', label: '王芳(运维二部-调度)' }, + { value: 'lh', label: '李华(运维中心-班长)' }, + { value: 'zq', label: '赵强(运维一部-驻场)' }, + { value: 'cj', label: '陈静(运维三部-客服协同)' } + ]; + }, []); + + function toFixed2Input(v) { + var s = String(v === null || v === undefined ? '' : v); + s = s.replace(/[^\d.]/g, ''); + var firstDot = s.indexOf('.'); + if (firstDot >= 0) { + s = s.slice(0, firstDot + 1) + s.slice(firstDot + 1).replace(/\./g, ''); + } + if (firstDot >= 0) { + var a = s.split('.'); + s = a[0] + '.' + (a[1] || '').slice(0, 2); + } + return s; + } + + function phoneDigitsOnly(v) { + return String(v || '') + .replace(/\D/g, '') + .slice(0, 11); + } + + var updateInfo = useCallback(function (patch) { + setInfo(function (p) { + return Object.assign({}, p, patch); + }); + }, []); + + var updateRow = useCallback(function (index, patch) { + setVehicles(function (prev) { + var list = prev.slice(); + var cur = list[index] || {}; + list[index] = Object.assign({}, cur, patch); + return list; + }); + }, []); + + var handlePlateChange = useCallback( + function (index, plateNo) { + var v = plateNo ? lookupVehicle(plateNo) : null; + var unit = v && v.dashboardH2Unit ? v.dashboardH2Unit : '%'; + updateRow(index, { plateNo: plateNo, h2Unit: unit, departParking: v && v.currentParking ? v.currentParking : '' }); + }, + [updateRow, vehicleDb] + ); + + function runValidate() { + var e = {}; + if (!info.method) e.method = '请选择调拨方式'; + if (!String(info.transportLeader || '').trim()) e.transportLeader = '请输入运输负责人姓名'; + if (!info.receivePerson) e.receivePerson = '请选择接收人员'; + + var phone = String(info.transportPhone || '').trim(); + if (!phone) e.transportPhone = '请输入运输方联系方式'; + else if (!/^\d{11}$/.test(phone)) e.transportPhone = '请输入11位数字手机号'; + + if (info.method === METHOD_THIRD) { + if (!String(info.transportCost || '').trim()) e.transportCost = '请输入运输费用'; + } + + for (var i = 0; i < (vehicles || []).length; i++) { + var r = vehicles[i] || {}; + if (!String(r.plateNo || '').trim()) e['row_' + i + '_plate'] = '请选择车牌号'; + if (info.method === METHOD_DRIVER) { + if (!String(r.departMileageKm || '').trim()) e['row_' + i + '_mile'] = '请输入出发时里程'; + if (!String(r.departHydrogen || '').trim()) e['row_' + i + '_h2'] = '请输入出发时氢量'; + if (!String(r.departElectricKwh || '').trim()) e['row_' + i + '_kwh'] = '请输入出发时电量'; + } + } + setErrors(e); + return { ok: Object.keys(e).length === 0, err: e }; + } + + var handleSubmitAudit = useCallback(function () { + var result = runValidate(); + if (!result.ok) { + message.error('请完善必填项'); + return; + } + Modal.confirm({ + title: '确认提交审核?', + content: '提交后将进入审批流程(原型)。', + okText: '提交审核', + cancelText: '取消', + onOk: function () { + message.success('已提交审核(原型)'); + } + }); + }, [info, vehicles]); + + var handleSave = useCallback(function () { + message.success('已保存(原型:不校验必填项,仅保存当前已填数据)'); + }, []); + + var handleCancel = useCallback(function () { + Modal.confirm({ + title: '是否确认取消', + content: '未保存的修改将丢失,是否确认?', + okText: '确认', + cancelText: '取消', + onOk: function () { + message.info('返回上一页(原型)'); + } + }); + }, []); + + var vehicleColumns = useMemo( + function () { + var cols = [ + { + title: '品牌', + key: 'brand', + width: 100, + render: function (_, r) { + return React.createElement(Input, { value: r.brand || '', readOnly: true, style: readOnlyStyle }); + } + }, + { + title: '型号', + key: 'model', + width: 110, + render: function (_, r) { + return React.createElement(Input, { value: r.model || '', readOnly: true, style: readOnlyStyle }); + } + }, + { + title: React.createElement('span', null, reqStar, '车牌号'), + key: 'plateNo', + width: 220, + render: function (_, r, index) { + return React.createElement(Select, { + placeholder: '请选择或输入车牌号', + style: { width: '100%' }, + value: r.plateNo, + onChange: function (v) { + handlePlateChange(index, v); + }, + allowClear: true, + showSearch: true, + options: plateOptionsEligible, + filterOption: filterOption, + status: errors['row_' + index + '_plate'] ? 'error' : undefined + }); + } + } + ]; + + cols.push({ + title: '出发停车场', + key: 'departParking', + width: 160, + render: function (_, r) { + return React.createElement(Input, { value: r.departParking || '', readOnly: true, style: readOnlyStyle, placeholder: '—' }); + } + }); + + if (info.method === METHOD_DRIVER) { + cols.push({ + title: React.createElement('span', null, reqStar, '出发时里程'), + key: 'departMileageKm', + width: 140, + render: function (_, r, index) { + return React.createElement(Input, { + value: r.departMileageKm, + onChange: function (e) { + updateRow(index, { departMileageKm: toFixed2Input(e.target.value) }); + }, + placeholder: '0.00', + addonAfter: 'km', + status: errors['row_' + index + '_mile'] ? 'error' : undefined + }); + } + }); + cols.push({ + title: React.createElement('span', null, reqStar, '出发时氢量'), + key: 'departHydrogen', + width: 130, + render: function (_, r, index) { + return React.createElement(Input, { + value: r.departHydrogen, + onChange: function (e) { + updateRow(index, { departHydrogen: toFixed2Input(e.target.value) }); + }, + placeholder: '0.00', + addonAfter: r.h2Unit || '%', + status: errors['row_' + index + '_h2'] ? 'error' : undefined + }); + } + }); + cols.push({ + title: React.createElement('span', null, reqStar, '出发时电量'), + key: 'departElectricKwh', + width: 140, + render: function (_, r, index) { + return React.createElement(Input, { + value: r.departElectricKwh, + onChange: function (e) { + updateRow(index, { departElectricKwh: toFixed2Input(e.target.value) }); + }, + placeholder: '0.00', + addonAfter: 'kWh', + status: errors['row_' + index + '_kwh'] ? 'error' : undefined + }); + } + }); + } + + return cols; + }, + [info.method, plateOptionsEligible, errors, handlePlateChange, updateRow] + ); + + var departRegionText = regionValueToProvinceCityLabel(snapshot.departRegionValues); + var receiveRegionText = regionValueToProvinceCityLabel(snapshot.receiveRegionValues); + + return React.createElement( + App, + null, + React.createElement( + 'div', + { style: layoutStyle }, + React.createElement( + 'div', + { + style: { + display: 'flex', + alignItems: 'center', + justifyContent: 'space-between', + marginBottom: 8, + flexWrap: 'wrap', + gap: 8 + } + }, + React.createElement(Breadcrumb, { + items: [{ title: '运维管理' }, { title: '车辆业务' }, { title: '调拨管理' }, { title: '运维(调拨方)-编辑' }] + }), + React.createElement(Button, { type: 'link', style: { padding: 0 }, onClick: function () { setRequirementModalOpen(true); } }, '查看需求说明') + ), + React.createElement( + 'div', + { style: { marginBottom: 16, color: 'rgba(0,0,0,0.65)', fontSize: 12 } }, + '调拨单号:', + snapshot.transferId + ), + + React.createElement( + Modal, + { + title: '需求说明', + open: requirementModalOpen, + onCancel: function () { setRequirementModalOpen(false); }, + width: 760, + footer: React.createElement(Button, { onClick: function () { setRequirementModalOpen(false); } }, '关闭'), + bodyStyle: { maxHeight: '70vh', overflow: 'auto' } + }, + React.createElement('div', { style: { whiteSpace: 'pre-wrap', fontSize: 13, lineHeight: 1.65, color: 'rgba(0,0,0,0.85)' } }, requirementDocContent) + ), + + React.createElement( + Card, + { title: '调拨情况', style: { marginBottom: 16 } }, + React.createElement( + 'div', + { style: { display: 'grid', gridTemplateColumns: '1fr 1fr 1fr', gap: '16px 24px', alignItems: 'start' } }, + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '调拨日期'), + React.createElement(Input, { value: snapshot.transferDateStr, readOnly: true, style: readOnlyStyle, placeholder: 'YYYY-MM-DD' }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '出发区域'), + React.createElement(Input, { value: departRegionText, readOnly: true, style: readOnlyStyle, placeholder: '省-市' }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, '接收区域'), + React.createElement(Input, { value: receiveRegionText, readOnly: true, style: readOnlyStyle, placeholder: '省-市' }) + ), + React.createElement( + 'div', + { style: Object.assign({}, formItemStyle, { gridColumn: 'span 3' }) }, + React.createElement('div', { style: labelStyle }, '调拨原因'), + React.createElement(Input.TextArea, { + value: snapshot.reason, + readOnly: true, + style: readOnlyStyle, + autoSize: { minRows: 3, maxRows: 6 } + }) + ) + ) + ), + + React.createElement( + Card, + { title: '调拨信息', style: { marginBottom: 16 } }, + React.createElement( + 'div', + { style: { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '16px 24px', alignItems: 'start' } }, + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '调拨方式'), + React.createElement(Select, { + placeholder: '请选择调拨方式', + style: controlStyle, + value: info.method, + onChange: function (v) { + updateInfo({ method: v }); + }, + allowClear: true, + options: methodOptions, + status: errors.method ? 'error' : undefined + }), + errors.method ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.method) : null + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '运输负责人'), + React.createElement(Input, { + placeholder: '请输入运输负责人姓名', + value: info.transportLeader, + onChange: function (e) { + updateInfo({ transportLeader: e.target.value }); + }, + status: errors.transportLeader ? 'error' : undefined + }) + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '运输方联系方式'), + React.createElement(Input, { + placeholder: '请输入运输方联系方式', + value: info.transportPhone, + maxLength: 11, + onChange: function (e) { + updateInfo({ transportPhone: phoneDigitsOnly(e.target.value) }); + }, + status: errors.transportPhone ? 'error' : undefined + }), + errors.transportPhone ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.transportPhone) : null + ), + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '接收人员'), + React.createElement(Select, { + placeholder: '请输入或选择运维部门人员', + style: controlStyle, + value: info.receivePerson, + onChange: function (v) { + updateInfo({ receivePerson: v }); + }, + allowClear: true, + showSearch: true, + options: opsStaffOptions, + filterOption: filterOption, + status: errors.receivePerson ? 'error' : undefined + }), + errors.receivePerson ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.receivePerson) : null + ) + ), + + info.method === METHOD_THIRD + ? React.createElement( + 'div', + { style: { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '16px 24px', marginTop: 8 } }, + React.createElement( + 'div', + { style: formItemStyle }, + React.createElement('div', { style: labelStyle }, reqStar, '运输费用'), + React.createElement(Input, { + placeholder: '0.00', + value: info.transportCost, + onChange: function (e) { + updateInfo({ transportCost: toFixed2Input(e.target.value) }); + }, + addonAfter: '元', + status: errors.transportCost ? 'error' : undefined + }), + errors.transportCost ? React.createElement('div', { style: { marginTop: 4, color: '#ff4d4f', fontSize: 12 } }, errors.transportCost) : null + ), + React.createElement( + 'div', + { style: Object.assign({}, formItemStyle, { gridColumn: 'span 2' }) }, + React.createElement('div', { style: labelStyle }, '运输合同附件(选填)'), + React.createElement( + Upload, + { + accept: '.doc,.docx,.pdf', + multiple: true, + fileList: fileList, + beforeUpload: function () { + return false; + }, + onChange: function (i) { + setFileList(i.fileList || []); + } + }, + React.createElement(Button, null, '附件上传') + ), + React.createElement('div', { style: { marginTop: 6, fontSize: 12, color: 'rgba(0,0,0,0.45)' } }, '支持 doc、docx、pdf;原型不实际上传服务器') + ) + ) + : null + ), + + React.createElement( + Card, + { title: '调拨车辆清单', style: { marginBottom: 16 } }, + React.createElement(Table, { + rowKey: 'id', + columns: vehicleColumns, + dataSource: vehicles, + size: 'small', + pagination: false, + scroll: { x: 'max-content' } + }) + ), + + React.createElement('div', { style: { height: 56 } }), + React.createElement( + 'div', + { + style: { + position: 'fixed', + left: 0, + right: 0, + bottom: 0, + padding: '12px 24px', + background: '#fff', + borderTop: '1px solid #f0f0f0', + display: 'flex', + gap: 8, + zIndex: 10 + } + }, + React.createElement(Button, { type: 'primary', onClick: handleSubmitAudit }, '提交审核'), + React.createElement(Button, { onClick: handleSave }, '保存'), + React.createElement(Button, { onClick: handleCancel }, '取消') + ) + ) + ); +}; + diff --git a/web端/运维管理/车辆业务/调拨管理.jsx b/web端/运维管理/车辆业务/调拨管理.jsx index 55db836..ec4e4e5 100644 --- a/web端/运维管理/车辆业务/调拨管理.jsx +++ b/web端/运维管理/车辆业务/调拨管理.jsx @@ -18,6 +18,8 @@ const Component = function () { var Cascader = antd.Cascader; var message = antd.message; var Modal = antd.Modal; + var Popover = antd.Popover; + var List = antd.List; var RangePicker = DatePicker.RangePicker; @@ -66,16 +68,6 @@ const Component = function () { ]; }, []); - var plateOptions = useMemo(function () { - return [ - { value: '粤A12345', label: '粤A12345' }, - { value: '粤B11111', label: '粤B11111' }, - { value: '浙A11111', label: '浙A11111' }, - { value: '浙B22222', label: '浙B22222' }, - { value: '沪A30003', label: '沪A30003' } - ]; - }, []); - var methodOptions = useMemo(function () { return [ { value: '第三方运输', label: '第三方运输' }, @@ -102,11 +94,11 @@ const Component = function () { transferPerson: undefined, receiveDateRange: null, receivePerson: undefined, - plateNo: undefined, departRegion: undefined, - transferRegion: undefined, + receiveRegion: undefined, method: undefined, - approvalStatus: undefined + bizApprovalStatus: undefined, + opsApprovalStatus: undefined }); var draft = draftState[0]; var setDraft = draftState[1]; @@ -116,11 +108,11 @@ const Component = function () { transferPerson: undefined, receiveDateRange: null, receivePerson: undefined, - plateNo: undefined, departRegion: undefined, - transferRegion: undefined, + receiveRegion: undefined, method: undefined, - approvalStatus: undefined + bizApprovalStatus: undefined, + opsApprovalStatus: undefined }); var applied = appliedState[0]; var setApplied = appliedState[1]; @@ -148,63 +140,50 @@ const Component = function () { '1.2.调拨人:选择器,支持输入框输入内容模糊搜索下拉选择对应调拨人,调拨人来自用户表;', '1.3.接收日期:日期选择器,支持单输入框双日历进行开始-结束时间搜索;', '1.4.接收人:选择器,支持输入框输入内容模糊搜索下拉选择对应接收人,接收人来自用户表;', - '1.5.车牌号:选择器,支持输入框输入内容模糊搜索下拉选择车牌号;', - '1.6.出发区域:级联地区选择器,省-市2级;', - '1.7.调拨区域:级联地区选择器,省-市2级;', - '1.8.调拨方式:选择器,选项为:第三方运输、司机驾驶;', - '1.9.审批状态:选择器,选项为:待提交、审批中、审批完成、审批驳回、撤回;', + '1.5.出发区域:级联地区选择器,省-市2级;', + '1.6.调拨区域:级联地区选择器,省-市2级;', + '1.7.调拨方式:选择器,选项为:第三方运输、司机驾驶;', + '1.8.业务审批状态:选择器,选项为:待提交、审批中、审批完成、审批驳回、撤回;', + '1.9.运维审批状态:选择器,选项为:待提交、审批中、审批完成、审批驳回、撤回;', '', '2.列表:分为进行中、历史记录2个tab;tab最右侧为新增、导出;', '2.1.进行中:', '2.1.1.调拨日期:显示调拨日期,格式为:YYYY-MM-DD HH:MM;', - '2.1.2.出发区域:显示出发省-市,根据车辆出发时停车场区域获取;', - '2.1.3.调拨人:显示调拨人姓名;', - '2.1.4.接收区域:显示接受省-市;', - '2.1.5.接收人:显示接收人姓名;', - '2.1.6.审批状态:待提交、审批中、审批完成、驳回、撤回;', - '2.1.7.调拨方式:显示调拨方式,分为第三方运输、司机驾驶;', - '2.1.8.调拨原因:显示调拨原因;', - '2.1.9.车牌号:显示调拨车牌号;', - '2.1.10.车辆类型:显示调拨车辆对应类型;', - '2.1.11.品牌:显示调拨车辆对应品牌;', - '2.1.12.型号:显示调拨车辆对应型号;', - '2.1.13.运输方名称:显示调拨车辆对应运输方信息;', - '2.1.14.出发里程(km):显示调拨车辆对应出发里程;', - '2.1.15.出发氢量:显示调拨车辆对应出发氢量,带单位(单位根据该型号型号参数下仪表盘单位)', - '2.1.16.出发电量(kWh):显示调拨车辆对应出发电量;', - '2.1.17.出发停车场:显示调拨车辆出发停车场名称;', - '2.1.18.创建日期:显示调拨申请创建日期,格式为:YYYY-MM-DD HH:MM;', - '2.1.19.操作:查看、编辑、接收记录、撤回;', - ' 2.1.19.1.查看:点击跳转调拨管理-查看页;', - ' 2.1.19.2.编辑:点击跳转调拨管理-编辑页,只有待提交、审批驳回、撤回状态才显示编辑;', - ' 2.1.19.3.接收记录:点击跳转调拨管理-接收记录页,只有审批状态为审批完成时才显示接收记录;', - ' 2.1.19.4.撤回:点击进行二次确认,确认后审批状态修改为撤回,只有审批状态为审批中时才显示撤回;', + '2.1.2.业务审批状态:待提交、审批中、审批完成、驳回、撤回;', + '2.1.3.运维审批状态:待提交、审批中、审批完成、驳回、撤回;', + '2.1.4.出发区域:显示出发省-市,根据车辆出发时停车场区域获取;', + '2.1.5.接收区域:显示接受省-市;', + '2.1.6.调拨原因:显示调拨原因;', + '2.1.7.车辆数:显示调拨车辆数,点击车辆数显示气泡卡片,卡片中显示列表,列表字段为:品牌、型号、车牌号;', + '2.1.8.调拨人:显示表单创建人姓名;', + '2.1.9.调拨方式:显示调拨方式,分为第三方运输、司机运输;', + '2.1.10.运输负责人:显示调拨车辆对应运输负责人;', + '2.1.11.运输方联系方式:显示调拨车辆对应运输方联系方式;', + '2.1.12.接收人员:显示接收人姓名;', + '2.1.13.创建日期:显示调拨申请创建日期,格式为:YYYY-MM-DD HH:MM;', + '2.1.14.操作:查看、编辑、撤回、调拨信息、接收信息;', + '2.1.14.1.编辑:业务审批状态或运维审批状态任意一个为「待提交/撤回/审批驳回」时显示;', + '2.1.14.2.接收信息:运维审批状态为「审批中/审批完成」时显示;', + '2.1.14.3.调拨信息:业务审批状态为「审批完成」且运维审批状态为空或「待提交」时显示;', '', '2.2.历史记录:', '2.2.1.调拨日期:显示调拨日期,格式为:YYYY-MM-DD HH:MM;', - '2.2.2.出发区域:显示出发省-市,根据车辆出发时停车场区域获取;', - '2.2.3.调拨人:显示调拨人姓名;', - '2.2.4.接收日期:显示接收日期,格式为:YYYY-MM-DD HH:MM;', + '2.2.2.业务审批状态:待提交、审批中、审批完成、驳回、撤回;', + '2.2.3.运维审批状态:待提交、审批中、审批完成、驳回、撤回;', + '2.2.4.出发区域:显示出发省-市,根据车辆出发时停车场区域获取;', '2.2.5.接收区域:显示接受省-市;', - '2.2.6.接收人:显示接收人姓名;', - '2.2.7.审批状态:审核完成;', - '2.2.8.调拨方式:显示调拨方式,分为第三方运输、司机驾驶;', - '2.2.9.调拨原因:显示调拨原因;', - '2.2.10.车牌号:显示调拨车牌号;', - '2.2.11.车辆类型:显示调拨车辆对应类型;', - '2.2.12.品牌:显示调拨车辆对应品牌;', - '2.2.13.型号:显示调拨车辆对应型号;', - '2.2.14.运输方名称:显示调拨车辆对应运输方信息;', - '2.2.15.出发里程(km):显示调拨车辆对应出发里程;', - '2.2.16.接收里程(km):显示调拨车辆对应接收里程;', - '2.2.17.出发氢量:显示调拨车辆对应出发氢量,带单位(单位根据该型号型号参数下仪表盘单位);', - '2.2.18.接收氢量:显示调拨车辆对应接收氢量,带单位(单位根据该型号型号参数下仪表盘单位);', - '2.2.19.出发电量(kWh):显示调拨车辆对应出发电量;', - '2.2.20.接收电量(kWh):显示调拨车辆对应接收电量;', - '2.2.21.出发停车场:显示调拨车辆出发停车场名称;', - '2.2.22.创建日期:显示调拨申请创建日期,格式为:YYYY-MM-DD HH:MM;', - '2.2.23.操作:查看;', - ' 2.1.17.1.查看:点击跳转调拨管理-查看页;' + '2.2.6.调拨原因:显示调拨原因;', + '2.2.7.车辆数:显示调拨车辆数,点击车辆数显示气泡卡片,卡片中显示列表,列表字段为:品牌、型号、车牌号;', + '2.2.8.调拨人:显示表单创建人姓名;', + '2.2.9.调拨方式:显示调拨方式,分为第三方运输、司机运输;', + '2.2.10.运输负责人:显示调拨车辆对应运输负责人;', + '2.2.11.运输方联系方式:显示调拨车辆对应运输方联系方式;', + '2.2.12.接收人员:显示接收人姓名;', + '2.2.13.接收时间:显示接收时间,格式为:YYYY-MM-DD HH:MM;', + '2.2.14.接收区域:显示接受区域,停车场或其他;', + '2.2.15.停车场/停车地址:显示停车场名称或停车地址;', + '2.2.16.创建日期:显示调拨申请创建日期,格式为:YYYY-MM-DD HH:MM;', + '2.2.17.操作:查看;' ].join('\n'); var listInProgressState = useState(function () { @@ -213,220 +192,199 @@ const Component = function () { id: 'tp1', transferDate: '2026-02-20 09:30', departRegionText: '广东省-广州市', - transferPerson: '张明', receiveRegionText: '浙江省-嘉兴市', - receivePerson: '王芳', - approvalStatus: '待提交', + bizApprovalStatus: '待提交', + opsApprovalStatus: '待提交', method: '第三方运输', reason: '场站资源调整', - plateNo: '粤A12345', - vehicleType: '厢式货车', - brand: '东风', - model: 'DFH1180', - carrierName: '顺丰同城运输', - departMileageKm: '15230.12', - departHydrogen: '28.30', - h2Unit: 'MPa', - departElectricKwh: '68.40', - departParking: '天河智慧停车场', + vehicles: [ + { brand: '东风', model: 'DFH1180', plateNo: '粤A12345' }, + { brand: '比亚迪', model: '汉', plateNo: '粤B11111' } + ], + transferPerson: '张明', + transportLeader: '周海', + transportContact: '13800000001', + receivePerson: '王芳', + transferInfoStatus: '未填写', createDate: '2026-02-20 08:10' }, { id: 'tp2', transferDate: '2026-02-22 14:10', departRegionText: '浙江省-杭州市', - transferPerson: '李华', receiveRegionText: '上海市-上海市', - receivePerson: '赵强', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '待提交', method: '司机驾驶', reason: '项目调度需要', - plateNo: '浙A11111', - vehicleType: 'SUV', - brand: '小鹏', - model: 'P7', - carrierName: '-', - departMileageKm: '12010.00', - departHydrogen: '60.00', - h2Unit: '%', - departElectricKwh: '55.20', - departParking: '西湖景区停车场', + vehicles: [ + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' }, + { brand: '蔚来', model: 'ET5', plateNo: '浙B22222' }, + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' } + ], + transferPerson: '李华', + transportLeader: '李华', + transportContact: '13800000002', + receivePerson: '赵强', + transferInfoStatus: '已通过', createDate: '2026-02-22 12:40' }, { id: 'tp3', transferDate: '2026-02-24 11:05', departRegionText: '广东省-深圳市', - transferPerson: '王芳', receiveRegionText: '浙江省-宁波市', - receivePerson: '陈静', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '维修站资源调整', - plateNo: '粤B11111', - vehicleType: '轿车', - brand: '比亚迪', - model: '汉', - carrierName: '德邦物流', - departMileageKm: '8020.50', - departHydrogen: '55.00', - h2Unit: '%', - departElectricKwh: '62.10', - departParking: '南山科技园停车场', + vehicles: [ + { brand: '比亚迪', model: '汉', plateNo: '粤B11111' } + ], + transferPerson: '王芳', + transportLeader: '黄蕾', + transportContact: '13800000003', + receivePerson: '陈静', + transferInfoStatus: '已通过', createDate: '2026-02-24 10:20' }, { id: 'tp4', transferDate: '2026-02-25 16:40', departRegionText: '浙江省-嘉兴市', - transferPerson: '赵强', receiveRegionText: '上海市-上海市', - receivePerson: '李华', - approvalStatus: '待提交', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '待提交', method: '司机驾驶', reason: '项目调度需要', - plateNo: '浙B22222', - vehicleType: '轿车', - brand: '蔚来', - model: 'ET5', - carrierName: '-', - departMileageKm: '15010.00', - departHydrogen: '22.10', - h2Unit: 'MPa', - departElectricKwh: '58.00', - departParking: '宁波江北停车场', + vehicles: [ + { brand: '蔚来', model: 'ET5', plateNo: '浙B22222' } + ], + transferPerson: '赵强', + transportLeader: '赵强', + transportContact: '13800000004', + receivePerson: '李华', + transferInfoStatus: '未填写', createDate: '2026-02-25 15:55' }, { id: 'tp5', transferDate: '2026-02-26 09:15', departRegionText: '上海市-上海市', - transferPerson: '陈静', receiveRegionText: '广东省-广州市', - receivePerson: '张明', - approvalStatus: '审批驳回', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批中', method: '第三方运输', reason: '车辆调拨申请驳回样例', - plateNo: '沪A30003', - vehicleType: '厢式货车', - brand: '福田', - model: 'BJ1180', - carrierName: '顺丰同城运输', - departMileageKm: '9800.00', - departHydrogen: '26.00', - h2Unit: 'MPa', - departElectricKwh: '69.00', - departParking: '张江园区停车场', + vehicles: [ + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' }, + { brand: '东风', model: 'DFH1180', plateNo: '粤A12345' } + ], + transferPerson: '陈静', + transportLeader: '周海', + transportContact: '13800000005', + receivePerson: '张明', + transferInfoStatus: '未填写', createDate: '2026-02-26 08:30' }, { id: 'tp6', transferDate: '2026-02-27 13:30', departRegionText: '浙江省-杭州市', - transferPerson: '张明', receiveRegionText: '浙江省-嘉兴市', - receivePerson: '王芳', - approvalStatus: '撤回', + bizApprovalStatus: '撤回', + opsApprovalStatus: '待提交', method: '司机驾驶', reason: '计划变更,撤回申请', - plateNo: '浙A11111', - vehicleType: 'SUV', - brand: '小鹏', - model: 'P7', - carrierName: '-', - departMileageKm: '12100.20', - departHydrogen: '58.00', - h2Unit: '%', - departElectricKwh: '54.80', - departParking: '西湖景区停车场', + vehicles: [ + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' } + ], + transferPerson: '张明', + transportLeader: '张明', + transportContact: '13800000006', + receivePerson: '王芳', + transferInfoStatus: '未填写', createDate: '2026-02-27 12:45' }, { id: 'tp7', transferDate: '2026-02-28 08:50', departRegionText: '广东省-东莞市', - transferPerson: '李华', receiveRegionText: '广东省-深圳市', - receivePerson: '赵强', - approvalStatus: '审批中', + bizApprovalStatus: '审批中', + opsApprovalStatus: '待提交', method: '第三方运输', reason: '跨区域调拨', - plateNo: '粤A12345', - vehicleType: '厢式货车', - brand: '东风', - model: 'DFH1180', - carrierName: '中外运', - departMileageKm: '15310.00', - departHydrogen: '27.50', - h2Unit: 'MPa', - departElectricKwh: '67.20', - departParking: '松山湖停车场', + vehicles: [ + { brand: '东风', model: 'DFH1180', plateNo: '粤A12345' }, + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' } + ], + transferPerson: '李华', + transportLeader: '黄蕾', + transportContact: '13800000007', + receivePerson: '赵强', + transferInfoStatus: '未填写', createDate: '2026-02-28 08:05' }, { id: 'tp8', transferDate: '2026-03-01 10:10', departRegionText: '浙江省-宁波市', - transferPerson: '王芳', receiveRegionText: '上海市-上海市', - receivePerson: '陈静', - approvalStatus: '待提交', + bizApprovalStatus: '待提交', + opsApprovalStatus: '待提交', method: '司机驾驶', reason: '项目新增点位支持', - plateNo: '浙B22222', - vehicleType: '轿车', - brand: '蔚来', - model: 'ET5', - carrierName: '-', - departMileageKm: '15120.00', - departHydrogen: '21.80', - h2Unit: 'MPa', - departElectricKwh: '57.50', - departParking: '宁波江北停车场', + vehicles: [ + { brand: '蔚来', model: 'ET5', plateNo: '浙B22222' }, + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' } + ], + transferPerson: '王芳', + transportLeader: '王芳', + transportContact: '13800000008', + receivePerson: '陈静', + transferInfoStatus: '未填写', createDate: '2026-03-01 09:30' }, { id: 'tp9', transferDate: '2026-03-02 15:25', departRegionText: '上海市-上海市', - transferPerson: '赵强', receiveRegionText: '浙江省-杭州市', - receivePerson: '李华', - approvalStatus: '审批中', + bizApprovalStatus: '审批中', + opsApprovalStatus: '待提交', method: '第三方运输', reason: '场站容量调整', - plateNo: '沪A30003', - vehicleType: '厢式货车', - brand: '福田', - model: 'BJ1180', - carrierName: '德邦物流', - departMileageKm: '9850.00', - departHydrogen: '24.20', - h2Unit: 'MPa', - departElectricKwh: '68.30', - departParking: '张江园区停车场', + vehicles: [ + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' } + ], + transferPerson: '赵强', + transportLeader: '周海', + transportContact: '13800000009', + receivePerson: '李华', + transferInfoStatus: '未填写', createDate: '2026-03-02 14:40' }, { id: 'tp10', transferDate: '2026-03-03 09:05', departRegionText: '浙江省-嘉兴市', - transferPerson: '陈静', receiveRegionText: '广东省-广州市', - receivePerson: '张明', - approvalStatus: '待提交', + bizApprovalStatus: '待提交', + opsApprovalStatus: '待提交', method: '第三方运输', reason: '车辆调拨支持新项目', - plateNo: '浙A11111', - vehicleType: 'SUV', - brand: '小鹏', - model: 'P7', - carrierName: '顺丰同城运输', - departMileageKm: '12220.00', - departHydrogen: '56.00', - h2Unit: '%', - departElectricKwh: '53.90', - departParking: '嘉兴南湖停车场', + vehicles: [ + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' }, + { brand: '比亚迪', model: '汉', plateNo: '粤B11111' }, + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' }, + { brand: '蔚来', model: 'ET5', plateNo: '浙B22222' } + ], + transferPerson: '陈静', + transportLeader: '黄蕾', + transportContact: '13800000010', + receivePerson: '张明', + transferInfoStatus: '未填写', createDate: '2026-03-03 08:20' } ]; @@ -440,260 +398,215 @@ const Component = function () { id: 'th1', transferDate: '2026-01-10 10:00', departRegionText: '上海市-上海市', - transferPerson: '张明', - receiveDate: '2026-01-12 18:20', receiveRegionText: '广东省-深圳市', - receivePerson: '陈静', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '场站资源调整', - plateNo: '沪A30003', - vehicleType: '厢式货车', - brand: '福田', - model: 'BJ1180', - carrierName: '德邦物流', - departMileageKm: '9800.00', - receiveMileageKm: '10120.00', - departHydrogen: '25.50', - receiveHydrogen: '22.10', - h2Unit: 'MPa', - departElectricKwh: '70.00', - receiveElectricKwh: '62.30', - departParking: '张江园区停车场', + vehicles: [ + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' }, + { brand: '东风', model: 'DFH1180', plateNo: '粤A12345' } + ], + transferPerson: '张明', + transportLeader: '周海', + transportContact: '13800001001', + receivePerson: '陈静', + receiveTime: '2026-01-12 18:20', + receiveAreaType: '停车场', + parkingOrAddress: '南山科技园停车场', createDate: '2026-01-09 16:45' }, { id: 'th2', transferDate: '2026-01-15 09:30', departRegionText: '广东省-广州市', - transferPerson: '王芳', - receiveDate: '2026-01-17 14:10', receiveRegionText: '浙江省-杭州市', - receivePerson: '赵强', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '司机驾驶', reason: '项目调度需要', - plateNo: '粤A12345', - vehicleType: '厢式货车', - brand: '东风', - model: 'DFH1180', - carrierName: '-', - departMileageKm: '14500.00', - receiveMileageKm: '14920.00', - departHydrogen: '30.00', - receiveHydrogen: '27.10', - h2Unit: 'MPa', - departElectricKwh: '66.00', - receiveElectricKwh: '59.20', - departParking: '天河智慧停车场', + vehicles: [ + { brand: '东风', model: 'DFH1180', plateNo: '粤A12345' } + ], + transferPerson: '王芳', + transportLeader: '王芳', + transportContact: '13800001002', + receivePerson: '赵强', + receiveTime: '2026-01-17 14:10', + receiveAreaType: '其他', + parkingOrAddress: '杭州市西湖区文三路 88 号', createDate: '2026-01-14 18:00' }, { id: 'th3', transferDate: '2026-01-20 16:05', departRegionText: '浙江省-宁波市', - transferPerson: '李华', - receiveDate: '2026-01-22 10:30', receiveRegionText: '广东省-深圳市', - receivePerson: '陈静', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '场站资源调整', - plateNo: '浙B22222', - vehicleType: '轿车', - brand: '蔚来', - model: 'ET5', - carrierName: '中外运', - departMileageKm: '15080.00', - receiveMileageKm: '15410.00', - departHydrogen: '24.00', - receiveHydrogen: '21.50', - h2Unit: 'MPa', - departElectricKwh: '58.60', - receiveElectricKwh: '52.10', - departParking: '宁波江北停车场', + vehicles: [ + { brand: '蔚来', model: 'ET5', plateNo: '浙B22222' }, + { brand: '比亚迪', model: '汉', plateNo: '粤B11111' } + ], + transferPerson: '李华', + transportLeader: '黄蕾', + transportContact: '13800001003', + receivePerson: '陈静', + receiveTime: '2026-01-22 10:30', + receiveAreaType: '停车场', + parkingOrAddress: '南山科技园停车场', createDate: '2026-01-20 15:15' }, { id: 'th4', transferDate: '2026-01-25 11:20', departRegionText: '上海市-上海市', - transferPerson: '张明', - receiveDate: '2026-01-27 19:45', receiveRegionText: '广东省-东莞市', - receivePerson: '王芳', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '跨区域调拨', - plateNo: '沪A30003', - vehicleType: '厢式货车', - brand: '福田', - model: 'BJ1180', - carrierName: '德邦物流', - departMileageKm: '9900.00', - receiveMileageKm: '10320.00', - departHydrogen: '26.80', - receiveHydrogen: '23.60', - h2Unit: 'MPa', - departElectricKwh: '71.20', - receiveElectricKwh: '64.00', - departParking: '张江园区停车场', + vehicles: [ + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' } + ], + transferPerson: '张明', + transportLeader: '周海', + transportContact: '13800001004', + receivePerson: '王芳', + receiveTime: '2026-01-27 19:45', + receiveAreaType: '停车场', + parkingOrAddress: '松山湖停车场', createDate: '2026-01-25 10:40' }, { id: 'th5', transferDate: '2026-01-28 08:50', departRegionText: '广东省-深圳市', - transferPerson: '陈静', - receiveDate: '2026-01-30 16:10', receiveRegionText: '浙江省-嘉兴市', - receivePerson: '李华', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '司机驾驶', reason: '项目新增点位支持', - plateNo: '粤B11111', - vehicleType: '轿车', - brand: '比亚迪', - model: '汉', - carrierName: '-', - departMileageKm: '8100.00', - receiveMileageKm: '8460.00', - departHydrogen: '58.00', - receiveHydrogen: '52.00', - h2Unit: '%', - departElectricKwh: '61.00', - receiveElectricKwh: '55.00', - departParking: '南山科技园停车场', + vehicles: [ + { brand: '比亚迪', model: '汉', plateNo: '粤B11111' }, + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' } + ], + transferPerson: '陈静', + transportLeader: '陈静', + transportContact: '13800001005', + receivePerson: '李华', + receiveTime: '2026-01-30 16:10', + receiveAreaType: '其他', + parkingOrAddress: '嘉兴市秀洲区中山西路 66 号', createDate: '2026-01-28 08:05' }, { id: 'th6', transferDate: '2026-02-02 14:30', departRegionText: '浙江省-杭州市', - transferPerson: '赵强', - receiveDate: '2026-02-04 09:20', receiveRegionText: '上海市-上海市', - receivePerson: '张明', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '场站容量调整', - plateNo: '浙A11111', - vehicleType: 'SUV', - brand: '小鹏', - model: 'P7', - carrierName: '顺丰同城运输', - departMileageKm: '11880.00', - receiveMileageKm: '12110.00', - departHydrogen: '62.00', - receiveHydrogen: '58.00', - h2Unit: '%', - departElectricKwh: '56.00', - receiveElectricKwh: '52.30', - departParking: '西湖景区停车场', + vehicles: [ + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' } + ], + transferPerson: '赵强', + transportLeader: '周海', + transportContact: '13800001006', + receivePerson: '张明', + receiveTime: '2026-02-04 09:20', + receiveAreaType: '停车场', + parkingOrAddress: '张江园区停车场', createDate: '2026-02-02 13:45' }, { id: 'th7', transferDate: '2026-02-05 10:10', departRegionText: '广东省-东莞市', - transferPerson: '李华', - receiveDate: '2026-02-07 18:30', receiveRegionText: '广东省-深圳市', - receivePerson: '陈静', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '司机驾驶', reason: '场站资源调整', - plateNo: '粤A12345', - vehicleType: '厢式货车', - brand: '东风', - model: 'DFH1180', - carrierName: '-', - departMileageKm: '14850.00', - receiveMileageKm: '15120.00', - departHydrogen: '29.00', - receiveHydrogen: '26.50', - h2Unit: 'MPa', - departElectricKwh: '65.00', - receiveElectricKwh: '60.00', - departParking: '松山湖停车场', + vehicles: [ + { brand: '东风', model: 'DFH1180', plateNo: '粤A12345' }, + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' } + ], + transferPerson: '李华', + transportLeader: '李华', + transportContact: '13800001007', + receivePerson: '陈静', + receiveTime: '2026-02-07 18:30', + receiveAreaType: '停车场', + parkingOrAddress: '南山科技园停车场', createDate: '2026-02-05 09:20' }, { id: 'th8', transferDate: '2026-02-08 15:40', departRegionText: '上海市-上海市', - transferPerson: '张明', - receiveDate: '2026-02-10 11:15', receiveRegionText: '浙江省-宁波市', - receivePerson: '王芳', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '项目调度需要', - plateNo: '沪A30003', - vehicleType: '厢式货车', - brand: '福田', - model: 'BJ1180', - carrierName: '德邦物流', - departMileageKm: '10050.00', - receiveMileageKm: '10460.00', - departHydrogen: '25.20', - receiveHydrogen: '22.80', - h2Unit: 'MPa', - departElectricKwh: '72.00', - receiveElectricKwh: '66.00', - departParking: '张江园区停车场', + vehicles: [ + { brand: '福田', model: 'BJ1180', plateNo: '沪A30003' } + ], + transferPerson: '张明', + transportLeader: '周海', + transportContact: '13800001008', + receivePerson: '王芳', + receiveTime: '2026-02-10 11:15', + receiveAreaType: '停车场', + parkingOrAddress: '宁波江北停车场', createDate: '2026-02-08 14:50' }, { id: 'th9', transferDate: '2026-02-12 09:00', departRegionText: '浙江省-嘉兴市', - transferPerson: '陈静', - receiveDate: '2026-02-14 17:20', receiveRegionText: '广东省-广州市', - receivePerson: '赵强', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '第三方运输', reason: '车辆调拨支持新项目', - plateNo: '浙A11111', - vehicleType: 'SUV', - brand: '小鹏', - model: 'P7', - carrierName: '顺丰同城运输', - departMileageKm: '11980.00', - receiveMileageKm: '12420.00', - departHydrogen: '60.00', - receiveHydrogen: '55.00', - h2Unit: '%', - departElectricKwh: '55.00', - receiveElectricKwh: '49.80', - departParking: '嘉兴南湖停车场', + vehicles: [ + { brand: '小鹏', model: 'P7', plateNo: '浙A11111' }, + { brand: '蔚来', model: 'ET5', plateNo: '浙B22222' } + ], + transferPerson: '陈静', + transportLeader: '黄蕾', + transportContact: '13800001009', + receivePerson: '赵强', + receiveTime: '2026-02-14 17:20', + receiveAreaType: '其他', + parkingOrAddress: '广州市海珠区新港中路 18 号', createDate: '2026-02-12 08:15' }, { id: 'th10', transferDate: '2026-02-16 13:10', departRegionText: '广东省-深圳市', - transferPerson: '王芳', - receiveDate: '2026-02-18 09:40', receiveRegionText: '上海市-上海市', - receivePerson: '李华', - approvalStatus: '审批完成', + bizApprovalStatus: '审批完成', + opsApprovalStatus: '审批完成', method: '司机驾驶', reason: '项目调度需要', - plateNo: '粤B11111', - vehicleType: '轿车', - brand: '比亚迪', - model: '汉', - carrierName: '-', - departMileageKm: '8200.00', - receiveMileageKm: '8560.00', - departHydrogen: '57.00', - receiveHydrogen: '50.00', - h2Unit: '%', - departElectricKwh: '60.00', - receiveElectricKwh: '54.00', - departParking: '南山科技园停车场', + vehicles: [ + { brand: '比亚迪', model: '汉', plateNo: '粤B11111' } + ], + transferPerson: '王芳', + transportLeader: '王芳', + transportContact: '13800001010', + receivePerson: '李华', + receiveTime: '2026-02-18 09:40', + receiveAreaType: '停车场', + parkingOrAddress: '张江园区停车场', createDate: '2026-02-16 12:20' } ]; @@ -728,15 +641,15 @@ const Component = function () { return (list || []).filter(function (r) { if (applied.transferPerson && r.transferPerson !== applied.transferPerson) return false; if (applied.receivePerson && r.receivePerson !== applied.receivePerson) return false; - if (applied.plateNo && r.plateNo !== applied.plateNo) return false; if (applied.method && r.method !== applied.method) return false; - if (applied.approvalStatus && r.approvalStatus !== applied.approvalStatus) return false; + if (applied.bizApprovalStatus && r.bizApprovalStatus !== applied.bizApprovalStatus) return false; + if (applied.opsApprovalStatus && r.opsApprovalStatus !== applied.opsApprovalStatus) return false; if (!matchRange(r.transferDate, applied.transferDateRange)) return false; if (isHistory) { - if (!matchRange(r.receiveDate, applied.receiveDateRange)) return false; + if (!matchRange(r.receiveTime, applied.receiveDateRange)) return false; } if (!matchRegionText(r.departRegionText, applied.departRegion)) return false; - if (!matchRegionText(r.receiveRegionText, applied.transferRegion)) return false; + if (!matchRegionText(r.receiveRegionText, applied.receiveRegion)) return false; return true; }); } @@ -765,11 +678,11 @@ const Component = function () { transferPerson: undefined, receiveDateRange: null, receivePerson: undefined, - plateNo: undefined, departRegion: undefined, - transferRegion: undefined, + receiveRegion: undefined, method: undefined, - approvalStatus: undefined + bizApprovalStatus: undefined, + opsApprovalStatus: undefined }; setDraft(empty); setApplied(empty); @@ -782,38 +695,79 @@ const Component = function () { var columnsInProgress = useMemo(function () { return [ { title: '调拨日期', dataIndex: 'transferDate', key: 'transferDate', width: 160, render: function (v) { return fmtYMDHM(v); } }, + { title: '业务审批状态', dataIndex: 'bizApprovalStatus', key: 'bizApprovalStatus', width: 110 }, + { + title: '运维审批状态', + dataIndex: 'opsApprovalStatus', + key: 'opsApprovalStatus', + width: 110, + render: function (v, r) { + if (String(r && r.bizApprovalStatus ? r.bizApprovalStatus : '') === '待提交') return '-'; + return v || '-'; + } + }, { title: '出发区域', dataIndex: 'departRegionText', key: 'departRegionText', width: 130 }, - { title: '调拨人', dataIndex: 'transferPerson', key: 'transferPerson', width: 100 }, { title: '接收区域', dataIndex: 'receiveRegionText', key: 'receiveRegionText', width: 130 }, - { title: '接收人', dataIndex: 'receivePerson', key: 'receivePerson', width: 100 }, - { title: '审批状态', dataIndex: 'approvalStatus', key: 'approvalStatus', width: 100 }, - { title: '调拨方式', dataIndex: 'method', key: 'method', width: 110 }, - { title: '调拨原因', dataIndex: 'reason', key: 'reason', width: 140, ellipsis: true }, - { title: '车牌号', dataIndex: 'plateNo', key: 'plateNo', width: 110 }, - { title: '车辆类型', dataIndex: 'vehicleType', key: 'vehicleType', width: 120, ellipsis: true }, - { title: '品牌', dataIndex: 'brand', key: 'brand', width: 90 }, - { title: '型号', dataIndex: 'model', key: 'model', width: 120, ellipsis: true }, - { title: '运输方名称', dataIndex: 'carrierName', key: 'carrierName', width: 140, ellipsis: true }, - { title: '出发里程(km)', dataIndex: 'departMileageKm', key: 'departMileageKm', width: 130 }, - { title: '出发氢量', key: 'departHydrogen', width: 110, render: function (_, r) { return (r.departHydrogen || '-') + (r.h2Unit ? r.h2Unit : ''); } }, - { title: '出发电量(kWh)', dataIndex: 'departElectricKwh', key: 'departElectricKwh', width: 130 }, - { title: '出发停车场', dataIndex: 'departParking', key: 'departParking', width: 140, ellipsis: true }, + { title: '调拨原因', dataIndex: 'reason', key: 'reason', width: 160, ellipsis: true }, + { + title: '车辆数', + key: 'vehicleCount', + width: 90, + render: function (_, r) { + var vs = (r && r.vehicles) || []; + var cnt = vs.length; + if (!cnt) return '-'; + var content = React.createElement('div', { style: { width: 320 } }, + React.createElement('div', { style: { fontWeight: 600, marginBottom: 8 } }, '车辆明细'), + React.createElement(List, { + size: 'small', + dataSource: vs, + renderItem: function (it) { + return React.createElement(List.Item, null, + React.createElement('div', { style: { display: 'flex', width: '100%', gap: 8 } }, + React.createElement('div', { style: { flex: 1, minWidth: 0 } }, (it && it.brand) || '-'), + React.createElement('div', { style: { flex: 1, minWidth: 0 } }, (it && it.model) || '-'), + React.createElement('div', { style: { width: 110, textAlign: 'right' } }, (it && it.plateNo) || '-') + ) + ); + } + }) + ); + return React.createElement(Popover, { content: content, trigger: 'click', placement: 'bottomLeft' }, + React.createElement(Button, { type: 'link', size: 'small' }, String(cnt)) + ); + } + }, + { title: '调拨人', dataIndex: 'transferPerson', key: 'transferPerson', width: 100 }, + { + title: '调拨方式', + dataIndex: 'method', + key: 'method', + width: 110, + render: function (v) { return v === '司机驾驶' ? '司机运输' : (v || '-'); } + }, + { title: '运输负责人', dataIndex: 'transportLeader', key: 'transportLeader', width: 110 }, + { title: '运输方联系方式', dataIndex: 'transportContact', key: 'transportContact', width: 130 }, + { title: '接收人员', dataIndex: 'receivePerson', key: 'receivePerson', width: 100 }, { title: '创建日期', dataIndex: 'createDate', key: 'createDate', width: 160, render: function (v) { return fmtYMDHM(v); } }, { title: '操作', key: 'action', - width: 280, + width: 340, fixed: 'right', render: function (_, r) { - var st = String(r && r.approvalStatus ? r.approvalStatus : ''); - var canEdit = st === '待提交' || st === '审批驳回' || st === '撤回'; - var canReceiveRecord = st === '审批完成'; - var canRevoke = st === '审批中'; + var bizSt = String(r && r.bizApprovalStatus ? r.bizApprovalStatus : ''); + var opsSt = String(r && r.opsApprovalStatus ? r.opsApprovalStatus : ''); + var showEdit = bizSt === '待提交' || bizSt === '撤回' || bizSt === '审批驳回' || opsSt === '待提交' || opsSt === '撤回' || opsSt === '审批驳回'; + var canRevoke = bizSt === '审批中'; var rowId = r && r.id; + var showTransferInfo = bizSt === '审批完成' && (!opsSt || opsSt === '待提交'); + var showReceiveInfo = opsSt === '审批中' || opsSt === '审批完成'; return React.createElement('span', { style: { display: 'inline-flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' } }, React.createElement(Button, { type: 'link', size: 'small', onClick: function () { message.info('跳转调拨管理-查看页(原型)ID:' + rowId); } }, '查看'), - canEdit ? React.createElement(Button, { type: 'link', size: 'small', onClick: function () { message.info('跳转调拨管理-编辑页(原型)ID:' + rowId); } }, '编辑') : null, - canReceiveRecord ? React.createElement(Button, { type: 'link', size: 'small', onClick: function () { message.info('跳转调拨管理-接收记录页(原型)ID:' + rowId); } }, '接收记录') : null, + showEdit ? React.createElement(Button, { type: 'link', size: 'small', onClick: function () { message.info('跳转调拨管理-编辑页(原型)ID:' + rowId); } }, '编辑') : null, + showTransferInfo ? React.createElement(Button, { type: 'link', size: 'small', onClick: function () { message.info('跳转调拨管理-调拨信息页(原型)ID:' + rowId); } }, '调拨信息') : null, + showReceiveInfo ? React.createElement(Button, { type: 'link', size: 'small', onClick: function () { message.info('跳转调拨管理-接收信息页(原型)ID:' + rowId); } }, '接收信息') : null, canRevoke ? React.createElement(Button, { type: 'link', size: 'small', @@ -821,17 +775,17 @@ const Component = function () { onClick: function () { Modal.confirm({ title: '是否确认撤回?', - content: '确认后该调拨单审批状态将变更为「撤回」。', + content: '确认后该调拨单审批状态将变更为「撤回」。若该流程存在多个分支工作流,将按撤回节点回退到对应的前置操作状态(原型展示)。', okText: '确认', cancelText: '取消', onOk: function () { setListInProgress(function (prev) { return (prev || []).map(function (row) { - if (row && row.id === rowId) return Object.assign({}, row, { approvalStatus: '撤回' }); + if (row && row.id === rowId) return Object.assign({}, row, { bizApprovalStatus: '撤回', opsApprovalStatus: '撤回' }); return row; }); }); - message.success('已撤回,审批状态已更新为撤回'); + message.success('已撤回,业务/运维审批状态已更新为撤回'); } }); } @@ -845,26 +799,63 @@ const Component = function () { var columnsHistory = useMemo(function () { return [ { title: '调拨日期', dataIndex: 'transferDate', key: 'transferDate', width: 160, render: function (v) { return fmtYMDHM(v); } }, + { title: '业务审批状态', dataIndex: 'bizApprovalStatus', key: 'bizApprovalStatus', width: 110 }, + { + title: '运维审批状态', + dataIndex: 'opsApprovalStatus', + key: 'opsApprovalStatus', + width: 110, + render: function (v, r) { + if (String(r && r.bizApprovalStatus ? r.bizApprovalStatus : '') === '待提交') return '-'; + return v || '-'; + } + }, { title: '出发区域', dataIndex: 'departRegionText', key: 'departRegionText', width: 130 }, + { title: '接收区域(省市)', dataIndex: 'receiveRegionText', key: 'receiveRegionText', width: 140 }, + { title: '调拨原因', dataIndex: 'reason', key: 'reason', width: 160, ellipsis: true }, + { + title: '车辆数', + key: 'vehicleCount', + width: 90, + render: function (_, r) { + var vs = (r && r.vehicles) || []; + var cnt = vs.length; + if (!cnt) return '-'; + var content = React.createElement('div', { style: { width: 320 } }, + React.createElement('div', { style: { fontWeight: 600, marginBottom: 8 } }, '车辆明细'), + React.createElement(List, { + size: 'small', + dataSource: vs, + renderItem: function (it) { + return React.createElement(List.Item, null, + React.createElement('div', { style: { display: 'flex', width: '100%', gap: 8 } }, + React.createElement('div', { style: { flex: 1, minWidth: 0 } }, (it && it.brand) || '-'), + React.createElement('div', { style: { flex: 1, minWidth: 0 } }, (it && it.model) || '-'), + React.createElement('div', { style: { width: 110, textAlign: 'right' } }, (it && it.plateNo) || '-') + ) + ); + } + }) + ); + return React.createElement(Popover, { content: content, trigger: 'click', placement: 'bottomLeft' }, + React.createElement(Button, { type: 'link', size: 'small' }, String(cnt)) + ); + } + }, { title: '调拨人', dataIndex: 'transferPerson', key: 'transferPerson', width: 100 }, - { title: '接收日期', dataIndex: 'receiveDate', key: 'receiveDate', width: 160, render: function (v) { return fmtYMDHM(v); } }, - { title: '接收区域', dataIndex: 'receiveRegionText', key: 'receiveRegionText', width: 130 }, - { title: '接收人', dataIndex: 'receivePerson', key: 'receivePerson', width: 100 }, - { title: '审批状态', dataIndex: 'approvalStatus', key: 'approvalStatus', width: 100 }, - { title: '调拨方式', dataIndex: 'method', key: 'method', width: 110 }, - { title: '调拨原因', dataIndex: 'reason', key: 'reason', width: 140, ellipsis: true }, - { title: '车牌号', dataIndex: 'plateNo', key: 'plateNo', width: 110 }, - { title: '车辆类型', dataIndex: 'vehicleType', key: 'vehicleType', width: 120, ellipsis: true }, - { title: '品牌', dataIndex: 'brand', key: 'brand', width: 90 }, - { title: '型号', dataIndex: 'model', key: 'model', width: 120, ellipsis: true }, - { title: '运输方名称', dataIndex: 'carrierName', key: 'carrierName', width: 140, ellipsis: true }, - { title: '出发里程(km)', dataIndex: 'departMileageKm', key: 'departMileageKm', width: 130 }, - { title: '接收里程(km)', dataIndex: 'receiveMileageKm', key: 'receiveMileageKm', width: 130 }, - { title: '出发氢量', key: 'departHydrogen', width: 110, render: function (_, r) { return (r.departHydrogen || '-') + (r.h2Unit ? r.h2Unit : ''); } }, - { title: '接收氢量', key: 'receiveHydrogen', width: 110, render: function (_, r) { return (r.receiveHydrogen || '-') + (r.h2Unit ? r.h2Unit : ''); } }, - { title: '出发电量(kWh)', dataIndex: 'departElectricKwh', key: 'departElectricKwh', width: 130 }, - { title: '接收电量(kWh)', dataIndex: 'receiveElectricKwh', key: 'receiveElectricKwh', width: 130 }, - { title: '出发停车场', dataIndex: 'departParking', key: 'departParking', width: 140, ellipsis: true }, + { + title: '调拨方式', + dataIndex: 'method', + key: 'method', + width: 110, + render: function (v) { return v === '司机驾驶' ? '司机运输' : (v || '-'); } + }, + { title: '运输负责人', dataIndex: 'transportLeader', key: 'transportLeader', width: 110 }, + { title: '运输方联系方式', dataIndex: 'transportContact', key: 'transportContact', width: 130 }, + { title: '接收人员', dataIndex: 'receivePerson', key: 'receivePerson', width: 100 }, + { title: '接收时间', dataIndex: 'receiveTime', key: 'receiveTime', width: 160, render: function (v) { return fmtYMDHM(v); } }, + { title: '接收区域', dataIndex: 'receiveAreaType', key: 'receiveAreaType', width: 100 }, + { title: '停车场/停车地址', dataIndex: 'parkingOrAddress', key: 'parkingOrAddress', width: 180, ellipsis: true }, { title: '创建日期', dataIndex: 'createDate', key: 'createDate', width: 160, render: function (v) { return fmtYMDHM(v); } }, { title: '操作', @@ -895,25 +886,25 @@ const Component = function () { React.createElement('div', { style: filterLabelStyle }, '接收人'), React.createElement(Select, { placeholder: '请输入或选择接收人', style: filterControlStyle, value: draft.receivePerson, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { receivePerson: v }); }); }, allowClear: true, showSearch: true, options: userOptions, filterOption: filterOption }) ), - React.createElement('div', { key: 'plateNo', style: filterItemStyle }, - React.createElement('div', { style: filterLabelStyle }, '车牌号'), - React.createElement(Select, { placeholder: '请输入或选择车牌号', style: filterControlStyle, value: draft.plateNo, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { plateNo: v }); }); }, allowClear: true, showSearch: true, options: plateOptions, filterOption: filterOption }) - ), React.createElement('div', { key: 'departRegion', style: filterItemStyle }, React.createElement('div', { style: filterLabelStyle }, '出发区域'), React.createElement(Cascader, { placeholder: '请选择出发区域', style: filterControlStyle, options: regionOptions, value: draft.departRegion, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { departRegion: v }); }); }, allowClear: true }) ), - React.createElement('div', { key: 'transferRegion', style: filterItemStyle }, + React.createElement('div', { key: 'receiveRegion', style: filterItemStyle }, React.createElement('div', { style: filterLabelStyle }, '调拨区域'), - React.createElement(Cascader, { placeholder: '请选择调拨区域', style: filterControlStyle, options: regionOptions, value: draft.transferRegion, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { transferRegion: v }); }); }, allowClear: true }) + React.createElement(Cascader, { placeholder: '请选择调拨区域', style: filterControlStyle, options: regionOptions, value: draft.receiveRegion, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { receiveRegion: v }); }); }, allowClear: true }) ), React.createElement('div', { key: 'method', style: filterItemStyle }, React.createElement('div', { style: filterLabelStyle }, '调拨方式'), React.createElement(Select, { placeholder: '请选择调拨方式', style: filterControlStyle, value: draft.method, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { method: v }); }); }, allowClear: true, options: methodOptions }) ), - React.createElement('div', { key: 'approvalStatus', style: filterItemStyle }, - React.createElement('div', { style: filterLabelStyle }, '审批状态'), - React.createElement(Select, { placeholder: '请选择审批状态', style: filterControlStyle, value: draft.approvalStatus, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { approvalStatus: v }); }); }, allowClear: true, options: approvalOptions }) + React.createElement('div', { key: 'bizApprovalStatus', style: filterItemStyle }, + React.createElement('div', { style: filterLabelStyle }, '业务审批状态'), + React.createElement(Select, { placeholder: '请选择业务审批状态', style: filterControlStyle, value: draft.bizApprovalStatus, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { bizApprovalStatus: v }); }); }, allowClear: true, options: approvalOptions }) + ), + React.createElement('div', { key: 'opsApprovalStatus', style: filterItemStyle }, + React.createElement('div', { style: filterLabelStyle }, '运维审批状态'), + React.createElement(Select, { placeholder: '请选择运维审批状态', style: filterControlStyle, value: draft.opsApprovalStatus, onChange: function (v) { setDraft(function (p) { return Object.assign({}, p, { opsApprovalStatus: v }); }); }, allowClear: true, options: approvalOptions }) ) ]; @@ -930,7 +921,7 @@ const Component = function () { rowKey: 'id', columns: columnsInProgress, dataSource: pagedInProgress, - scroll: { x: 2300 }, + scroll: { x: 1850 }, size: 'small', pagination: { current: page, @@ -950,7 +941,7 @@ const Component = function () { rowKey: 'id', columns: columnsHistory, dataSource: pagedHistory, - scroll: { x: 2600 }, + scroll: { x: 2100 }, size: 'small', pagination: { current: page,