From 61f1fc38bb7c290ccace616b7df4609a8b82a73b Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 06 九月 2024 13:52:36 +0800
Subject: [PATCH] update viewupdate
---
jrj/project/business/Quote3.list3.cpp | 0
jrj/project/business/GDN3.list.cpp | 2 +-
jrj/project/business/PO/Maint.PurcherItem.cpp | 0
jrj/project/business/GDN/list.SOTrace3.cpp | 0
jrj/project/business/SystemSettings/AddUserGroup.cpp | 14 +++++++-------
jrj/project/business/AP/list.ap.cpp | 2 +-
jrj/project/business/Expense/FreightExpenseInput.cpp | 0
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/workflow/workflow.chkdlg_vd.cpp | 4 +++-
jrj/project/business/GDN/AdvanceChargeList.cpp | 0
jrj/project/business/Customer3.list.cpp | 0
jrj/project/business/Supplier3.list.cpp | 2 +-
jrj/project/business/SystemSettings/SysUser.cpp | 6 +++---
jrj/project/business/SO/Apply.SOItem.cpp | 2 +-
jrj/project/workflow/workflow.chkdlg.cpp | 4 +++-
15 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp
index c0bd4fc..d39bd70 100644
--- a/jrj/project/business/AP/list.ap.cpp
+++ b/jrj/project/business/AP/list.ap.cpp
@@ -76,7 +76,7 @@
return dw_list.GetItemString(dw_list.GetRow(), L"APID");
}
- int ViewUpdate(int pr, xstring updateItem, xaserverarg arg)
+ int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg arg)
{
if (updateItem == L"del")
{
diff --git a/jrj/project/business/Customer3.list.cpp b/jrj/project/business/Customer3.list.cpp
index bcaafeb..31572ec 100644
--- a/jrj/project/business/Customer3.list.cpp
+++ b/jrj/project/business/Customer3.list.cpp
Binary files differ
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index d55ea7f..515d0fd 100644
--- a/jrj/project/business/EnquiryEx3.list.cpp
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp
index f4ad582..54c0f43 100644
--- a/jrj/project/business/Expense/FreightExpenseInput.cpp
+++ b/jrj/project/business/Expense/FreightExpenseInput.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/AdvanceChargeList.cpp b/jrj/project/business/GDN/AdvanceChargeList.cpp
index f6ebf5e..4b70e11 100644
--- a/jrj/project/business/GDN/AdvanceChargeList.cpp
+++ b/jrj/project/business/GDN/AdvanceChargeList.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/list.SOTrace3.cpp b/jrj/project/business/GDN/list.SOTrace3.cpp
index 3bf447a..08ed75b 100644
--- a/jrj/project/business/GDN/list.SOTrace3.cpp
+++ b/jrj/project/business/GDN/list.SOTrace3.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index 18475f1..ea3b01e 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -154,7 +154,7 @@
return 1;
}
- int ViewUpdate(int pr, xstring updateItem, xaserverarg arg)
+ int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg arg)
{
if (updateItem == L"del")
{
diff --git a/jrj/project/business/PO/Maint.PurcherItem.cpp b/jrj/project/business/PO/Maint.PurcherItem.cpp
index ebc0331..10e8ba1 100644
--- a/jrj/project/business/PO/Maint.PurcherItem.cpp
+++ b/jrj/project/business/PO/Maint.PurcherItem.cpp
Binary files differ
diff --git a/jrj/project/business/Quote3.list3.cpp b/jrj/project/business/Quote3.list3.cpp
index e622817..d0c1c5a 100644
--- a/jrj/project/business/Quote3.list3.cpp
+++ b/jrj/project/business/Quote3.list3.cpp
Binary files differ
diff --git a/jrj/project/business/SO/Apply.SOItem.cpp b/jrj/project/business/SO/Apply.SOItem.cpp
index 925ca2d..a8a05a9 100644
--- a/jrj/project/business/SO/Apply.SOItem.cpp
+++ b/jrj/project/business/SO/Apply.SOItem.cpp
@@ -70,7 +70,7 @@
return id;
}
- int ViewUpdate(int pr, xstring updateItem, xaserverarg arg)
+ int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg arg)
{
if (updateItem == L"del")
{
diff --git a/jrj/project/business/Supplier3.list.cpp b/jrj/project/business/Supplier3.list.cpp
index 6a7c199..47dda23 100644
--- a/jrj/project/business/Supplier3.list.cpp
+++ b/jrj/project/business/Supplier3.list.cpp
@@ -109,7 +109,7 @@
}
- int ViewUpdate(int pr, xstring updateItem, xaserverarg arg)
+ int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg arg)
{
if (updateItem == L"refresh")
{
diff --git a/jrj/project/business/SystemSettings/AddUserGroup.cpp b/jrj/project/business/SystemSettings/AddUserGroup.cpp
index 6b8c2cf..9f6fb82 100644
--- a/jrj/project/business/SystemSettings/AddUserGroup.cpp
+++ b/jrj/project/business/SystemSettings/AddUserGroup.cpp
@@ -17,10 +17,10 @@
int wid;
xtreeview tv;
xdwgrid dw;
- xwin pwin;
+ xwin* pwin;
public:
- AddUserGroup(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+ AddUserGroup(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd),pwin(nullptr) {}
public:
static AddUserGroup* CreateInstance(void* implPtr, void* hWnd)
{
@@ -40,17 +40,17 @@
return 1;
}
int AppendItem(xml x, KXMLDOMElement r, xstring item) {
- var e = x.createElement(item);
+ auto e = x.createElement(item);
xcontrol xc = GetControl(item);
- e.text() = xc.GetText();
+ e.settext(xc.GetText());
r.appendChild(e);
return 1;
}
int AppendAttrib(xml x, KXMLDOMElement r, xstring item) {
- var e = x.createElement(item);
+ auto e = x.createElement(item);
//xcontrol xc = GetControl(item);
xcontrol xc= GetControl(item);
- e.text() = xc.GetText();
+ e.settext(xc.GetText());
r.setAttribute(item, xc.GetText());
return 1;
}
@@ -67,7 +67,7 @@
xaserverarg arg;
x.loadXML(L"<row/>");
- var r = x.documentElement();
+ auto r = x.documentElement();
xstring gpguid;
if (p.note == L"修改")
{
diff --git a/jrj/project/business/SystemSettings/SysUser.cpp b/jrj/project/business/SystemSettings/SysUser.cpp
index a3b66d8..4155add 100644
--- a/jrj/project/business/SystemSettings/SysUser.cpp
+++ b/jrj/project/business/SystemSettings/SysUser.cpp
@@ -308,8 +308,6 @@
int onload()
{
- m_agentNode = new xnode;
-
tv_usergroup = GetControl(L"tv_usergroup");
dw_user = new xdwgrid;
dw_user.setNativePointer(GetControl(L"dw_user"));
@@ -322,11 +320,13 @@
HTREEITEM root = tv_usergroup.GetRootItem();
tv_usergroup.ExpandItem( root);
- xml x;
+ //return 1;
+ xml x;
x.loadXML(L"<Config/>");
m_configDoc = x;
rowSearch(L"系统用户.vface/template/SysUser/list");
+ return 1;
GridSearchEx();
return 1;
diff --git a/jrj/project/workflow/workflow.chkdlg.cpp b/jrj/project/workflow/workflow.chkdlg.cpp
index e500ef2..7c8d23d 100644
--- a/jrj/project/workflow/workflow.chkdlg.cpp
+++ b/jrj/project/workflow/workflow.chkdlg.cpp
@@ -24,7 +24,9 @@
if (comdid == L"xmOK")
{
xcontrol xc = GetControl(L"content");
- arg.AddArg(L"content", xc.GetText());
+ xstring str = xc.GetText();
+ if (str == L"")str = L".";
+ arg.AddArg(L"content", str);
}
arg.AddArg(L"comdid", comdid);
}
diff --git a/jrj/project/workflow/workflow.chkdlg_vd.cpp b/jrj/project/workflow/workflow.chkdlg_vd.cpp
index b6cad36..621383c 100644
--- a/jrj/project/workflow/workflow.chkdlg_vd.cpp
+++ b/jrj/project/workflow/workflow.chkdlg_vd.cpp
@@ -24,7 +24,9 @@
if (comdid == L"xmOK")
{
xcontrol xc = GetControl(L"content");
- arg.AddArg(L"content", xc.GetText());
+ xstring str = xc.GetText();
+ if (str == L"")str = L".";
+ arg.AddArg(L"content", str);
}
arg.AddArg(L"comdid", comdid);
}
--
Gitblit v1.9.3