From ff36263c5340c2eab8ce54a23b73fd3f19c46200 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 11 二月 2025 16:10:32 +0800
Subject: [PATCH] update
---
jrj/project/business/AR/ExchageInput3.cpp | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/jrj/project/business/AR/ExchageInput3.cpp b/jrj/project/business/AR/ExchageInput3.cpp
index 6b46415..0c129bf 100644
--- a/jrj/project/business/AR/ExchageInput3.cpp
+++ b/jrj/project/business/AR/ExchageInput3.cpp
@@ -18,7 +18,7 @@
xnode m_agentNode; //Agent Condition
xstring tabname;
xstring tabagent;
- int hSignWin;
+ HWND hSignWin;
///sale/data/AR/list
public:
@@ -61,7 +61,7 @@
arg.AddArg(L"content", x.xml());
- //trace(x.xml());
+ //alert(x.xml());
if (xurl::get(L"/sale/data/AR/update/item", arg.GetString(), x) != 1)
{
xstring error = x.text();
@@ -147,7 +147,7 @@
int OnSign()
{
- OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", cast(dw_list as int));
+ OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", (WPARAM) & dw_list);
return 1;
}
@@ -190,6 +190,16 @@
return 1;
}
+ int OnSaveAs()
+ {
+ if (tabname == L"sign") return dw_list.SaveAs(L"");
+ if (tabname == L"signed") return dw_signed.SaveAs(L"");
+ if (tabname == L"exch") return dw_exch.SaveAs(L"");
+ if (tabname == L"unexch") return dw_unexch.SaveAs(L"");
+ if (tabname == L"adjust") return dw_adjust.SaveAs(L"");
+ return 1;
+ }
+
int RetrieveData()
{
if (tabname == L"sign") return OnRetrieve(L"/sale/data/AR/list", dw_list);
@@ -219,6 +229,9 @@
{
return OnDeleteRow();
}
+ else if (comdid == L"xmSaveAs")
+ return OnSaveAs();
+
else if (comdid == L"xmDelete")
{
int MB_OKCANCEL = 1;
@@ -272,8 +285,8 @@
else if (comdid == L"xmExchangeFile")
{
//if(iswindow(hSignWin) & 0x1) return 1;
- xwin xw = OpenWindow(L"dev:xpage[ExchageFile.vx]", 0);
- hSignWin = xw.GetHWND();
+ xwin* xw = OpenWindow(L"dev:xpage[ExchageFile.vx]", 0);
+ hSignWin = xw->GetHWND();
return 1;
}
else if (comdid == L"xmRefresh")
@@ -306,14 +319,14 @@
}
if (frow > dw_list.GetRowCount()) return 1;
dw_list.SetRow(frow);
- OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", cast(dw_list as int));
+ OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", (WPARAM)&dw_list);
return 1;
}
else if (comdid == L"xmAdd")
{
xaserverarg arg ;
- arg.AddArg(L"HWND", GetHWND());
+ arg.SetParam(L"HWND", GetHWND());
OpenWindow(L"dev:xpage[maint.SettlementExchange.vx]", arg);
}
@@ -321,7 +334,7 @@
{
xaserverarg arg1 ;
- arg1.AddArg(L"HWND", GetHWND().toString());
+ arg1.SetParam(L"HWND", GetHWND());
arg1.AddArg(L"SettlementExchangeID", dw_list.GetGuid(dw_list.GetRow()));
OpenWindow(L"dev:xpage[maint.SettlementExchange.vx]", arg1);
@@ -353,15 +366,15 @@
}
- int OnCombboChanged(ref TCommandEvent evt, int lParam)
+ int OnCombboChanged(TEvent* evt, int lParam)
{
xstring id = L"";
xstring name = L"";
- int h = xcombobox::GetCurSel(evt.hCtrl);
+ int h = xcombobox::GetCurSel(evt->command.hCtrl);
if (h > -1)
{
- tabname = xcombobox::GetItemData(evt.hCtrl, h);
- SwitchLayer(L"sheet" + (h + 1).toString(), L"frame");
+ tabname = (string)xcombobox::GetItemData(evt->command.hCtrl, h);
+ SwitchLayer(L"sheet" + xstring(h + 1), L"frame");
RetrieveData();
SetAgent();
}
@@ -426,9 +439,7 @@
xml x;
xaserverarg arg ;
-
- arg.setNativePointer(arg.CreateInstance());
- arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
+ arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"QueryArg", GetQueryArg());
//trace(L"QueryArg======L"+GetQueryArg());
if (getUrl(dataUrl, arg.GetString(), x) != 1)
@@ -454,7 +465,6 @@
{
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/AR/template/list");
-
dw_signed = GetControl(L"dw_signed");
dw_signed.openUrl(L"/sale/view/AR/template/listFinish");
@@ -492,7 +502,6 @@
int onloaded()
{
SetAgent();
-
return 1;
}
};
--
Gitblit v1.9.3