修复了一些bug

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -49,7 +49,7 @@
 						<Button name="btn_diandan_cundan" width="90" height="40" padding="10,10,10,0" text="存单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						<Button name="btn_diandan_qudan" width="90" height="40" padding="10,10,10,0" text="取单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						
-						<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" textcolor="#FFFFFFFF" bkimage="num_bkg.png" float="true" pos="85,255,104,274" bordercolor="#FFFF0000" bordersize="0"></Label>
+						<Label name="diandan_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" textcolor="#FFFFFFFF" bkimage="num_bkg.png" float="true" pos="85,325,104,274" bordercolor="#FFFF0000" bordersize="0"></Label>
 						
 						<Button name="btn_diandan_zhengdanbeizhu" width="90" height="40" padding="10,10,10,0" text="整单备注" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						

bin/Win32/Debug/zhipuzi_pos_windows/skin/main.xml

@@ -38,7 +38,7 @@
 		
 		<HorizontalLayout>
 			<VerticalLayout width="91" bkcolor="#FFEDEDED">				
-				<VerticalLayout name="main_gongneng_daohang_layout" inset="0,15,0,20" vscrollbar="true">
+				<VerticalLayout width="91" name="main_gongneng_daohang_layout" inset="0,15,0,20" vscrollbar="true">
 
 				</VerticalLayout>
 				

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -983,14 +983,16 @@ void CMainWnd::UpdateGongnengDaohang()
 	for (size_t i = 0; i < changyongVector.size(); i++)
 	{
 		COptionUI* newOption = new COptionUI;
-
+		
 		//公共属性
 		newOption->SetGroup(L"main_tab");
 		newOption->SetFixedWidth(91);
 		newOption->SetFixedHeight(92);
 
+		newOption->SetAttribute(L"align", L"left");
+
 		RECT padding;
-		padding.left = 0;
+		padding.left = 28;
 		padding.top = 55;
 		padding.right = 0;
 		padding.bottom = 0;
@@ -1106,12 +1108,14 @@ void CMainWnd::UpdateGongnengDaohang()
 
 	//公共属性
 	newOption->SetGroup(L"main_tab");
-	newOption->SetFixedWidth(101);
-	newOption->SetFixedHeight(102);
+	newOption->SetFixedWidth(91);
+	newOption->SetFixedHeight(92);
+
+	newOption->SetAttribute(L"align", L"left");
 
 	RECT padding;
-	padding.left = 0;
-	padding.top = 60;
+	padding.left = 28;
+	padding.top = 55;
 	padding.right = 0;
 	padding.bottom = 0;
 	newOption->SetTextPadding(padding);

zhipuzi_pos_windows/wnd/CNumInputWnd.cpp

@@ -332,7 +332,7 @@ void CNumInputWnd::SaveNum()
 	m_content = CLewaimaiString::UnicodeToUTF8(wsReason);
 
 	int zhekou = atoi(m_content.c_str());
-	if (zhekou > 100 || zhekou < 1)
+	if (zhekou > m_max_int || zhekou < m_min_int)
 	{
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText((L"ÇëÊäÈë" + to_wstring(m_min_int) + L"µ½" + to_wstring(m_max_int) + L"Ö®¼äµÄÕûÊý").c_str());