From d013a35ef5bb3b45b46362c67d6f3ca52a54e96d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 16:07:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/printview/Template.Print.Dialog.cpp | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/jrj/project/printview/Template.Print.Dialog.cpp b/jrj/project/printview/Template.Print.Dialog.cpp
index 3158b09..7b58fbd 100644
--- a/jrj/project/printview/Template.Print.Dialog.cpp
+++ b/jrj/project/printview/Template.Print.Dialog.cpp
@@ -25,17 +25,11 @@
xdwgrid dw_list;
xdwgrid dw_doclist;
bool bupdate;
-public:
- TemplatePrintDialog(void* implPtr, HWND hWnd) :responsewin(implPtr, hWnd) {}
-public:
- static TemplatePrintDialog* CreateInstance(void* implPtr, void* hWnd)
- {
- return new TemplatePrintDialog(implPtr, (HWND)hWnd);
- }
+
public:
int OnRetrieve()
{
- xstring username = publiccode::GetUser()->name;
+ xstring username = publiccode::GetUser().name;
if (username != L"admin" && m_Dir != username)
{
bupdate = false;
@@ -292,7 +286,7 @@
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
- arg.setNativePointer(xaserverarg::CreateInstance());
+
arg.AddArg(L"content", x.xml());
if (xurl::get(L"/sale/data/SysPrintTemplate/updateinfo", arg.GetString(), x) != 1)
@@ -361,7 +355,7 @@
int SetAgent()
{
- PUser& puser = *publiccode::GetUser();
+ PUser& puser = publiccode::GetUser();
xstring susername = puser.name;
if (susername != L"admin")
{
@@ -376,7 +370,7 @@
int CreateDir()
{
- PUser& puser = *publiccode::GetUser();
+ PUser& puser = publiccode::GetUser();
xstring susername = puser.name;
xml x;
@@ -398,7 +392,7 @@
int i;
int nlen = nlist.length();
xstring toolStr = L"<vbox name='Dir'>";
- xstring deptName = publiccode::GetUser()->deptname;
+ xstring deptName = publiccode::GetUser().deptname;
if (deptName == L"跟单部" && m_EntityName == L"GDN3") {
for (i = 2; i < nlen; i++)
{
@@ -479,11 +473,10 @@
m_EntityNo = arg_param.GetArgString(L"EntityNo");
xaserverarg arg;
- arg.setNativePointer(xaserverarg::CreateInstance());
arg.AddArg(L"EntityName", m_EntityName);
arg.AddArg(L"EntityID", m_EntityID);
arg.AddArg(L"EntityNo", m_EntityNo);
- xml x = new xml;
+ xml x ;
if (xurl::get(L"/sale/data/DocumentList3/bill/doclist", arg.GetString(), x) != 1)
{
@@ -516,7 +509,6 @@
{
SetArg();
responsewin::onload();
-
/*if (GetParam())
{
xstring action = arg_param.GetArgString(L"action");
--
Gitblit v1.9.3