diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 6979ee147..12d8d1a26 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -263,9 +263,9 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
if (formSchema.searchPage && formSchema.verificationParams) {
if (!formSchema.multiple) {
//获取data.ts参数信息
- const searchCondition = formSchema?.searchCondition || []
+ let searchCondition = formSchema?.searchCondition || []
//获取失去焦点参数信息
- const verificationParams = formSchema?.verificationParams ||
+ let verificationParams = formSchema?.verificationParams ||
[]
console.log('走新方法啦')
// searchCondition = [...searchCondition, ...verificationParams]
@@ -276,6 +276,9 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
const filters: any[] = []
if (searchCondition && searchCondition.length > 0) {
// 转换筛选条件所需
+ // 如果searchCondition和verificationParams有重复参数的,已verificationParams为准
+ searchCondition = searchCondition.filter(aItem => verificationParams.every(bItem => aItem.key !== bItem.key));
+
for (let i = 0; i < searchCondition.length; i++) {
// searchCondition.forEach((item) => {
// 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取
@@ -363,6 +366,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
}
}
}
+ console.log(verificationParams)
if (verificationParams && verificationParams.length > 0) {
// 转换筛选条件所需
for (let i = 0; i < verificationParams.length; i++) {
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 35c8ffc4d..a76a91848 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -394,14 +394,16 @@