From aee67ef5bf2e57a148bfded1cb986378e35e7e01 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 18 四月 2024 00:49:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue b/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue index 02bd9e2..aa87fb0 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue @@ -172,11 +172,13 @@ return; } const Parameter = {}; + const DefaultParameter = {}; Parameter[`conditionMap['${this.SelectValue}']`] = this.SelectSearchValue; + DefaultParameter[`conditionMap['${this.SelectValue}_like']`] = this.SelectSearchValue; if(this.codeType === "btmCode"){ this.btmDefaultRend(Parameter) }else { - this.defaultSearchRend(Parameter); + this.defaultSearchRend(DefaultParameter); } }, //琛ㄦ牸琛屽崟閫� @@ -184,7 +186,7 @@ this.radioValue = row.$index; this.LineParm = row; this.crudName = row.name; - this.crudOid = row.oid; + this.crudOid = this.codeType === 'btmCode' ? row.id : row.oid; }, //纭畾 HandlerClickSave() { -- Gitblit v1.9.3