fix(assets): show inventory operations managers and bump v1.1.19

src/modules/assets/analysis-export.test.ts

@@ -41,3 +41,13 @@ test('one Excel workbook contains statistics and all details in two named sheets
   const empty = await createAnalysisWorkbook([], []);
   assert.deepEqual(empty.SheetNames, ['统计表', '详情表']);
 });
+
+test('inventory export uses assigned operations managers and a dash when unset', () => {
+  const vehicles = ['张三、李四', null, '   '].map(opsManagers => ({
+    opsManagers, customerManager: '业务负责人', customerName: '客户', status: 'Inventory',
+  } as VehicleListItem));
+  const rows = vehicleExportRows(vehicles, true);
+  assert.deepEqual(rows.map(row => row.运维负责人), ['张三、李四', '-', '-']);
+  assert.ok(rows.every(row => !('业务负责人' in row) && !('客户' in row)));
+  assert.equal(vehicleExportRows(vehicles)[0].业务负责人, '业务负责人');
+});

src/modules/assets/analysis-export.ts

@@ -12,7 +12,7 @@ export function statisticsExportRows(labels: string[], groups: { values: string[
   }));
 }
 
-export function vehicleExportRows(vehicles: VehicleListItem[]): ExportRow[] {
+export function vehicleExportRows(vehicles: VehicleListItem[], inventory = false): ExportRow[] {
   const status: Record<string, string> = { Abnormal: '异动', Pending: '待交车', Inventory: '在库', Operating: '运营中' };
   const operation: Record<string, string> = { '1': '租赁', '2': '自营', '3': '可运营', '4': '待运营' };
   const hasPending = vehicles.some(v => v.pendingDelivery);
@@ -21,7 +21,7 @@ export function vehicleExportRows(vehicles: VehicleListItem[]): ExportRow[] {
     车牌: v.plateNumber, VIN: v.vin, 品牌: v.brandLabel, 车型: v.type, 型号: v.model,
     省份: v.province, 城市: v.city || v.location,
     状态: status[v.status] || v.status, 运营状态: operation[v.operationStatus || ''] || v.operationStatus,
-    客户: v.customerName, 签约公司: v.orgName, 部门: v.departmentName, 业务负责人: v.customerManager,
+    ...(inventory ? { 运维负责人: v.opsManagers?.trim() || '-' } : { 客户: v.customerName, 签约公司: v.orgName, 部门: v.departmentName, 业务负责人: v.customerManager }),
     所属公司: v.subjectOrg, 合同: v.contractNo,
     ...(hasPending ? { 待交车合同: v.pendingDelivery?.contractNo, 待交车客户: v.pendingDelivery?.customerName } : {}),
     ...(hasMovement ? {

src/modules/assets/components/analysis/AssetAnalysisModal.tsx

@@ -128,7 +128,7 @@ function AnalysisDialog({ selection, subject, close }: Props & { selection: Vehi
         extra: view === 'inventory' ? { 待交车: row.totals.pending, 异动: row.totals.abnormal } : undefined })),
       showDetails ? rows.length : analysis.total,
     );
-    await downloadAnalysisWorkbook(statistics, vehicleExportRows(rows), `${title}-${scopeLabel}${detailGroup ? `-${detailGroup.label}` : ''}`);
+    await downloadAnalysisWorkbook(statistics, vehicleExportRows(rows, view === 'inventory'), `${title}-${scopeLabel}${detailGroup ? `-${detailGroup.label}` : ''}`);
   };
   return <div className="asset-analysis-overlay">
     <div ref={dialog} role="dialog" aria-modal="true" aria-label={title} tabIndex={-1} className={`asset-analysis-dialog ${view === 'abnormal' ? 'analysis-amber' : ''}`}>
@@ -164,7 +164,7 @@ function AnalysisDialog({ selection, subject, close }: Props & { selection: Vehi
             <div className="analysis-table-tools"><h3>车辆明细 <small>{number(visibleVehicles.length)} 台</small></h3><AnalysisExportButton disabled={detailBusy || !!detailError || !visibleVehicles.length} onExport={exportWorkbook} /><label className="analysis-search"><Search size={15} /><input aria-label="搜索车辆明细" placeholder="搜索车牌、VIN、型号、城市" value={search} onChange={event => { setSearch(event.target.value); }} /></label></div>
             {detailBusy ? <div className="analysis-message" role="status"><Loader2 className="animate-spin" />正在加载车辆明细…</div> : detailError ? <div className="analysis-message" role="alert"><p>{detailError}</p><button className="analysis-button" onClick={() => setDetailRetry(detailRetry + 1)}>重新加载明细</button></div> : <>
               {vehicles.length !== detailGroup.count && <p className="analysis-definition">车辆状态可能已更新：统计快照 {detailGroup.count} 台，当前明细 {vehicles.length} 台。</p>}
-              {(view === 'abnormal' || detailGroup.values.inventoryState === 'abnormal' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'abnormal')) ? <AbnormalVehicleDetails vehicles={shownVehicles} /> : (view === 'pending' || detailGroup.values.inventoryState === 'pending' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'pending')) ? <PendingVehicleDetails vehicles={shownVehicles} /> : <VehicleRows vehicles={shownVehicles} />}
+              {(view === 'abnormal' || detailGroup.values.inventoryState === 'abnormal' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'abnormal')) ? <AbnormalVehicleDetails vehicles={shownVehicles} /> : (view === 'pending' || detailGroup.values.inventoryState === 'pending' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'pending')) ? <PendingVehicleDetails vehicles={shownVehicles} /> : <VehicleRows vehicles={shownVehicles} inventory={view === 'inventory'} />}
               <ProgressiveRowsStatus {...detailProgress} unit="台" />
             </>}
           </div>}
@@ -175,14 +175,14 @@ function AnalysisDialog({ selection, subject, close }: Props & { selection: Vehi
   </div>;
 }
 
-function VehicleRows({ vehicles }: { vehicles: VehicleListItem[] }) {
+function VehicleRows({ vehicles, inventory = false }: { vehicles: VehicleListItem[]; inventory?: boolean }) {
   if (!vehicles.length) return <div className="analysis-message">暂无匹配车辆</div>;
   const stateLabel = (vehicle: VehicleListItem) => {
     const operation = ({ '1': '租赁', '2': '自营', '3': '可运营', '4': '待运营' } as Record<string, string>)[vehicle.operationStatus || ''] || vehicle.operationStatus;
     const business = ({ Abnormal: '异动', Pending: '待交车', Inventory: '在库', Operating: '运营中' } as Record<string, string>)[vehicle.status] || vehicle.status;
     return [business, operation].filter(Boolean).join(' · ');
   };
-  return <div className="analysis-detail-table" tabIndex={0} role="region" aria-label="车辆明细表"><table><thead><tr>{['车牌 / VIN', '品牌 / 车型 / 型号', '省份 / 城市', '状态', '客户 / 签约公司', '部门 / 业务负责人', '所属公司'].map(label => <th key={label}>{label}</th>)}</tr></thead><tbody>{vehicles.map(vehicle => <tr key={vehicle.id}><td><Blur>{vehicle.plateNumber || vehicle.vin || '未提供'}</Blur></td><td>{vehicle.brandLabel || '—'} · {vehicle.type}<small>{vehicle.model}</small></td><td>{vehicle.province || '未标注'} / {vehicle.city || vehicle.location || '未标注'}</td><td>{stateLabel(vehicle)}</td><td><Blur>{vehicle.customerName || '—'}</Blur><small><Blur>{vehicle.orgName || '—'}</Blur></small></td><td><Blur>{vehicle.departmentName || '—'}</Blur><small><Blur>{vehicle.customerManager || '—'}</Blur></small></td><td>{vehicle.subjectOrg || '—'}</td></tr>)}</tbody></table></div>;
+  return <div className="analysis-detail-table" tabIndex={0} role="region" aria-label="车辆明细表"><table><thead><tr>{['车牌 / VIN', '品牌 / 车型 / 型号', '省份 / 城市', '状态', ...(inventory ? ['运维负责人'] : ['客户 / 签约公司', '部门 / 业务负责人']), '所属公司'].map(label => <th key={label}>{label}</th>)}</tr></thead><tbody>{vehicles.map(vehicle => <tr key={vehicle.id}><td><Blur>{vehicle.plateNumber || vehicle.vin || '未提供'}</Blur></td><td>{vehicle.brandLabel || '—'} · {vehicle.type}<small>{vehicle.model}</small></td><td>{vehicle.province || '未标注'} / {vehicle.city || vehicle.location || '未标注'}</td><td>{stateLabel(vehicle)}</td>{inventory ? <td><Blur>{vehicle.opsManagers?.trim() || '-'}</Blur></td> : <><td><Blur>{vehicle.customerName || '—'}</Blur><small><Blur>{vehicle.orgName || '—'}</Blur></small></td><td><Blur>{vehicle.departmentName || '—'}</Blur><small><Blur>{vehicle.customerManager || '—'}</Blur></small></td></>}<td>{vehicle.subjectOrg || '—'}</td></tr>)}</tbody></table></div>;
 }
 
 type WeeklyDimension = 'date' | 'contract_type';

src/modules/assets/types.ts

@@ -104,6 +104,7 @@ export interface InventoryTypeSummary {
 }
 
 export interface VehicleListItem {
+  opsManagers?: string | null;
   color?: string;
   operationStatus?: string | null;
   inventoryKey?: string;

src/server/routes/vehicles.ts

@@ -544,6 +544,7 @@ function vehicleListItem(v: Vehicle) {
       subjectOrg: v.subjectOrg,
       departmentName: v.departmentName,
       customerManager: v.customerManager,
+      opsManagers: v.opsManagers || null,
       brandLabel: v.brandLabel,
       orgName: v.orgName,
     };

src/server/routes/vehicles/model.test.ts

@@ -199,6 +199,7 @@ test('transforms database rows without changing the route model contract', () =>
     subjectOrg: '主体',
     projectName: '项目',
     customerManager: '经理',
+    opsManagers: null,
     managerId: '9',
     brandLabel: '现代',
   });

src/server/routes/vehicles/model.ts

@@ -255,6 +255,7 @@ export function transformRow(row: VehicleRow): Vehicle {
     subjectOrg: row.主体,
     projectName: row.项目名称,
     customerManager: row.客户经理,
+    opsManagers: row.ops_managers?.trim() || null,
     managerId: row.经理ID || null,
     brandLabel: row.车辆品牌Label,
   };

src/server/routes/vehicles/repository.ts

@@ -100,6 +100,11 @@ export const MAIN_SQL = `SELECT
     NULLIF(vi.registered_ownership, '') AS 主体,
     vor.project_name AS 项目名称,
     vor.business_manager AS 客户经理,
+    (SELECT GROUP_CONCAT(
+       COALESCE(NULLIF(TRIM(ops.nick_name), ''), NULLIF(TRIM(ops.user_name), ''), CAST(ops.user_id AS CHAR))
+       ORDER BY ops.id SEPARATOR '、')
+     FROM vehicle_ops_manager_rel ops
+     WHERE ops.vehicle_id = vi.id AND ops.del_flag = '0') AS ops_managers,
     CAST(COALESCE(c.business_manager_id, vi.business_id) AS CHAR) AS 经理ID
 FROM vehicle_info vi
 LEFT JOIN vehicle_status vs

src/server/types.ts

@@ -1,6 +1,7 @@
 import type { AbnormalMoveDetail } from '../shared/assets/abnormal-move.js';
 
 export interface VehicleRow {
+  ops_managers?: string | null;
   pending_delivery_id?: string | null;
   pending_contract_no?: string | null;
   pending_customer_name?: string | null;
@@ -42,6 +43,7 @@ export interface VehicleRow {
 }
 
 export interface Vehicle {
+  opsManagers?: string | null;
   pendingDelivery?: { contractNo: string | null; customerName: string | null } | null;
   abnormalMove?: AbnormalMoveDetail | null;
   id: string;