From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SystemSettings/level.Customer.v3.cpp |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/jrj/project/business/SystemSettings/level.Customer.v3.cpp b/jrj/project/business/SystemSettings/level.Customer.v3.cpp
index f7be604..a4b1a7e 100644
--- a/jrj/project/business/SystemSettings/level.Customer.v3.cpp
+++ b/jrj/project/business/SystemSettings/level.Customer.v3.cpp
@@ -35,10 +35,9 @@
 	}
 	int OnPreRetrieve()
 	{
-		xml x ;
-		
-		xaserverarg arg ;
-		;	
+		xml x;
+		xaserverarg arg;
+
 		arg.AddArg(L"pageindex", xstring(PIndex)); //第几页
 		arg.AddArg(L"pagenumber", xstring(m_pageNumber)); //每页数量
 		arg.AddArg(L"QueryTxt",m_QueryTxt );
@@ -132,10 +131,9 @@
 		while (tv_1.GetRootItem())
 			tv_1.DeleteItem(tv_1.GetRootItem());
 		
-		xml x ;
-		
-		xaserverarg arg ;
-		;
+		xml x;
+		xaserverarg arg;
+
 		arg.AddArg(L"sType",sType);
 		if(getUrl(L"/sale/data/"+GetEntityName(1)+L"/pref/list/tree",arg.GetString(),x)!=1)
 		{
@@ -195,10 +193,9 @@
 		int  MB_YESNO = 0x00000004;
 		int  IDYES =  6;	
 		if(MessageBox(GetHWND(),L"确认要删除客户 "+sName+L" 的信息吗?",L"提示",MB_YESNO)!=IDYES) return 1;
-		xml x ;
+		xml x;
+		xaserverarg arg;
 		
-		xaserverarg arg ;
-		;
 		arg.AddArg(L"guid",sguid);
 		if (xurl::post(L"/sale/data/"+GetEntityName(1)+L"/entity/delete",arg.GetString(),x) != 1)
 		{
@@ -232,8 +229,8 @@
 	//设置层级弹出窗与保存
 	int OnLevelCustomer()
 	{
-		xaserverarg arg ;
-		;
+		xaserverarg arg;
+		
 		OpenWindow(L"dev:xpage[maint.Level.Customer3.vx]", arg);
 		
 		xml ux ;
@@ -243,7 +240,7 @@
 
 		if(arg.GetArgString(L"ok")==L"true")
 		{
-			xml x ;
+			xml x;
 			
 			x.loadXML(arg.GetArgString(L"arg"));
 			KXMLDOMElement uele = x.documentElement(); 
@@ -305,10 +302,9 @@
 		int row = hdr.row;
 		KXMLDOMElement ele = listwin::dw_list.GetRowElement(row);
 		xstring entity = ele.selectSingleNode(L"CustomerID").text();
-		xml x ;
+		xml x;
+		xaserverarg arg;
 		
-		xaserverarg arg ;
-		;
 		arg.AddArg(L"EntityID",entity);
 		if (getUrl(L"/sale/data/CustomerV3/entity/customeritem",arg.GetString(),x)!=1)
 		{

--
Gitblit v1.9.3