From 9a2d8c993779b096665daf199fc26169fc8a2ad1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 14:57:42 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index a2d59af..ae37a70 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -14,7 +14,9 @@
KXMLDOMDocument m_configDoc;
string m_EntityID;
- maint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+ maint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {
+ this->SetArg();
+ }
xstring GetEntityWorkNode(LPARAM pr, xstring what)
{
if (m_configDoc)
@@ -66,23 +68,26 @@
int getURLParam()
{
- //xpage xp = GetXPage();
- //xstring aurl = xp.GetWkUrl();
- xaserverarg* arg = (xaserverarg *)GetParam();
- m_EntityID = arg->GetArgString(L"EntityID");
- xstring config = arg->GetArgString(L"config");
- KXMLDOMDocument x;
- if (config == L"")
+ if (GetWinParam())
{
- string configXml = arg->GetArgString(L"configxml");
- if (configXml == L"") return 1;
- x.loadXML(configXml);
+ //xpage xp = GetXPage();
+ //xstring aurl = xp.GetWkUrl();
+ xaserverarg arg = GetArg();
+ m_EntityID = arg.GetArgString(L"EntityID");
+ xstring config = arg.GetArgString(L"config");
+ KXMLDOMDocument x;
+ if (config == L"")
+ {
+ string configXml = arg.GetArgString(L"configxml");
+ if (configXml == L"") return 1;
+ x.loadXML(configXml);
+ }
+ else
+ {
+ getUrl(config, L"", x);
+ }
+ m_configDoc = x;
}
- else
- {
- getUrl(config, L"", x);
- }
- m_configDoc = x;
return 1;
}
@@ -211,7 +216,7 @@
int OnPrint()
{
- xaserverarg* arg;
+ xaserverarg* arg = new xaserverarg;
arg->AddArg(L"EntityName", GetEntityName(1), L"");
arg->AddArg(L"EntityID", GetEntityID(1), L"");
openUrl(L"/sale/view/view.base/xpage/Template/PrintView", arg);
@@ -483,7 +488,7 @@
e = nlist.item(index);
//if(!e.selectSingleNode(L"@type")) continue;
//alert(e.xml);
- xstring xdwname = L"";//e.selectsingleNode(L"@name").text();
+ string xdwname = L"";//e.selectsingleNode(L"@name").text();
xstring xtpl = L"";//e.selectsingleNode(L"@url").text();
xstring xtpy = L"dwgrid";
if (e.selectSingleNode(L"@name")) xdwname = e.selectSingleNode(L"@name").text();
--
Gitblit v1.9.3