From c6d20716a2ae3b743b98459a647d3474dff2dcb7 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 17:16:39 +0800
Subject: [PATCH] update ext
---
jrj/project/business/HR/ManpowerFileWindow.cpp | 2 +-
jrj/project/business/HR/AdministrativeDepartment.cpp | 2 +-
jrj/ext-jrj/ext-jrj.vcxproj | 14 ++++++++++----
jrj/project/business/HR/ManpowerFile.cpp | 2 ++
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 93dab91..d9113b3 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -630,13 +630,19 @@
</ClCompile>
<ClCompile Include="..\project\business\HR\BlankExcelTemplate.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\HR\GraduationSchool.cpp" />
- <ClCompile Include="..\project\business\HR\GraduationSchoolWin.vx.cpp" />
+ <ClCompile Include="..\project\business\HR\GraduationSchool.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\project\business\HR\GraduationSchoolWin.vx.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\HR\ManpowerFile.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\ManpowerFileWindow.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/project/business/HR/AdministrativeDepartment.cpp b/jrj/project/business/HR/AdministrativeDepartment.cpp
index 6b0ce3b..aee1a23 100644
--- a/jrj/project/business/HR/AdministrativeDepartment.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartment.cpp
@@ -342,7 +342,7 @@
xstring child = e.getAttribute(L"child");
int image = 18;
if (sImage) image = sImage.toInt();
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM) & e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
if (child != L"no")
tv_folder.SetItemChild(h, 1);
ExpandChildFolder(h, e);
diff --git a/jrj/project/business/HR/ManpowerFile.cpp b/jrj/project/business/HR/ManpowerFile.cpp
index 007f977..3cd79ba 100644
--- a/jrj/project/business/HR/ManpowerFile.cpp
+++ b/jrj/project/business/HR/ManpowerFile.cpp
@@ -126,6 +126,8 @@
return 1;
KXMLDOMElement ele = dw_list.GetRowElement(row);
xstring mfid = ele.selectSingleNode(L"mfid").text();//获取节点的值
+ xaserverarg arg;
+ //arg.AddArg(L"mfid", mfid);
OpenWindow(L"dev:xpage[ManpowerFileWindow.vx]",mfid);
return 1;
}
diff --git a/jrj/project/business/HR/ManpowerFileWindow.cpp b/jrj/project/business/HR/ManpowerFileWindow.cpp
index f6582f0..be12d03 100644
--- a/jrj/project/business/HR/ManpowerFileWindow.cpp
+++ b/jrj/project/business/HR/ManpowerFileWindow.cpp
@@ -162,7 +162,7 @@
int onload()
{
- SetArg();
+ //SetArg();
dw_base = GetControl(L"dw_base");
dw_base.openUrl(L"/sale/view/ManpowerFile/template/win");
mfid = L"";
--
Gitblit v1.9.3