From 05327a1e8a3448b96ffad5c14163b16d5a6c184a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 09 七月 2024 13:31:04 +0800
Subject: [PATCH] update

---
 jrj/project/business/Enquiry.list.cpp |   62 ++++++++++++++-----------------
 1 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index 9e6968c..e07aea8 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -20,8 +20,8 @@
 	}
 
 public:
-	xstring m_sType; //鏍戦�変腑鐨勭被鍨�
-	xstring m_sTypeTxt; //鏍戦�変腑鐨勬暟鎹�
+	xstring m_sType; //树选中的类型
+	xstring m_sTypeTxt; //树选中的数据
 	xstring urlTree;
 	xstring myDataUrl;
 	xstring myDataUrl1;
@@ -147,7 +147,7 @@
 	}
 	
 	//process tree
-	//鏌ユ壘褰撳墠鏍戦」鐨勯《绾х洰褰�
+	//查找当前树项的顶级目录
 	HTREEITEM LookupTopFolder(HTREEITEM hItem)
 	{
 		HTREEITEM hRoot = tv_folder.GetRootItem();
@@ -187,7 +187,7 @@
 		return 1;				
 	}	
 
-	//鏍戝睍寮�
+	//树展开
 	int OnTreeExpanding(TEvent* evt, int p)
 	{
 		NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
@@ -289,11 +289,11 @@
 			xstring str = x.documentElement().getAttribute(L"text");
 			if(str == L"true")
 			{
-				alert(L"淇濆瓨鎴愬姛!"); 
+				alert(L"保存成功!"); 
 				dw_pricelistshare.ResetUpdateStatus();
 			}else 
 			{
-				alert(L"淇濆瓨澶辫触!");
+				alert(L"保存失败!");
 			}
 		}
 		
@@ -306,10 +306,10 @@
 		KXMLDOMElement xitem = nlist.item(0);
 		
 		xstring Reciever = xitem.selectSingleNode(L"userno").text(); 
-		xstring Subject = L"浠锋牸鍗曞凡鍏变韩["+CName+L"]";
-		xstring Category = L"浠锋牸鍗曞叡浜�";
+		xstring Subject = L"价格单已共享["+CName+L"]";
+		xstring Category = L"价格单共享";
 		xstring Content  = L"";
-		ViewObject::AddMessage(Category, Reciever, NO, EntityID, Subject, Content);
+		ViewObject::AddMessage(GetServerUrl(),Category, Reciever, NO, EntityID, Subject, Content);
 		return 1;
 	}
 	int SendNotice(xml content)
@@ -380,7 +380,7 @@
 					dw_pricelistex.ResetUpdateStatus();
 				}else 
 				{
-					alert(L"鎴愬搧浠锋牸鍗曚繚瀛樺け璐�!");
+					alert(L"成品价格单保存失败!");
 					return 1;
 				}
 			}
@@ -413,7 +413,7 @@
 						dw_priceitem.ResetUpdateStatus();
 					}else 
 					{
-						alert(L"缁勪欢浠锋牸鍗曚繚瀛樺け璐�!");
+						alert(L"组件价格单保存失败!");
 						return 1;
 					}
 				}
@@ -435,12 +435,12 @@
 			if(str == L"true")
 			{
 				dw_pricelistshare.ResetUpdateStatus();
-				alert(L"淇濆瓨鎴愬姛!"); 
-				OnProductPriceShareRetrieve();//鍒锋柊鏁版嵁
-				SendNotice(x2);//鍙戦�侀�氱煡
+				alert(L"保存成功!"); 
+				OnProductPriceShareRetrieve();//刷新数据
+				SendNotice(x2);//发送通知
 			}else 
 			{
-				alert(L"鍏变韩鏁版嵁淇濆瓨澶辫触!");
+				alert(L"共享数据保存失败!");
 			}
 		}
 		
@@ -487,12 +487,12 @@
 		return false;
 	}
 			
-	//妫�绱�
+	//检索
 	int OnPreRetrieve()
 	{
 	
 		HTREEITEM hItem = tv_folder.GetSelectedItem();
-		if(hItem <=0) return 1;
+		if(!hItem) return 1;
 		
 		HCURSOR 	hCursor = xutil::SetCursorWait();
 		KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
@@ -556,7 +556,7 @@
 		return 1;
 	}
 
-	//鍘嗗彶鏁版嵁
+	//历史数据
 	int Onhistroydata()
 	{
 		return 1;
@@ -868,7 +868,7 @@
 					dw_pricelistshare.SetItemString(crow,L"NO",No);
 					dw_pricelistshare.SetItemString(crow,L"GroupOrEmp",GroupOrEmp);
 					dw_pricelistshare.SetItemString(crow,L"EntityID",EntityID);
-					dw_pricelistshare.SetItemString(crow,L"EntityName",L"浜у搧浠锋牸鍗�");
+					dw_pricelistshare.SetItemString(crow,L"EntityName",L"产品价格单");
 					if(node.selectSingleNode(L"UserGroupID"))
 						dw_pricelistshare.SetItemString(crow,L"UserGroupID",node.selectSingleNode(L"UserGroupID").text());
 					if(node.selectSingleNode(L"PersonID"))
@@ -1216,9 +1216,9 @@
 				xml supplier_x = ViewObject::RetrieveData(L"/sale/data/SupplierV3/entity/FindBySaleType",L"id", s);
 				if(supplier_x)
 				{
-					if((xstring)supplier_x.text() == L"閲囪喘缁忕悊")
+					if((xstring)supplier_x.text() == L"采购经理")
 						{
-						alert(L"褰撳墠瑙掕壊涓嶆槸閲囪喘鍛樹笉鑳芥柊澧炲崟瀛愶紝璇烽噸鏂伴�夋嫨瑙掕壊");
+						alert(L"当前角色不是采购员不能新增单子,请重新选择角色");
 						return 0;
 					}
 				}
@@ -1281,7 +1281,7 @@
 		return 1;
 	}
 	
-	//xcombobox涓嬫媺
+	//xcombobox下拉
 	int OnSelectDdlb(TEvent* evt,int p)
 	{
 		changeddlb=1;
@@ -1405,17 +1405,11 @@
 		xutil::RestoreCursor(hCursor);
 		return 1;		
 	}
-	int OnDoubleClicked(TEvent* evt, LPARAM pr)
-	{
-		HCURSOR hCursor = xutil::SetCursorWait();
-		OnCmdDispatch(L"action:bill.open");
-		xutil::RestoreCursor(hCursor);
-		return 1;		
-	}
+
 	int AttachListon()
 	{
-		AttachEvent(L"tv_folder", L"TVN_SELCHANGED",(FEvent)&Enquiry3list::OnTreeSelChanged); //鏍戦�夋嫨
-		AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnTreeExpanding); //鏍戝睍寮�
+		AttachEvent(L"tv_folder", L"TVN_SELCHANGED",(FEvent)&Enquiry3list::OnTreeSelChanged); //树选择
+		AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnTreeExpanding); //树展开
 		AttachEvent(L"dw_list",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged);
 		AttachEvent(L"dw_list2",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged2);
 		AttachEvent(L"dw_list1",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged1);
@@ -1423,7 +1417,7 @@
 		AttachEvent(L"WM_COMMAND", (FEvent)&Enquiry3list::OnCkbCLick);
 		AttachEvent(L"dw_list",L"DWV_ASKSTYLE", (FEvent)&Enquiry3list::OnItemAskStyle);
 		AttachEvent(L"dw_pricelist",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnPriceListRowChanged);
-		AttachEvent(L"tv_folder_pricebill", L"TVN_SELCHANGED", (FEvent)&Enquiry3list::OnPriceBillTreeSelChanged); //鏍戦�夋嫨
+		AttachEvent(L"tv_folder_pricebill", L"TVN_SELCHANGED", (FEvent)&Enquiry3list::OnPriceBillTreeSelChanged); //树选择
 		AttachEvent(L"tv_folder_pricebill", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnPriceBillTreeExpanding);
 		
 		AttachEvent(L"dw_pricelistex",L"DWV_DOUBLECLICKED", (FEvent)&Enquiry3list::OnPriceListDoubleClicked);
@@ -1615,7 +1609,7 @@
 		
 		tv_folder_pricebill = GetControl(L"tv_folder_pricebill");
 		InitialFolderPriceBill();
-		
+		return 1;
 	}
 		
 	int onloaded()
@@ -1663,7 +1657,7 @@
 	{
 		HTREEITEM hItem = tv_folder.GetCaretItem();
 		arg.AddArg(L"sheetname",sheetname);
-		if(hItem > 0)
+		if(!hItem)
 		{
 			KXMLDOMElement e = tv_folder.GetItemData(hItem);
 			

--
Gitblit v1.9.3