From bb4dc0fab56e542e784311f95ae6d7e7dd785a8f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 29 十月 2024 17:10:33 +0800
Subject: [PATCH] update

---
 jrj/project/business/Company/CompanyMaint.cpp |   35 +++++++++++++----------------------
 1 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/jrj/project/business/Company/CompanyMaint.cpp b/jrj/project/business/Company/CompanyMaint.cpp
index c94f48a..0eb9c66 100644
--- a/jrj/project/business/Company/CompanyMaint.cpp
+++ b/jrj/project/business/Company/CompanyMaint.cpp
@@ -3,6 +3,7 @@
 #include <xcontrol/xdwgrid.hpp>
 #include <wobject/xdouble.hpp>
 #include <xcontrol/xlayersheet.hpp>
+#include <xcontrol/xdwpages.hpp>
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
@@ -11,7 +12,7 @@
 class __declspec(dllexport) CompanyMaint : public xframe
 {
 public:
-	pagecontrol m_layer;
+	xlayersheet m_layer;
 	xdwtable	dw_detail;
 	xdwtable	dw_bank;
 	xstring		m_operate;
@@ -150,14 +151,13 @@
 		xstring val, val2;
 		xml x;
 
-		var xdoc = x;
+		auto xdoc = x;
 		dw_detail.DwUpdateAllTo(xdoc);
 		//val = xdoc.xml ;
 		dw_bank.DwUpdateAllTo(xdoc);
-		val = xdoc.xml;
+		val = xdoc.xml();
 		trace(val);
 		xaserverarg args;
-		args.setNativePointer(args.CreateInstance());
 		args.AddArg(L"content", val);
 		args.AddArg(L"dbmap", L"CompanyInfo.dbmap");
 		//trace(m_EntityValueEx);
@@ -182,9 +182,8 @@
 		xutil::RestoreCursor(hIcon);
 		dw_detail.ResetUpdateStatus();
 		dw_bank.ResetUpdateStatus();
-		var xdoc2 = x;
-		dw_detail.DwUpdateAllTo(xdoc2);
-		val = xdoc.xml;
+		dw_detail.DwUpdateAllTo(x);
+		val = x.xml();
 		trace(val);
 		return 1;
 	}
@@ -213,9 +212,7 @@
 		xstring col = dwhdr.colname;
 		if (col != L"") {
 			xml x;
-
 			xaserverarg arg;
-
 			xstring query;
 			query = L"[IResourceMSSql.xq]";
 			if (col == L"TradeType") {
@@ -311,9 +308,7 @@
 	int  OnRetrieve()
 	{
 		xml x;
-
 		xaserverarg arg;
-
 		arg.AddArg(L"guid", m_sguid);
 		//trace(m_sguid);
 		//if (xurl::get(L"OrganizationStruct/detail.CompanyInfo",arg.GetString(),x) != 1)
@@ -358,16 +353,13 @@
 
 	int onload()
 	{
-		m_layer = new pagecontrol;
-		m_layer.setNativePointer(GetControl(L"cTab"));
+		m_layer = GetControl(L"cTab");
 
-		dw_detail = new xdwtable;
-		dw_detail.setNativePointer(GetControl(L"dw_detail"));
+		dw_detail = GetControl(L"dw_detail");
 		dw_detail.openUrl(L"组织架构.vface/template/company/detail");
 		dw_detail.SetColHeaderHeight(0);
 		dw_detail.SetRowSelectorWidth(0);
-		dw_bank = new xdwtable;
-		dw_bank.setNativePointer(GetControl(L"dw_bank"));
+		dw_bank = GetControl(L"dw_bank");
 		dw_bank.openUrl(L"组织架构.vface/template/company/bank");
 
 		OnInitial();
@@ -375,8 +367,7 @@
 			OnRetrieve();
 		}
 		else {
-			xdwtable dw = new xdwtable;
-			dw.setNativePointer(dw_detail.FindDwTable(L"CompanyInfo", 0));
+			xdwtable dw = dw_detail.FindDwTable(L"CompanyInfo", 0);
 			dw.SetItemString(1, L"Status", L"1");
 			dw.SetItemString(1, L"InternalFlag", L"Y");
 			dw.SetItemString(1, L"Type", L"0");
@@ -387,14 +378,14 @@
 			dw.SetItemDisplayString(1,L"CreatorID",susername);
 			dw.SetItemString(1,L"CreateDate",sdate);*/
 
-			dw.setNativePointer(dw_detail.FindDwTable(L"address", 0));
+			dw = dw_detail.FindDwTable(L"address", 0);
 			dw.SetItemString(1, L"IdentifyAddressFlag", L"Y");
 			dw.SetItemString(1, L"Status", L"1");
-			dw.setNativePointer(dw_detail.FindDwTable(L"Regist", 0));
+			dw = dw_detail.FindDwTable(L"Regist", 0);
 			dw.SetItemString(1, L"IdentifyAddressFlag", L"N");
 			dw.SetItemString(1, L"Status", L"1");
 
-			dw.setNativePointer(dw_bank.FindDwTable(L"item", 0));
+			dw = dw_bank.FindDwTable(L"item", 0);
 			if (dw) {
 				//KXMLDOMElement ele = dw.GetElement();
 				//trace(ele.xml);

--
Gitblit v1.9.3