Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-06-26 f9b257b3c9add11f7181a69443a4834f15991f24

Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

 jrj/project/business/GDN3.list.cpp

@@ -80,14 +80,18 @@
    int ExpandFolderItem(HTREEITEM hItem, xstring no)
    {
        //xml x = ViewObject::RetrieveData(urlTree,L"no",no);
        xml x = xml::Make();
        /*xml x = xml::Make();
        xaserverarg arg = xaserverarg::Make();
        arg.AddArg(L"no", no);
        xaserver::ExecXQuery(GetServerUrl(), L"[customerfolder.gdn.sql.xq]", arg.GetString(), x);
        */

		
        KXMLDOMDocument x = ViewObject::RetrieveData(GetServerUrl(), L"[customerfolder.gdn.sql.xq]", L"id", no);

        if (!x) return 0;

        KXMLDOMNodeList nlist = x.SelectNodes(L"/data/item");
        KXMLDOMNodeList nlist = x.selectNodes(L"/data/item");
        int len = nlist.length();
        for (int i = 0; i < len; i++)
        {
@@ -212,6 +216,7 @@
        arg.AddArg(L"no", no);
        arg.AddArg(L"QueryTxt", m_QueryTxt);
        arg.AddArg(L"rows", rows);

        trace(no + L"***" + m_QueryTxt + L"***" + rows);
        /*if(DeptName==L"跟单部"){
            dw_list.DwRetrieve(GetServerUrl(),L"[list.creator.gdn.sql.xq]",arg.GetString());
@@ -556,9 +561,8 @@
    int OnSelectDdlb(TEvent* evt, LPARAM p)
    {
        changeddlb = 1;
        int wid = ddlb_1.GetId();
        int CB_GETCURSEL = 0x0147;
        int nIndex = SendMessageW(wid, CB_GETCURSEL, 0, 0);
        int nIndex = SendMessageW(HWND(), CB_GETCURSEL, 0, 0);
        KXMLDOMElement e = ddlb_1.GetElement();
        KXMLDOMElement e2 = e.selectSingleNode(L"item[" + xstring(nIndex + 1) + L"]");
        xstring no = e2.selectSingleNode(L"@element").text();
@@ -575,9 +579,8 @@

    int OnSelectDataShowDdlb(TEvent* evt, LPARAM p)
    {
        int wid = cbx_datashow.GetId();
        int CB_GETCURSEL = 0x0147;
        int nIndex = SendMessageW(wid, CB_GETCURSEL, 0, 0);
        int nIndex = SendMessageW(HWND(), CB_GETCURSEL, 0, 0);
        KXMLDOMElement e = cbx_datashow.GetElement();
        KXMLDOMElement e2 = e.selectSingleNode(L"item[" + xstring(nIndex + 1) + L"]");
        rows = e2.selectSingleNode(L"@rows").text();
@@ -587,7 +590,7 @@
    }


    int AttachEvent()
    int PostOnAttachEvent()
    {
        AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&GDN3list::OnTreeSelChanged); //树选择
        //AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING",(FEvent)&GDN3list::OnTreeExpanding); //树展开
@@ -679,7 +682,7 @@


        //attach my control event
        AttachEvent();
        PostOnAttachEvent();

        readed = false;


 jrj/project/business/Supplier.maint.cpp

Binary files differ

 jrj/project/business/Supplier3.list.cpp

@@ -449,7 +449,8 @@
        AttachEvent(L"tv_1", L"TVN_SELCHANGED", (FEvent)&listSupplierv3::OnTreeSelChanged);
        AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&listSupplierv3::OnSelectDdlb);
        AttachEvent(L"pages", L"PAGE_CLICK", (FEvent)&listSupplierv3::OnChangePages);
        AttachEvent(L"dw_list", L"DWV_RCLICKED", (FEvent)&listSupplierv3::OnRClick);//鼠标右键						
        AttachEvent(L"dw_list", L"DWV_RCLICKED", (FEvent)&listSupplierv3::OnRClick);//鼠标右键		
        AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listSupplierv3::OnDoubleClicked);

        return 1;
    }