From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/view.assignadjust.cpp | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/jrj/project/business/SystemSettings/view.assignadjust.cpp b/jrj/project/business/SystemSettings/view.assignadjust.cpp
index 8969135..20cd4e8 100644
--- a/jrj/project/business/SystemSettings/view.assignadjust.cpp
+++ b/jrj/project/business/SystemSettings/view.assignadjust.cpp
@@ -51,13 +51,11 @@
int OnSave()
{
- xml x ;
+ xml x;
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
- xaserverarg arg ;
-
-
+ xaserverarg arg;
xml x0;
x0.loadXML(L"<data/>");
KXMLDOMNodeList t = x.selectNodes(L"data/node()[(@update.new='1') or (@update.modify='1') or (@update.delete='1') ]");
@@ -113,7 +111,7 @@
int OnSearch()
{
xaserverarg arg;
- ;
+
arg.AddArg(L"text", searchStr);
OpenWindow(L"dev:xpage[search.dialog.vx]", arg);
xstring str = arg.GetArgString(L"text");
@@ -217,13 +215,14 @@
return 1;
}
- int ShowRetrieveingTip()
+ int ShowRetrieveingTip()
{
dataretrieveing = true;
xwin* pwin = OpenWindow(L"dev:xpage[TestRetrieveing.vx]");
hWndRetrieveTip = pwin->GetHWND();
return 1;
}
+
int CloseRetrieveTip()
{
dataretrieveing = false;
@@ -238,10 +237,9 @@
if(!rptEle) return 0;
dw_list.Reset();
- xml x ;
-
- xaserverarg arg ;
- ;
+ xml x;
+ xaserverarg arg;
+
arg.AddArg(L"arg",argstr);
if (xurl::get(dataurl,arg.GetString(),x)!=1)
{
--
Gitblit v1.9.3