From 86996f38d6dc5bb6a049f3ab6aa492bd22f7dde0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 05 九月 2024 15:03:14 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO/paymentterm.base.maint.so.cpp | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/jrj/project/business/SO/paymentterm.base.maint.so.cpp b/jrj/project/business/SO/paymentterm.base.maint.so.cpp
index 523590b..bbf2ade 100644
--- a/jrj/project/business/SO/paymentterm.base.maint.so.cpp
+++ b/jrj/project/business/SO/paymentterm.base.maint.so.cpp
@@ -1,4 +1,4 @@
-#include <wobject/xstring.hpp>
+锘�#include <wobject/xstring.hpp>
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include <xcontrol/xcell.hpp>
@@ -16,8 +16,6 @@
xdwtable dw_p;
xcell dw_cell;
- vcontrol vc;
-
xstring sCryno;
public:
@@ -187,6 +185,11 @@
xstring sTxt = OnCreateTxt();
dw_1.SetItemString(1, L"PaymentTermEx", sTxt);
+ xml x;
+ dw_1.DwUpdateAllTo(x);
+ GetArg().SetArg(L"content", x.xml());
+ GetArg().SetArg(L"process", L"ok");
+
CloseWindow();
return 1;
@@ -347,8 +350,8 @@
int OnInit()
{
- xaserver Args = GetArg();
-
+ xaserverarg Args = GetArg();
+ /*
XXmlContentSvr xdoc = new XXmlContentSvr;
xdoc.setNativePointer(Args);
vc = new vcontrol;
@@ -356,13 +359,13 @@
vbind bind = new vbind;
bind.bind(dw_1, vc);
-
- xml x;
-
+ xml x;
x.loadXML(vc.GetContent());
-
+ */
//alert(x.GetXml());
-
+ xml x;
+ xstring xs = GetArg().GetArgString(L"content");
+ x.loadXML(xs.c_str());
dw_1.Retrieve(x);
//if (x.GetXmlDoc().documentElement.selectSingleNode(L"CurrencyCode"))
@@ -375,11 +378,12 @@
int onload()
{
+ SetArg();
dw_1 = GetControl(L"dw_1");
dw_1.openUrl(L"/sale/view/SaleOrder/template/payment"); //base.maint.so.tpl/payment
/*
- xml x = new xml;
+ xml x ;
x.setNativePointer(xml::CreateInstance());
if(url::get(L"/sale/view/SaleOrder/template/SaleOrder/payment1",L"",x)!=1) //SO.updata.oldserver.pr.xq
{
@@ -399,7 +403,7 @@
OnAttachEvent();
- if (GetParam())OnInit();
+ if (GetWinParam())OnInit();
return 1;
}
--
Gitblit v1.9.3