chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

基础资料限制修改

Browse Source
This commit is contained in:
jiangxh
2026-07-29 10:23:32 +08:00
parent 442a4c8ae2
commit 2310f79f43
10 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jeecgboot-vue3/src/views/xslmes/mesXslMixerCondition/MesXslMixerCondition.data.ts
View File

@@ -42,11 +42,13 @@ export const formSchema: FormSchema[] = [
validator: async (_rule, value) => {
const v = value == null ? '' : String(value).trim();
if (!v) return Promise.resolve();
// 未选设备时不做跨设备校验，保存时仍会强制校验
if (!model?.equipmentId) return Promise.resolve();
try {
await checkConditionName({ conditionName: v, dataId: model?.id });
await checkConditionName({ conditionName: v, equipmentId: model.equipmentId, dataId: model?.id });
return Promise.resolve();
} catch (e: any) {
return Promise.reject(e?.response?.data?.message || e?.message || '条件名称不能重复');
return Promise.reject(e?.response?.data?.message || e?.message || '同一设备下条件名称不能重复');
}
},
trigger: 'blur',
@@ -64,11 +66,12 @@ export const formSchema: FormSchema[] = [
validator: async (_rule, value) => {
const v = value == null ? '' : String(value).trim();
if (!v) return Promise.resolve();
if (!model?.equipmentId) return Promise.resolve();
try {
await checkConditionCode({ conditionCode: v, dataId: model?.id });
await checkConditionCode({ conditionCode: v, equipmentId: model.equipmentId, dataId: model?.id });
return Promise.resolve();
} catch (e: any) {
return Promise.reject(e?.response?.data?.message || e?.message || '条件代码不能重复');
return Promise.reject(e?.response?.data?.message || e?.message || '同一设备下条件代码不能重复');
}
},
trigger: 'blur',