From 65a0a22fc5385eed07417706a5ad3ef5a21e2ead Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 10 四月 2025 17:59:33 +0800
Subject: [PATCH] update
---
jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp | 21 +++++++++++++++++++++
jrj/project/HomeWin.cpp | 14 ++++++++------
jrj/project/IndexWin3.cpp | 1 +
jrj/project/business/Expense/Salaryslip.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 1 +
jrj/project/business/Expense/SalaryslipImp.cpp | 0
6 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 4d12ff3..7796782 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -149,6 +149,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>..\xframe;..\xframe\system;..\project;..\jarch;..\jarch.impl;.;..\ext-jrj;..</AdditionalIncludeDirectories>
+ <Optimization>MaxSpeed</Optimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
diff --git a/jrj/project/HomeWin.cpp b/jrj/project/HomeWin.cpp
index a6783db..d503a2a 100644
--- a/jrj/project/HomeWin.cpp
+++ b/jrj/project/HomeWin.cpp
@@ -6,7 +6,6 @@
#include "xcontrol/xshtml.hpp"
#include "vbusiness/vframe/frame.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
-#include "xcontrol/xshtml.hpp"
using xml = Hxsoft::XFrame::KXMLDOMDocument;
@@ -905,7 +904,7 @@
arg.AddArg(L"content", ele.xml());
xml doc;
- if (getUrl(L"/sale/data/vpage/vstart/task", arg.GetString(), doc) != 1)
+ if (getUrl(L"/sale/data/vpage/vstart/taskex", arg.GetString(), doc) != 1)
{
trace((xstring)L"error->:" + doc.xml());
return 0;
@@ -939,18 +938,20 @@
else
{
SetAgent();
- ShowAgentInfo();
+ //ShowAgentInfo();
}
return 1;
}
+ /*
int ShowAgentInfo()
{
xstring taskID = GetTaskID();
if (taskID != L"")
{
- KXMLDOMDocument x = ViewObject::RetrieveData(L"/sale/data/Agent/task", L"TaskID", taskID);
+ //KXMLDOMDocument x = ViewObject::RetrieveData(L"/sale/data/Agent/task", L"TaskID", taskID);
+ KXMLDOMDocument x = ViewObject::RetrieveData(L"/sale/data/Agent/entity", L"EntityID", GetEntityID(0));
if (x)
{
xshtml xs = GetControl(L"frame:agentinfo");
@@ -960,7 +961,8 @@
}
}
return 1;
- }
+ }*/
+
int OnRowChanged(TEvent* evt, LPARAM p)
{
DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
@@ -976,7 +978,7 @@
else
{
SetAgent();
- ShowAgentInfo();
+ //ShowAgentInfo();
}
return 1;
diff --git a/jrj/project/IndexWin3.cpp b/jrj/project/IndexWin3.cpp
index 2953783..10c1678 100644
--- a/jrj/project/IndexWin3.cpp
+++ b/jrj/project/IndexWin3.cpp
@@ -310,6 +310,7 @@
if (xaserver::ExecXQuery(GetServerUrl(), L"[GetSysInfo.xq]", arg.GetString(), x) != 1)
{
//trace(x.GetXml());
+ const wchar_t * str = x.xml();
return -1;
}
if ((xstring)x.xml() == L"") return -1;
diff --git a/jrj/project/business/Expense/Salaryslip.cpp b/jrj/project/business/Expense/Salaryslip.cpp
index 1d63416..a749cec 100644
--- a/jrj/project/business/Expense/Salaryslip.cpp
+++ b/jrj/project/business/Expense/Salaryslip.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SalaryslipImp.cpp b/jrj/project/business/Expense/SalaryslipImp.cpp
index f3de09a..3808c28 100644
--- a/jrj/project/business/Expense/SalaryslipImp.cpp
+++ b/jrj/project/business/Expense/SalaryslipImp.cpp
Binary files differ
diff --git a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
index f131170..d9150d2 100644
--- a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
@@ -3,6 +3,9 @@
#include <wobject/xwin.hpp>
#include <wobject/xurl.hpp>
#include <wobject/xapp.hpp>
+#include "viewobject/view.base.hpp"
+#include "xcontrol/xshtml.hpp"
+
class xframe : public xwin
{
public:
@@ -389,6 +392,22 @@
return L"";
}
+ virtual int ShowAgentInfo(xstring scene, xstring EntityID)
+ {
+ if (EntityID != L"")
+ {
+ KXMLDOMDocument x = ViewObject::RetrieveData(L"/sale/data/Agent/entity", L"scene",scene,L"EntityID", EntityID);
+ if (x)
+ {
+ xshtml xs =GetControl(L"frame:agentinfo");
+ string content = x.xml();
+ xs.SetContent(content);
+ xs.Redraw();
+ }
+ }
+ return 1;
+ }
+
virtual int SetAgent(xstring scene, xstring EntityID)
{
xstring xfNodeAgentArea =L"agentarea";
@@ -469,6 +488,8 @@
tools +=L"</vbox>";
SetAgentNode(anode, tools);
+ if (GetControl(L"frame:agentinfo"))ShowAgentInfo(scene,EntityID);
+
return 1;
}
--
Gitblit v1.9.3