heqiapp/platforms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化气站订单分配配送点与人员名称回显

Browse Source
This commit is contained in:
czl231
2026-08-19 20:34:37 +08:00
parent 2d793db38b
commit 09e0e6878c
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/gas_admin/src/api/resources.ts
View File

@@ -434,7 +434,7 @@ const platformResources: ResourceUiDefinition[] = [
]),
define('gasorder_contract_revision', '合同修订记录', 'readonly', []),
define('gasorder_basic', '气体配送订单', 'append_only', [f('request_no', { required: true }), relation('gasorder_contract_identity', '/gasorder_contract', true), f('creator_type', { required: true, type: 'select', options: [{ label: '用户', value: 'user' }, { label: '工作人员', value: 'staff' }, { label: '配送站', value: 'delivery' }, { label: '气站', value: 'gas' }] }), f('creator_identity', { required: true }), relation('user_address_identity', '/user_address', true), f('gasorder_contract_product_identities', { required: true, type: 'identity-list', relation: '/gasorder_contract_product' }), f('contact_name', { required: true }), f('contact_phone', { required: true }), f('discount_amount'), f('remark')], 'list', [
{ name: '分配订单', resource: '/gasorder_basic/:identity/assign', fields: [relation('delivery_basic_identity', '/delivery_basic', true), relation('staff_account_identity', '/staff_account', true, { staffRelation: { roles: ['delivery'], enabledOnly: true } }), ...reason], visibleFor: { field: 'order_status', values: [16, 18] } },
{ name: '分配订单', resource: '/gasorder_basic/:identity/assign', fields: [relation('delivery_basic_identity', '/delivery_basic', true, { label: '配送点', placeholder: '请选择合同履约范围内的配送点', relationOptionLabelKey: 'name' }), relation('staff_account_identity', '/staff_account', true, { label: '配送人员', placeholder: '请选择当前配送点内的配送人员', staffRelation: { roles: ['delivery'], enabledOnly: true } }), ...reason], visibleFor: { field: 'order_status', values: [16, 18] } },
{ name: '开始罐装', resource: '/gasorder_basic/:identity/filling', fields: reason, visibleFor: { field: 'order_status', values: [18] } },
{ name: '待配送', resource: '/gasorder_basic/:identity/ready', fields: reason, visibleFor: { field: 'order_status', values: [19] } },
{ name: '开始配送', resource: '/gasorder_basic/:identity/delivering', fields: reason, visibleFor: { field: 'order_status', values: [20] } },

12
frontend/gas_admin/src/views/resource/ResourceActionDialog.vue
View File

@@ -217,7 +217,17 @@ async function initializeGasorderAssignment() {
const lockedIdentity = lockedAssignmentDeliveryIdentity.value;
if (lockedIdentity) {
form.delivery_basic_identity = lockedIdentity;
await relations.ensure('/delivery_basic', lockedIdentity);
const lockedDisplayName = String(
props.record.delivery_basic_display_name ?? '',
).trim();
// 订单详情已返回当前配送点名称时直接回显，避免补载请求期间短暂展示裸唯一标识。
if (lockedDisplayName) {
relations.options['/delivery_basic'] = [
{ identity: lockedIdentity, name: lockedDisplayName },
];
} else {
await relations.ensure('/delivery_basic', lockedIdentity);
}
await relations.loadField(staffField, '', {
filters: assignmentStaffFilters(lockedIdentity),
});