From dcbbf1257383b6dfff41e44b0815474c999c3ee3 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 08 七月 2024 17:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AP/list.ap.cpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp
index 3d185f7..11b76e5 100644
--- a/jrj/project/business/AP/list.ap.cpp
+++ b/jrj/project/business/AP/list.ap.cpp
@@ -56,9 +56,9 @@
xstring GetPayType()
{
xcombobox cbx_type = GetControl(L"cbx_type");
- int h = xcombobox::GetCurSel(cbx_type.GetId());
- if (h < 0) return "";
- return xcombobox::GetLBText(cbx_type.GetId(), h);
+ int h = xcombobox::GetCurSel(cbx_type.GetHWND());
+ if (h < 0) return L"";
+ return xcombobox::GetLBText(cbx_type.GetHWND(), h);
}
xstring GetEntityName(int pr)
@@ -168,7 +168,7 @@
arg.AddArg(L"APID", APID);
arg.AddArg(L"APType", apType);
- OpenWindow(L"dev:xpage[maint.ap.vx]", pa);
+ OpenWindow(L"dev:xpage[maint.ap.vx]", arg);
return 1;
}
if (comdid.find(L"action:", 0) >= 0)
@@ -289,6 +289,7 @@
AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&ListAP::OnDoubleClicked);//行双击
AttachEvent(L"cbx_state", L"CBN_SELCHANGE", (FEvent)&ListAP::OnDatePicker);
AttachEvent(L"dw_list", L"DWV_ITEMCHANGED", (FEvent)&ListAP::OnItemChanged);
+ return 1;
}
int OnDatePicker(TEvent* evt, int lParam)
@@ -409,7 +410,7 @@
xaserverarg arg;
- arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
+ arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"APType", APType);
arg.AddArg(L"QueryArg", GetQueryArg());
arg.AddArg(L"DatePicker", DatePickerOne);
@@ -446,7 +447,7 @@
xaserverarg arg;
- arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
+ arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"APType", APType);
arg.AddArg(L"QueryArg", GetQueryArg());
arg.AddArg(L"DatePicker", DatePicker);
--
Gitblit v1.9.3