update

xj qian

2025-04-10 65a0a22fc5385eed07417706a5ad3ef5a21e2ead

update

 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>

 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;

 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;

 jrj/project/business/Expense/Salaryslip.cpp

Binary files differ

 jrj/project/business/Expense/SalaryslipImp.cpp

Binary files differ

 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;
    }