From aa966512d0b4bc7fe9df2b0c5a38413db0ed3e4c Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 03 七月 2024 23:12:40 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Customer3.maint.cpp | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 3be41ae..830737d 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -81,7 +81,7 @@
e.appendChild(Item);
}
- xml x2= new xml;
+ xml x2;
dw_Meetings.DwUpdateAllTo(x2);
KXMLDOMElement e2=x2.documentElement();
@@ -93,7 +93,7 @@
e.appendChild(Item2);
}
- xml x3= new xml;
+ xml x3;
dw_MeetingsEx.DwUpdateAllTo(x3);
KXMLDOMElement e3=x3.documentElement();
@@ -290,7 +290,7 @@
{
xdwtable dw_PartyContact1;
dw_PartyContact1 =dw_detail.FindDwTable(L"PC_OtherInfo");
- xml xx = new xml;
+ xml x
xx.setNativePointer(xml ::CreateInstance());
xaserverarg argnew = new xaserverarg;
argnew.setNativePointer(argnew.CreateInstance());
@@ -970,18 +970,13 @@
if(value == L"人员")
{
- xaserverarg& arg2 =* new xaserverarg;
-
+ xaserverarg arg = GetArg();
+ OpenWindow(L"dev:xpage[UserGroupPersonSelect.vx]", arg);
- xaserverarg& parg2 = *(xaserverarg*)GetParam();
-
- OpenWindow(L"dev:xpage[UserGroupPersonSelect.vx]", (LPARAM)&arg2);
-
- if(arg2.GetArgString(L"comdid")==L"xmOk")
+ if(arg.GetArgString(L"comdid")==L"xmOk")
{
- xstring data = arg2.GetArgString(L"data");
+ xstring data = arg.GetArgString(L"data");
xml x2;
-
x2.loadXML(data);
KXMLDOMNodeList nodes = x2.selectNodes(L"/root/item");
trace(x2.xml());
@@ -1020,7 +1015,7 @@
xstring value = hdr->data;
int row = hdr->row;
//alert(value);
- xaserverarg& arg=*new xaserverarg;
+ xaserverarg arg;
if(value == L"附件上传")
@@ -1033,20 +1028,18 @@
arg.AddArg(L"entityid",dw.GetGuid(dw.GetRow()));
- OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]",(LPARAM)&arg);
+ OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]",arg);
return 1;
}
if(value == L"人员")
{
- xaserverarg& arg2 = *new xaserverarg;
+ xaserverarg arg;
+ OpenWindow(L"dev:xpage[UserGroupPersonSelectEx.vx]", arg);
- xaserverarg parg2 = *(xaserverarg*)GetParam();
- OpenWindow(L"dev:xpage[UserGroupPersonSelectEx.vx]", (LPARAM)&arg2);
-
- if(arg2.GetArgString(L"comdid")==L"xmOk")
+ if(arg.GetArgString(L"comdid")==L"xmOk")
{
- xstring data = arg2.GetArgString(L"data");
+ xstring data = arg.GetArgString(L"data");
xml x2;
x2.loadXML(data);
@@ -1216,11 +1209,9 @@
- if (GetParam())
+ if (GetWinParam())
{
- xaserverarg& args = *(xaserverarg * )GetParam();
-
-
+ xaserverarg args = GetArg();
if (args.GetArgString(L"PartyID") != L"")
{
CustomerBase(m_EntityID);
--
Gitblit v1.9.3