From 9786b6898c79f5de9ca7eeb168fe4b6f5b0d173f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 06 九月 2024 13:52:39 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/Enquiry/ViewPictures.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jrj/project/business/Enquiry/ViewPictures.cpp b/jrj/project/business/Enquiry/ViewPictures.cpp
index 6e186df..677bffd 100644
--- a/jrj/project/business/Enquiry/ViewPictures.cpp
+++ b/jrj/project/business/Enquiry/ViewPictures.cpp
@@ -4,6 +4,7 @@
 #include <wobject/xdouble.hpp>
 #include <xcontrol/xlayersheet.hpp>
 #include <xcontrol/xdatetimepick.hpp>
+#include <xcontrol/ximageview.hpp>
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
@@ -45,9 +46,9 @@
 
 		int OnShowImage(xstring skuid)
 		{
-			imageview im = GetControl(L"im1");
+			ximageview im = GetControl(L"im1");
 			//im.RemoveImage();
-			im.ResetEx();
+			im.Reset();
 
 			xml xp ;
 			
@@ -85,9 +86,7 @@
 		{
 			SetArg();
 			OnAttachEvent();
-			xaserverarg arg;
-			
-			int p = GetArg();
+			xaserverarg arg= GetArg();
 		
 			xstring skuid = arg.GetArgString(L"guid");
 			xstring customerItemNo = arg.GetArgString(L"CustomerItemNo");

--
Gitblit v1.9.3