1
1
This commit is contained in:
29
src/App.tsx
29
src/App.tsx
@ -1821,7 +1821,6 @@ export default function App() {
|
|||||||
const DELIVERY_LABELS_FIELD_ID = 'fldp0cDP2T'; // 标签汇总字段(需要替换为实际字段ID)
|
const DELIVERY_LABELS_FIELD_ID = 'fldp0cDP2T'; // 标签汇总字段(需要替换为实际字段ID)
|
||||||
const DELIVERY_STYLE_FIELD_ID = 'fldJRFxwB1'; // 款式字段(需要替换为实际字段ID)
|
const DELIVERY_STYLE_FIELD_ID = 'fldJRFxwB1'; // 款式字段(需要替换为实际字段ID)
|
||||||
const DELIVERY_COLOR_FIELD_ID = 'fldhA1uBMy'; // 颜色字段(需要替换为实际字段ID)
|
const DELIVERY_COLOR_FIELD_ID = 'fldhA1uBMy'; // 颜色字段(需要替换为实际字段ID)
|
||||||
const DELIVERY_PO_FIELD_ID = 'fldIIdnq4c';
|
|
||||||
const DELIVERY_CREATOR_FIELD_ID = 'fldmYAYCyt';
|
const DELIVERY_CREATOR_FIELD_ID = 'fldmYAYCyt';
|
||||||
const DELIVERY_CREATE_TIME_FIELD_ID = 'fldP4w79LQ'; // 生成时间字段(需要替换为实际字段ID)
|
const DELIVERY_CREATE_TIME_FIELD_ID = 'fldP4w79LQ'; // 生成时间字段(需要替换为实际字段ID)
|
||||||
const DELIVERY_EXPECTED_DATE_FIELD_ID = 'fldrjlzsxn'; // 预计交付日期字段(需要替换为实际字段ID)
|
const DELIVERY_EXPECTED_DATE_FIELD_ID = 'fldrjlzsxn'; // 预计交付日期字段(需要替换为实际字段ID)
|
||||||
@ -2491,6 +2490,7 @@ export default function App() {
|
|||||||
const omsTable = await bitable.base.getTable(OMS_BOARD_TABLE_ID);
|
const omsTable = await bitable.base.getTable(OMS_BOARD_TABLE_ID);
|
||||||
const omsRecord = await omsTable.getRecordById(omsRecordId);
|
const omsRecord = await omsTable.getRecordById(omsRecordId);
|
||||||
const planText = extractText(omsRecord?.fields?.[OMS_PLAN_TEXT_FIELD_ID])?.trim();
|
const planText = extractText(omsRecord?.fields?.[OMS_PLAN_TEXT_FIELD_ID])?.trim();
|
||||||
|
const omsPoValue = extractText(omsRecord?.fields?.[OMS_CURRENT_DELIVERY_RECORD_ID_FIELD_ID])?.trim();
|
||||||
if (!planText) {
|
if (!planText) {
|
||||||
if (bitable.ui.showToast) {
|
if (bitable.ui.showToast) {
|
||||||
await bitable.ui.showToast({ toastType: ToastType.warning, message: 'OMS看板记录缺少货期计划' });
|
await bitable.ui.showToast({ toastType: ToastType.warning, message: 'OMS看板记录缺少货期计划' });
|
||||||
@ -2511,15 +2511,19 @@ export default function App() {
|
|||||||
const fields = r?.fields || {};
|
const fields = r?.fields || {};
|
||||||
const expectedTs = parseTimestampFromField(fields?.[DELIVERY_EXPECTED_DATE_FIELD_ID]);
|
const expectedTs = parseTimestampFromField(fields?.[DELIVERY_EXPECTED_DATE_FIELD_ID]);
|
||||||
const createdTs = parseTimestampFromField(fields?.[DELIVERY_CREATE_TIME_FIELD_ID]);
|
const createdTs = parseTimestampFromField(fields?.[DELIVERY_CREATE_TIME_FIELD_ID]);
|
||||||
|
const factoryTs = parseTimestampFromField(fields?.[DELIVERY_FACTORY_DEPARTURE_DATE_FIELD_ID]);
|
||||||
const expectedDate = expectedTs ? formatDate(new Date(expectedTs), 'DISPLAY_DATE_ONLY') : (extractText(fields?.[DELIVERY_EXPECTED_DATE_FIELD_ID]) || '');
|
const expectedDate = expectedTs ? formatDate(new Date(expectedTs), 'DISPLAY_DATE_ONLY') : (extractText(fields?.[DELIVERY_EXPECTED_DATE_FIELD_ID]) || '');
|
||||||
|
const factoryDepartureDate = factoryTs ? formatDate(new Date(factoryTs), 'DISPLAY_DATE_ONLY') : (extractText(fields?.[DELIVERY_FACTORY_DEPARTURE_DATE_FIELD_ID]) || '');
|
||||||
const createdAt = createdTs ? formatDate(new Date(createdTs)) : (extractText(fields?.[DELIVERY_CREATE_TIME_FIELD_ID]) || '');
|
const createdAt = createdTs ? formatDate(new Date(createdTs)) : (extractText(fields?.[DELIVERY_CREATE_TIME_FIELD_ID]) || '');
|
||||||
|
const recordId = r?.recordId || r?.id || '';
|
||||||
return {
|
return {
|
||||||
recordId: r?.recordId || r?.id || '',
|
recordId,
|
||||||
po: extractText(fields?.[DELIVERY_PO_FIELD_ID]) || '',
|
|
||||||
expectedDate,
|
expectedDate,
|
||||||
|
factoryDepartureDate,
|
||||||
version: parseVersionLabel(fields?.[DELIVERY_VERSION_FIELD_ID]),
|
version: parseVersionLabel(fields?.[DELIVERY_VERSION_FIELD_ID]),
|
||||||
creator: extractUserNames(fields?.[DELIVERY_CREATOR_FIELD_ID]),
|
creator: extractUserNames(fields?.[DELIVERY_CREATOR_FIELD_ID]),
|
||||||
createdAt
|
createdAt,
|
||||||
|
isCurrent: !!(omsPoValue && recordId && omsPoValue === recordId)
|
||||||
};
|
};
|
||||||
}).filter((row: any) => row.recordId);
|
}).filter((row: any) => row.recordId);
|
||||||
};
|
};
|
||||||
@ -6239,9 +6243,20 @@ export default function App() {
|
|||||||
|
|
||||||
|
|
||||||
const omsVersionColumns = [
|
const omsVersionColumns = [
|
||||||
{ title: 'PO', dataIndex: 'po', key: 'po', width: 180 },
|
{ title: '预计交付日期', dataIndex: 'expectedDate', key: 'expectedDate', width: 160 },
|
||||||
{ title: '预计交付日期', dataIndex: 'expectedDate', key: 'expectedDate', width: 140 },
|
{ title: '预计工厂离厂日期', dataIndex: 'factoryDepartureDate', key: 'factoryDepartureDate', width: 160 },
|
||||||
{ title: '版本号', dataIndex: 'version', key: 'version', width: 110 },
|
{
|
||||||
|
title: '版本号',
|
||||||
|
dataIndex: 'version',
|
||||||
|
key: 'version',
|
||||||
|
width: 140,
|
||||||
|
render: (v: any, row: any) => (
|
||||||
|
<span style={{ display: 'inline-flex', alignItems: 'center', gap: 8 }}>
|
||||||
|
<span>{v || ''}</span>
|
||||||
|
{row?.isCurrent ? <Tag color="green">当前版本</Tag> : null}
|
||||||
|
</span>
|
||||||
|
)
|
||||||
|
},
|
||||||
{ title: '创建人', dataIndex: 'creator', key: 'creator', width: 160 },
|
{ title: '创建人', dataIndex: 'creator', key: 'creator', width: 160 },
|
||||||
{ title: '生成时间', dataIndex: 'createdAt', key: 'createdAt', width: 170 },
|
{ title: '生成时间', dataIndex: 'createdAt', key: 'createdAt', width: 170 },
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user