From 1d95b134d85c3c60cf0e72739888c9741a0bb1ee Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 10 四月 2026 13:20:39 +0800
Subject: [PATCH] #页面优化
---
rsf-design/src/views/basic-info/bas-station-area/basStationAreaPage.helpers.js | 89 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/rsf-design/src/views/basic-info/bas-station-area/basStationAreaPage.helpers.js b/rsf-design/src/views/basic-info/bas-station-area/basStationAreaPage.helpers.js
index b3046db..c94a34a 100644
--- a/rsf-design/src/views/basic-info/bas-station-area/basStationAreaPage.helpers.js
+++ b/rsf-design/src/views/basic-info/bas-station-area/basStationAreaPage.helpers.js
@@ -181,7 +181,13 @@
}
return {
value: Number(value),
- label: normalizeText(item.name || item.areaName || item.code || item.areaCode || `${$t('menu.warehouseAreas')} ${value}`)
+ label: normalizeText(
+ item.name ||
+ item.areaName ||
+ item.code ||
+ item.areaCode ||
+ `${$t('menu.warehouseAreas')} ${value}`
+ )
}
})
.filter(Boolean)
@@ -203,7 +209,9 @@
}
return {
value: Number(value),
- label: normalizeText(item.stationName || item.stationId || item.name || `${$t('menu.basStation')} ${value}`)
+ label: normalizeText(
+ item.stationName || item.stationId || item.name || `${$t('menu.basStation')} ${value}`
+ )
}
})
.filter(Boolean)
@@ -290,7 +298,9 @@
containerType: normalizeText(params.containerType),
barcode: normalizeText(params.barcode),
autoTransfer:
- params.autoTransfer !== undefined && params.autoTransfer !== null && params.autoTransfer !== ''
+ params.autoTransfer !== undefined &&
+ params.autoTransfer !== null &&
+ params.autoTransfer !== ''
? Number(params.autoTransfer)
: void 0,
stationAlias: normalizeText(params.stationAlias),
@@ -302,7 +312,9 @@
}
return Object.fromEntries(
- Object.entries(searchParams).filter(([, value]) => value !== '' && value !== void 0 && value !== null)
+ Object.entries(searchParams).filter(
+ ([, value]) => value !== '' && value !== void 0 && value !== null
+ )
)
}
@@ -310,6 +322,7 @@
return {
current: params.current || 1,
pageSize: params.pageSize || params.size || 20,
+ orderBy: normalizeText(params.orderBy) || 'create_time desc',
...buildBasStationAreaSearchParams(params)
}
}
@@ -356,7 +369,9 @@
...(formData.area !== void 0 && formData.area !== null && formData.area !== ''
? { area: Number(formData.area) }
: {}),
- ...(formData.isCrossZone !== void 0 && formData.isCrossZone !== null && formData.isCrossZone !== ''
+ ...(formData.isCrossZone !== void 0 &&
+ formData.isCrossZone !== null &&
+ formData.isCrossZone !== ''
? { isCrossZone: Number(formData.isCrossZone) }
: {}),
...(Array.isArray(formData.crossZoneArea) && formData.crossZoneArea.length
@@ -370,7 +385,9 @@
? { containerType: normalizeIdArray(formData.containerType) }
: {}),
barcode: normalizeText(formData.barcode) || '',
- ...(formData.autoTransfer !== void 0 && formData.autoTransfer !== null && formData.autoTransfer !== ''
+ ...(formData.autoTransfer !== void 0 &&
+ formData.autoTransfer !== null &&
+ formData.autoTransfer !== ''
? { autoTransfer: Number(formData.autoTransfer) }
: {}),
...(Array.isArray(formData.stationAlias) && formData.stationAlias.length
@@ -384,10 +401,12 @@
}
}
-export function buildBasStationAreaDialogModel(record = {}, resolvers = {}) {
+export function buildBasStationAreaDialogModel(record = {}) {
return {
...createBasStationAreaFormState(),
- ...(record.id !== void 0 && record.id !== null && record.id !== '' ? { id: Number(record.id) } : {}),
+ ...(record.id !== void 0 && record.id !== null && record.id !== ''
+ ? { id: Number(record.id) }
+ : {}),
stationAreaName: normalizeText(record.stationAreaName || ''),
stationAreaId: normalizeText(record.stationAreaId || ''),
type: normalizeIdValue(record.type),
@@ -395,13 +414,17 @@
outAble: record.outAble !== void 0 && record.outAble !== null ? Number(record.outAble) : 0,
useStatus: normalizeText(record.useStatus || ''),
area: normalizeIdValue(record.area),
- isCrossZone: record.isCrossZone !== void 0 && record.isCrossZone !== null ? Number(record.isCrossZone) : 0,
+ isCrossZone:
+ record.isCrossZone !== void 0 && record.isCrossZone !== null ? Number(record.isCrossZone) : 0,
crossZoneArea: normalizeIdArray(record.crossZoneArea),
isWcs: record.isWcs !== void 0 && record.isWcs !== null ? Number(record.isWcs) : 0,
wcsData: normalizeText(record.wcsData || ''),
containerType: normalizeIdArray(record.containerType ?? record.containerTypes),
barcode: normalizeText(record.barcode || ''),
- autoTransfer: record.autoTransfer !== void 0 && record.autoTransfer !== null ? Number(record.autoTransfer) : 0,
+ autoTransfer:
+ record.autoTransfer !== void 0 && record.autoTransfer !== null
+ ? Number(record.autoTransfer)
+ : 0,
stationAlias: normalizeIdArray(record.stationAlias),
status: record.status !== void 0 && record.status !== null ? Number(record.status) : 1,
memo: normalizeText(record.memo || '')
@@ -424,32 +447,46 @@
stationAreaName: normalizeText(record.stationAreaName) || t('common.placeholder.empty'),
stationAreaId: normalizeText(record.stationAreaId) || t('common.placeholder.empty'),
type: normalizeIdValue(record.type),
- typeText: normalizeText(
- record.type$ || record.typeText || resolvers.resolveTypeLabel?.(typeValue) || typeValue
- ) || t('common.placeholder.empty'),
+ typeText:
+ normalizeText(
+ record.type$ || record.typeText || resolvers.resolveTypeLabel?.(typeValue) || typeValue
+ ) || t('common.placeholder.empty'),
inAble: normalizeIdValue(record.inAble),
inAbleText: normalizeBooleanText(record.inAble, t),
outAble: normalizeIdValue(record.outAble),
outAbleText: normalizeBooleanText(record.outAble, t),
useStatus: normalizeText(record.useStatus),
useStatusText:
- normalizeText(record.useStatus$ || record.useStatusText || resolvers.resolveUseStatusLabel?.(record.useStatus) || record.useStatus) ||
- t('common.placeholder.empty'),
+ normalizeText(
+ record.useStatus$ ||
+ record.useStatusText ||
+ resolvers.resolveUseStatusLabel?.(record.useStatus) ||
+ record.useStatus
+ ) || t('common.placeholder.empty'),
area: normalizeIdValue(areaId),
- areaText: normalizeText(record.area$ || record.areaText || resolvers.resolveAreaLabel?.(areaId) || '') || t('common.placeholder.empty'),
+ areaText:
+ normalizeText(
+ record.area$ || record.areaText || resolvers.resolveAreaLabel?.(areaId) || ''
+ ) || t('common.placeholder.empty'),
isCrossZone: normalizeIdValue(record.isCrossZone),
isCrossZoneText: normalizeBooleanText(record.isCrossZone, t),
crossZoneArea: crossZoneAreaIds,
crossZoneAreaText:
- resolveOptionText(crossZoneAreaIds, resolvers.resolveCrossZoneAreaLabel, record.crossZoneAreaText || []) ||
- t('common.placeholder.empty'),
+ resolveOptionText(
+ crossZoneAreaIds,
+ resolvers.resolveCrossZoneAreaLabel,
+ record.crossZoneAreaText || []
+ ) || t('common.placeholder.empty'),
isWcs: normalizeIdValue(record.isWcs),
isWcsText: normalizeBooleanText(record.isWcs, t),
wcsData: normalizeText(record.wcsData) || t('common.placeholder.empty'),
containerType: containerTypeIds,
containerTypeText:
- resolveOptionText(containerTypeIds, resolvers.resolveContainerTypeLabel, record.containerTypesText || []) ||
- t('common.placeholder.empty'),
+ resolveOptionText(
+ containerTypeIds,
+ resolvers.resolveContainerTypeLabel,
+ record.containerTypesText || []
+ ) || t('common.placeholder.empty'),
barcode: normalizeText(record.barcode) || t('common.placeholder.empty'),
autoTransfer: normalizeIdValue(record.autoTransfer),
autoTransferText: normalizeBooleanText(record.autoTransfer, t),
@@ -465,10 +502,14 @@
statusType: statusMeta.type,
statusBool: record.statusBool !== void 0 ? Boolean(record.statusBool) : statusMeta.bool,
memo: normalizeText(record.memo) || t('common.placeholder.empty'),
- createByText: normalizeText(record.createBy$ || record.createByText || '') || t('common.placeholder.empty'),
- createTimeText: normalizeText(record.createTime$ || record.createTime || '') || t('common.placeholder.empty'),
- updateByText: normalizeText(record.updateBy$ || record.updateByText || '') || t('common.placeholder.empty'),
- updateTimeText: normalizeText(record.updateTime$ || record.updateTime || '') || t('common.placeholder.empty')
+ createByText:
+ normalizeText(record.createBy$ || record.createByText || '') || t('common.placeholder.empty'),
+ createTimeText:
+ normalizeText(record.createTime$ || record.createTime || '') || t('common.placeholder.empty'),
+ updateByText:
+ normalizeText(record.updateBy$ || record.updateByText || '') || t('common.placeholder.empty'),
+ updateTimeText:
+ normalizeText(record.updateTime$ || record.updateTime || '') || t('common.placeholder.empty')
}
}
--
Gitblit v1.9.1