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

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

@@ -118,6 +118,9 @@ package com.jtgh.yjpt.common
 	import com.jtgh.yjpt.vo.zysqbp.ZysqbpGatherVo;
 	import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
 	import com.jtgh.yjpt.vo.zysqbp.ZysqbphsdbVo;
+	import com.jtgh.yjpt.vo.cginfo.CgInfoVo;
+	import com.jtgh.yjpt.vo.cginfo.CgStorageVo;
+	import com.jtgh.yjpt.vo.cginfo.CgOperationConditionVo;
 	
 	import mx.charts.ColumnChart;
 	import mx.charts.PieChart;
@@ -353,6 +356,9 @@ package com.jtgh.yjpt.common
 		ActivitySelect;
 		ActivityVo;
 		WFPropLayout;
+		CgInfoVo;
+		CgStorageVo;
+		CgOperationConditionVo;
 	}
 }
 

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

@@ -125,6 +125,11 @@ package com.jtgh.yjpt.common
 		public static var MODEL_008:String = "008"; // 任务管理
 		public static var MODEL_008001	:String = "008001"; // 待办任务
 		public static var MODEL_008002:String = "008002"; // 工作提醒
+		
+		/** 储罐基本信息 */
+		public static var MODEL_003008:String = "003008";
+		
+		
 		private static var resourceManager:IResourceManager=ResourceManager.getInstance();
 		
 		public static function getModuleName(modId:String):String

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/cginfo/CgInfoModel.as

@@ -0,0 +1,294 @@
+package com.jtgh.yjpt.model.cginfo
+{
+	import com.jtgh.yjpt.common.IModule;
+	import com.jtgh.yjpt.common.util.Utils;
+	import com.jtgh.yjpt.model.BaseModel;
+	import com.jtgh.yjpt.model.SystemModel;
+	import com.jtgh.yjpt.view.cginfo.CgInfoEdit;
+	import com.jtgh.yjpt.view.cginfo.CgOpConditionEdit;
+	import com.jtgh.yjpt.view.cginfo.CgStorageEdit;
+	import com.jtgh.yjpt.vo.cginfo.CgInfoVo;
+	import com.jtgh.yjpt.vo.cginfo.CgOperationConditionVo;
+	import com.jtgh.yjpt.vo.cginfo.CgStorageVo;
+	import com.jtgh.yjpt.vo.common.CodeVo;
+	import com.jtgh.yjpt.vo.gkgq.GqVo;
+	import com.jtgh.yjpt.vo.jyr.JyrVo;
+	
+	import com.jtgh.yjpt.common.BusinessContext;
+	import flash.display.DisplayObject;
+	
+	import mx.collections.ArrayCollection;
+	import mx.core.FlexGlobals;
+	import mx.events.CloseEvent;
+	import mx.rpc.events.ResultEvent;
+	
+	[Bindable]
+	public class CgInfoModel extends BaseModel
+	{ 
+		
+		public var thisView:Object;//CgInfo creationComplete 
+		public var thisData:CgInfoVo;  
+		public var cgStorageList:ArrayCollection; 
+		public var delCgStorageList:ArrayCollection; 
+		public var opList:ArrayCollection; 
+		public var delOpList:ArrayCollection;
+		public var functionId:Number;
+		public var cgInfoEdit:CgInfoEdit;
+		public var cgStorageEdit:CgStorageEdit;
+		public var cgOpConditionEdit:CgOpConditionEdit;
+		public var storage_index:Number;
+		public var op_index:Number;
+		
+		public function CgInfoModel()
+		{
+			super(IModule.MODEL_003008);
+		}
+		 
+		///跳出新增页面
+		public function doAdd(functionId:Number):void
+		{
+			this.thisData=new CgInfoVo;
+			this.thisData.haveDesignInfo="Y";  
+			this.thisData.haveCompletionInfo = "Y";  
+			this.thisData.isRegularDetection="Y"; 
+			this.thisData.isRepaired="Y";
+			cgInfoEdit=new CgInfoEdit;
+			cgInfoEdit.cgInfoModel = this; 
+			cgStorageList=new ArrayCollection;
+			delCgStorageList=new ArrayCollection;
+			opList=new ArrayCollection;
+			delOpList=new ArrayCollection;
+			this.functionId=functionId; 
+			Utils.popupWindow(resourceManager.getString("common","btn.add"),
+				cgInfoEdit,SystemModel.getInstance().getMainLayout() as DisplayObject,thisView.pageQuery,800,600);
+		}
+		
+		
+		
+		private function doSaveCheck():Boolean{ 
+			return true;
+		}
+		
+		public function doSave():void
+		{
+			if(!doSaveCheck()){
+				return;
+			}
+			//储罐容积
+			if(cgInfoEdit.cgVolume.text.length!=0){
+				this.thisData.cgVolume = new Number(cgInfoEdit.cgVolume.text);
+			}
+			else{
+				this.thisData.cgVolume=0;
+			} 
+			//设计压力MPa
+			if(cgInfoEdit.designPressure.text.length!=0){
+				this.thisData.designPressure = new Number(cgInfoEdit.designPressure.text);
+			}
+			else{
+				this.thisData.designPressure=0;
+			}
+			//设计温度℃
+			if(cgInfoEdit.designTemp.text.length!=0){
+				this.thisData.designTemp = new Number(cgInfoEdit.designTemp.text);
+			}
+			else{
+				this.thisData.designTemp=0;
+			}
+			
+			this.thisData.szd=cgInfoEdit.szd.selectedVO as CodeVo;
+			this.thisData.szgq=cgInfoEdit.szgq.selectedVO as GqVo;
+			this.thisData.jyr=cgInfoEdit.jyr.selectedVO as JyrVo;
+			this.thisData.buildDate=cgInfoEdit.buildDate.dateTime;
+			this.thisData.detectionTime=cgInfoEdit.detectionTime.dateTime;
+			this.thisData.repairTime=cgInfoEdit.repairTime.dateTime;
+			//是否有设计资料
+			if(cgInfoEdit.haveDesignInfo.selected)
+				this.thisData.haveDesignInfo="Y";
+			else
+				this.thisData.haveDesignInfo="N";
+			//是否有建造工程资料（竣工资料）
+			if(cgInfoEdit.haveCompletionInfo.selected)
+				this.thisData.haveCompletionInfo = "Y";
+			else
+				this.thisData.haveCompletionInfo="N";
+			//是否对储罐进行过定期检测
+			if(cgInfoEdit.isRegularDetection.selected)
+				this.thisData.isRegularDetection="Y";
+			else
+				this.thisData.isRegularDetection="N";
+			//是否对储罐进行过维修
+			if(cgInfoEdit.isRepaired.selected)
+				this.thisData.isRepaired="Y";
+			else
+				this.thisData.isRepaired="N";
+			
+			var method:String="add";
+			if(thisData.id > 0){
+				method="edit";
+			}
+			Utils.callRemote("cgInfoController",method,function(r:ResultEvent):void{
+				cgInfoEdit.dispatchEvent(new CloseEvent(CloseEvent.CLOSE)); 
+			},this.functionId,this.thisData,this.cgStorageList,this.delCgStorageList,this.opList,this.delOpList);
+			
+		}
+		
+		
+		/**
+		 * 编辑
+		 */
+		public function doEdit(functionId:Number):void
+		{
+			//检查选中项
+			if(thisView.grid.selectedIndex==-1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}
+			// 获取选中项
+			var cgInfoVo:CgInfoVo = thisView.grid.selectedItem as CgInfoVo;
+			cgInfoEdit=new CgInfoEdit;
+			cgInfoEdit.cgInfoModel = this; 
+			this.cgInfoEdit=cgInfoEdit;
+			this.thisData=cgInfoVo;  
+			this.delCgStorageList=new ArrayCollection;
+			this.delOpList=new ArrayCollection;
+			this.cgStorageList = new ArrayCollection;
+			this.opList = new ArrayCollection;
+			this.functionId=functionId; 
+			Utils.popupWindow(resourceManager.getString('common','btn.edit'), cgInfoEdit as DisplayObject, FlexGlobals.topLevelApplication as DisplayObject, thisView.pager.doQuery, 780, 600);
+		}
+		
+		//弹出 “添加”  储存介质 页面
+		public function addStorage():void
+		{ 
+			storage_index=-1;
+			cgStorageEdit = new CgStorageEdit();
+			cgStorageEdit.thisData = new CgStorageVo();
+			cgStorageEdit.cgInfoModel = this;
+			Utils.popupWindow(resourceManager.getString("common","btn.add"),
+				cgStorageEdit,SystemModel.getInstance().getMainLayout() as DisplayObject,null,800,220);
+		}
+		
+		//弹出 “编辑”  储存介质 页面
+		public function editStorage(cgStorageVo:CgStorageVo):void
+		{
+			cgStorageEdit = new CgStorageEdit(); 
+			cgStorageEdit.thisData=cgStorageVo.clone() as CgStorageVo;
+			cgStorageEdit.cgInfoModel = this;
+			storage_index=cgInfoEdit.grid1.selectedIndex;
+			Utils.popupWindow(resourceManager.getString("common","btn.edit"),
+				cgStorageEdit,SystemModel.getInstance().getMainLayout() as DisplayObject,null,800,220);
+		}
+		
+		//删除 储存介质
+		public function delStorage(cgStorageVo:CgStorageVo):void
+		{
+			cgStorageList.removeItemAt(cgInfoEdit.grid1.selectedIndex);
+			if(cgStorageVo.id!=0)
+			{
+				delCgStorageList.addItem(cgStorageVo);		
+			} 
+		}
+		
+		//保存 存储介质 必填验证
+		private function saveStorageCheck():Boolean{ 
+			return true;
+		}
+		
+		//保存 存储介质 存入内存页面变量，未入库
+		public function saveStorage():void{
+			if(!saveStorageCheck()){
+				return;
+			}
+			if(-1==storage_index)
+			{
+				//add
+				
+				cgStorageEdit.thisData.szd =  cgInfoEdit.szd.selectedVO as CodeVo;
+				cgStorageList.addItem(cgStorageEdit.thisData);
+			}
+			else
+			{
+				//edit
+				cgStorageList.setItemAt(cgStorageEdit.thisData,storage_index);
+			} 
+			cgStorageEdit.dispatchEvent(new CloseEvent(CloseEvent.CLOSE)); 
+		}
+		 
+		//弹出  添加  近3个月作业情况   页面
+		public function addOpCondition():void
+		{
+			op_index=-1;
+			cgOpConditionEdit = new CgOpConditionEdit();
+			cgOpConditionEdit.thisData=new CgOperationConditionVo();
+			cgOpConditionEdit.cgInfoModel = this;
+			Utils.popupWindow(resourceManager.getString("common","btn.add"),
+				cgOpConditionEdit,SystemModel.getInstance().getMainLayout() as DisplayObject,null,800,180);
+		}
+		
+		//弹出  编辑  近3个月作业情况   页面
+		public function editOpCondition(cgOperationConditionVo:CgOperationConditionVo):void
+		{
+			cgOpConditionEdit = new CgOpConditionEdit(); 
+			cgOpConditionEdit.thisData=cgOperationConditionVo.clone() as CgOperationConditionVo;
+			cgOpConditionEdit.cgInfoModel = this;
+			op_index=cgInfoEdit.grid2.selectedIndex;
+			Utils.popupWindow(resourceManager.getString("common","btn.edit"),
+				cgOpConditionEdit,SystemModel.getInstance().getMainLayout() as DisplayObject,null,800,180);
+		}
+		
+		//删除 储存介质
+		public function delOpCondition(cgOperationConditionVo:CgOperationConditionVo):void
+		{
+			opList.removeItemAt(cgInfoEdit.grid2.selectedIndex);
+			if(cgOperationConditionVo.id!=0)
+			{
+				delOpList.addItem(cgOperationConditionVo);		
+			} 
+		}
+		
+		//保存 近3个月作业情况 必填验证
+		private function saveOpCheck():Boolean{ 
+			return true;
+		}
+		
+		//保存 近3个月作业情况 存入内存页面变量，未入库
+		public function saveOpCondition():void{
+			if(!saveOpCheck()){
+				return;
+			}
+			
+			//作业时间
+			cgOpConditionEdit.thisData.operationTime = cgOpConditionEdit.operationTime.dateTime;
+			//作业压力MPa
+			if(cgOpConditionEdit.operationPressure.text.length!=0){
+				cgOpConditionEdit.thisData.operationPressure = new Number(cgOpConditionEdit.operationPressure.text);
+			}
+			else{
+				cgOpConditionEdit.thisData.operationPressure=0;
+			} 
+			//作业温度℃
+			if(cgOpConditionEdit.operationTemp.text.length!=0){
+				cgOpConditionEdit.thisData.operationTemp = new Number(cgOpConditionEdit.operationTemp.text);
+			}
+			else{
+				cgOpConditionEdit.thisData.operationTemp=0;
+			} 
+			
+			if(-1==op_index)
+			{
+				//add
+				cgOpConditionEdit.thisData.szd =  cgInfoEdit.szd.selectedVO as CodeVo; 
+				opList.addItem(cgOpConditionEdit.thisData);
+			}
+			else
+			{
+				//edit
+				opList.setItemAt(cgOpConditionEdit.thisData,op_index);
+			} 
+			cgOpConditionEdit.dispatchEvent(new CloseEvent(CloseEvent.CLOSE)); 
+		}
+		
+	}
+	
+}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/cginfo/CgInfo.mxml

@@ -15,15 +15,15 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.BusinessContext;
-			
-			import mx.core.FlexGlobals;
-			
-			import com.jtgh.yjpt.common.Global; 
-			import com.jtgh.yjpt.common.util.Utils;  
-			import com.jtgh.yjpt.vo.common.SinglePageRequestVo; 
+			import com.jtgh.yjpt.common.Global;
+			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.SystemModel;
+			import com.jtgh.yjpt.model.cginfo.CgInfoModel;
+			import com.jtgh.yjpt.vo.cginfo.CgInfoVo;
+			import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 			
 			import mx.collections.ArrayCollection;
+			import mx.core.FlexGlobals;
 			import mx.events.FlexEvent;
 			import mx.rpc.events.ResultEvent;
 			
@@ -33,6 +33,8 @@
 			public var thisDataList:ArrayCollection;
 			[Bindable]
 			public var sfJyrFlag:Boolean=false;
+			[Bindable]
+			public var cgInfoModel:CgInfoModel=new CgInfoModel;
 			
 			
 			protected function creationComplete(event:FlexEvent):void
@@ -42,7 +44,8 @@
 				}
 				else{
 					szd.selectedVO=Global.szd;
-				}  
+				} 
+				cgInfoModel.thisView = this;
 				pageQuery(pager.pageVo);
 			}
 	 
@@ -86,24 +89,17 @@
 				var pageVo:SinglePageRequestVo = pager.pageVo; 
 				pageQuery(pageVo);
 			}
-			
-			
-			///跳出新增页面
-			public function doAdd():void
-			{ 
-				var cgInfoEdit:CgInfoEdit=new CgInfoEdit();   
-				Utils.popupWindow(resourceManager.getString("common","btn.add"),
-					cgInfoEdit,SystemModel.getInstance().getMainLayout() as DisplayObject,null,800,600);			
-			}
+		
 		]]>
 	</fx:Script>
 	<!-- 定义工具栏按钮 -->
 	
 	<s:HGroup width="100%" height="40" gap="10"  horizontalAlign="left" verticalAlign="middle">
-		<button:IconButton id="add" type="add" click="{doAdd()}"
+		<button:IconButton id="add" type="add" click="{cgInfoModel.doAdd(Utils.getFunctionId(add))}"
 						   toolTip="{resourceManager.getString('common','btn.add')}" />
 		<button:IconButton id="del" type="delete" toolTip="{resourceManager.getString('common','btn.del')}"/> 
-		<button:IconButton id="edit" type="edit" toolTip="{resourceManager.getString('common','btn.edit')}"/>
+		<button:IconButton id="edit" type="edit" click="{cgInfoModel.doEdit(Utils.getFunctionId(edit))}"
+						   toolTip="{resourceManager.getString('common','btn.edit')}"/>
 		<button:IconButton id="query" type="query" click="switchSearchBox(event)" toolTip="{resourceManager.getString('common','btn.query')}"/>
 	</s:HGroup>
 	<s:VGroup id="searchGroup" width="100%"  visible="false" includeInLayout="false">
@@ -145,16 +141,17 @@
 	</s:VGroup>
 	<!-- 显示一览记录 -->
 	<ui:DataGrid id="grid" width="100%" dataProvider="{thisDataList}" doubleClickEnabled="true">
-		<ui:columns><s:ArrayList>
-						<ui:DataGridColumn  labelFunction="labelFun" 
-											headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>
-						<ui:DataGridColumn width="100" dataField="jyrName" showDataTips="true" dataTipField="jyrName"
-										   headerText="{resourceManager.getString('common','gkjyr')}"/>
-						<ui:DataGridColumn width="100" dataField="szdName"
-										   headerText="{resourceManager.getString('check','zc.szd')}"/>	
-						<ui:DataGridColumn dataField="szgqName"
-										   headerText="{resourceManager.getString('check','zc.szgq')}"/>	
-					</s:ArrayList>
+		<ui:columns>
+			<s:ArrayList>
+				<ui:DataGridColumn  labelFunction="labelFun" 
+									headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>
+				<ui:DataGridColumn width="100" dataField="jyrName" showDataTips="true" dataTipField="jyrName"
+								   headerText="{resourceManager.getString('common','gkjyr')}"/>
+				<ui:DataGridColumn width="100" dataField="szdName"
+								   headerText="{resourceManager.getString('check','zc.szd')}"/>	
+				<ui:DataGridColumn dataField="szgqName"
+								   headerText="{resourceManager.getString('check','zc.szgq')}"/>	
+			</s:ArrayList>
 		</ui:columns>
 	</ui:DataGrid>
 	<ui:Pager id="pager" queryFunction="{pageQuery}"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/cginfo/CgInfoEdit.mxml

@@ -1,7 +1,9 @@
 <?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.*" 
+		  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="init(event)">
 	<fx:Declarations>
 		<!-- 将非可视元素（例如服务、值对象）放在此处 -->
@@ -9,23 +11,24 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.BusinessContext;
-			
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.TypeBase;
-			import com.jtgh.yjpt.common.util.Utils; 
-			import com.jtgh.yjpt.vo.cginfo.CgInfoVo; 
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.vo.cginfo.CgInfoVo;
 			
 			import mx.collections.ArrayCollection;
+			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			import mx.managers.CursorManager;
 			import mx.rpc.events.ResultEvent;
 			import mx.utils.ObjectUtil;
-			import mx.events.CloseEvent;
 			
 			import spark.events.GridSelectionEvent;
+			
+			import com.jtgh.yjpt.model.cginfo.CgInfoModel;
 			 
 			[Bindable]
-			public var thisData:CgInfoVo; 
+			public var cgInfoModel:CgInfoModel;
 			 
 			protected function getSzgq():void
 			{
@@ -35,54 +38,94 @@
 			
 			protected function init(event:FlexEvent):void
 			{
-
+				Utils.callRemote("cgInfoController","getCgRelatedInfo",function(r:ResultEvent):void{
+					var bc:BusinessContext=r.result as BusinessContext; 
+					cgInfoModel.cgStorageList = bc.getAttribute("storage") as ArrayCollection;
+					cgInfoModel.opList = bc.getAttribute("op") as ArrayCollection;
+				},cgInfoModel.thisData.id);
 			}
 			
 			/** 是否有设计资料 */
-			protected function designInfoFun(chk:CheckBox):void
+			protected function haveDesignInfoFun():void
 			{
-				haveDesignInfo.selected = false;
-				lackDesignInfo.selected = false;
-				chk.selected = true; 
+				if(haveDesignInfo.selected)
+					lackDesignInfo.selected = false; 
+				else
+					lackDesignInfo.selected = true;
 			}
+			protected function lackDesignInfoFun():void
+			{
+				if(lackDesignInfo.selected)
+					haveDesignInfo.selected = false; 
+				else
+					haveDesignInfo.selected = true;
+			}
+			 
 			
 			/** 是否有建造工程资料（竣工资料） */
-			protected function completionInfoFun(chk:CheckBox):void
+			protected function haveCompletionInfoFun():void
 			{
-				haveCompletionInfo.selected = false;
-				lackCompletionInfo.selected = false;
-				chk.selected = true; 
+				if(haveCompletionInfo.selected){
+					lackCompletionInfo.selected = false; 
+				} 
+				else{
+					lackCompletionInfo.selected = true; 
+				}
 			}
-			
-			/** 是否对储罐进行过定期检测 */
-			protected function regularDetectionFun(chk:CheckBox):void
+			protected function lackCompletionInfoFun():void
 			{
-				isRegularDetection.selected = false;
-				notRegularDetection.selected = false;
-				chk.selected = true; 
+				if(lackCompletionInfo.selected){
+					haveCompletionInfo.selected = false; 
+				} 
+				else{
+					haveCompletionInfo.selected = true;
+				}
 			}
 			
 			
-			private function doSaveCheck():Boolean{ 
-				return true;
+			
+			/** 是否对储罐进行过定期检测 */
+			protected function isRegularDetectionFun():void
+			{
+				if(isRegularDetection.selected){
+					notRegularDetection.selected = false; 
+				} 
+				else{
+					notRegularDetection.selected = true;
+				}
+			}
+			protected function notRegularDetectionFun():void
+			{
+				if(notRegularDetection.selected){
+					isRegularDetection.selected = false; 
+				} 
+				else{
+					isRegularDetection.selected = true;
+				}
 			}
 			
-			public function doSave():void
+			
+			/** 是否对储罐进行过维修 */
+			protected function isRepairedFun():void
 			{
-				if(!doSaveCheck()){
-					return;
+				if(isRepaired.selected){
+					notRepaired.selected = false; 
+				} 
+				else{
+					notRepaired.selected = true; 
 				}
-				
-				var method:String="add";
-				if(thisData.id > 0){
-					method="edit";
+			}
+			protected function notRepairedFun():void
+			{
+				if(notRepaired.selected){
+					isRepaired.selected = false; 
+				} 
+				else{
+					isRepaired.selected = true; 
 				}
-				Utils.callRemote("cgInfoController",method,function(r:ResultEvent):void{
-					this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE)); 
-				},this.functionId,this.zcVo,zcyhList,this.delList);
-				
 			}
 			
+			
 			public function doPopupClose(view:DisplayObject):void
 			{
 				Utils.doCloseConfirm(function():void{
@@ -94,41 +137,41 @@
 	</fx:Script>
 	<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="135" text="{resourceManager.getString('check','zc.szd')}" notNull="true"/>
-			<cus:QComboBox width="200" id="szd" selectedVO="{thisData.szd==null?Global.user.szd:thisData.szd}" comboxClass="SzdEditSelect"
+			<cus:QLabel width="135" text="{resourceManager.getString('check','zc.szd')}" notNull="true"/> 
+			<cus:QComboBox width="200" id="szd" selectedVO="{cgInfoModel.thisData.szd==null?Global.user.szd:cgInfoModel.thisData.szd}" comboxClass="SzdEditSelect"
 						   parentId="{Global.szd.id}" change="getSzgq()"/>
 			<cus:QLabel width="135" text="建造日期" notNull="true"/>
-			<ui:DateTime width="200" id="buildDate" dateTime="{thisData.buildDate}" />
+			<ui:DateTime width="200" id="buildDate" dateTime="{cgInfoModel.thisData.buildDate}" />
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="{resourceManager.getString('check','zc.szgq')}" notNull="true"/>
-			<cus:QComboBox width="200" id="szgq" selectedVO="{thisData.szgq}" 
-						   comboxClass="GqBySzdSelect" parentId="{thisData.szd==null?Global.user.szd:thisData.szd}"/>	
+			<cus:QComboBox width="200" id="szgq" selectedVO="{cgInfoModel.thisData.szgq}" 
+						   comboxClass="GqBySzdSelect" parentId="{cgInfoModel.thisData.szd==null?Global.user.szd:cgInfoModel.thisData.szd}"/>	
 			<cus:QLabel width="135" text="储罐编号" notNull="true"/>
-			<cus:QTextInput width="200" text="@{thisData.bh}"/>
+			<cus:QTextInput width="200" text="@{cgInfoModel.thisData.bh}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="{resourceManager.getString('common','gkjyr')}" notNull="true"/>
-			<cus:QComboBox id="jyr" selectedVO="{thisData.jyr}" comboxClass="JyrSelect" 
-						   parentId="{thisData.szd==null?Global.user.szd:thisData.szd}" width="200" />
+			<cus:QComboBox id="jyr" selectedVO="{cgInfoModel.thisData.jyr}" comboxClass="JyrSelect" 
+						   parentId="{cgInfoModel.thisData.szd==null?Global.user.szd:cgInfoModel.thisData.szd}" width="200" />
 			<cus:QLabel width="135" text="储罐形式" notNull="true"/>
-			<cus:QTextInput width="200" text="@{thisData.cgForm}"/>
+			<cus:QTextInput width="200" text="@{cgInfoModel.thisData.cgForm}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="联系人"/>
-			<cus:QTextInput width="200" text="@{thisData.contactPerson}"/>
+			<cus:QTextInput width="200" text="@{cgInfoModel.thisData.contactPerson}"/>
 			<cus:QLabel width="135" text="储罐容积" />
-			<cus:QTextInput width="200"  text="@{thisData.cgVolume.toString()}"/>
+			<cus:QTextInput width="200" id="cgVolume" type="double" text="{cgInfoModel.thisData.cgVolume.toString()=='NaN'?'':cgInfoModel.thisData.cgVolume.toString()}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="联系电话"/>
-			<cus:QTextInput width="200"  text="@{thisData.contactPhone}"/>
+			<cus:QTextInput width="200"  text="@{cgInfoModel.thisData.contactPhone}"/>
 			<cus:QLabel width="135" text="储罐材质"/>
-			<cus:QTextInput width="200" text="@{thisData.cgMaterial}"/>
+			<cus:QTextInput width="200" text="@{cgInfoModel.thisData.cgMaterial}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="联系人邮箱"/>
-			<cus:QTextInput width="547" text="@{thisData.contactEmail}"/>
+			<cus:QTextInput width="547" text="@{cgInfoModel.thisData.contactEmail}"/>
 		</s:HGroup> 
 	</s:VGroup>
 	<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#00FFFF">
@@ -140,8 +183,12 @@
 	</s:BorderContainer>
 	<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
 		<s:HGroup>
-			<s:Label text="储存介质" fontWeight="bold" paddingLeft="10" />
-			<ui:DataGrid id="grid1" width="80%" height="110">
+			<s:VGroup>
+				<s:Label text="储存介质" fontWeight="bold" paddingLeft="10"  width="115" />
+				<s:Button label="{resourceManager.getString('common','btn.add')}" click="{cgInfoModel.addStorage()}" skinClass="skins.cus.ButtonSkin"/>
+			</s:VGroup>
+			
+			<ui:DataGrid id="grid1" width="567" height="110" dataProvider="{cgInfoModel.cgStorageList}">
 				<ui:columns>
 					<s:ArrayList>
 						<ui:DataGridColumn dataField="commodityName" headerText="货种名称"/>
@@ -150,25 +197,38 @@
 						<ui:DataGridColumn dataField="fireRisk" headerText="火灾危险性"/>
 						<ui:DataGridColumn dataField="dangerChemical" headerText="危险化学品"/> 
 						<ui:DataGridColumn dataField="toxicChemical" headerText="剧毒化学品" />
+						<ui:DataGridColumn headerText="{resourceManager.getString('common','btn.cz')}" 
+										   type="{TypeBase.MULTIBUTTON}" editFunction="{cgInfoModel.editStorage}" delFunction="{cgInfoModel.delStorage}"/>
 					</s:ArrayList>
 				</ui:columns>
 			</ui:DataGrid>	
 		</s:HGroup>
 		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
+		
 		<s:HGroup>
-			<s:Label text="近3个月作业情况" fontWeight="bold" paddingLeft="10" />
-			<ui:DataGrid id="grid2" width="80%" height="110">
+			<s:VGroup>
+				<s:Label text="近3个月作业情况" fontWeight="bold" paddingLeft="10" width="115" />
+				<s:Button label="{resourceManager.getString('common','btn.add')}" click="{cgInfoModel.addOpCondition()}" skinClass="skins.cus.ButtonSkin"/>
+			</s:VGroup>
+			
+			<ui:DataGrid id="grid2" width="567" height="110" dataProvider="{cgInfoModel.opList}">
 				<ui:columns>
 					<s:ArrayList>
 						<ui:DataGridColumn dataField="operationTime" headerText="作业时间"/>
 						<ui:DataGridColumn dataField="operationCommodityName" headerText="作业货种"/>
 						<ui:DataGridColumn dataField="operationPressure" headerText="作业压力MPa"/>
 						<ui:DataGridColumn dataField="operationTemp" headerText="作业温度℃"/> 
+						<ui:DataGridColumn headerText="{resourceManager.getString('common','btn.cz')}" 
+										   type="{TypeBase.MULTIBUTTON}" editFunction="{cgInfoModel.editOpCondition}" delFunction="{cgInfoModel.delOpCondition}"/>
 					</s:ArrayList>
 				</ui:columns>
 			</ui:DataGrid>	
 		</s:HGroup>
 		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
 		<s:BorderContainer width="100%" borderVisible="false" height="32" > 
 			<s:HGroup width="100%" verticalAlign="middle" horizontalAlign="center">
 				<s:Label text="储罐设计及检测维护信息"  fontWeight="bold" paddingLeft="10"/>
@@ -176,60 +236,106 @@
 		</s:BorderContainer>
 		
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="135" text="是否有设计资料"/>
-			<ui:CheckBox id="haveDesignInfo" selected="{'Y'==thisData.haveDesignInfo}" label="是"  valueCommit="designInfoFun(this.haveDesignInfo)"/>
-			<ui:CheckBox id="lackDesignInfo" selected="{'N'==thisData.haveDesignInfo}" label="否" valueCommit="designInfoFun(this.lackDesignInfo)"/>
+			<cus:QLabel width="200" text="是否有设计资料"/>
+			<ui:CheckBox id="haveDesignInfo" selected="{'Y'==cgInfoModel.thisData.haveDesignInfo}" label="是"  valueCommit="haveDesignInfoFun()"/>
+			<ui:CheckBox id="lackDesignInfo" selected="{'N'==cgInfoModel.thisData.haveDesignInfo}" label="否" valueCommit="lackDesignInfoFun()"/>
 		</s:HGroup> 
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="设计单位名称"/>
-			<cus:QTextInput width="547" text="@{thisData.designOrgName}"/>
+			<cus:QTextInput width="547" text="@{cgInfoModel.thisData.designOrgName}"/>
 		</s:HGroup> 
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="设计单位资质"/>
-			<cus:QTextInput width="547" text="@{thisData.designOrgQualification}"/> 
+			<cus:QTextInput width="547" text="@{cgInfoModel.thisData.designOrgQualification}"/> 
 		</s:HGroup> 
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="设计压力MPa"/>
-			<cus:QTextInput width="200" text="@{thisData.designPressure.toString()}"/> 
+			<cus:QTextInput width="200" id="designPressure" type="double" text="{cgInfoModel.thisData.designPressure.toString() =='NaN'?'':cgInfoModel.thisData.designPressure.toString()}"/> 
 			<cus:QLabel width="135" text="设计温度℃"/>
-			<cus:QTextInput width="200" text="@{thisData.designTemp.toString()}"/> 
+			<cus:QTextInput width="200" id="designTemp" type="double" text="{cgInfoModel.thisData.designTemp.toString() =='NaN'?'':cgInfoModel.thisData.designTemp.toString()}"/> 
 		</s:HGroup>
+		
+		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="135" text="是否有建造工程资料（竣工资料）"/>
-			<ui:CheckBox id="haveCompletionInfo" selected="{'Y'==thisData.haveCompletionInfo}" label="是"  valueCommit="completionInfoFun(this.haveCompletionInfo)"/>
-			<ui:CheckBox id="lackCompletionInfo" selected="{'N'==thisData.haveCompletionInfo}" label="否" valueCommit="completionInfoFun(this.lackCompletionInfo)"/>
+			<cus:QLabel width="200" text="是否有建造工程资料（竣工资料）"/>
+			<ui:CheckBox id="haveCompletionInfo" selected="{'Y'==cgInfoModel.thisData.haveCompletionInfo}" label="是" valueCommit="haveCompletionInfoFun()"/>
+			<ui:CheckBox id="lackCompletionInfo" selected="{'N'==cgInfoModel.thisData.haveCompletionInfo}" label="否" valueCommit="lackCompletionInfoFun()"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="建造单位名称"/>
-			<cus:QTextInput width="547" text="@{thisData.buildOrgName}"/>
+			<cus:QTextInput width="547" text="@{cgInfoModel.thisData.buildOrgName}"/>
 		</s:HGroup> 
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="135" text="建造单位资质"/>
-			<cus:QTextInput width="547" text="@{thisData.buildOrgQualification}"/>
+			<cus:QTextInput width="547" text="@{cgInfoModel.thisData.buildOrgQualification}"/>
 		</s:HGroup> 
+		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
+		<!-- 是否对储罐进行过定期检测-->
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="135" text="是否对储罐进行过定期检测"/>
-			<ui:CheckBox id="isRegularDetection" selected="{'Y'==thisData.isRegularDetection}" label="是"  valueCommit="regularDetectionFun(this.isRegularDetection)"/>
-			<ui:CheckBox id="notRegularDetection" selected="{'N'==thisData.isRegularDetection}" label="否" valueCommit="regularDetectionFun(this.notRegularDetection)"/>
+			<cus:QLabel width="200" text="是否对储罐进行过定期检测"/>
+			<ui:CheckBox id="isRegularDetection" selected="{'Y'==cgInfoModel.thisData.isRegularDetection}" label="是"  valueCommit="isRegularDetectionFun()"/>
+			<ui:CheckBox id="notRegularDetection" selected="{'N'==cgInfoModel.thisData.isRegularDetection}" label="否" valueCommit="notRegularDetectionFun()"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="135" text="检测时间"/>
-			<cus:QLabel width="250" text="检测机构"/>
-			<cus:QLabel width="250" text="检测结论"/>
+			<s:HGroup width="210" verticalAlign="middle" horizontalAlign="center">
+				<cus:QLabel width="150" text="检测时间"/>
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QLabel width="150" text="检测机构"/>
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QLabel width="150" text="检测结论"/>
+			</s:HGroup>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">  
-			<ui:DateTime width="135" id="buildDate" dateTime="{thisData.detectionTime}" />
-			<cus:QTextInput width="200" text="@{thisData.detectionOrg}"/> 
-			<cus:QTextInput width="200" text="@{thisData.detectionConclusion}"/> 
+			<s:HGroup width="210" verticalAlign="middle" horizontalAlign="center">
+				<ui:DateTime width="200" id="detectionTime" dateTime="{cgInfoModel.thisData.detectionTime}" />
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QTextInput width="220" text="@{cgInfoModel.thisData.detectionOrg}"/> 
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QTextInput width="220" text="@{cgInfoModel.thisData.detectionConclusion}"/> 
+			</s:HGroup>
 		</s:HGroup> 
+		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
+		<!--是否对储罐进行过维修-->
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="200" text="是否对储罐进行过维修"/>
+			<ui:CheckBox id="isRepaired" selected="{'Y'==cgInfoModel.thisData.isRepaired}" label="是"  valueCommit="isRepairedFun()"/>
+			<ui:CheckBox id="notRepaired" selected="{'N'==cgInfoModel.thisData.isRepaired}" label="否" valueCommit="notRepairedFun()"/>
+		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
-			<cus:QLabel width="135" text="是否对储罐进行过维修"/>
-			<ui:CheckBox id="isRepaired" selected="{'Y'==thisData.isRepaired}" label="是"  valueCommit="repairedFun(this.isRepaired)"/>
-			<ui:CheckBox id="notRepaired" selected="{'N'==thisData.isRepaired}" label="否" valueCommit="repairedFun(this.notRepaired)"/>
+			<s:HGroup width="210" verticalAlign="middle" horizontalAlign="center">
+				<cus:QLabel width="150" text="维修时间"/>
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QLabel width="150" text="维修部位"/>
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QLabel width="150" text="维修方式"/>
+			</s:HGroup>
 		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">  
+			<s:HGroup width="210" verticalAlign="middle" horizontalAlign="center">
+				<ui:DateTime width="200" id="repairTime" dateTime="{cgInfoModel.thisData.repairTime}" />
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QTextInput width="220" text="@{cgInfoModel.thisData.repairPart}"/> 
+			</s:HGroup>
+			<s:HGroup width="230" verticalAlign="middle" horizontalAlign="center">
+				<cus:QTextInput width="220" text="@{cgInfoModel.thisData.repairWay}"/> 
+			</s:HGroup>
+		</s:HGroup> 
 		
 		<s:HGroup width="100%" horizontalAlign="center">
-			<s:Button id="save" label="{resourceManager.getString('common','btn.save')}" click="{doSave()}" skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="save" label="{resourceManager.getString('common','btn.save')}" click="{cgInfoModel.doSave()}" skinClass="skins.cus.ButtonSkin"/>
 			<s:Button id="close" label="{resourceManager.getString('common','btn.close')}" click="{doPopupClose(this)}" skinClass="skins.cus.ButtonSkin"/>
 		</s:HGroup>
 		

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/cginfo/CgOpConditionEdit.mxml

@@ -0,0 +1,61 @@
+<?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="init(event)">
+	<fx:Declarations>
+		<!-- 将非可视元素（例如服务、值对象）放在此处 -->
+	</fx:Declarations>
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.vo.cginfo.CgOperationConditionVo;
+			import com.jtgh.yjpt.common.util.Utils;
+			import mx.events.CloseEvent;
+			
+			import mx.events.FlexEvent;
+			import com.jtgh.yjpt.model.cginfo.CgInfoModel;
+			
+			[Bindable]
+			public var thisData:CgOperationConditionVo;
+			[Bindable]
+			public var cgInfoModel:CgInfoModel;
+			
+			protected function init(event:FlexEvent):void
+			{
+				
+			}
+			
+			public function doPopupClose(view:DisplayObject):void
+			{
+				Utils.doCloseConfirm(function():void{
+					view.dispatchEvent(new CloseEvent(CloseEvent.CLOSE));
+				});
+			}
+		]]>
+	</fx:Script>
+	
+	<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="作业时间" notNull="true"/> 
+			<ui:DateTime width="200" id="operationTime" dateTime="{thisData.operationTime}" />
+			<cus:QLabel width="135" text="作业货种" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.operationCommodityName}"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="作业压力MPa" notNull="true"/>
+			<cus:QTextInput width="200" id="operationPressure" type="double" text="{thisData.operationPressure.toString()=='NaN'?'':thisData.operationPressure.toString()}"/>
+			<cus:QLabel width="135" text="作业温度℃" notNull="true"/>
+			<cus:QTextInput width="200" id="operationTemp" type="double" text="{thisData.operationTemp.toString()=='NaN'?'':thisData.operationTemp.toString()}"/>
+		</s:HGroup> 
+		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
+		<s:HGroup width="100%" horizontalAlign="center">
+			<s:Button id="save" label="{resourceManager.getString('common','btn.save')}" click="cgInfoModel.saveOpCondition()"  skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="close" label="{resourceManager.getString('common','btn.close')}" click="{doPopupClose(this)}" skinClass="skins.cus.ButtonSkin"/>
+		</s:HGroup>
+	</s:VGroup>	
+	
+</s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/cginfo/CgStorageEdit.mxml

@@ -0,0 +1,64 @@
+<?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="init(event)">
+	<fx:Declarations>
+		<!-- 将非可视元素（例如服务、值对象）放在此处 -->
+	</fx:Declarations>
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.vo.cginfo.CgStorageVo;
+			import com.jtgh.yjpt.common.util.Utils;
+			import mx.events.CloseEvent;
+			import mx.events.FlexEvent;
+			import com.jtgh.yjpt.model.cginfo.CgInfoModel;
+			
+			[Bindable]
+			public var thisData:CgStorageVo;
+			[Bindable]
+			public var cgInfoModel:CgInfoModel;
+			
+			protected function init(event:FlexEvent):void
+			{
+				
+			}
+			
+			public function doPopupClose(view:DisplayObject):void
+			{
+				Utils.doCloseConfirm(function():void{
+					view.dispatchEvent(new CloseEvent(CloseEvent.CLOSE));
+				});
+			}
+		]]>
+	</fx:Script>
+	<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="货种名称" notNull="true"/> 
+			<cus:QTextInput width="200" text="@{thisData.commodityName}"/>
+			<cus:QLabel width="135" text="CAS号" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.cas}"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="UN编号" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.un}"/>
+			<cus:QLabel width="135" text="火灾危险性" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.fireRisk}"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="危险化学品" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.dangerChemical}"/>
+			<cus:QLabel width="135" text="剧毒化学品" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.toxicChemical}"/>
+		</s:HGroup>
+		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" >  
+		</s:BorderContainer>
+		<s:HGroup width="100%" horizontalAlign="center">
+			<s:Button id="save" label="{resourceManager.getString('common','btn.save')}" click="cgInfoModel.saveStorage()"  skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="close" label="{resourceManager.getString('common','btn.close')}" click="{doPopupClose(this)}" skinClass="skins.cus.ButtonSkin"/>
+		</s:HGroup>
+	</s:VGroup>	 
+</s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/cginfo/CgInfoVo.as

@@ -1,6 +1,7 @@
 package com.jtgh.yjpt.vo.cginfo
 {
 	import com.jtgh.yjpt.vo.BaseVo;
+	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	
@@ -41,6 +42,35 @@ package com.jtgh.yjpt.vo.cginfo
 		public var repairPart:String;
 		public var repairWay:String;
 		
+		/**
+		 * 所在地
+		 * 
+		 */
+		public var szd:CodeVo;
+		
+		
+		public function get szdName():String
+		{
+			if(null!=szd)
+				return　szd.localeName;
+			return "";
+		}
+		
+		public function get jyrName():String
+		{
+			if(null!=jyr)
+				return jyr.gkjyr;
+			return "";
+		}
+		
+		public function get szgqName():String
+		{
+			if(null!=szgq){
+				return szgq.gqmc;
+			}
+			return "";
+		}
+		
 		
 	}
 	

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/cginfo/CgOperationConditionVo.as

@@ -1,6 +1,7 @@
 package com.jtgh.yjpt.vo.cginfo
 {
 	import com.jtgh.yjpt.vo.BaseVo;
+	import com.jtgh.yjpt.vo.common.CodeVo;
 
 	[Bindable]
 	[RemoteClass(alias="com.jtgh.yjpt.entity.cginfo.CgOperationConditionEntity")] 
@@ -16,6 +17,17 @@ package com.jtgh.yjpt.vo.cginfo
 		public var operationTime:Date;
 		public var operationCommodityName:String;
 		public var operationPressure:Number;
-		public var operationTemp:Number;		
+		public var operationTemp:Number;	
+		/**
+		 * 所在地
+		 * 
+		 */
+		public var szd:CodeVo;
+		public function get szdName():String
+		{
+			if(null!=szd)
+				return　szd.localeName;
+			return "";
+		}
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/cginfo/CgStorageVo.as

@@ -1,6 +1,7 @@
 package com.jtgh.yjpt.vo.cginfo
 {
-	import com.jtgh.yjpt.vo.BaseVo;
+	import com.jtgh.yjpt.vo.BaseVo;;
+	import com.jtgh.yjpt.vo.common.CodeVo;
 	
 	[Bindable]
 	[RemoteClass(alias="com.jtgh.yjpt.entity.cginfo.CgStorageEntity")] 
@@ -19,5 +20,18 @@ package com.jtgh.yjpt.vo.cginfo
 		public var fireRisk:String;
 		public var dangerChemical:String;
 		public var toxicChemical:String;
+		
+		/**
+		 * 所在地
+		 * 
+		 */
+		public var szd:CodeVo;
+		public function get szdName():String
+		{
+			if(null!=szd)
+				return　szd.localeName;
+			return "";
+		}
+		
 	}
 }