From 7a91c3a1ed37b0332d4ff0ebeae60bd6da3665c0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 16 七月 2024 18:28:58 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/HR/BlankExcelTemplate.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/jrj/project/business/HR/BlankExcelTemplate.cpp b/jrj/project/business/HR/BlankExcelTemplate.cpp
index 289e4ce..70a02b4 100644
--- a/jrj/project/business/HR/BlankExcelTemplate.cpp
+++ b/jrj/project/business/HR/BlankExcelTemplate.cpp
@@ -54,13 +54,13 @@
int OnSave()
{
- xml x = new xml;
+ xml x ;
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
- arg.setNativePointer(xaserverarg::CreateInstance());
- arg.AddArg(L"content", x.xml().replace(L" 00:00:00", L"").replace(L"0000-00-00", L""));
+
+ arg.AddArg(L"content", xstring(x.xml()).replace(L" 00:00:00", L"").replace(L"0000-00-00", L""));
//trace(x.xml().replace(L" 00:00:00", L"").replace(L"0000-00-00", L""));//运行界面打印
if (getUrl(L"/sale/data/ManpowerFile/multiUpdate", arg.GetString(), x) != 1) {
xstring error = x.text();
@@ -101,12 +101,13 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&BlankExcelTemplateView::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&BlankExcelTemplateView::OnSetFocus);
+ return 1;
}
/*//加载数据
int OnRetrieve()
{
- xml x = new xml;
+ xml x ;
xaserverarg arg;
--
Gitblit v1.9.3