Merge branch 'main' of http://47.100.72.85:3000/rtgit/RTFormwork
This commit is contained in:
commit
2d5d69eb25
|
@ -1738,6 +1738,14 @@ begin
|
|||
Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TComboBox(Controls[i]).Text))
|
||||
else if Controls[i].Tag = LikeTag then
|
||||
Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TComboBox(Controls[i]).Text) + '%');
|
||||
end
|
||||
else if Controls[i] is TcxComboBox then
|
||||
begin
|
||||
if Trim(TcxComboBox(Controls[i]).Text) <> '' then
|
||||
if Controls[i].Tag = EquTag then
|
||||
Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TcxComboBox(Controls[i]).Text))
|
||||
else if Controls[i].Tag = LikeTag then
|
||||
Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TcxComboBox(Controls[i]).Text) + '%');
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
@ -2545,7 +2553,7 @@ begin
|
|||
finally
|
||||
mADOTmp.close;
|
||||
mADOTmp.Free;
|
||||
cxGrid.EndUpdate() ;
|
||||
cxGrid.EndUpdate();
|
||||
end;
|
||||
|
||||
end;
|
||||
|
@ -2654,7 +2662,7 @@ begin
|
|||
finally
|
||||
mADOTmp.close;
|
||||
mADOTmp.Free;
|
||||
cxGrid.EndUpdate ;
|
||||
cxGrid.EndUpdate;
|
||||
end;
|
||||
|
||||
end;
|
||||
|
|
Loading…
Reference in New Issue
Block a user