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

xj qian

2024-07-18 797e3bf30e745c5344e3b1fadfe3725cc035c1ac

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -757,13 +757,13 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Quote\TOSelectDlg.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Quote\trade.document.saveas.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Quote\trade.document.selectdlg.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Quote\xmQuoteBillList.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>

 jrj/project/business/Quote/Product.Select.cpp

@@ -1,13 +1,17 @@
#include <wobject/xstring.hpp>
#include <wobject/xdouble.hpp>
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include <wobject/xdouble.hpp>
#include <xcontrol/xlayersheet.hpp>
#include <xcontrol/xdatetimepick.hpp>
#include <xcontrol/ximageview.hpp>


#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "vbusiness/vframe/maint.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
#include "viewobject/saleorder.view.hpp"
#include "viewobject/quote.view.hpp"
#include "viewobject/shoppingcart.view.hpp"
#include "viewobject/productLibrary.view.hpp"
#include "xcontrol/xcheckbox.hpp"
#include "xcontrol/xshtml.hpp"

using xml = KXMLDOMDocument;
class __declspec(dllexport)  ProductSelectWin :  public xwin

 jrj/project/business/Quote/TOSelectDlg.cpp

@@ -8,6 +8,7 @@

#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
#include <xcontrol/xlistview.hpp>

using xml = KXMLDOMDocument;
    class __declspec(dllexport) TOSelectDlg :  public xframe
@@ -93,8 +94,9 @@
            lvItem.iSubItem = 0;
            lvItem.mask = LVIF_PARAM ;
            
            lv_view.GetItem(lv_item.GetId(), lvItem);
            KXMLDOMElement  ele = trust(lvItem.lParam as KXMLDOMElement); 
            lv_view.GetItem( lvItem);
		
            KXMLDOMElement ele = lvItem.lParam;
            return ele;
        }
        
@@ -130,7 +132,7 @@
            int  LVNI_CUT               = 0x0004;
            int  LVNI_DROPHILITED   = 0x0008;
            
            int nItem =lv_view.GetNextItem(lv_view1.GetId(), -1, LVNI_FOCUSED);
            int nItem =lv_view.GetNextItem(-1, LVNI_FOCUSED);
            if(nItem < 0) return 1;
            
            if(GetWinParam())
@@ -151,12 +153,12 @@
        int SetListViewHeaderColumn(xstring Url,xlistview lv_item)
        {
            const int LVCFMT_LEFT = 0;
            for(int i=0;i<3;i++)  lv_item.DeleteColumn(lv_item.GetId(),1);
            for(int i=0;i<3;i++)  lv_item.DeleteColumn(1);
            //if(Url==L"")
            //{
                lv_item.InsertColumn(lv_item.GetId(),0,L"创建日期",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"创建人员",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"名称",0,120,0);
                lv_item.InsertColumn(0,L"创建日期",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(0,L"创建人员",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(0,L"名称",0,120,0);
                columnCount = 3;
            //}
            return 1;
@@ -165,16 +167,16 @@
        int SetListViewHeaderColumnItem(xstring Url,xlistview lv_item)
        {
            const int LVCFMT_LEFT = 0;
            for(int i=0;i<6;i++)  lv_item.DeleteColumn(lv_item.GetId(),1);
            for(int i=0;i<6;i++)  lv_item.DeleteColumn(1);
            //if(Url==L"")
            //{
                lv_item.InsertColumn(lv_item.GetId(),0,L"最后修改日期",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"创建日期",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"创建人员",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"״̬",0,70,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"主题",0,120,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"编号",0,70,0);
                lv_item.InsertColumn(lv_item.GetId(),0,L"事务",0,60,0);
                lv_item.InsertColumn(0,L"最后修改日期",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(0,L"创建日期",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(0,L"创建人员",LVCFMT_LEFT,80,0);
                lv_item.InsertColumn(0,L"״̬",0,70,0);
                lv_item.InsertColumn(0,L"主题",0,120,0);
                lv_item.InsertColumn(0,L"编号",0,70,0);
                lv_item.InsertColumn(0,L"事务",0,60,0);
                columnCount = 6;
            //}
            return 1;

 jrj/project/business/Quote/trade.document.saveas.cpp

@@ -4,7 +4,7 @@
#include <wobject/xdouble.hpp>
#include <xcontrol/xlayersheet.hpp>
#include <xcontrol/xdatetimepick.hpp>

#include <xcontrol/xlistview.hpp>

#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"

 jrj/project/business/Quote/trade.document.selectdlg.cpp

@@ -4,7 +4,7 @@
#include <wobject/xdouble.hpp>
#include <xcontrol/xlayersheet.hpp>
#include <xcontrol/xdatetimepick.hpp>

#include <xcontrol/xlistview.hpp>

#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -84,8 +84,8 @@
            lvItem.mask = LVIF_PARAM ;
            
            lv_view.GetItem( lvItem);
            KXMLDOMElement ele = trust(lvItem.lParam as KXMLDOMElement); 
            
            KXMLDOMElement ele = lvItem.lParam;
            xstring src = ele.getAttribute(L"url");
            xstring name=ele.getAttribute(L"caption");
            xstring file =L"";
@@ -143,7 +143,7 @@
                return -1;
            }
            //openRet = ShellExecute(0,L"open",L"C:/Temp/"+name,L"",L"",5);    
            openRet = ShellExecute(0,L"open",L"C:/Temp/"+sfile+ext,L"",L"",5);	
            openRet = ShellExecuteW(0,L"open",L"C:/Temp/"+sfile+ext,L"",L"",5);	
            if(openRet < 32)
            {
                alert(L"文件打开失败2！");

 jrj/project/business/QuoteFile.cpp

@@ -4726,6 +4726,7 @@

    int onload()
    {
        SetArg();
        Reset();
        orivalue = L"";
        ARow = 1;