修复配送订单创建方名称显示

This commit is contained in:
czl231
2026-08-14 21:19:46 +08:00
parent 3ba05dc147
commit b49b070cae
6 changed files with 33 additions and 3 deletions

View File

@@ -62,7 +62,7 @@ func buildGasorderListDisplays(orders []models.GasorderBasic) ([]gasorderListDis
for _, order := range orders { for _, order := range orders {
creatorName := strings.TrimSpace(creatorNames[creatorLookupKey(order.CreatorType, order.CreatorID)]) creatorName := strings.TrimSpace(creatorNames[creatorLookupKey(order.CreatorType, order.CreatorID)])
if creatorName == "" { if creatorName == "" {
creatorName = fmt.Sprintf("记录已失效(%s", order.CreatorIdentity) creatorName = "记录已失效"
} }
displays = append(displays, gasorderListDisplay{ displays = append(displays, gasorderListDisplay{
GasorderBasic: order, GasorderBasic: order,

View File

@@ -20,9 +20,10 @@
## 操作后状态 ## 操作后状态
- 创建方以当前可读名称展示;关联记录失效时显示“记录已失效(唯一标识)” - 创建方以当前可读名称展示;关联记录失效时显示“记录已失效”,并保留唯一标识复制入口
- 收货地址显示订单创建时保存的地址快照,空值显示“未填写”,长文本沿用表格悬浮全文能力。 - 收货地址显示订单创建时保存的地址快照,空值显示“未填写”,长文本沿用表格悬浮全文能力。
- 合同气瓶显示紧凑摘要,点击后可在详情页查看全部气瓶记录。 - 合同气瓶显示紧凑摘要,点击后可在详情页查看全部气瓶记录。
- 创建方可读名称的渲染优先于通用唯一标识分支,名称旁保留独立复制入口;失效记录显示“记录已失效”。
## 代码变更 ## 代码变更
@@ -36,6 +37,7 @@
- 后端平台配送订单专项测试通过。 - 后端平台配送订单专项测试通过。
- 平台总后台 TypeScript 类型检查与生产构建通过。 - 平台总后台 TypeScript 类型检查与生产构建通过。
- 配送订单列表创建方显示专项静态检查通过。
## 风险评估 ## 风险评估

View File

@@ -26,6 +26,7 @@
"gasorder-contract-candidates:check": "node scripts/check-gasorder-contract-candidates.mjs", "gasorder-contract-candidates:check": "node scripts/check-gasorder-contract-candidates.mjs",
"gasorder-contract-products:check": "node scripts/check-gasorder-contract-product-display.mjs", "gasorder-contract-products:check": "node scripts/check-gasorder-contract-product-display.mjs",
"gasorder-creator:check": "node scripts/check-gasorder-creator-linkage.mjs", "gasorder-creator:check": "node scripts/check-gasorder-creator-linkage.mjs",
"gasorder-list-display:check": "node scripts/check-gasorder-list-display.mjs",
"product-ownership:check": "node scripts/check-product-ownership-action.mjs", "product-ownership:check": "node scripts/check-product-ownership-action.mjs",
"product-ownership-display:check": "node scripts/check-product-ownership-display.mjs", "product-ownership-display:check": "node scripts/check-product-ownership-display.mjs",
"product-lifecycle-display:check": "node scripts/check-product-lifecycle-display.mjs", "product-lifecycle-display:check": "node scripts/check-product-lifecycle-display.mjs",

View File

@@ -0,0 +1,19 @@
// 功能描述:静态校验配送订单列表优先显示可读创建方,并保留唯一标识复制入口。
// 版本v1.0.0
import fs from 'node:fs';
const resources = fs.readFileSync(new URL('../src/api/resources.ts', import.meta.url), 'utf8');
const listPage = fs.readFileSync(new URL('../src/views/shared/CrudListPage.vue', import.meta.url), 'utf8');
const assertions = [
[resources.includes("listDisplayKey: 'creator_display_name'"), '创建方未配置可读名称字段'],
[resources.includes('listDisplayIdentityCopy: true'), '创建方未保留唯一标识复制入口'],
[listPage.includes('field.listDisplayIdentityCopy && identityFieldValue(field, record)'), '可读名称分支未优先于通用唯一标识分支'],
[listPage.includes(':name="displayListField(field, record)"'), '创建方复制组件未使用列表可读名称'],
];
for (const [passed, message] of assertions) {
if (!passed) throw new Error(message);
}
console.log('配送订单列表创建方显示检查通过');

View File

@@ -82,6 +82,8 @@ export type ResourceField = {
listDisplayKey?: string; listDisplayKey?: string;
/** 点击列表展示内容时进入当前记录详情。 */ /** 点击列表展示内容时进入当前记录详情。 */
listDetailLink?: boolean; listDetailLink?: boolean;
/** 列表以可读展示字段为主文案,同时保留原关系唯一标识复制入口。 */
listDisplayIdentityCopy?: boolean;
options?: Array<{ label: string; value: string | number }>; options?: Array<{ label: string; value: string | number }>;
defaultValue?: string | number | boolean; defaultValue?: string | number | boolean;
readonlyOnCreate?: boolean; readonlyOnCreate?: boolean;
@@ -559,7 +561,7 @@ export const resources: ResourceUiDefinition[] = [
{ name: '解绑气瓶', resource: '/gasorder_contract_product/:identity/unbind', danger: true, fields: reason }, { name: '解绑气瓶', resource: '/gasorder_contract_product/:identity/unbind', danger: true, fields: reason },
]), ]),
define('gasorder_contract_revision', '合同修订记录', 'readonly', []), define('gasorder_contract_revision', '合同修订记录', 'readonly', []),
define('gasorder_basic', '气体配送订单', 'append_only', [f('request_no', { required: true }), relation('gasorder_contract_identity', '/gasorder_contract', true, { label: '配送合同', placeholder: '请选择当前可履约的生效合同', relationFilters: { candidate: 'order' }, relationStrictFilter: true, relationInvalidMessage: '所选配送合同已不可履约,已清空,请重新选择', relationEmptyText: '暂无可下单的生效合同,请先启用或续签配送合同' }), f('creator_type', { required: true, type: 'select', options: resourceSearchEnumOptions('gasorder_basic', 'creator_type') }), f('creator_identity', { label: '创建方', required: true, listDisplayKey: 'creator_display_name', placeholder: '请先选择配送合同和创建方类型', readonlyRelationText: true, relationFilters: { status: '1' }, relationEmptyText: '当前合同下暂无可用的创建方', dynamicRelation: { define('gasorder_basic', '气体配送订单', 'append_only', [f('request_no', { required: true }), relation('gasorder_contract_identity', '/gasorder_contract', true, { label: '配送合同', placeholder: '请选择当前可履约的生效合同', relationFilters: { candidate: 'order' }, relationStrictFilter: true, relationInvalidMessage: '所选配送合同已不可履约,已清空,请重新选择', relationEmptyText: '暂无可下单的生效合同,请先启用或续签配送合同' }), f('creator_type', { required: true, type: 'select', options: resourceSearchEnumOptions('gasorder_basic', 'creator_type') }), f('creator_identity', { label: '创建方', required: true, listDisplayKey: 'creator_display_name', listDisplayIdentityCopy: true, placeholder: '请先选择配送合同和创建方类型', readonlyRelationText: true, relationFilters: { status: '1' }, relationEmptyText: '当前合同下暂无可用的创建方', dynamicRelation: {
parentKey: 'creator_type', parentLabel: '创建方类型', contextParentKey: 'gasorder_contract_identity', parentKey: 'creator_type', parentLabel: '创建方类型', contextParentKey: 'gasorder_contract_identity',
resources: { user: '/user_account', staff: '/staff_account', delivery: '/delivery_basic', gas: '/gas_basic' }, resources: { user: '/user_account', staff: '/staff_account', delivery: '/delivery_basic', gas: '/gas_basic' },
fixedIdentityKeys: { user: 'user_account_identity', gas: 'gas_basic_identity', delivery: 'delivery_basic_identity' }, fixedIdentityKeys: { user: 'user_account_identity', gas: 'gas_basic_identity', delivery: 'delivery_basic_identity' },

View File

@@ -62,6 +62,12 @@
:identity="identityFieldValue(field, record)" :identity="identityFieldValue(field, record)"
:identity-label="field.label" :identity-label="field.label"
/> />
<RelationNameText
v-else-if="field.listDisplayIdentityCopy && identityFieldValue(field, record)"
:name="displayListField(field, record)"
:identity="identityFieldValue(field, record)"
:identity-label="field.label"
/>
<IdentityText <IdentityText
v-else-if="field.type === 'identity' && !field.displayRelationLabel && identityFieldValue(field, record)" v-else-if="field.type === 'identity' && !field.displayRelationLabel && identityFieldValue(field, record)"
:value="identityFieldValue(field, record)" :value="identityFieldValue(field, record)"