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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzhz/GkwxhwzyfzhzModel.as

@@ -395,6 +395,27 @@ package com.jtgh.yjpt.model.zyfzhz
 					}
 				}
 			}
+			
+			//任务状态筛选条件：
+			var _status:String = '';
+			if(thisView.query_lcStatus!=null && thisView.query_lcStatus.selectedItem!=null){
+				var _xml:XML = thisView.query_lcStatus.selectedItem as XML;
+				_status = _xml.@id;
+			}
+			if(_status=='' && _status.length==0){
+				//任务状态下拉为空状态是默认状态，查看非未提交、非待填报状态的记录
+				lcStatus = 'default';
+			}
+			else{
+				if(_status=='wf.qb'){
+					//全部
+					lcStatus = '';
+				}
+				else{
+					lcStatus = _status;
+				}
+			}
+			
 			Utils.callRemote("gkwxhwzyfzhzController", queryAction, 
 				resultCallback,Utils.getFunctionId(thisView), pager, jyr,szd,gq,lcStatus,fddbr,aqgljgfzr);
 		}
@@ -612,7 +633,7 @@ package com.jtgh.yjpt.model.zyfzhz
 			fzView.mode = Constants.mode_edit;
 			fzView.view=view;
 			fzView.model=this;
-			Utils.popupWindow("作业场所信息", fzView as DisplayObject, view as DisplayObject,null,500,300);
+			Utils.popupWindow("作业场所信息", fzView as DisplayObject, view as DisplayObject,null,500,400);
 		}
 		
 		/**

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzndjy/GkwxhwzyfzblhhzModel.as

@@ -743,7 +743,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 			editView.mode = Constants.mode_edit;
 			editView.view=view;
 			editView.model=this;
-			Utils.popupWindow("附证发放信息", editView as DisplayObject, thisView as DisplayObject,null,500,300);
+			Utils.popupWindow("附证发放信息", editView as DisplayObject, thisView as DisplayObject,null,500,400);
 		}
 		
 		/**

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/Wxhwpm.mxml

@@ -64,22 +64,22 @@
 				//保存用户最近选择过的危险品名称
 				Utils.callRemote("wxhwpmController","saveWxhwpmMem",null,this.dataGrid.selectedData);
 				if(selectMode=="multipleRows"){
-				var selectList:Array=this.dataGrid.selectedData as Array;
-				if(selectList!=null){
-				for(var i:int=0;i<selectList.length;i++){
-					var vo:WxhwpmVo=selectList[i] as WxhwpmVo;
-					if(hwpm.indexOf(vo.bh+" ")==-1)
-					{
-						hwpm=hwpm+vo.bh+" "+vo.mchsm+";";
-						hwpmStr=hwpmStr+vo.mchsm+";\n";
+					var selectList:Array=this.dataGrid.selectedData as Array;
+					if(selectList!=null){
+						for(var i:int=0;i<selectList.length;i++){
+							var vo:WxhwpmVo=selectList[i] as WxhwpmVo;
+							if(hwpm.indexOf(vo.bh+" ")==-1)
+							{
+								hwpm=hwpm+vo.bh+" "+vo.mchsm+";";
+								hwpmStr=hwpmStr+vo.mchsm+";";
+							}
+						}
+						var res:Object=new Object;
+						res["hwpm"]=hwpm;
+						res["hwpmStr"]=hwpmStr;
+					this.dispatchEvent(new MyEvent(MyEvent.SAVE_OK,res));
 					}
 				}
-				var res:Object=new Object;
-				res["hwpm"]=hwpm;
-				res["hwpmStr"]=hwpmStr;
-				this.dispatchEvent(new MyEvent(MyEvent.SAVE_OK,res));
-				}
-				}
 				else if(selectMode=="singleRow"){
 					this.dispatchEvent(new MyEvent(MyEvent.SAVE_OK,this.dataGrid.selectedItem as WxhwpmVo));
 				}

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

@@ -99,7 +99,7 @@
 						view.dispatchEvent(new CloseEvent(Event.CLOSE));
 						if(thisModel!=null)
 							thisModel.doQuery(null);
-					},shyj,new Date(),vo,true);
+					},shyj,new Date(),vo,true,flag);
 				});
 			}
 			/**
@@ -114,7 +114,7 @@
 						}
 						view.dispatchEvent(new CloseEvent(Event.CLOSE));
 						thisModel.doQuery(null);
-					},shyj,new Date(),vo,false);
+					},shyj,new Date(),vo,false,flag);
 				});
 			}
 			public  function getShyj():void{

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

@@ -254,9 +254,9 @@
 					 paddingRight="5" paddingTop="5">	
 				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 					<cus:QLabel width="100" text="延续"/>
-					<s:CheckBox id="yanxu" click="YanXu(event)" selected="{thisVo.byzd2 == 'Y'}" />
+					<s:CheckBox id="yanxu"   selected="{thisVo.byzd2 == 'Y'}" />
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="yanxuTime" visible="{yanxu.selected}" includeInLayout="{yanxu.selected}">
+				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="yanxuTime" visible="false" includeInLayout="false">
 					<cus:QLabel width="100" text="{resourceManager.getString('Gkwxhwzyfzblhhz','fzrq')}"/>
 					<ui:DateField  width="150" selectedDate="@{thisVo.fzsj}"/>
 					<cus:QLabel width="100" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yxrq')}"/>

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

@@ -131,6 +131,14 @@
 					<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">
+					<!-- 任务状态 -->
+					<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)}">

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
-		 xmlns:s="library://ns.adobe.com/flex/spark" 
-		 xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%"
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
+		 xmlns:s="library://ns.adobe.com/flex/spark"
+		 xmlns:mx="library://ns.adobe.com/flex/mx"
 		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
 		 xmlns:cus="com.jtgh.yjpt.common.cus.*"
-		 creationComplete="creationCompleteHandler(event)" xmlns:aqsszxyssc="com.jtgh.yjpt.view.aqsszxyssc.*" >
+		 xmlns:aqsszxyssc="com.jtgh.yjpt.view.aqsszxyssc.*"
+		 width="100%" height="100%" creationComplete="creationCompleteHandler(event)">
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.Global;
@@ -22,7 +23,9 @@
 			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 			import com.jtgh.yjpt.vo.zyfzndjy.Gkwxhwzyfzbl_fzVo;
 			import com.jtgh.yjpt.vo.zyfzndjy.GkwxhwzyfzblhhzVo;
+			import com.jtgh.yjpt.vo.zysqbp.wh;
 			
+			import mx.collections.ArrayCollection;
 			import mx.controls.Alert;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
@@ -30,7 +33,6 @@
 			import mx.rpc.events.ResultEvent;
 			
 			import spark.components.gridClasses.GridColumn;
-
 			
 			[Bindable]
 			public var fzvo:Gkwxhwzyfzbl_fzVo = new Gkwxhwzyfzbl_fzVo();
@@ -44,6 +46,9 @@
 			public var enableflg:Boolean = false;
 			[Bindable]
 			public var mode:String = Constants.mode_add;
+			[Bindable]
+			public var wxhwpmArrCol:ArrayCollection = new ArrayCollection();
+			public var wxhwm_text:String = '';
 			
 			/**
 			 * 创建完成
@@ -96,12 +101,36 @@
 						gbq.text = fzvo.qynbbh;
 					}
 				}
+				
+				//初始化允许作业危险货物品列表 
+				wxhwm_text = fzvo.byzd5;
+				if(wxhwm_text!=null){
+					var _wh:Array = wxhwm_text.split(';');
+					var _whCheckID_Name:Array = fzvo.wxhwm.split(';');
+					for(var i:int =0;i<_wh.length;i++){
+						if(_wh[i]!=null){
+							var wh_txt = _wh[i] as String;
+							wh_txt = wh_txt.replace('\n','');
+							if(wh_txt !=''){
+								var whTemp:wh = new wh();
+								whTemp.wxhwpm = wh_txt
+								if(_whCheckID_Name[i]!=null && (_whCheckID_Name[i] as String).indexOf(wh_txt)>-1){
+									whTemp.whID = _whCheckID_Name[i] as String;
+								}
+								wxhwpmArrCol.addItem(whTemp);
+							}
+						}
+					}
+				}
 			}
+			
+			 
+			
 			protected function doSave():void
 			{
 				fzvo.fzsq = vo;
 				fzvo.zycs = vo.zycs;
-				fzvo.byzd5 = wxhwm.text;
+				fzvo.byzd5 = wxhwm_text;
 				fzvo.jyr = vo.jyrVo;
 				if(enableflg) {
 					fzvo.fzcsbh=vo.gkjyxkz;
@@ -188,60 +217,139 @@
 				Utils.popupWindow("危险品信息",view,this as DisplayObject,null,1000,600);
 			}
 			private function saveWxhwpm(event:MyEvent):void{
-				fzvo.wxhwm = event.data["hwpm"] as String;
-				this.wxhwm.text += event.data["hwpmStr"] as String;
+				fzvo.wxhwm = event.data["hwpm"] as String; 
+				
+				if(wxhwm_text==null)
+					wxhwm_text = event.data["hwpmStr"] as String;
+				else
+					wxhwm_text += event.data["hwpmStr"] as String;
+				
+				if(wxhwm_text!=null){
+					var _wh:Array = wxhwm_text.split(';');
+					var _whCheckID_Name:Array = fzvo.wxhwm.split(';');
+					wxhwpmArrCol = new ArrayCollection();
+					for(var i:int =0;i<_wh.length;i++){
+						if(_wh[i]!=null){
+							var wh_txt = _wh[i] as String;
+							wh_txt = wh_txt.replace('\n','');
+							if(wh_txt !=''){
+								var whTemp:wh = new wh();
+								whTemp.wxhwpm = wh_txt
+								if(_whCheckID_Name[i]!=null && (_whCheckID_Name[i] as String).indexOf(wh_txt)>-1)
+									whTemp.whID = _whCheckID_Name[i] as String;
+								wxhwpmArrCol.addItem(whTemp);
+							}
+						}
+					}//end for wh arr
+				}//end if wxhwm_text!=null
+			}
+			
+			
+			//允许作业的危险货物品名
+			protected function delWxhwpm(data:wh):void
+			{
+				var _wh:Array = wxhwm_text.split(';');
+				var _whCheckID_Name:Array = fzvo.wxhwm.split(';');
+				wxhwpmArrCol = new ArrayCollection();
+				for(var i:int =0;i<_wh.length;i++){
+					if(_wh[i]!=null){
+						var wh_txt = _wh[i] as String;
+						wh_txt = wh_txt.replace('\n','');
+						if(wh_txt !='' && data.wxhwpm !=wh_txt){
+							var whTemp:wh = new wh();
+							whTemp.wxhwpm = wh_txt
+							if(_whCheckID_Name[i]!=null && (_whCheckID_Name[i] as String).indexOf(wh_txt)>-1)
+								whTemp.whID = _whCheckID_Name[i] as String;
+							wxhwpmArrCol.addItem(whTemp);
+						}
+					}
+				}
+				
+				fzvo.wxhwm=''; 
+				fzvo.byzd5 = '';
+				for(var i:int=0;i<wxhwpmArrCol.length;i++){
+					fzvo.byzd5 += (wxhwpmArrCol[i] as wh).wxhwpm + ';';
+					fzvo.wxhwm += (wxhwpmArrCol[i] as wh).whID + ';';
+				}
+				wxhwm_text=fzvo.byzd5;
 			}
 			
 		]]>
 	</fx:Script>
 	
 	<s:VGroup width="100%" height="100%">
-		<s:VGroup width="100%" paddingBottom="5" paddingLeft="5"
-					  paddingRight="5" paddingTop="10">
-			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle"
-						  visible="{enableflg}" includeInLayout="{enableflg}">
+		<s:VGroup width="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10">
+			<s:HGroup visible="{enableflg}" width="100%" horizontalAlign="left"
+					  includeInLayout="{enableflg}" verticalAlign="middle">
 				<cus:QLabel width="80" text="作业场所"/>
-				<cus:QTextInput enabled="false" text="{vo.zycs.localeName}" width="340"/>
+				<cus:QTextInput width="340" enabled="false" text="{vo.zycs.localeName}"/>
 			</s:HGroup>
-			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle"
-						  visible="{enableflg}" includeInLayout="{enableflg}">
-				<cus:QLabel width="80" text="附证编号" notNull="true"/> 
-				<cus:QTextInput  id="fzbh_gkjyxkz" text="{vo.gkjyxkz}" width="220" editable="false"/>
+			<s:HGroup visible="{enableflg}" width="100%" horizontalAlign="left"
+					  includeInLayout="{enableflg}" verticalAlign="middle">
+				<cus:QLabel width="80" notNull="true" text="附证编号"/> 
+				<cus:QTextInput id="fzbh_gkjyxkz" width="220" editable="false" text="{vo.gkjyxkz}"/>
 				<cus:QLabel width="5" text="-"/>
-				<cus:QTextInput  id="fzbh_zyqylsh" text="@{fzvo.byzd1}" width="40" />
+				<cus:QTextInput id="fzbh_zyqylsh" width="40" text="@{fzvo.byzd1}"/>
 				<cus:QLabel width="5" text="-"/>
-				<cus:QComboBox  id="fzbh_mtlx" comboxClass="MtlxSelect" dataField="{fzvo.byzd2}" enabled="{vo.zycs.id==10000501}" 
-									hasBlank="true" width="46" toolTip="{resourceManager.getString('Gkwxhwzyfzblhhz','mtlx')}"/>
+				<cus:QComboBox id="fzbh_mtlx" width="46" comboxClass="MtlxSelect"
+							   dataField="{fzvo.byzd2}" enabled="{vo.zycs.id==10000501}"
+							   hasBlank="true"
+							   toolTip="{resourceManager.getString('Gkwxhwzyfzblhhz','mtlx')}"/>
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="mtg" visible="false" includeInLayout="false">
-					<cus:QLabel width="80" text="名称" notNull="true"/>
-					<cus:QComboBox id="mt" width="340" comboxClass="BwByJyrSelect"  parentId="{vo.jyrVo}"/>
+				<s:HGroup id="mtg" visible="false" width="100%" horizontalAlign="left"
+						  includeInLayout="false" verticalAlign="middle">
+					<cus:QLabel width="80" notNull="true" text="名称"/>
+					<cus:QComboBox id="mt" width="340" comboxClass="BwByJyrSelect"
+								   parentId="{vo.jyrVo}"/>
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="cgg" visible="false" includeInLayout="false">
-					<cus:QLabel width="80" text="名称" notNull="true"/>
-					<cus:QComboBox id="cg" width="340" comboxClass="CgSelect"  parentId="{vo.jyrVo}"/>
+				<s:HGroup id="cgg" visible="false" width="100%" horizontalAlign="left"
+						  includeInLayout="false" verticalAlign="middle">
+					<cus:QLabel width="80" notNull="true" text="名称"/>
+					<cus:QComboBox id="cg" width="340" comboxClass="CgSelect" parentId="{vo.jyrVo}"/>
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="dcg" visible="false" includeInLayout="false">
-					<cus:QLabel width="80" text="名称" notNull="true"/>
-					<cus:QComboBox id="dc" width="340" comboxClass="DcSelect"  parentId="{vo.jyrVo}"/>
+				<s:HGroup id="dcg" visible="false" width="100%" horizontalAlign="left"
+						  includeInLayout="false" verticalAlign="middle">
+					<cus:QLabel width="80" notNull="true" text="名称"/>
+					<cus:QComboBox id="dc" width="340" comboxClass="DcSelect" parentId="{vo.jyrVo}"/>
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="ckg" visible="false" includeInLayout="false">
-					<cus:QLabel width="80" text="名称" notNull="true"/>
-					<cus:QComboBox id="ck" width="340" comboxClass="CkSelect"  parentId="{vo.jyrVo}"/>
+				<s:HGroup id="ckg" visible="false" width="100%" horizontalAlign="left"
+						  includeInLayout="false" verticalAlign="middle">
+					<cus:QLabel width="80" notNull="true" text="名称"/>
+					<cus:QComboBox id="ck" width="340" comboxClass="CkSelect" parentId="{vo.jyrVo}"/>
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="gbqg" visible="false" includeInLayout="false">
-					<cus:QLabel width="80" text="名称" notNull="true"/>
-					<cus:QTextInput  id="gbq" width="340"/>
+				<s:HGroup id="gbqg" visible="false" width="100%" horizontalAlign="left"
+						  includeInLayout="false" verticalAlign="middle">
+					<cus:QLabel width="80" notNull="true" text="名称"/>
+					<cus:QTextInput id="gbq" width="340"/>
 				</s:HGroup>
-				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" >
-					<cus:QLabel width="80" text="允许作业的危险货物品名"/>
-					<cus:QTextArea  id="wxhwm" width="340" height="100" text="@{fzvo.byzd5}" editable="false"/>
-					<s:Button id="treeBtn" label="选择" enabled="true" click="treeBtnClick()"  skinClass="skins.cus.ButtonSkin"/>
-				</s:HGroup>				
-			</s:VGroup>	
-		<s:HGroup width="100%" verticalAlign="middle" height="30" horizontalAlign="center" paddingLeft="10" paddingRight="10">
-			<s:Button id="btnSave" label="确定" click="doSave()" skinClass="skins.cus.ButtonSkin" />
-			<s:Button id="btnClose" label="{resourceManager.getString('common','btn.close')}" click="doPopupClose(event)" skinClass="skins.cus.ButtonSkin"/>
+			<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+				<cus:QLabel width="80" text="允许作业的危险货物品名"/>
+				<!-- 危货附证货种列表 -->
+				<ui:DataGrid id="fzDataGrid" width="260" height="200" dataProvider="{wxhwpmArrCol}" editable="true">
+					<ui:columns>
+						<s:ArrayList>
+							<ui:DataGridColumn width="180" dataField="wxhwpm" headerText="危险货物品名" showDataTips="true" />  
+							<ui:DataGridColumn width="60" linkButtonFunc="{delWxhwpm}"
+											   linkButtonLabel="{resourceManager.getString('common','btn.del')}"
+											   type="{TypeBase.LINKBUTTON}"/>
+						</s:ArrayList>
+					</ui:columns>
+				</ui:DataGrid>
+				<s:Button id="treeBtn" label="选择" click="treeBtnClick()" enabled="true"
+							  skinClass="skins.cus.ButtonSkin"/>
+			</s:HGroup>	
+				 <!--
+				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+					
+					<cus:QTextArea id="wxhwm" width="340" height="100" editable="false"
+								   text="@{fzvo.byzd5}"/>
+				</s:HGroup>		-->			
+			</s:VGroup>
+		<s:HGroup width="100%" height="30" horizontalAlign="center" paddingLeft="10"
+				  paddingRight="10" verticalAlign="middle">
+			<s:Button id="btnSave" label="确定" click="doSave()" skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="btnClose" label="{resourceManager.getString('common','btn.close')}"
+					  click="doPopupClose(event)" skinClass="skins.cus.ButtonSkin"/>
 		</s:HGroup>
 	</s:VGroup>
 </s:Group>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<s:VGroup xmlns:fx="http://ns.adobe.com/mxml/2009" 
-		 xmlns:s="library://ns.adobe.com/flex/spark" 
-		 xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%"
-		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
-		 xmlns:cus="com.jtgh.yjpt.common.cus.*"
-		 creationComplete="creationCompleteHandler(event)" 
-		 xmlns:jyrzbxx="com.jtgh.yjpt.view.jyr.zbxx.*"
-		 horizontalAlign="center">
+<s:VGroup xmlns:fx="http://ns.adobe.com/mxml/2009"
+		  xmlns:s="library://ns.adobe.com/flex/spark"
+		  xmlns:mx="library://ns.adobe.com/flex/mx"
+		  xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+		  xmlns:cus="com.jtgh.yjpt.common.cus.*"
+		  xmlns:jyrzbxx="com.jtgh.yjpt.view.jyr.zbxx.*"
+		  width="100%" height="100%" creationComplete="creationCompleteHandler(event)"
+		  horizontalAlign="center">
 	<fx:Script>
 		<![CDATA[ 
 			import com.jtgh.yjpt.common.BusinessContext;
@@ -223,205 +223,270 @@
 		]]>
 	</fx:Script>
 	
-	<s:VGroup width="780" height="100%" paddingBottom="5" paddingLeft="5"
-			  paddingRight="5" paddingTop="5">
-		<s:BorderContainer  width="100%" borderWeight="1">
-			<s:VGroup gap="0" width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">
-				<s:BorderContainer  width="100%" borderWeight="1">
-					<cus:QLabel fontWeight="bold" text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqdw')}" 
-								width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
+	<s:VGroup width="780" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5"
+			  paddingTop="5">
+		<s:BorderContainer width="100%" borderWeight="1">
+			<s:VGroup width="100%" height="100%" gap="0" horizontalAlign="center"
+					  verticalAlign="middle">
+				<s:BorderContainer width="100%" borderWeight="1">
+					<cus:QLabel width="100%" height="100%" fontSize="22" fontWeight="bold"
+								text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqdw')}"
+								textalign="center" verticalAlign="middle"/>
 					
 				</s:BorderContainer>
-				<s:BorderContainer  width="100%" borderWeight="1">
-					<mx:VBox width="100%" label="{resourceManager.getString('Gkwxhwzyfzblhhz','sqdw')}"  paddingBottom="5" paddingLeft="5"
-							 paddingRight="5" paddingTop="5" id="vv">
+				<s:BorderContainer width="100%" borderWeight="1">
+					<mx:VBox id="vv" width="100%"
+							 label="{resourceManager.getString('Gkwxhwzyfzblhhz','sqdw')}"
+							 paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="办理编号" width="120"/>
-							<cus:QTextInput enabled="{enableflg}" width="200" text="@{vo.byzd1}"/>
+							<cus:QLabel width="120" text="办理编号"/>
+							<cus:QTextInput width="200" enabled="{enableflg}" text="@{vo.byzd1}"/>
 						</s:HGroup>				
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','szd')}" width="120"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','szd')}"/>
 							<cus:QComboBox id="szd" width="200" codeType="{Constants.GROUP_CODE_SZD}"
-										   comboxClass="CodeSelect" hasBlank="true"
-										   selectedVO="{vo.szd}"
-										   enabled="{Global.deployMode==Constants.DEPLOY_MODE_0?enableflg:false}"/>
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','ssgq')} " width="120"/>
-							<cus:QComboBox enabled="{enableflg}" id="szgq" width="200"  comboxClass="GqBySzdSelect" selectedVO="{vo.ssgq}" hasBlank="true"/>
+										   comboxClass="CodeSelect"
+										   enabled="{Global.deployMode==Constants.DEPLOY_MODE_0?enableflg:false}"
+										   hasBlank="true" selectedVO="{vo.szd}"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','ssgq')} "/>
+							<cus:QComboBox id="szgq" width="200" comboxClass="GqBySzdSelect"
+										   enabled="{enableflg}" hasBlank="true"
+										   selectedVO="{vo.ssgq}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qymc')}" width="120"/>
-							<cus:QTextInput enabled="{enableflg}" width="200" text="@{vo.jyrVo.gkjyr}"/>
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','gkjyxkzh')}"
-										width="120"/>
-							<cus:QTextInput editable="{enableflg}" width="200" text="@{vo.gkjyxkz}" toolTip="{vo.gkjyxkz}"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','qymc')}"/>
+							<cus:QTextInput width="200" enabled="{enableflg}"
+											text="@{vo.jyrVo.gkjyr}"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','gkjyxkzh')}"/>
+							<cus:QTextInput width="200" editable="{enableflg}" text="@{vo.gkjyxkz}"
+											toolTip="{vo.gkjyxkz}"/>
 						</s:HGroup>	
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','dz')}" width="120"/>
-							<cus:QTextInput editable="{enableflg}" id="zyfzr" width="200" text="@{vo.dz}"  toolTip="{vo.dz}"/>
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','fddbr')}" width="120"/>
-							<cus:QTextInput enabled="{enableflg}" id="lxdh" width="200" text="@{vo.fddbr}" />
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','dz')}"/>
+							<cus:QTextInput id="zyfzr" width="200" editable="{enableflg}"
+											text="@{vo.dz}" toolTip="{vo.dz}"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','fddbr')}"/>
+							<cus:QTextInput id="lxdh" width="200" enabled="{enableflg}"
+											text="@{vo.fddbr}"/>
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqgljg')}" width="120"/>
-							<cus:QTextInput enabled="{enableflg}" width="200" text="@{vo.aqgljg}" />
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqfz')}" width="120"/>
-							<cus:QTextInput enabled="{enableflg}" width="200" text="@{vo.aqfz}" />
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqgljg')}"/>
+							<cus:QTextInput width="200" enabled="{enableflg}" text="@{vo.aqgljg}"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqfz')}"/>
+							<cus:QTextInput width="200" enabled="{enableflg}" text="@{vo.aqfz}"/>
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqgljgfzrxx')}" width="120"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','aqgljgfzrxx')}"/>
 							<s:VGroup width="100%">
 								<s:HGroup width="100%" height="50%">
-									<cus:QLabel textalign="center" text="{resourceManager.getString('Gkwxhwzyfzblhhz','xm')}" width="25%"/>
-									<cus:QLabel textalign="center" text="{resourceManager.getString('Gkwxhwzyfzblhhz','zc')}" width="25%"/>
-									<cus:QLabel textalign="center" text="{resourceManager.getString('Gkwxhwzyfzblhhz','lxdh')}" width="25%"/>
-									<cus:QLabel textalign="center" text="{resourceManager.getString('Gkwxhwzyfzblhhz','dzyx')}" width="25%"/>
+									<cus:QLabel width="25%"
+												text="{resourceManager.getString('Gkwxhwzyfzblhhz','xm')}"
+												textalign="center"/>
+									<cus:QLabel width="25%"
+												text="{resourceManager.getString('Gkwxhwzyfzblhhz','zc')}"
+												textalign="center"/>
+									<cus:QLabel width="25%"
+												text="{resourceManager.getString('Gkwxhwzyfzblhhz','lxdh')}"
+												textalign="center"/>
+									<cus:QLabel width="25%"
+												text="{resourceManager.getString('Gkwxhwzyfzblhhz','dzyx')}"
+												textalign="center"/>
 								</s:HGroup>
 								<s:HGroup width="100%" height="50%">
-									<cus:QTextInput enabled="{enableflg}" width="25%" text="@{vo.gqgljgfzrxm}" />
-									<cus:QTextInput enabled="{enableflg}" width="25%" text="@{vo.gqgljgfzrzc}" />
-									<cus:QTextInput enabled="{enableflg}" width="25%" text="@{vo.gqgljgfzrlxdh}" />
-									<cus:QTextInput enabled="{enableflg}" width="25%" text="@{vo.gqgljgfzrdzyx}" />
+									<cus:QTextInput width="25%" enabled="{enableflg}"
+													text="@{vo.gqgljgfzrxm}"/>
+									<cus:QTextInput width="25%" enabled="{enableflg}"
+													text="@{vo.gqgljgfzrzc}"/>
+									<cus:QTextInput width="25%" enabled="{enableflg}"
+													text="@{vo.gqgljgfzrlxdh}"/>
+									<cus:QTextInput width="25%" enabled="{enableflg}"
+													text="@{vo.gqgljgfzrdzyx}"/>
 								</s:HGroup>
 							</s:VGroup>
 						</s:HGroup>
 					</mx:VBox>
 				</s:BorderContainer>
-				<s:BorderContainer  width="100%" borderWeight="1">
-					<cus:QLabel fontWeight="bold" text="{resourceManager.getString('Gkwxhwzyfzblhhz','wxhwgkzysq')}" 
-								width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
+				<s:BorderContainer width="100%" borderWeight="1">
+					<cus:QLabel width="100%" height="100%" fontSize="22" fontWeight="bold"
+								text="{resourceManager.getString('Gkwxhwzyfzblhhz','wxhwgkzysq')}"
+								textalign="center" verticalAlign="middle"/>
 				</s:BorderContainer>
-				<s:BorderContainer  width="100%" borderWeight="1">
-					<mx:VBox width="100%" label="{resourceManager.getString('Gkwxhwzyfzblhhz','wxhwgkzysq')}"  paddingBottom="5" paddingLeft="5"
-							 paddingRight="5" paddingTop="5">	
+				<s:BorderContainer width="100%" borderWeight="1">
+					<mx:VBox width="100%"
+							 label="{resourceManager.getString('Gkwxhwzyfzblhhz','wxhwgkzysq')}"
+							 paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">	
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','zycs')}" width="120"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','zycs')}"/>
 							<mx:HBox width="100%">
 								<mx:Repeater id="Repeaterckzycs" dataProvider="{model.zycsList}"> 
-									<mx:CheckBox enabled="{enableflg}" id="zycs" selected="{Repeaterckzycs.currentItem.id == vo.zycs.id}"
+									<mx:CheckBox id="zycs"
 												 label="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"
 												 data="{Repeaterckzycs.currentItem.id}"
-												 name="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"/>
+												 enabled="{enableflg}"
+												 name="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"
+												 selected="{Repeaterckzycs.currentItem.id == vo.zycs.id}"/>
 								</mx:Repeater>
 							</mx:HBox>
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','cq')}" width="120"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','cq')}"/>
 							<mx:HBox width="100%">
 								<mx:Repeater id="Repeaterckcq" dataProvider="{model.cqList}"> 
-									<mx:CheckBox enabled="{enableflg}" id="cq" selected="{Repeaterckcq.currentItem.id == vo.cq.id}"
+									<mx:CheckBox id="cq"
 												 label="{resourceManager.getString('select',Repeaterckcq.currentItem.name)}"
 												 data="{Repeaterckcq.currentItem.id}"
-												 name="{resourceManager.getString('select',Repeaterckcq.currentItem.name)}"/>
+												 enabled="{enableflg}"
+												 name="{resourceManager.getString('select',Repeaterckcq.currentItem.name)}"
+												 selected="{Repeaterckcq.currentItem.id == vo.cq.id}"/>
 								</mx:Repeater>
 							</mx:HBox>
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','zyfs')}" width="120"/>
-							<cus:QTextInput enabled="{enableflg}" id="zyfs" width="200" text="@{vo.zyfs}"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','zyfs')}"/>
+							<cus:QTextInput id="zyfs" width="200" enabled="{enableflg}"
+											text="@{vo.zyfs}"/>
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','whdj')}" width="120"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','whdj')}"/>
 							<mx:HBox width="100%">
 								<mx:Repeater id="Repeaterckwhdj" dataProvider="{model.whdjList}"> 
-									<mx:CheckBox enabled="{enableflg}" id="whdj" selected="{Repeaterckwhdj.currentItem.id == vo.whdj.id}"
+									<mx:CheckBox id="whdj"
 												 label="{resourceManager.getString('select',Repeaterckwhdj.currentItem.name)}"
 												 data="{Repeaterckwhdj.currentItem.id}"
-												 name="{resourceManager.getString('select',Repeaterckwhdj.currentItem.name)}"/>
+												 enabled="{enableflg}"
+												 name="{resourceManager.getString('select',Repeaterckwhdj.currentItem.name)}"
+												 selected="{Repeaterckwhdj.currentItem.id == vo.whdj.id}"/>
 								</mx:Repeater>
 							</mx:HBox>
 							
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','zywxhwpm')}" width="120"/>
-							<cus:QTextArea editable="{enableflg}" height="100%" id="hwpm" width="533"/>
+							<cus:QLabel width="120"
+										text="{resourceManager.getString('Gkwxhwzyfzblhhz','zywxhwpm')}"/>
+							<cus:QTextArea id="hwpm" width="533" height="100%" editable="{enableflg}"/>
 						</s:HGroup>
 						
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<ui:DataGrid id="fzDataGrid" width="100%" height="200" editable="{enableflg}"  dataProvider="{model.fzs}">
+							<ui:DataGrid id="fzDataGrid" width="100%" height="200"
+										 dataProvider="{model.fzs}" editable="{enableflg}">
 								<ui:columns><s:ArrayList>
-												<ui:DataGridColumn dataField="qynbmc" 
-																   headerText="企业内部编号" />
-												<ui:DataGridColumn dataField="byzd5" width="400"
-																   headerText="允许作业的危险货物品名" showDataTips="true" dataTipField="byzd5"/>
+												<ui:DataGridColumn dataField="qynbmc"
+																   headerText="企业内部编号"/>
+												<ui:DataGridColumn width="400" dataField="byzd5"
+																   dataTipField="byzd5"
+																   headerText="允许作业的危险货物品名"
+																   showDataTips="true"/>
 											</s:ArrayList></ui:columns>
 							</ui:DataGrid>
 						</s:HGroup>
 					</mx:VBox>
 				</s:BorderContainer>
-				<s:BorderContainer  width="100%" borderWeight="1">
-					<cus:QLabel fontWeight="bold" text="{resourceManager.getString('Gkwxhwzyfzblhhz','xtgdfjcl')}" 
-								width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
+				<s:BorderContainer width="100%" borderWeight="1">
+					<cus:QLabel width="100%" height="100%" fontSize="22" fontWeight="bold"
+								text="{resourceManager.getString('Gkwxhwzyfzblhhz','xtgdfjcl')}"
+								textalign="center" verticalAlign="middle"/>
 				</s:BorderContainer>
-				<s:BorderContainer  width="100%" borderWeight="1">
+				<s:BorderContainer width="100%" borderWeight="1">
 					<s:VGroup width="100%">
 						<!-- 成立安全生产管理机构或者任命专职安全生产管理人员的文件 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'1.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj1')}" 
+							<mx:LinkButton label="{'1.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj1')}"
 										   click="model.fileLoad('other',Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ1)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ1" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ1}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ1" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ1}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 安全管理制度和操作规程清单 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'2.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj2')}" 
+							<mx:LinkButton label="{'2.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj2')}"
 										   click="model.fileLoad(Constants.GGDM_NAME_GKWXHWZYFZBLHHZ_FJ2,Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ2)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ2" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ2}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ2" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ2}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 特种设备作业人员汇总表 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'3.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj3')}" 
+							<mx:LinkButton label="{'3.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj3')}"
 										   click="model.fileLoad(Constants.GGDM_NAME_GKWXHWZYFZBLHHZ_FJ3,Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ3)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ3" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ3}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ3" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ3}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 企业主要负责人，危险货物装缷管理人员、申报人员、集装箱装箱现场检查员从业资格证书复印件 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'4.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj4')}" 
+							<mx:LinkButton label="{'4.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj4')}"
 										   click="model.fileLoad('other',Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ4)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ4" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ4}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ4" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ4}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 应急设施设备清单 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'5.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj5')}" 
+							<mx:LinkButton label="{'5.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj5')}"
 										   click="model.fileLoad(Constants.GGDM_NAME_GKWXHWZYFZBLHHZ_FJ5,Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ5)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ5" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ5}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ5" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ5}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 事故应急预案汇总表 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'6.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj6')}" 
+							<mx:LinkButton label="{'6.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj6')}"
 										   click="model.fileLoad(Constants.GGDM_NAME_GKWXHWZYFZBLHHZ_FJ6,Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ6)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ6" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ6}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ6" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ6}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 安全专项验收合格证明或有效的安全现状评价报告报备单 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'7.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj7')}" 
+							<mx:LinkButton label="{'7.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj7')}"
 										   click="model.fileLoad('other',Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ7)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ7" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ7}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ7" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ7}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						<!-- 危险货物作业场所平面示意图 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'8.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj8')}" 
+							<mx:LinkButton label="{'8.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj8')}"
 										   click="model.fileLoad('other',Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ8)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ8" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ8}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ8" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ8}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						
 						<!-- 港口经营许可证书或临时经营许可证复印件 -->
 						<s:HGroup width="100%">
-							<mx:LinkButton label="{'9.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj9')}" 
+							<mx:LinkButton label="{'9.'+resourceManager.getString('Gkwxhwzyfzblhhz','fj9')}"
 										   click="model.fileLoad('other',Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ9)"/>
-							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ9" name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ9}" text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}" color="#ff0000"/>
+							<s:Label id="T_YJPT_GKWXHWZYFZBLHHZ_FJ9" color="#ff0000"
+									 name="{Constants.GGDM_ID_GKWXHWZYFZBLHHZ_FJ9}"
+									 text="{resourceManager.getString('Gkwxhwzyfzblhhz','que')}"/>
 						</s:HGroup>
 						
-						<s:HGroup width="100%" verticalAlign="middle"  paddingBottom="10">
+						<s:HGroup width="100%" paddingBottom="10" verticalAlign="middle">
 							<cus:QLabel width="120" text="填写人"/>
-							<cus:QTextInput width="200" text="{vo.taskStartUser}" editable="false"/>
-							<cus:QLabel width="120" text="填写日期"   />
-							<ui:DateField width="200" selectedDate="{vo.addDate}" enabled="false"/>
+							<cus:QTextInput width="200" editable="false" text="{vo.taskStartUser}"/>
+							<cus:QLabel width="120" text="填写日期"/>
+							<ui:DateField width="200" enabled="false" selectedDate="{vo.addDate}"/>
 						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>
@@ -445,117 +510,164 @@
 				</s:HGroup>-->
 			
 		<!-- 审批流程意见 -->
-				<s:BorderContainer  width="100%" borderWeight="1">
-					<cus:QLabel fontWeight="bold" text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqsm')}" 
-								width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
+				<s:BorderContainer width="100%" borderWeight="1">
+					<cus:QLabel width="100%" height="100%" fontSize="22" fontWeight="bold"
+								text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqsm')}"
+								textalign="center" verticalAlign="middle"/>
 				</s:BorderContainer>
-				<s:BorderContainer  width="100%" borderWeight="1">
+				<s:BorderContainer width="100%" borderWeight="1">
 					<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5"
 							  paddingRight="5" paddingTop="5">
-						<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','sm')}" width="100%" textalign="left"/>
+						<cus:QLabel width="100%"
+									text="{resourceManager.getString('Gkwxhwzyfzblhhz','sm')}"
+									textalign="left"/>
 						<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
 							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqqy')}"/>
-							<cus:QLabel text="{vo.jyrVo.gkjyr}" width="150" enabled="false"/>
+							<cus:QLabel width="150" enabled="false" text="{vo.jyrVo.gkjyr}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
 							<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','frdb')}"/>
-							<cus:QTextInput enabled="{enableflg}" text="{vo.fddbr}" width="150" />
+							<cus:QTextInput width="150" enabled="{enableflg}" text="{vo.fddbr}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-							<ui:DateField enabled="{enableflg}" width="150" selectedDate="{vo.addDate}" />
+							<ui:DateField width="150" enabled="{enableflg}"
+										  selectedDate="{vo.addDate}"/>
 						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>
 				
-				<s:HGroup gap="0" width="100%" visible="{!Utils.getCurrentUser().jyr}" includeInLayout="{!Utils.getCurrentUser().jyr}">
-					<s:BorderContainer  width="100%" borderWeight="1" id="yj1">
-						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel id="yj1_label" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj1"   width="150" text="{vo.xsscTask.auditMsg}" toolTip="{vo.xsscTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm1"   width="150" text="{vo.xsscTask.auditUsername}" enabled="false"/>
+				<s:HGroup visible="{!Utils.getCurrentUser().jyr}" width="100%" gap="0"
+						  includeInLayout="{!Utils.getCurrentUser().jyr}">
+					<s:BorderContainer id="yj1" width="100%" borderWeight="1">
+						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5"
+								  paddingRight="5" paddingTop="5">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel id="yj1_label" width="100%"
+											text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}"
+											textalign="left"/>
+								<cus:QTextArea id="shyj1" width="250" height="50"
+											   text="{vo.xsscTask.auditMsg}"
+											   toolTip="{vo.xsscTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<ui:DateField  width="150" selectedDate="{vo.xsscTask.auditTime}" id="shsj1" enabled="false"/>
+								<cus:QLabel width="100"
+											text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"
+											textalign="left"/>
+								<cus:QTextInput id="shqm1" width="100" enabled="false"
+												text="{vo.xsscTask.auditUsername}"/>
+							 
+								<ui:DateField id="shsj1" width="150" enabled="false"
+											  selectedDate="{vo.xsscTask.auditTime}"/>
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
-					<s:BorderContainer  width="100%" borderWeight="1" id="yj2">
-						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel id="yj2_label" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj2"   width="150" text="{vo.scTask.auditMsg}" toolTip="{vo.scTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm2"  width="150" text="{vo.scTask.auditUsername}" enabled="false"/>
+					<s:BorderContainer id="yj2" width="100%" borderWeight="1">
+						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5"
+								  paddingRight="5" paddingTop="5">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel id="yj2_label" width="100%"
+											text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}"
+											textalign="left"/>
+								<cus:QTextArea id="shyj2" width="250" height="50"
+											   text="{vo.scTask.auditMsg}"
+											   toolTip="{vo.scTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<ui:DateField id="shsj2"  width="150" selectedDate="{vo.scTask.auditTime}"  enabled="false"/>
+								<cus:QLabel width="100"
+											text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"
+											textalign="left"/>
+								<cus:QTextInput id="shqm2" width="100" enabled="false"
+												text="{vo.scTask.auditUsername}"/>
+							 
+								<ui:DateField id="shsj2" width="150" enabled="false"
+											  selectedDate="{vo.scTask.auditTime}"/>
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 				</s:HGroup>
-				<s:HGroup gap="0" width="100%" visible="{!Utils.getCurrentUser().jyr}" includeInLayout="{!Utils.getCurrentUser().jyr}">
-					<s:BorderContainer  width="100%" borderWeight="1" id="yj3" >
-						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel id="yj3_label" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj3"  toolTip="{vo.shTask.auditMsg}"  width="150" text="{vo.shTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm3"   width="150" text="{vo.shTask.auditUsername}" enabled="false"/>
+				<s:HGroup visible="{!Utils.getCurrentUser().jyr}" width="100%" gap="0"
+						  includeInLayout="{!Utils.getCurrentUser().jyr}">
+					<s:BorderContainer id="yj3" width="100%" borderWeight="1">
+						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5"
+								  paddingRight="5" paddingTop="5">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel id="yj3_label" width="100%"
+											text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}"
+											textalign="left"/>
+								<cus:QTextArea id="shyj3" width="250" height="50"
+											   text="{vo.shTask.auditMsg}"
+											   toolTip="{vo.shTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<ui:DateField id="shsj3"  width="150" selectedDate="{vo.shTask.auditTime}"  enabled="false" />
+								<cus:QLabel width="100"
+											text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"
+											textalign="left"/>
+								<cus:QTextInput id="shqm3" width="100" enabled="false"
+												text="{vo.shTask.auditUsername}"/>
+						 
+								<ui:DateField id="shsj3" width="150" enabled="false"
+											  selectedDate="{vo.shTask.auditTime}"/>
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
-					<s:BorderContainer  width="100%" borderWeight="1" id="yj4">
-						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:Group width="100%" height="100%">
-								<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-									<cus:QLabel id="yj4_label" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100%" textalign="left"/>
-									<cus:QTextInput id="shyj4" toolTip="{vo.pzTask.auditMsg}"  width="150" text="{vo.pzTask.auditMsg}"/>
+					<s:BorderContainer id="yj4" width="100%" borderWeight="1">
+						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5"
+								  paddingRight="5" paddingTop="5"> 
+								<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+									<cus:QLabel id="yj4_label" width="100%"
+												text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}"
+												textalign="left"/>
+									<cus:QTextInput id="shyj4" width="250" height="50"
+													text="{vo.pzTask.auditMsg}"
+													toolTip="{vo.pzTask.auditMsg}"/>
 								</s:HGroup> 
 								<s:HGroup x="0" y="32" width="100%" horizontalAlign="right"
 										  verticalAlign="middle">
-									<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-									<cus:QTextInput id="shqm4"   width="150" text="{vo.pzTask.auditUsername}" enabled="false"/>
-								</s:HGroup>
-								<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								</s:HGroup>
-								<ui:DateField id="shsj4" x="222" y="58" width="150" enabled="false"
+									<cus:QLabel width="100"
+												text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"
+												textalign="left"/>
+									<cus:QTextInput id="shqm4" width="100" enabled="false"
+													text="{vo.pzTask.auditUsername}"/>
+								 
+								<ui:DateField id="shsj4" width="150" enabled="false"
 											  selectedDate="{vo.pzTask.auditTime}"/>
 								<!--s:Image x="234" y="0" width="100" height="100"
 										 source="resource/images/gaizhang.png"/-->
+								</s:HGroup>
 								
-							</s:Group>
+							 
 							
 						</s:VGroup>
 					</s:BorderContainer>
 				</s:HGroup>
-				<s:VGroup width="100%"  verticalAlign="middle" horizontalAlign="left" gap="0" visible="{vo.recordStatus==Constants.RECORD_STATE_COMPLETED}" includeInLayout="{vo.recordStatus==Constants.RECORD_STATE_COMPLETED}">
-					<s:BorderContainer  width="100%" height="25" borderWeight="1">
-						<cus:QLabel  text="港口危险作业附证年审信息" verticalAlign="middle" textalign="center"  width="100%" height="100%" fontSize="22"   fontWeight="bold"/>
+				<s:VGroup visible="{vo.recordStatus==Constants.RECORD_STATE_COMPLETED}" width="100%"
+						  gap="0" horizontalAlign="left"
+						  includeInLayout="{vo.recordStatus==Constants.RECORD_STATE_COMPLETED}"
+						  verticalAlign="middle">
+					<s:BorderContainer width="100%" height="25" borderWeight="1">
+						<cus:QLabel width="100%" height="100%" fontSize="22" fontWeight="bold"
+									text="港口危险作业附证年审信息" textalign="center" verticalAlign="middle"/>
 					</s:BorderContainer>
-					<s:BorderContainer  width="100%"  borderWeight="1">
-						<jyrzbxx:JyrNsxx width="100%" fzbh="{vo.byzd1}" />
+					<s:BorderContainer width="100%" borderWeight="1">
+						<jyrzbxx:JyrNsxx width="100%" fzbh="{vo.byzd1}"/>
 					</s:BorderContainer>
 				</s:VGroup>
 			</s:VGroup>
 		</s:BorderContainer>
 		
 		
-		<s:HGroup width="100%" verticalAlign="middle" height="30" horizontalAlign="center" paddingLeft="10" paddingRight="10">
-			<s:Button id="pass" label="通过" click="doPass(event)"  skinClass="skins.cus.ButtonSkin" visible="{mode!=Constants.mode_view}" includeInLayout="{mode!=Constants.mode_view}"/>
-			<s:Button id="back" label="不通过" click="doBack(event)"  skinClass="skins.cus.ButtonSkin" visible="{mode!=Constants.mode_view}" includeInLayout="{mode!=Constants.mode_view}"/>
-			<s:Button id="btnClose" label="{resourceManager.getString('common','btn.close')}" click="doPopupClose(event)" skinClass="skins.cus.ButtonSkin"/>
-			<s:Button  label="{resourceManager.getString('common','btn.print')}" click="print(event)" skinClass="skins.cus.ButtonSkin"/>
+		<s:HGroup width="100%" height="30" horizontalAlign="center" paddingLeft="10"
+				  paddingRight="10" verticalAlign="middle">
+			<s:Button id="pass" visible="{mode!=Constants.mode_view}" label="通过"
+					  click="doPass(event)" includeInLayout="{mode!=Constants.mode_view}"
+					  skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="back" visible="{mode!=Constants.mode_view}" label="不通过"
+					  click="doBack(event)" includeInLayout="{mode!=Constants.mode_view}"
+					  skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="btnClose" label="{resourceManager.getString('common','btn.close')}"
+					  click="doPopupClose(event)" skinClass="skins.cus.ButtonSkin"/>
+			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print(event)"
+					  skinClass="skins.cus.ButtonSkin"/>
 		</s:HGroup>
 	</s:VGroup>
 </s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzns/GkwxhwzyfznsAudit.mxml

@@ -285,30 +285,28 @@
 				<s:HGroup gap="0" width="100%">
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj1">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="top">
 								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj1"   width="150" text="{thisModel.thisData.xsscTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm1"   width="150" text="{thisModel.thisData.xsscTask.auditUsername}" enabled="false"/>
+								<cus:QTextArea id="shyj1" width="250" height="50" text="{thisModel.thisData.xsscTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm1"   width="100" text="{thisModel.thisData.xsscTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField  width="150" selectedDate="{thisModel.thisData.xsscTask.auditTime}" id="shsj1" enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj2">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj2"   width="150" text="{thisModel.thisData.scTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm2"  width="150" text="{thisModel.thisData.scTask.auditUsername}" enabled="false"/>
+								<cus:QTextArea id="shyj2"  width="250" height="50" text="{thisModel.thisData.scTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm2"  width="100" text="{thisModel.thisData.scTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj2"  width="150" selectedDate="{thisModel.thisData.scTask.auditTime}"  enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>
@@ -317,30 +315,28 @@
 				<s:HGroup gap="0" width="100%">
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj3" >
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj3"   width="150" text="{thisModel.thisData.shTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm3"   width="150" text="{thisModel.thisData.shTask.auditUsername}" enabled="false"/>
+								<cus:QTextArea id="shyj3" width="250" height="50" text="{thisModel.thisData.shTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm3"   width="100" text="{thisModel.thisData.shTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj3"  width="150" selectedDate="{thisModel.thisData.shTask.auditTime}"  enabled="false" />
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj4">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj4"   width="150" text="{thisModel.thisData.pzTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm4"   width="150" text="{thisModel.thisData.pzTask.auditUsername}" enabled="false"/>
+								<cus:QTextArea id="shyj4" width="250" height="50" text="{thisModel.thisData.pzTask.auditMsg}"/>
 							</s:HGroup>
 							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm4"   width="100" text="{thisModel.thisData.pzTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj4"  width="150" selectedDate="{thisModel.thisData.pzTask.auditTime}"  enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzns/GkwxhwzyfznsView.mxml

@@ -186,31 +186,29 @@
 						<s:HGroup gap="0" width="100%" visible="{!Utils.getCurrentUser().jyr}" includeInLayout="{!Utils.getCurrentUser().jyr}">
 							<s:BorderContainer  width="100%" borderWeight="1" id="yj1">
 								<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+									<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100%" textalign="left"/>
-										<cus:QTextInput id="shyj1"   width="150" text="{thisModel.thisData.xsscTask.auditMsg}" editable="false"/>
-									</s:HGroup>
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-										<cus:QTextInput id="shqm1"   width="150" text="{thisModel.thisData.xsscTask.auditUsername}" enabled="false"/>
+										<cus:QTextArea id="shyj1"  width="250" height="50" text="{thisModel.thisData.xsscTask.auditMsg}" editable="false"/>
 									</s:HGroup>
 									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+										<cus:QTextInput id="shqm1"   width="100" text="{thisModel.thisData.xsscTask.auditUsername}" enabled="false"/>
+									 
 										<ui:DateField  width="150" selectedDate="{thisModel.thisData.xsscTask.auditTime}" id="shsj1" enabled="false"/>
 									</s:HGroup>
 								</s:VGroup>
 							</s:BorderContainer>
 							<s:BorderContainer  width="100%" borderWeight="1" id="yj2">
 								<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+									<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100%" textalign="left"/>
-										<cus:QTextInput id="shyj2"   width="150" text="{thisModel.thisData.scTask.auditMsg}" editable="false"/>
-									</s:HGroup>
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-										<cus:QTextInput id="shqm2"  width="150" text="{thisModel.thisData.scTask.auditUsername}" enabled="false"/>
+										<cus:QTextArea id="shyj2"  width="250" height="50" text="{thisModel.thisData.scTask.auditMsg}" editable="false"/>
 									</s:HGroup>
 									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-										<ui:DateField id="shsj2"  width="150" selectedDate="{thisModel.thisData.scTask.auditTime}"  enabled="false"/>
+										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+										<cus:QTextInput id="shqm2"  width="100" text="{thisModel.thisData.scTask.auditUsername}" enabled="false"/>
+									 
+										<ui:DateField id="shsj2" width="150" selectedDate="{thisModel.thisData.scTask.auditTime}"  enabled="false"/>
 									</s:HGroup>
 								</s:VGroup>
 							</s:BorderContainer>
@@ -218,30 +216,28 @@
 						<s:HGroup gap="0" width="100%" visible="{!Utils.getCurrentUser().jyr}" includeInLayout="{!Utils.getCurrentUser().jyr}">
 							<s:BorderContainer  width="100%" borderWeight="1" id="yj3" >
 								<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+									<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100%" textalign="left"/>
-										<cus:QTextInput id="shyj3"   width="150" text="{thisModel.thisData.shTask.auditMsg}" editable="false"/>
-									</s:HGroup>
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-										<cus:QTextInput id="shqm3"   width="150" text="{thisModel.thisData.shTask.auditUsername}" enabled="false"/>
+										<cus:QTextArea id="shyj3"  width="250" height="50" text="{thisModel.thisData.shTask.auditMsg}" editable="false"/>
 									</s:HGroup>
 									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+										<cus:QTextInput id="shqm3"   width="100" text="{thisModel.thisData.shTask.auditUsername}" enabled="false"/>
+									 
 										<ui:DateField id="shsj3"  width="150" selectedDate="{thisModel.thisData.shTask.auditTime}"  enabled="false" />
 									</s:HGroup>
 								</s:VGroup>
 							</s:BorderContainer>
 							<s:BorderContainer  width="100%" borderWeight="1" id="yj4">
 								<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+									<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
 										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100%" textalign="left"/>
-										<cus:QTextInput id="shyj4"   width="150" text="{thisModel.thisData.pzTask.auditMsg}" editable="false"/>
-									</s:HGroup>
-									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-										<cus:QTextInput id="shqm4"   width="150" text="{thisModel.thisData.pzTask.auditUsername}" enabled="false"/>
+										<cus:QTextArea id="shyj4"  width="250" height="50" text="{thisModel.thisData.pzTask.auditMsg}" editable="false"/>
 									</s:HGroup>
 									<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+										<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+										<cus:QTextInput id="shqm4"   width="100" text="{thisModel.thisData.pzTask.auditUsername}" enabled="false"/>
+									 
 										<ui:DateField id="shsj4"  width="150" selectedDate="{thisModel.thisData.pzTask.auditTime}"  enabled="false"/>
 									</s:HGroup>
 								</s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/zysqbp/wh.as

@@ -0,0 +1,16 @@
+package com.jtgh.yjpt.vo.zysqbp
+{
+	public class wh
+	{
+		public function wh()
+		{
+			super();
+		}
+		
+		//危货name
+		public var wxhwpm:String;  
+		//危货id or 类别 ,就是品名前用于check的id码
+		public var whID:String;
+		
+	}
+}