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

---
 jrj/project/business/AR/ExchageInput3.cpp |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/jrj/project/business/AR/ExchageInput3.cpp b/jrj/project/business/AR/ExchageInput3.cpp
index 89408ad..3063bc9 100644
--- a/jrj/project/business/AR/ExchageInput3.cpp
+++ b/jrj/project/business/AR/ExchageInput3.cpp
@@ -61,7 +61,7 @@
 			
 			arg.AddArg(L"content", x.xml());
 
-			//trace(x.xml());
+			alert(x.xml());
 			if (xurl::get(L"/sale/data/AR/update/item", arg.GetString(), x) != 1)
 			{
 				xstring error = x.text();
@@ -360,7 +360,7 @@
 			int h = xcombobox::GetCurSel(evt->command.hCtrl);
 			if (h > -1)
 			{
-				tabname = xcombobox::GetItemData(evt->command.hCtrl, h);
+				tabname = (string)xcombobox::GetItemData(evt->command.hCtrl, h);
 				SwitchLayer(L"sheet" + xstring(h + 1), L"frame");
 				RetrieveData();
 				SetAgent();
@@ -453,7 +453,6 @@
 			dw_list = GetControl(L"dw_list");
 			dw_list.openUrl(L"/sale/view/AR/template/list");
 
-
 			dw_signed = GetControl(L"dw_signed");
 			dw_signed.openUrl(L"/sale/view/AR/template/listFinish");
 			dw_exch = GetControl(L"dw_exch");
@@ -490,7 +489,6 @@
 		int onloaded()
 		{
 			SetAgent();
-
 			return 1;
 		}
 	};

--
Gitblit v1.9.3