From b015137b1adc8949576fefdf055ba058b7ca22fc Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 09 九月 2024 17:15:08 +0800
Subject: [PATCH] update

---
 jrj/project/business/GDN3.list.cpp |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index 342c44f..9b60889 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -70,9 +70,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);
 			string 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;
@@ -96,9 +96,9 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			string 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;
@@ -125,13 +125,13 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			string 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);
 		}
@@ -154,7 +154,7 @@
 		return 1;
 	}
 
-	int ViewUpdate(int pr, xstring updateItem, xaserverarg  arg)
+	int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg  arg)
 	{
 		if (updateItem == L"del")
 		{
@@ -420,7 +420,7 @@
 				KXMLDOMDocument supplier_x = ViewObject::RetrieveData(L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
 				if (supplier_x)
 				{
-					if (supplier_x.text() != L"跟单")
+					if ((xstring)supplier_x.text() != L"跟单")
 					{
 						alert(L"当前角色不是跟单员不能新增单子,请重新选择角色");
 						return 0;
@@ -433,7 +433,7 @@
 			xstring EntityIDEx = dw_list.GetGuid(dw_list.GetRow());
 			xaserverarg argEx;
 			
-			alert(EntityIDEx);
+			//alert(EntityIDEx);
 			argEx.AddArg(L"GDNID", EntityIDEx);
 			OpenWindow(L"dev:xpage[GDNDelay.vx]", argEx);
 			return 1;
@@ -578,8 +578,9 @@
 
 	int OnSelectDataShowDdlb(TEvent* evt, LPARAM p)
 	{
+		HWND wid = cbx_datashow.GetHWND();
 		int CB_GETCURSEL = 0x0147;
-		int nIndex = SendMessageW(HWND(), CB_GETCURSEL, 0, 0);
+		int nIndex = SendMessageW(wid, CB_GETCURSEL, 0, 0);
 		KXMLDOMElement e = cbx_datashow.GetElement();
 		KXMLDOMElement e2 = e.selectSingleNode(L"item[" + xstring(nIndex + 1) + L"]");
 		rows = e2.selectSingleNode(L"@rows").text();
@@ -589,6 +590,7 @@
 	}
 
 
+
 	int PostOnAttachEvent()
 	{
 		AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&ListGDN3Win::OnTreeSelChanged); //树选择

--
Gitblit v1.9.3