From a6b54d999992d72b2d9ea33efec0b7d642ea9f2d Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 18 七月 2024 12:21:12 +0800
Subject: [PATCH] update

---
 jrj/project/business/HR/ManpowerFile.cpp |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jrj/project/business/HR/ManpowerFile.cpp b/jrj/project/business/HR/ManpowerFile.cpp
index a661607..be4a0cd 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
 
@@ -132,8 +132,8 @@
 
 		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,8 +179,7 @@
 			xaserverarg arg;
 			
 			arg.AddArg(L"html", str);
-			int obj = cast(dw_list as int);
-			arg.AddArg(L"obj", xstring(obj));
+			arg.SetParam(L"obj", (LPARAM)&dw_list);
 			OpenWindow(L"dev:xpage[data.vanalysis.vx]", arg);
 			xutil::RestoreCursor(hCursor);
 			return 1;
@@ -199,10 +198,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 +212,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 +273,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 +287,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