From 6c8c9ddaeb2bc6245a374c9354296bcfc2d96c06 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 29 四月 2025 14:10:22 +0800
Subject: [PATCH] update
---
jrj/project/business/HR/ManpowerFile.cpp | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/jrj/project/business/HR/ManpowerFile.cpp b/jrj/project/business/HR/ManpowerFile.cpp
index 123d75c..3cd79ba 100644
--- a/jrj/project/business/HR/ManpowerFile.cpp
+++ b/jrj/project/business/HR/ManpowerFile.cpp
@@ -12,7 +12,7 @@
{
public:
xdwgrid dw_list;//hxsoft.com -> Developer -> wface -> vcontrol
- int hSignWin;
+ HWND hSignWin;
xdwtable dw_arg;
xnode m_agentNode; //Agent Condition
@@ -33,13 +33,13 @@
int len = nlist.length();
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
xstring sImage = e.getAttribute(L"image");
xstring child = e.getAttribute(L"child");
int image = 15;
if (sImage) image = sImage.toInt();
- HTREEITEM h = tv_folder.InsertChildItem( hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem( hItem, name, e, image);
if (child != L"no") tv_folder.SetItemChild(h, 1);
ExpandChildFolder(h, e);
}
@@ -61,9 +61,9 @@
if (len > 0) tv_folder.SetItemChild(hItem, 1);
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
ExpandCatChildFolder(h, e, 35);
}
return 1;
@@ -76,9 +76,9 @@
int len = nlist.length();
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, 35);
ExpandCatChildFolder(h, e, 35);
}
return 1;
@@ -126,14 +126,16 @@
return 1;
KXMLDOMElement ele = dw_list.GetRowElement(row);
xstring mfid = ele.selectSingleNode(L"mfid").text();//获取节点的值
+ xaserverarg arg;
+ //arg.AddArg(L"mfid", mfid);
OpenWindow(L"dev:xpage[ManpowerFileWindow.vx]",mfid);
return 1;
}
int OnExchangeFileWindow()
{
- xwin xw = OpenWindow(L"dev:xpage[BlankExcelTemplate.vx]", 0);
- hSignWin = xw.GetHWND();
+ xwin* xw = OpenWindow(L"dev:xpage[BlankExcelTemplate.vx]", 0);
+ hSignWin = xw->GetHWND();
return 1;
}
@@ -179,9 +181,8 @@
xaserverarg arg;
arg.AddArg(L"html", str);
- int obj = cast(dw_list as int);
- arg.AddArg(L"obj", obj.toString());
- OpenWindow(L"dev:xpage[data.vanalysis.vx]", cast(arg as int));
+ arg.SetParam(L"obj", (LPARAM)&dw_list);
+ OpenWindow(L"dev:xpage[data.vanalysis.vx]", arg);
xutil::RestoreCursor(hCursor);
return 1;
}
@@ -199,10 +200,10 @@
int OnRetrieveEx1()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0) return 1;
+ if (!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
xstring no = e1.getAttribute(L"no");
xml x ;
@@ -213,7 +214,7 @@
arg.AddArg(L"QueryArg", GetQueryArg());
arg.AddArg(L"MStatus", no);
- arg.AddArg(L"QueryName", GetControl(L"QueryName").GetText());
+ arg.AddArg(L"QueryName", xcontrol(GetControl(L"QueryName")).GetText());
//trace(arg.GetString());
if (getUrl(L"/sale/data/ManpowerFile/list", arg.GetString(), x) != 1)
{
@@ -274,6 +275,7 @@
AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewManpowerFileList::OnSetFocus);
AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&ViewManpowerFileList::OnDoubleClicked);//行双击
AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&ViewManpowerFileList::OnTreeSelChanged); //树选择
+ return 1;
}
//数据传输函数
@@ -287,7 +289,7 @@
//arg.AddArg(L"QueryTxt",GetControl(L"sle_search").GetText());//添加所需要传到后台的参数
arg.AddArg(L"QueryArg", GetQueryArg());
arg.AddArg(L"MStatus", L"");
- arg.AddArg(L"QueryName", GetControl(L"QueryName").GetText());
+ arg.AddArg(L"QueryName", xcontrol(GetControl(L"QueryName")).GetText());
//trace(L"查看arg=L"+arg.GetString());//运行界面打印
if (getUrl(L"/sale/data/ManpowerFile/list", arg.GetString(), x) != 1)///sale/data/ManpowerFile/doclist后台接口
{
--
Gitblit v1.9.3