git-svn-id: https://192.168.57.71/svn/lyggkj@114 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-flex/trunk/html-template/index.template.html

@@ -54,7 +54,7 @@
             attributes.name = "${application}";
             attributes.align = "middle";
             swfobject.embedSWF(
-                "${swf}.swf?version=4.1.8", "flashContent", 
+                "${swf}.swf?version=4.1.5", "flashContent", 
                 "${width}", "${height}", 
                 swfVersionStr, xiSwfUrlStr, 
                 flashvars, params, attributes);

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/ClassRegistry.as

@@ -89,8 +89,8 @@ package com.jtgh.yjpt.common
 	import com.jtgh.yjpt.vo.yjgl.YjylVo;
 	import com.jtgh.yjpt.vo.yjgl.YjyxVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
-	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgsyVo;
+	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.QskVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.ZbhjjbqkVo;
 	import com.jtgh.yjpt.vo.yjzyxxgl.GkqyxxwhVo;
@@ -317,6 +317,7 @@ package com.jtgh.yjpt.common
 		ZtSelect;
 		MtlxSelect;
 		GqBySzdZysqbpSelect;
+		CgqSelect;
 		// Model
 
 		// View

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/Global.as

@@ -10,6 +10,7 @@ package com.jtgh.yjpt.common
 	import flash.utils.Dictionary;
 	
 	import mx.collections.ArrayCollection;
+	
 
 	[Bindable]
 	public class Global

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/util/Constants.as

@@ -214,6 +214,8 @@ package com.jtgh.yjpt.common.util
 		public static var GROUP_CODE_JDHXPZDWXY:String="JDHXPZDWXY";
 		/** 水域类型 */
 		public static var GROUP_CODE_SYLX:String="SYLX";
+		/**所在水系*/
+		public static var GROUP_CODE_SXLX:String="SXLX";
 		/**经营人企业类型*/
 		public static var GROUP_CODE_JYR_QYLX:String="JYR.QYLX";
 		/**安全评价机构附件类型*/

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyr/JyrEditModel.as

@@ -14,10 +14,10 @@ package com.jtgh.yjpt.model.jyr
 	import com.jtgh.yjpt.view.jyr.JyrEdit;
 	import com.jtgh.yjpt.view.jyr.JyrOfJyrLayout;
 	import com.jtgh.yjpt.view.jyr.JyrZycsEdit;
-	import com.jtgh.yjpt.view.jyr.ShyjEdit;
-	import com.jtgh.yjpt.view.jyr.jyrShxxView;
 	import com.jtgh.yjpt.view.jyr.zbxx.BwList;
 	import com.jtgh.yjpt.view.jyr.zbxx.BwListView;
+	import com.jtgh.yjpt.view.jyr.zbxx.CgqEdit;
+	import com.jtgh.yjpt.view.jyr.zbxx.CgqView;
 	import com.jtgh.yjpt.view.jyr.zbxx.CkList;
 	import com.jtgh.yjpt.view.jyr.zbxx.CkListView;
 	import com.jtgh.yjpt.view.jyr.zbxx.DcList;
@@ -28,7 +28,7 @@ package com.jtgh.yjpt.model.jyr
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.gkgq.MtVo;
 	import com.jtgh.yjpt.vo.jyr.BwVo;
-	import com.jtgh.yjpt.vo.jyr.JyrShxxVo;
+	import com.jtgh.yjpt.vo.jyr.CgqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	import com.jtgh.yjpt.vo.jyrxxgl.JyrckxxVo;
 	import com.jtgh.yjpt.vo.jyrxxgl.JyrdcxxVo;
@@ -38,7 +38,6 @@ package com.jtgh.yjpt.model.jyr
 	import flash.display.Bitmap;
 	import flash.display.BitmapData;
 	import flash.display.DisplayObject;
-	import flash.display.Loader;
 	import flash.display.LoaderInfo;
 	import flash.events.Event;
 	import flash.events.MouseEvent;
@@ -79,6 +78,12 @@ package com.jtgh.yjpt.model.jyr
 		public var bw_add_list:ArrayCollection=new ArrayCollection;
 		//泊位删除的列表
 		public var bw_del_list:ArrayCollection=new ArrayCollection;
+		
+		//储罐区新增的列表
+		public var cgq_add_list:ArrayCollection=new ArrayCollection;
+		//储罐区删除的列表
+		public var cgq_del_list:ArrayCollection=new ArrayCollection;
+		
 		//储罐的信息列表
 		public var cgList:ArrayCollection=new ArrayCollection;
 		public var mtList:ArrayCollection=new ArrayCollection;
@@ -285,7 +290,7 @@ package com.jtgh.yjpt.model.jyr
 				var jyrxxgl:JyrVo = bc.result as JyrVo;		
 				fjList.doFileSave(jyrxxgl.id);
 //				doCloseThis(null);
-			},thisView.functionId,vo,dc_add_list,dc_del_list,bw_add_list,bw_del_list,ckList,delCkList);
+			},thisView.functionId,vo,dc_add_list,dc_del_list,bw_add_list,bw_del_list,ckList,delCkList,cgq_add_list,cgq_del_list);
 		}
 
 		/**
@@ -653,6 +658,47 @@ package com.jtgh.yjpt.model.jyr
 		}
 		
 		
+		
+		public function cgqTodelete(vo:CgqVo):void
+		{
+			if(vo.id.toString() != "NaN"){
+				cgq_del_list.addItem(vo);
+			}
+			var selectIndex:int = thisView.cgqGrid.selectedIndex;
+			cgq_add_list.removeItemAt(selectIndex);
+		}
+		
+		//新增泊位信息
+		public function cgqToAdd(event:MouseEvent):void{
+			var view:CgqEdit=new CgqEdit;
+			view.mode = Constants.mode_add;
+			view.model = this;
+			view.vo = new CgqVo;
+			view.jyr = vo;
+			Utils.popupWindow("储罐区信息",view,thisView as DisplayObject,null,960,400);
+		}
+		
+		public function cgqToUpdate(cgqVo:CgqVo):void
+		{
+			var cgqVo:CgqVo=thisView.cgqGrid.selectedItem as CgqVo;;
+			var view:CgqEdit=new CgqEdit;
+			view.mode=Constants.mode_edit;
+			view.model=this;
+			view.vo=cgqVo;
+			Utils.popupWindow("储罐区信息",view,thisView as DisplayObject,null,960,400);
+		}	
+		
+		public function cgqDouble(event:MouseEvent):void{
+			var cgqVo:CgqVo=thisView.cgqGrid.selectedItem as CgqVo;
+			if(cgqVo!=null){
+				var view:CgqView=new CgqView;
+				view.vo=cgqVo;
+				Utils.popupWindow("储罐区信息",view,thisView as DisplayObject);			
+			}
+		}
+		
+		
+		
 		public function ckDouble(event:MouseEvent):void{
 			var vo:JyrckxxVo=thisView.ckGrid.selectedItem as JyrckxxVo;
 			if(vo!=null){

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyr/JyrModel.as

@@ -161,7 +161,7 @@ package com.jtgh.yjpt.model.jyr
 				updateView.thisModel.bw_add_list=bc.getAttribute("bwList") as ArrayCollection;
 				updateView.thisModel.ckList=bc.getAttribute("ckList") as ArrayCollection;
 				updateView.thisModel.cgList=bc.getAttribute("cgList") as ArrayCollection;
-
+				updateView.thisModel.cgq_add_list  = bc.getAttribute("cgqList") as ArrayCollection;
 //				updateView.model.filesList = bc.getAttribute("files") as ArrayCollection;
 				updateView.thisModel.parentView = thisView as JyrLayout;
 				Utils.popupWindow("经营人基础信息修改",updateView,FlexGlobals.topLevelApplication as DisplayObject,null,968,600);
@@ -280,6 +280,7 @@ package com.jtgh.yjpt.model.jyr
 				updateView.model.dc_add_list=bc.getAttribute("dcList") as ArrayCollection;
 				updateView.model.bw_add_list=bc.getAttribute("bwList") as ArrayCollection;
 				updateView.model.ckList=bc.getAttribute("ckList") as ArrayCollection;
+				updateView.model.cgq_add_list=bc.getAttribute("cgqList") as ArrayCollection;
 				updateView.model.cgList=bc.getAttribute("cgList") as ArrayCollection;
 				updateView.model.mtList=bc.getAttribute("mtList") as ArrayCollection;
 				updateView.model.fzList=bc.getAttribute("fzList") as ArrayCollection;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/yjgl/zdwxyfb/xxlr/CgModel.as

@@ -21,6 +21,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
+	import com.jtgh.yjpt.vo.jyr.CgqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgsyVo;
@@ -347,6 +348,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			cgVo.szd=cgEdit.szd.selectedVO as CodeVo;
 			cgVo.gq=cgEdit.szgq.selectedVO as GqVo;
 			cgVo.dwmc=cgEdit.dwmc.selectedVO as JyrVo;
+			cgVo.cgq = cgEdit.cgq.selectedVO as CgqVo;
 			if(cgVo.cgsy==null){
 				cgVo.cgsy=new CgsyVo;
 			}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/select/CgqSelect.as

@@ -0,0 +1,29 @@
+package com.jtgh.yjpt.select
+{
+	import com.jtgh.yjpt.common.util.Utils;
+	import com.jtgh.yjpt.vo.jyr.JyrVo;
+	
+	public class CgqSelect extends ServerDataSelectBase
+	{
+		public function CgqSelect()
+		{
+			super();
+			super.id="id";
+			super.name="cgqmc";
+		}
+		/*********************
+		 * 取数据，可以被多次调用，刷新下拉框数据
+		 */
+		public function loadData():void
+		{
+			Utils.callRemote("jyrController","listAllCgq",resultlist);
+		}
+		public function loadDataByParentId(obj:Object):void
+		{
+			if(null==obj)
+				Utils.callRemote("jyrController","listAllCgq",resultlist);
+			else if(obj is JyrVo)
+				Utils.callRemote("jyrController","listAllCgq",resultlist,obj as JyrVo);
+		}
+	}
+}

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

@@ -68,6 +68,10 @@
 				return new String(bwGrid.dataProvider.getItemIndex(obj)+1);
 			}
 			
+			private function getXhcgq(obj:Object,col:GridColumn):String{
+				return new String(cgqGrid.dataProvider.getItemIndex(obj)+1);
+			}
+			
 			private var hwpm:String = "";
 			private function showWxhw(event:MouseEvent):void{
 			 var view:Wxhwpm=new Wxhwpm();
@@ -165,7 +169,7 @@
 	</fx:Script>
 
 	<s:VGroup width="100%" height="100%" id="group"  paddingTop="10">
-		<mx:Accordion width="100%" height="480" headerStyleName="AccordionHeader"
+		<mx:Accordion width="100%" height="500" headerStyleName="AccordionHeader"
 					  change="vboxClick(event)">
 			<mx:VBox width="100%" height="100%" label="{resourceManager.getString('jlrxxgl','jyrjcxx')}">
 				<s:VGroup width="100%" height="100%" paddingTop="10" paddingBottom="10">
@@ -332,6 +336,7 @@
 					</s:HGroup>
 					</s:VGroup>
 			</mx:VBox>
+			
 			<mx:VBox id="bwboxinfo" width="100%" label="泊位信息">
 				<ui:DataGrid id="bwGrid" width="100%" height="350" doubleClickEnabled="true"  rowHeight="30" dataProvider="{thisModel.bw_add_list}">
 					<ui:columns><s:ArrayList>
@@ -388,6 +393,27 @@
 				<s:Button label="{resourceManager.getString('common','btn.add')}"
 						  click="thisModel.addCk()" enabled="true" skinClass="skins.cus.ButtonSkin" />
 			</mx:VBox>
+			
+			<mx:VBox id="cgqboxinfo" width="100%" label="储罐区信息">
+				<ui:DataGrid id="cgqGrid" width="100%" height="350" doubleClick="{thisModel.cgqDouble(event)}" doubleClickEnabled="true"  rowHeight="30" dataProvider="{thisModel.cgq_add_list}">
+					<ui:columns><s:ArrayList>
+									<ui:DataGridColumn width="80" dataField="id" visible="false" headerText="{resourceManager.getString('common','col.id')}"/>
+									<ui:DataGridColumn  labelFunction="getXhcgq" headerText="{resourceManager.getString('yjgl','xh')}"/>
+									<ui:DataGridColumn dataField="cgqmc" headerText="储罐区名称"/>
+									<ui:DataGridColumn dataField="cgqmj_s" headerText="储罐区面积"/>
+									<ui:DataGridColumn dataField="cggs_s" headerText="储罐个数"/>
+									<ui:DataGridColumn dataField="cgrj_s" headerText="储罐区容积"/>
+									<ui:DataGridColumn headerText="{resourceManager.getString('yjgl','cz')}" type="{TypeBase.MULTIBUTTON}" width="80" delFunction="{thisModel.cgqTodelete}" editFunction="{thisModel.cgqToUpdate}"/>
+								</s:ArrayList></ui:columns>
+				</ui:DataGrid>
+				
+				<s:HGroup width="100%" height="25" gap="0">
+					<s:Button id="cgqBtn" label="{resourceManager.getString('common','btn.add')}"
+							  click="thisModel.cgqToAdd(event)" enabled="true" skinClass="skins.cus.ButtonSkin" />
+					
+				</s:HGroup>
+			</mx:VBox>
+			
 		</mx:Accordion>
 		<s:HGroup width="100%" height="40" horizontalAlign="center" verticalAlign="middle">
 			<s:Spacer width="10" height="0"/>

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

@@ -212,6 +212,9 @@
 			public function getXhfz(obj:Object,col:GridColumn):String{
 				return new String(fzdataGrid.dataProvider.getItemIndex(obj)+1);
 			}
+			private function getXhcgq(obj:Object,col:GridColumn):String{
+				return new String(cgqGrid.dataProvider.getItemIndex(obj)+1);
+			}
 			
 			public function print(event:MouseEvent):void{
 				var param:PrintParam=new PrintParam("jyr");
@@ -505,6 +508,24 @@
 				</s:BorderContainer>
 				
 				<s:BorderContainer  width="100%" height="25" borderWeight="1">
+					<cus:QLabel  text="储罐区信息" verticalAlign="middle" textalign="center"  width="100%" height="100%" fontSize="22"   fontWeight="bold"/>
+				</s:BorderContainer>
+				<s:BorderContainer  width="100%"  borderWeight="1">
+					<s:HGroup width="100%" >
+						<ui:DataGrid id="cgqGrid" width="100%" height="350" doubleClickEnabled="true"  rowHeight="30" dataProvider="{model.cgq_add_list}">
+							<ui:columns><s:ArrayList>
+											<ui:DataGridColumn width="80" dataField="id" visible="false" headerText="{resourceManager.getString('common','col.id')}"/>
+											<ui:DataGridColumn  labelFunction="getXhcgq" headerText="{resourceManager.getString('yjgl','xh')}"/>
+											<ui:DataGridColumn dataField="cgqmc" headerText="储罐区名称"/>
+											<ui:DataGridColumn dataField="cgqmj_s" headerText="储罐区面积"/>
+											<ui:DataGridColumn dataField="cggs_s" headerText="储罐个数"/>
+											<ui:DataGridColumn dataField="cgrj_s" headerText="储罐区容积"/>
+										</s:ArrayList></ui:columns>
+						</ui:DataGrid>
+					</s:HGroup>
+				</s:BorderContainer>
+				
+				<s:BorderContainer  width="100%" height="25" borderWeight="1">
 					<cus:QLabel  text="储罐信息" verticalAlign="middle" textalign="center"  width="100%" height="100%" fontSize="22"   fontWeight="bold"/>
 				</s:BorderContainer>
 				<s:BorderContainer  width="100%"  borderWeight="1">
@@ -524,6 +545,8 @@
 						</ui:DataGrid>
 					</s:HGroup>
 				</s:BorderContainer>
+				
+				
 				<s:BorderContainer  width="100%" height="25" borderWeight="1">
 					<cus:QLabel  text="码头信息" verticalAlign="middle" textalign="center"  width="100%" height="100%" fontSize="22"   fontWeight="bold"/>
 				</s:BorderContainer>

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

@@ -19,6 +19,8 @@
 			import mx.events.FlexEvent;
 			import mx.utils.StringUtil;
 			
+			import spark.events.IndexChangeEvent;
+			
 			[Bindable]
 			public var mode:String;
 			[Bindable]
@@ -54,22 +56,22 @@
 						if(view[name].selected){
 						}
 					}
-//					if(vo.qysjsh.toString()=="NaN")
-//						qysjsh.text="";
-//					if(vo.qysjss.toString()=="NaN")
-//						qysjss.text="";
-//					if(vo.bwcd.toString()=="NaN")
-//						bwcd.text="";	
-//					if(vo.sjtgnl.toString()=="NaN")
-//						sjtgnl.text="";
-//					if(vo.sjkpnl.toString()=="NaN")
-//						sjkpnl.text="";
-//					if(vo.nhwtgml.toString()=="NaN")
-//						nhwtgml.text="";
-//					if(vo.nwxhwttl.toString()=="NaN")
-//						nwxhwttl.text="";
-//					if(vo.hckpnl.toString()=="NaN")
-//						hckpnl.text="";	
+					//					if(vo.qysjsh.toString()=="NaN")
+					//						qysjsh.text="";
+					//					if(vo.qysjss.toString()=="NaN")
+					//						qysjss.text="";
+					//					if(vo.bwcd.toString()=="NaN")
+					//						bwcd.text="";	
+					//					if(vo.sjtgnl.toString()=="NaN")
+					//						sjtgnl.text="";
+					//					if(vo.sjkpnl.toString()=="NaN")
+					//						sjkpnl.text="";
+					//					if(vo.nhwtgml.toString()=="NaN")
+					//						nhwtgml.text="";
+					//					if(vo.nwxhwttl.toString()=="NaN")
+					//						nwxhwttl.text="";
+					//					if(vo.hckpnl.toString()=="NaN")
+					//						hckpnl.text="";	
 				}
 				
 			}
@@ -169,10 +171,10 @@
 				//				Utils.showInfoMessage("sjtgnl.empty",null,"jlrxxgl");
 				//				return false;
 				//			}
-							if(StringUtil.trim(sjkpnl.text)==""){
-								Utils.showInfoMessage("sjkpnl.empty",null,"jlrxxgl");
-								return false;
-							}
+				if(StringUtil.trim(sjkpnl.text)==""){
+					Utils.showInfoMessage("sjkpnl.empty",null,"jlrxxgl");
+					return false;
+				}
 				//			if(StringUtil.trim(jgysnf.text)==""){
 				//				Utils.showInfoMessage("jgysnf.empty",null,"jlrxxgl");
 				//				return false;
@@ -190,11 +192,11 @@
 				//				Utils.showInfoMessage("nhwtgml.empty",null,"jlrxxgl");
 				//				return false;
 				//			}
-							if(StringUtil.trim(hckpnl.text)==""){
-								Utils.showInfoMessage("hckpnl.empty",null,"jlrxxgl");
-								return false;
-								
-							}
+				if(StringUtil.trim(hckpnl.text)==""){
+					Utils.showInfoMessage("hckpnl.empty",null,"jlrxxgl");
+					return false;
+					
+				}
 				//			if(StringUtil.trim(zyhbwfl.text)==""){
 				//				Utils.showInfoMessage("zyhbwfl.empty",null,"jlrxxgl");
 				//				return false;
@@ -213,10 +215,23 @@
 				//			}
 				return true;
 			}
+			
+			protected function jgxs_changeHandler(event:IndexChangeEvent):void
+			{
+				if(null!=(jgxs.selectedVO as CodeVo))
+					jgxs2.reload((jgxs.selectedVO as CodeVo).id);		
+			}
+			
 		]]>
 	</fx:Script>
 	<s:HGroup width="100%">
 		<s:HGroup width="50%" verticalAlign="middle">
+			<cus:QLabel text="泊位名称" width="40%" textAlign="right" notNull="true"/>
+			<cus:QTextInput id="bwmc" textAlign="left" width="50%" text="{vo.bwmc}" />
+		</s:HGroup>
+	</s:HGroup>
+	<s:HGroup width="100%">
+		<s:HGroup width="50%" verticalAlign="middle">
 			<cus:QLabel text="企业名称" width="40%" textAlign="right"/>
 			<cus:QTextInput id="qymc" textAlign="left" width="50%" text="{gkjyr}" editable="false"/>
 		</s:HGroup>
@@ -227,40 +242,40 @@
 	</s:HGroup>
 	<s:HGroup width="100%">
 		<s:HGroup width="50%" verticalAlign="middle">
-			<cus:QLabel text="泊位名称" width="40%" textAlign="right" notNull="true"/>
-			<cus:QTextInput id="bwmc" textAlign="left" width="50%" text="{vo.bwmc}" />
+			<cus:QLabel text="泊位所在水系" width="40%" textAlign="right" />
+			<cus:QComboBox id="bwszsx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SXLX}" hasBlank="true"  selectedVO="{vo.bwszsx}" width="50%"/>
 		</s:HGroup>
 		<s:HGroup width="50%" verticalAlign="middle">
 			<cus:QLabel text="泊位属性" width="40%" textAlign="right" />
 			<cus:QComboBox id="bwsx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWSX}" hasBlank="true"  selectedVO="{vo.bwsx}" width="50%"/>
 		</s:HGroup>
 	</s:HGroup>
-	
 	<s:HGroup width="100%">
 		<s:HGroup width="50%" verticalAlign="middle">
-			<cus:QLabel text="泊位所在水系" width="40%" textAlign="right" />
-			<cus:QComboBox id="bwszsx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWSZSX}" hasBlank="true"  selectedVO="{vo.bwszsx}" width="50%"/>
+			<cus:QLabel text="结构型式" width="40%" textAlign="right" />
+			<cus:QComboBox id="jgxs" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWXS}" change="jgxs_changeHandler(event)"
+						   hasBlank="true"  selectedVO="{vo.jgxs}" width="50%"/>
 		</s:HGroup>
 		<s:HGroup width="50%" verticalAlign="middle">
-			<cus:QLabel text="服务类型" width="40%" textAlign="right" />
-			<cus:QComboBox id="fwlx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWFWLX}" hasBlank="true"  selectedVO="{vo.fwlx}" width="50%"/>
+			<cus:QLabel text="结构子型式" width="40%" textAlign="right" />
+			<cus:QComboBox id="jgxs2" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWXS2}" hasBlank="true"  selectedVO="{vo.jgxs2}" 
+						   parentId="{vo.jgxs2.id.toString()}"  width="50%"/>
 		</s:HGroup>
 	</s:HGroup>
-	
 	<s:HGroup width="100%">
 		<s:HGroup width="50%" verticalAlign="middle">
-			<cus:QLabel text="投产年份" width="40%" textAlign="right" />
-			<cus:QTextInput id="tcnf" text="{vo.tcnf}" restrict="0-9" width="50%"/>
+			<cus:QLabel text="生产类型" width="40%" textAlign="right" />
+			<cus:QComboBox id="sclx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_CKSCLX}" hasBlank="true"  selectedVO="{vo.sclx}" width="50%"/>
 		</s:HGroup>
 		<s:HGroup width="50%" verticalAlign="middle">
-			<cus:QLabel text="结构型式" width="40%" textAlign="right" />
-			<cus:QComboBox id="jgxs" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWXS}" hasBlank="true"  selectedVO="{vo.jgxs}" width="50%"/>
+			<cus:QLabel text="服务类型" width="40%" textAlign="right" />
+			<cus:QComboBox id="fwlx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_BWFWLX}" hasBlank="true"  selectedVO="{vo.fwlx}" width="50%"/>
 		</s:HGroup>
 	</s:HGroup>
 	<s:HGroup width="100%">
 		<s:HGroup width="50%" verticalAlign="middle">
-			<cus:QLabel text="生产类型" width="40%" textAlign="right" />
-			<cus:QComboBox id="sclx" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_CKSCLX}" hasBlank="true"  selectedVO="{vo.sclx}" width="50%"/>
+			<cus:QLabel text="投产年份" width="40%" textAlign="right" />
+			<cus:QTextInput id="tcnf" text="{vo.tcnf}" restrict="0-9" width="50%"/>
 		</s:HGroup>
 		<s:HGroup width="50%" verticalAlign="middle">
 			<cus:QLabel text="竣工验收年份" width="40%" textAlign="right" />

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

@@ -0,0 +1,118 @@
+<?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:cus="com.jtgh.yjpt.common.cus.*" creationComplete="init(event)" xmlns:ui="com.jtgh.yjpt.common.component.ui.*">
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.model.jyr.JyrEditModel;
+			import com.jtgh.yjpt.common.util.Constants;
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.vo.jyr.CgqVo;
+			import com.jtgh.yjpt.vo.jyr.JyrVo;
+			
+			import mx.controls.Alert;
+			import mx.events.CloseEvent;
+			import mx.events.FlexEvent;
+			import mx.utils.StringUtil;
+			[Bindable]
+			public var model:JyrEditModel;
+			[Bindable]
+			public var  vo:CgqVo;
+			[Bindable]
+			public var mode:String;
+			[Bindable]
+			public var jyr:JyrVo;
+			
+			
+			protected function init(event:FlexEvent):void
+			{
+				if(mode == Constants.mode_add){
+					vo.dwmc  = jyr;
+					vo.tbr = Utils.getCurrentUser().name;
+					vo.tbsj = new Date();
+				}
+			}
+			
+			public function doClose(event:Event):void{
+				this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE));
+			}
+			
+			private function  doSave(e:Event):void{
+				if(!check()){
+					return;
+				}
+				getValue();
+				if(mode==Constants.mode_add){
+					model.cgq_add_list.addItem(vo);
+				}else if(mode==Constants.mode_edit){
+					model.cgq_add_list.setItemAt(vo,model.editDataRowid);
+				}
+				doClose(e);
+			}
+			
+			private function check():Boolean{
+				if(StringUtil.trim(cgqmc.text)==""){
+					Alert.show("储罐区名称不能为空","提示");
+					return false;
+				}
+				if(StringUtil.trim(cggs.text)==""){
+					Alert.show("储罐的个数不能为空","提示");
+					return false;			
+				}
+				if(StringUtil.trim(cgrj.text)==""){
+					Alert.show("储罐的总容积不能为空","提示");
+					return false;			
+				}
+				return true;
+			}
+			
+			private function getValue():void{
+				vo.tbsj= tbsj.dateTime;
+			}
+
+		]]>
+	</fx:Script>
+	<fx:Declarations>
+		<!-- 将非可视元素（例如服务、值对象）放在此处 -->
+	</fx:Declarations>
+	<s:VGroup width="100%" height="100%" paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5">				
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgqmc')}" width="200" notNull="true"/>
+			<cus:QTextInput id="cgqmc" text="@{vo.cgqmc}" width="200"/>
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.jtwz')}" width="200"/>
+			<cus:QTextInput text="@{vo.jtwz}" width="200"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgqmj')}" width="200" />
+			<cus:QTextInput  text="@{vo.cgqmj_s}" width="200" restrict="0-9\."/>
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.glzxjl')}(米)" width="200"/>
+			<cus:QTextInput text="@{vo.glzxjl_s}" width="200" type="double"/>
+		</s:HGroup>			
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.cggs')}" width="200" notNull="true"/>
+			<cus:QTextInput id="cggs" text="@{vo.cggs_s}" width="200" />
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgrj')}(万立方)" notNull="true" width="200"/>
+			<cus:QTextInput id="cgrj" text="@{vo.cgrj_s}" width="200" restrict="0-9\."  />
+		</s:HGroup>		
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.zdwxycggs')}" width="200"/>
+			<cus:QTextInput text="@{vo.zdwxycggs_s}" width="200" />
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.zdwxycgrl')}(万立方)" width="200"/>
+			<cus:QTextInput text="@{vo.zdwxycgrl_s}" width="200" />	
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.tbr')}" width="200"/>
+			<cus:QTextInput text="@{vo.tbr}" width="200" editable="false"/>
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.lxdh')}" width="200"/>
+			<cus:QTextInput text="@{vo.lxdh}" width="200"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('yjgl','cg.tbsj')}" width="200"/>
+			<ui:DateTime id="tbsj" dateTime="{vo.tbsj}" width="200"/>
+		</s:HGroup>
+	</s:VGroup>
+	<s:HGroup width="100%" horizontalAlign="center" paddingBottom="5">
+		<s:Button id="save" label="{resourceManager.getString('common','btn.save')}" click="{doSave(event)}" skinClass="skins.cus.ButtonSkin"/>
+		<s:Button id="close" label="{resourceManager.getString('common','btn.close')}" click="{doClose(event)}" skinClass="skins.cus.ButtonSkin"/>
+	</s:HGroup>
+</s:VGroup>

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

@@ -0,0 +1,89 @@
+<?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%" horizontalAlign="center"
+		  xmlns:cus="com.jtgh.yjpt.common.cus.*" xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+		  creationComplete="creationComplete(event)" 
+		  >
+	<fx:Declarations>
+		<!-- 将非可视元素（例如服务、值对象）放在此处 -->
+	</fx:Declarations>
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.model.jyr.JyrEditModel;
+			import com.jtgh.yjpt.vo.jyr.CgqVo;
+			
+			import mx.events.CloseEvent;
+			import mx.events.FlexEvent;
+			
+			[Bindable]
+			public var model:JyrEditModel;
+			[Bindable]
+			public var  vo:CgqVo;
+			[Bindable]
+			public var  screenWidth:Number=0;	
+			/**
+			 * 创建完成
+			 */
+			protected function creationComplete(event:FlexEvent):void
+			{
+			}
+			
+			public function close(event:Event):void{
+				this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE));
+			}
+			
+		]]>
+	</fx:Script>
+	<s:VGroup  paddingTop="20"  width="100%" paddingLeft="{screenWidth*0.25}" paddingRight="{screenWidth*0.25}" horizontalAlign="center">
+		<s:BorderContainer  width="100%" borderWeight="2">
+			<s:VGroup width="100%" verticalAlign="middle" horizontalAlign="center">
+				<s:BorderContainer  width="100%" height="25" borderWeight="1">
+					<cus:QLabel text="储罐区信息" verticalAlign="middle" textalign="center"  width="100%" height="100%"/>
+				</s:BorderContainer>
+				<s:BorderContainer  width="100%" borderWeight="1">
+					<s:VGroup width="100%" height="100%" paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5">				
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgqmc')}" width="200"/>
+							<cus:QTextInput text="@{vo.cgqmc}" width="200" editable="false"/>
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.jtwz')}" width="200"/>
+							<cus:QTextInput text="@{vo.jtwz}"  width="200"  editable="false"/>
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgqmj')}" width="200"/>
+							<cus:QTextInput text="@{vo.cgqmj_s}" width="200"  editable="false"/>
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.glzxjl')}(米)" width="200"/>
+							<cus:QTextInput text="@{vo.glzxjl_s}" width="200" type="double" editable="false"/>
+						</s:HGroup>			
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.cggs')}" width="200"/>
+							<cus:QTextInput text="@{vo.cggs_s}" width="200" editable="false" />
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgrj')}(万立方)" notNull="true" width="200"/>
+							<cus:QTextInput text="@{vo.cgrj_s}" width="200" restrict="0-9\."  editable="false" />
+						</s:HGroup>		
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.zdwxycggs')}" width="200"/>
+							<cus:QTextInput text="@{vo.zdwxycggs_s}" width="200" editable="false"/>
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.zdwxycgrl')}(万立方)" width="200"/>
+							<cus:QTextInput text="@{vo.zdwxycgrl_s}" width="200" editable="false"/>	
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.tbr')}" width="200"/>
+							<cus:QTextInput text="@{vo.tbr}" width="200"  editable="false"/>
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.lxdh')}" width="200"/>
+							<cus:QTextInput text="@{vo.lxdh}" width="200"  editable="false"/>
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('yjgl','cg.tbsj')}" width="200"/>
+							<ui:DateTime id="tbsj" dateTime="{vo.tbsj}" width="200" enabled="false"/>
+						</s:HGroup>
+					</s:VGroup>
+				</s:BorderContainer>
+			</s:VGroup>			
+		</s:BorderContainer>		
+		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="center" verticalAlign="middle">
+			<s:Button  label="{resourceManager.getString('common','btn.close')}"
+					   click="close(event)" enabled="true" skinClass="skins.cus.ButtonSkin" /> 
+		</s:HGroup>
+	</s:VGroup>
+</s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/CgEdit.mxml

@@ -5,6 +5,7 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.vo.jyr.CgqVo;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.TypeBase;
 			import com.jtgh.yjpt.common.util.Constants;
@@ -285,6 +286,8 @@
 				szgq.reload(szd.selectedVO);
 				dwmc.reload(szd.selectedVO);
 				cgModel.cgVo.whzyfzbh="";
+				cgModel.cgVo.hxpmc="";
+				cgModel.cgVo.hxpsl_s="";
 			}
 
 
@@ -292,7 +295,7 @@
 			{
 				var jyrVo:JyrVo=dwmc.selectedVO as JyrVo;
 				if(null!=jyrVo)
-					cgModel.cgVo.whzyfzbh=jyrVo.gkwxhwzyfzbh;
+					cgq.reload(dwmc.selectedVO as JyrVo);
 				else 
 					cgModel.cgVo.whzyfzbh="";
 			}
@@ -319,7 +322,16 @@
 					cgModel.cgVo.zdwxycgrl_s=cgModel.cgVo.cgrj_s;
 				}
 			}
-
+			
+			protected function cgq_changeHandler(event:IndexChangeEvent):void
+			{
+				if(cgq.selectedVO!=null){
+					cgModel.cgVo.cgq = cgq.selectedVO as CgqVo;
+					cgModel.cgVo.cgqmc = cgModel.cgVo.cgq.cgqmc;
+					cgModel.cgVo.cgqmj = cgModel.cgVo.cgq.cgqmj;
+				}						
+			}
+			
 		]]>
 	</fx:Script>
 	<fx:Declarations>
@@ -399,11 +411,17 @@
 				</s:HGroup>
 			</s:VGroup>
 		</mx:VBox>
-		<mx:VBox width="100%" height="100%" label="储罐区（储罐）基本特征" click="addLis(event)">
+		<mx:VBox width="100%" height="100%" label="储罐基本特征" click="addLis(event)">
 			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5">
 				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgmc')}" notNull="true" width="200"/>
+					<cus:QTextInput text="@{cgModel.cgVo.cgmc}" width="200"/>
+					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgxh')}" notNull="true" width="200"/>
+					<cus:QTextInput text="@{cgModel.cgVo.cgxh}" width="200"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgqmc')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.cgqmc}" width="200"/>
+					<cus:QComboBox id="cgq" comboxClass="CgqSelect" hasBlank="true" selectedVO="{cgModel.cgVo.cgq}" change="cgq_changeHandler(event)"   width="200"/>
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.jtwz')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.jtwz}" width="200"/>
 				</s:HGroup>
@@ -415,16 +433,11 @@
 				</s:HGroup>
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgqmj')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.cgqmj_s}" width="200" restrict="{TypeBase.NUM_RESTRICT}"/>
+					<cus:QTextInput text="@{cgModel.cgVo.cgqmj_s}" width="200" restrict="{TypeBase.NUM_RESTRICT}" editable="false"/>
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgcz')}" width="200"/>
 					<cus:QComboBox id="cgcz" comboxClass="CgczSelect" hasBlank="true"  dataField="{cgModel.cgVo.cgcz}"  width="200"/>
 				</s:HGroup>
-				<s:HGroup width="100%" verticalAlign="middle">
-					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgmc')}" notNull="true" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.cgmc}" width="200"/>
-					<cus:QLabel text="{resourceManager.getString('yjgl','cg.cgxh')}" notNull="true" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.cgxh}" width="200"/>
-				</s:HGroup>
+
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.ywfhd')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.ywfhd}" width="200"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/BwVo.as

@@ -4,7 +4,7 @@ package com.jtgh.yjpt.vo.jyr
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.gkgq.MtVo;
-
+	
 	[Bindable]
 	[RemoteClass(alias="com.jtgh.yjpt.entity.jyr.BwEntity")]	
 	public class BwVo extends BaseVo
@@ -31,10 +31,13 @@ package com.jtgh.yjpt.vo.jyr
 		public var bwszsx :CodeVo= null;
 		// 服务类型
 		public var fwlx:CodeVo= null;
+		
 		// 投产年份
 		public var tcnf:Number= new Date().fullYear;
 		// 结构型式
 		public var jgxs:CodeVo= null;
+		// 结构型式
+		public var jgxs2:CodeVo= null;
 		/** 生产类型*/
 		public var sclx:CodeVo= null;
 		/**竣工验收年份*/
@@ -87,13 +90,13 @@ package com.jtgh.yjpt.vo.jyr
 		}
 		
 		public function get fwlxName():String{
-		 return fwlx!=null?fwlx.localeName:"";
+			return fwlx!=null?fwlx.localeName:"";
 		}
 		public function get jgxsName():String{
 			return jgxs!=null?jgxs.localeName:"";
 		}
 		public function get bwszsxName():String{
-		return bwszsx!=null?bwszsx.localeName:"";
+			return bwszsx!=null?bwszsx.localeName:"";
 		}
 		public function get sclxName():String{
 			return sclx!=null?sclx.localeName:"";
@@ -102,7 +105,7 @@ package com.jtgh.yjpt.vo.jyr
 			return zyhbwfl!=null?zyhbwfl.localeName:"";
 		}
 		public function get mtmcName():String{
-		return mtmc!=null?mtmc.mtmc:"";
+			return mtmc!=null?mtmc.mtmc:"";
 		}
 		public function get bwsxName():String
 		{

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/CgqVo.as

@@ -0,0 +1,149 @@
+package com.jtgh.yjpt.vo.jyr
+{
+	import com.jtgh.yjpt.common.Global;
+	import com.jtgh.yjpt.vo.BaseVo;
+	import com.jtgh.yjpt.vo.common.AccessoryVo;
+	import com.jtgh.yjpt.vo.common.CodeVo;
+	import com.jtgh.yjpt.vo.gkgq.GqVo;
+	
+	import mx.resources.ResourceManager;
+
+	[Bindable]
+	[RemoteClass(alias="com.jtgh.yjpt.entity.jyr.CgqEntity")]
+	public class CgqVo extends BaseVo
+	{
+		public function CgqVo()
+		{
+			super();
+			if(Global.user.jyr){
+				this.dwmc=Global.user.jyrjcxx;
+			}
+			this.tbr=Global.user.name;
+			this.tbsj=new Date;
+			this.lxdh=Global.user.lxdh;
+		}
+		public var  id:Number;
+		/**
+		 * 单位名称
+		 */
+		public var dwmc:JyrVo;
+		/** 附件 */
+		public var accessory:AccessoryVo;
+		/**
+		 * 储罐区名称
+		 */
+		public var cgqmc:String;
+		/**
+		 * 具体位置
+		 */
+		public var jtwz:String;
+		/**
+		 * 储罐区面积
+		 */
+		public var  cgqmj:Number;
+		public function set cgqmj_s(value:String):void
+		{
+			this.cgqmj=Number(value);
+		}
+		public function get cgqmj_s():String
+		{
+			return "NaN"==this.cgqmj.toString()?"":this.cgqmj.toString();
+		}
+		/**
+		 * 储罐个数
+		 */
+		public var cggs:Number;
+		public function set cggs_s(value:String):void
+		{
+			this.cggs=Number(value);
+		}
+		public function get cggs_s():String
+		{
+			return "NaN"==this.cggs.toString()?"":this.cggs.toString();
+		}
+		/**
+		 * 罐间最小距离
+		 */
+		public var glzxjl:Number;
+		public function set glzxjl_s(value:String):void
+		{
+			this.glzxjl=Number(value);
+		}
+		public function get glzxjl_s():String
+		{
+			return "NaN"==this.glzxjl.toString()?"":this.glzxjl.toString();
+		}
+		/**
+		 * 储罐容积
+		 */
+		public var cgrj:Number;
+		public function set cgrj_s(value:String):void
+		{
+			this.cgrj=Number(value);
+		}
+		public function get cgrj_s():String
+		{
+			return "NaN"==this.cgrj.toString()?"":this.cgrj.toString();
+		}
+		/**
+		 * 填表人
+		 */
+		public var tbr:String;
+		/**
+		 * 联系电话
+		 */
+		public var lxdh:String;
+		/**
+		 * 填表时间
+		 */
+		public var  tbsj:Date;
+		
+		/**
+		 * 所在地
+		 */
+		public var szd:CodeVo;
+		public function get szdName():String
+		{
+			return null==szd?"":szd.localeName;
+		}
+		/**
+		 * 所在港区
+		 */
+		public var gq:GqVo;
+		public function get gqName():String
+		{
+			return  null==gq?"":gq.gqmc;
+		}
+		public function get jyrName():String
+		{
+			return dwmc!=null?dwmc.gkjyr:"";
+		}
+
+		/**
+		 * 重大危险源储罐个数
+		 */
+		public var zdwxycggs:Number;
+		public function set zdwxycggs_s(value:String):void
+		{
+			this.zdwxycggs=Number(value);
+		}
+		public function get zdwxycggs_s():String
+		{
+			return "NaN"==this.zdwxycggs.toString()?"":this.zdwxycggs.toString();
+		}
+		/**
+		 * 重大危险源储罐容量
+		 */
+		public var zdwxycgrl:Number;
+		public function set zdwxycgrl_s(value:String):void
+		{
+			this.zdwxycgrl=Number(value);
+		}
+		public function get zdwxycgrl_s():String
+		{
+			return "NaN"==this.zdwxycgrl.toString()?"":this.zdwxycgrl.toString();
+		}
+		
+	}
+}
+

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjgl/zdwxyfb/CgVo.as

@@ -7,6 +7,7 @@ package com.jtgh.yjpt.vo.yjgl.zdwxyfb
 	import com.jtgh.yjpt.vo.common.AccessoryVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
+	import com.jtgh.yjpt.vo.jyr.CgqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	
 	import mx.resources.ResourceManager;
@@ -145,6 +146,10 @@ package com.jtgh.yjpt.vo.yjgl.zdwxyfb
 		 */
 		public var gkzdwxybabh:String;
 		/**
+		 * 储罐区
+		 */
+		public var cgq:CgqVo;
+		/**
 		 * 储罐区名称
 		 */
 		public var cgqmc:String;