git-svn-id: https://192.168.57.71/svn/jsgkj@667 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzhz/GkwxhwzyfzhzLayout.mxml

@@ -126,18 +126,14 @@
 					<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqgljgfzr')}" width="130"  textAlign="right"/>
 					<cus:QTextInput id="aqgljgfzr" width="180" />
 				</s:HGroup>
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right" >
-					<cus:QLabel   width="130"/>
-					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="thisModel.doQuery(event)"/>
-				</s:HGroup>
-			</s:HGroup>
-			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
+				<s:HGroup  verticalAlign="middle" width="30%" textAlign="right">
 					<!-- 任务状态 -->
 					<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="130" textAlign="right"/>
 					<cus:QComboBox id="query_lcStatus" comboxClass="WHWorkflowSelect" hasBlank="true" width="180"  />
 				</s:HGroup>
-				
+				<s:HGroup  verticalAlign="middle" textAlign="right" >
+					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="thisModel.doQuery(event)"/>
+				</s:HGroup>
 			</s:HGroup>
 		</s:VGroup>
 		<s:VGroup width="100%" height="100%" >

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzblhhzLayout.mxml

@@ -156,8 +156,7 @@
 				</s:HGroup>
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','ssgq')}" width="130"  textAlign="right"/>
-					<cus:QComboBox id="query_gq" width="180" comboxClass="GqBySzdSelect" parentId="{Global.szd}" hasBlank="true" />	
-					
+					<cus:QComboBox id="query_gq" width="180" comboxClass="GqBySzdSelect" parentId="{Global.szd}" hasBlank="true" />						
 				</s:HGroup>
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qymc')}" width="130"  textAlign="right"/>
@@ -173,19 +172,14 @@
 					<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','fddbr')}" width="130"  textAlign="right"/>
 					<cus:QTextInput id="fddbr" width="180" />
 				</s:HGroup>
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
-					<!--s:Button label="{resourceManager.getString('Gkwxhwzyfzblhhz','shouqi')}" click="shouqi()" /-->
-					<cus:QLabel   width="130"/>
-					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="thisModel.doQuery(event)"/>
-				</s:HGroup>
-			</s:HGroup>
-			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
+				<s:HGroup  verticalAlign="middle" width="30%" textAlign="right">
 					<!-- 任务状态 -->
 					<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="130" textAlign="right"/>
 					<cus:QComboBox id="query_lcStatus" comboxClass="WHWorkflowSelect" hasBlank="true" width="180"  />
 				</s:HGroup>
-				
+				<s:HGroup  verticalAlign="middle"  textAlign="right">
+					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="thisModel.doQuery(event)"/>
+				</s:HGroup>
 			</s:HGroup>
 		</s:VGroup>
 		<s:VGroup width="100%" height="100%" >

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzblhhzLayoutNoFlow.mxml

@@ -142,8 +142,12 @@
 					<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqgljgfzr')}" width="130"  textAlign="right"/>
 					<cus:QTextInput id="aqgljgfzr" width="180" />
 				</s:HGroup-->
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
-					<cus:QLabel   width="130"/>
+				<s:HGroup  verticalAlign="middle" width="30%" textAlign="right">
+					<!-- 任务状态 -->
+					<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="130" textAlign="right"/>
+					<cus:QComboBox id="query_lcStatus" comboxClass="WHWorkflowSelect" hasBlank="true" width="180"  />
+				</s:HGroup>
+				<s:HGroup  verticalAlign="middle"  textAlign="right">
 					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="thisModel.doQuery(event)"/>
 				</s:HGroup>
 			</s:HGroup>
@@ -151,14 +155,6 @@
 				<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="100"/>
 				<cus:QComboBox id="query_lcStatus" comboxClass="WorkflowStatusSelect" hasBlank="true" />
 			</s:HGroup>-->
-			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
-					<!-- 任务状态 -->
-					<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="130" textAlign="right"/>
-					<cus:QComboBox id="query_lcStatus" comboxClass="WHWorkflowSelect" hasBlank="true" width="180"  />
-				</s:HGroup>
-				
-			</s:HGroup>
 		</s:VGroup>
 		<s:VGroup width="100%" height="100%" >
 			<ui:DataGrid id="dataGrid" sortChange="{thisModel.doSort(event)}" rowColorFunction="thisModel.fzgqFun">