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/Quote/TOSelectDlg.cpp |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

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;

--
Gitblit v1.9.3