From 797e3bf30e745c5344e3b1fadfe3725cc035c1ac Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 18 七月 2024 17:06:09 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/QuoteFile.cpp | 3 +
jrj/ext-jrj/ext-jrj.vcxproj | 6 +-
jrj/project/business/Quote/trade.document.selectdlg.cpp | 6 +-
jrj/project/business/Quote/Product.Select.cpp | 14 ++++--
jrj/project/business/Quote/TOSelectDlg.cpp | 32 ++++++++-------
jrj/project/business/Quote/trade.document.saveas.cpp | 2
6 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 2f6246c..77fe435 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/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>
diff --git a/jrj/project/business/Quote/Product.Select.cpp b/jrj/project/business/Quote/Product.Select.cpp
index 3f91041..c1af898 100644
--- a/jrj/project/business/Quote/Product.Select.cpp
+++ b/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
diff --git a/jrj/project/business/Quote/TOSelectDlg.cpp b/jrj/project/business/Quote/TOSelectDlg.cpp
index 5bf9bfc..08350f0 100644
--- a/jrj/project/business/Quote/TOSelectDlg.cpp
+++ b/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;
diff --git a/jrj/project/business/Quote/trade.document.saveas.cpp b/jrj/project/business/Quote/trade.document.saveas.cpp
index 0bf7f0b..652b58b 100644
--- a/jrj/project/business/Quote/trade.document.saveas.cpp
+++ b/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"
diff --git a/jrj/project/business/Quote/trade.document.selectdlg.cpp b/jrj/project/business/Quote/trade.document.selectdlg.cpp
index b259ebc..de49c8b 100644
--- a/jrj/project/business/Quote/trade.document.selectdlg.cpp
+++ b/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！");
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index 01ad4b3..55ff4f5 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -4726,11 +4726,12 @@
int onload()
{
+ SetArg();
Reset();
orivalue = L"";
ARow = 1;
ACol = 1;
-
+
tabsheet = L"tab_bill";
templateID = L"ECDDE57A-43EB-49DD-9287-DC5D0B29ECA1";
xstring templ = L"";
--
Gitblit v1.9.3