完善合同气瓶绑定约束与候选过滤

- 明确合同状态、气瓶归属、停用、报废和重复绑定失败原因
- 根据当前合同过滤可绑定气瓶,排除无效及重复候选项
- 从合同列表进入绑定页时锁定预填合同,防止切换上下文
- 切换通用新建页合同后清空旧气瓶并重新加载候选项
- 增加前后端回归检查并同步中文操作日志
This commit is contained in:
czl231
2026-08-13 00:10:42 +08:00
parent 96d37d63cf
commit 9937e3a508
11 changed files with 120 additions and 10 deletions

View File

@@ -162,7 +162,11 @@ export function useResourceRelationLinkage(
return;
const linkage = active.childField.relationLinkage;
const childIdentity = relationIdentity(form[active.childField.key]);
if (childIdentity) {
if (linkage.filterOnly && childIdentity) {
form[active.childField.key] = '';
Message.info('合同已变更,请重新选择该合同可绑定的气瓶');
}
if (childIdentity && !linkage.filterOnly) {
const option =
findOption(active.childField.relation, childIdentity) ??
(await relations.ensure(active.childField.relation, childIdentity));
@@ -187,6 +191,7 @@ export function useResourceRelationLinkage(
return;
const linkage = active.childField.relationLinkage;
if (!childIdentity) return;
if (linkage.filterOnly) return;
const option =
findOption(active.childField.relation, childIdentity) ??
(await relations.ensure(active.childField.relation, childIdentity));
@@ -249,6 +254,7 @@ export function useResourceRelationLinkage(
if (!active?.childField.relationLinkage || !active.childField.relation)
return '';
const linkage = active.childField.relationLinkage;
if (linkage.filterOnly) return '';
const parentIdentity = relationIdentity(form[linkage.parentKey]);
const childIdentity = relationIdentity(form[active.childField.key]);
const option = findOption(active.childField.relation, childIdentity);