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

gkaq/yjpt-flex/trunk/locale/zh_CN/module.properties

@@ -54,9 +54,7 @@ m002002003_c=\u5e94\u6025\u6f14\u7ec3\u586b\u62a5
 m002002_c=\u5e94\u6025\u57f9\u8bad\u3001\u6f14\u7ec3\u548c\u6f14\u4e60\u586b\u62a5
 m002005=\u4e8b\u6545\u6848\u4f8b\u7ba1\u7406
 m002005_c=\u4e8b\u6545\u6848\u4f8b\u586b\u62a5
-m002007=\u91cd\u5927\u5371\u9669\u6e90\u5f55\u5165
-m002010=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
-m002010_c=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
+m002007=\u91cd\u5927\u5371\u9669\u6e90\u5f55\u5165 
 m002007001=\u4fe1\u606f\u5f55\u5165
 m002007001_c=\u4fe1\u606f\u5f55\u5165
 m002007_c=\u50a8\u7f50\u4fe1\u606f\u586b\u62a5
@@ -82,6 +80,8 @@ m003006=\u5efa\u8bbe\u5355\u4f4d\u4fe1\u606f\u7ba1\u7406
 m003006_c=\u5efa\u8bbe\u5355\u4f4d\u4fe1\u606f
 m003007=\u7ecf\u8425\u4eba\u4fe1\u606f\u7ba1\u7406
 m003007_c=\u7ecf\u8425\u4eba\u4fe1\u606f
+m003008=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
+m003008_c=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
 m004=\u5b89\u5168\u5ba1\u6279\u7ba1\u7406
 m004001=\u5371\u8d27\u4f5c\u4e1a\u7533\u62a5\u5ba1\u6279
 m004001_c=\u5371\u8d27\u4f5c\u4e1a\u7533\u62a5

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/service/Service.mxml

@@ -4,6 +4,7 @@
 						  xmlns:mx="library://ns.adobe.com/flex/mx" 
 						  xmlns:cairngorm="com.adobe.cairngorm.business.*">  
 	<fx:Declarations>
+		<s:RemoteObject id="cgInfoController" destination="cgInfoController" showBusyCursor="true" />
 		<s:RemoteObject id="logController" destination="logController" showBusyCursor="true" />
 		<s:RemoteObject id="modelController" destination="modelController" showBusyCursor="true" />
 		<s:RemoteObject id="workFlowController" destination="workFlowController" showBusyCursor="true" />

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

@@ -18,15 +18,10 @@
 			
 			import mx.core.FlexGlobals;
 			
-			import com.jtgh.yjpt.common.Global;
-			import com.jtgh.yjpt.common.TypeBase;
-			import com.jtgh.yjpt.common.util.Constants;
-			import com.jtgh.yjpt.common.util.Utils;
-			import com.jtgh.yjpt.model.check.ZcModel;
-			import com.jtgh.yjpt.vo.check.ZcVo;
-			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.common.Global; 
+			import com.jtgh.yjpt.common.util.Utils;  
+			import com.jtgh.yjpt.vo.common.SinglePageRequestVo; 
+			import com.jtgh.yjpt.model.SystemModel;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
@@ -35,76 +30,36 @@
 			import spark.components.gridClasses.GridColumn;
 			
 			[Bindable]
-			public var zcModel:ZcModel=new ZcModel;
-			public var initParam:Array;
+			public var thisDataList:ArrayCollection;
 			[Bindable]
 			public var sfJyrFlag:Boolean=false;
 			
 			
 			protected function creationComplete(event:FlexEvent):void
-			{ 
-				if(null!=initParam){
-					initQueryConditon();
-				}
-				zcModel.zcLayout=this;
-				zcModel.doQuery();
+			{   
 				if("Y"==Global.user.sfjyr){
 					sfJyrFlag=true;
 				}
 				else{
 					szd.selectedVO=Global.szd;
 				}  
+				pageQuery(pager.pageVo);
 			}
+	 
 			
-			/**
-			 * 返回选中的记录
-			 */
-			public function getSelectedRecords():ArrayCollection
-			{
-				var items:Object = this.grid.selectedItems;
-				var records:ArrayCollection = new ArrayCollection();
-				if(items != null)
-				{
-					for(var i : int=0;i< items.length;i++){
-						var obj:ZcVo =items[i] as ZcVo;
-						records.addItem(obj);
-					}
-				}
-				return records;
+			public function pageQuery(pager1:SinglePageRequestVo):void
+			{ 
+				Utils.callRemote("cgInfoController","list",function(r:ResultEvent):void{
+					var bc:BusinessContext = r.result as BusinessContext;
+					thisDataList = bc.getAttribute("records") as ArrayCollection;
+					var pageVo:SinglePageRequestVo = pager.pageVo;
+					pageVo.totalCount = bc.getAttribute("totalCount") as int;
+				},pager1,Utils.getFunctionId(this))	
 			}
 			
-			private function initQueryConditon():void
+			private function labelFun(item:Object, column:GridColumn):String
 			{
-				if(Global.deployMode == Constants.DEPLOY_MODE_0){//则传进来的参数为所在地
-					Utils.callRemote("codeController","listByGroup",function(r:ResultEvent):void{
-						var bc:BusinessContext =  r.result as BusinessContext;
-						var arr:ArrayCollection = bc.result as ArrayCollection;
-						for(var i:int;i<arr.length;i++){
-							var szdName:String=resourceManager.getString("select",(arr.getItemAt(i) as CodeVo).name);
-							if(initParam[0]==szdName){
-								zcModel.queryVo.szd=arr.getItemAt(i) as CodeVo;
-								zcModel.doQuery();
-								break;
-							}
-						}
-					},Constants.GROUP_CODE_SZD);
-					
-				}else{//传进来的参数为港区
-					zcModel.queryVo.szd=Global.szd;
-					Utils.callRemote("gqController","listBySzd",function(r:ResultEvent):void{
-						var bc:BusinessContext =  r.result as BusinessContext;
-						var arr:ArrayCollection = bc.result as ArrayCollection;
-						for(var i:int;i<arr.length;i++){
-							var gqName:String=(arr.getItemAt(i) as GqVo).gqmc;
-							if(initParam[0]==gqName){
-								zcModel.queryVo.szgq=arr.getItemAt(i) as GqVo;
-								zcModel.doQuery();
-								break;
-							}
-						}
-					},Global.szd);
-				}
-				
+				return (this.pager.pageVo.page*10+this.grid.dataProvider.getItemIndex(item)+1).toString();
 			}
 			
 			protected function getSzgq(event:Event):void
@@ -112,20 +67,7 @@
 				szgq.reload(szd.selectedVO);
 				dwmc.reload(szd.selectedVO);
 			}
-			private function labelFun(item:Object, column:GridColumn):String
-			{
-				return (this.pager.pageVo.page*10+this.grid.dataProvider.getItemIndex(item)+1).toString();
-			}
 			
-			public function gqtxFun(item:Object):uint
-			{
-				if((item as ZcVo).hasSjyh=="1"){
-					return 0xff6666;
-				}
-				if("-1"==(item as ZcVo).mqzt)
-					return 0xFFFF33;
-				return 0xffffff;
-			}
 			/**
 			 * 开关查询框
 			 */
@@ -139,19 +81,29 @@
 				}
 			}
 			
-		 
+			public function doQuery():void
+			{
+				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" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}"
-						   click="{zcModel.doAdd(Utils.getFunctionId(add))}" toolTip="{resourceManager.getString('common','btn.add')}" />
-		<button:IconButton id="del" type="delete" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}"
-						   click="{zcModel.doDel()}" toolTip="{resourceManager.getString('common','btn.del')}"/> 
-		<button:IconButton id="edit" type="edit" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}"
-						   click="{zcModel.doEdit()}" toolTip="{resourceManager.getString('common','btn.edit')}"/>
+		<button:IconButton id="add" type="add" click="{doAdd()}"
+						   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="query" type="query" click="switchSearchBox(event)" toolTip="{resourceManager.getString('common','btn.query')}"/>
 	</s:HGroup>
 	<s:VGroup id="searchGroup" width="100%"  visible="false" includeInLayout="false">
@@ -160,22 +112,23 @@
 				  visible="{!sfJyrFlag}" includeInLayout="{!sfJyrFlag}">
 			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','zc.szd')}"/>
-				<cus:QComboBox width="180" id="szd" comboxClass="SzdSelect" requireSelection="true" parentId="{Global.szd.id}" change="getSzgq(event)" />
+				<cus:QComboBox width="180" id="szd" comboxClass="SzdSelect" requireSelection="true" parentId="{Global.szd.id}" 
+							   change="getSzgq(event)" />
 			</s:HGroup>
 			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','zc.szgq')}"/>
-				<cus:QComboBox width="180" id="szgq" selectedVO="{zcModel.queryVo.szgq}" comboxClass="GqBySzdSelect" hasBlank="true"  parentId="{Global.szd}"/>
+				<cus:QComboBox width="180" id="szgq"   comboxClass="GqBySzdSelect" hasBlank="true"  parentId="{Global.szd}"/>
 			</s:HGroup>
 			<s:HGroup width="31%" horizontalAlign="left" verticalCenter="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('common','gkjyr')}"/>
-				<cus:QComboBox id="dwmc" selectedVO="{zcModel.queryVo.qymc}" comboxClass="JyrSelect" hasBlank="true" parentId="{Global.szd}" width="180"/>
+				<cus:QComboBox id="dwmc"  comboxClass="JyrSelect" hasBlank="true" parentId="{Global.szd}" width="180"/>
 			</s:HGroup>
 		</s:HGroup>
 		
 		<s:HGroup width="100%" height="40"  gap="0" horizontalAlign="left" verticalAlign="middle">
 			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','zc.aqfzr')}"/>
-				<cus:QTextInput id="aqfzr" width="180" text="@{zcModel.queryVo.aqfzr}"/>
+				<cus:QTextInput id="aqfzr" width="180"  />
 			</s:HGroup>
 			<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
 				<cus:QLabel width="130" text="{resourceManager.getString('check','jdjcgl.jcrq')}"/>
@@ -186,12 +139,12 @@
 				<ui:DateTime id="sj2"  width="180"/>
 			</s:HGroup>
 			<s:HGroup verticalAlign="middle" textAlign="right">
-				<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="zcModel.doQuery()"/>
+				<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="doQuery()"/>
 			</s:HGroup>
 		</s:HGroup>
 	</s:VGroup>
 	<!-- 显示一览记录 -->
-	<ui:DataGrid id="grid" width="100%" dataProvider="{zcModel.thisDataList}" doubleClickEnabled="true" doubleClick="{zcModel.doView()}" rowColorFunction="{gqtxFun}">
+	<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"/>
@@ -204,5 +157,5 @@
 					</s:ArrayList>
 		</ui:columns>
 	</ui:DataGrid>
-	<ui:Pager id="pager" queryFunction="{zcModel.pageQuery}"/>
+	<ui:Pager id="pager" queryFunction="{pageQuery}"/>
 </s:Group>

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

@@ -0,0 +1,237 @@
+<?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.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 mx.collections.ArrayCollection;
+			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;
+			 
+			[Bindable]
+			public var thisData:CgInfoVo; 
+			 
+			protected function getSzgq():void
+			{
+				szgq.reload(szd.selectedVO);
+				jyr.reload(szd.selectedVO);
+			}
+			
+			protected function init(event:FlexEvent):void
+			{
+
+			}
+			
+			/** 是否有设计资料 */
+			protected function designInfoFun(chk:CheckBox):void
+			{
+				haveDesignInfo.selected = false;
+				lackDesignInfo.selected = false;
+				chk.selected = true; 
+			}
+			
+			/** 是否有建造工程资料（竣工资料） */
+			protected function completionInfoFun(chk:CheckBox):void
+			{
+				haveCompletionInfo.selected = false;
+				lackCompletionInfo.selected = false;
+				chk.selected = true; 
+			}
+			
+			/** 是否对储罐进行过定期检测 */
+			protected function regularDetectionFun(chk:CheckBox):void
+			{
+				isRegularDetection.selected = false;
+				notRegularDetection.selected = false;
+				chk.selected = true; 
+			}
+			
+			
+			private function doSaveCheck():Boolean{ 
+				return true;
+			}
+			
+			public function doSave():void
+			{
+				if(!doSaveCheck()){
+					return;
+				}
+				
+				var method:String="add";
+				if(thisData.id > 0){
+					method="edit";
+				}
+				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{
+					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="{resourceManager.getString('check','zc.szd')}" notNull="true"/>
+			<cus:QComboBox width="200" id="szd" selectedVO="{thisData.szd==null?Global.user.szd: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}" />
+		</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:QLabel width="135" text="储罐编号" notNull="true"/>
+			<cus:QTextInput width="200" text="@{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:QLabel width="135" text="储罐形式" notNull="true"/>
+			<cus:QTextInput width="200" text="@{thisData.cgForm}"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="联系人"/>
+			<cus:QTextInput width="200" text="@{thisData.contactPerson}"/>
+			<cus:QLabel width="135" text="储罐容积" />
+			<cus:QTextInput width="200"  text="@{thisData.cgVolume.toString()}"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="联系电话"/>
+			<cus:QTextInput width="200"  text="@{thisData.contactPhone}"/>
+			<cus:QLabel width="135" text="储罐材质"/>
+			<cus:QTextInput width="200" text="@{thisData.cgMaterial}"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="联系人邮箱"/>
+			<cus:QTextInput width="547" text="@{thisData.contactEmail}"/>
+		</s:HGroup> 
+	</s:VGroup>
+	<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#00FFFF">
+		<s:layout>
+			<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>
+		</s:layout>
+		<s:Label text="作业货种信息"  fontWeight="bold" paddingLeft="10"/>
+		<s:Spacer width="100%"/> 
+	</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">
+				<ui:columns>
+					<s:ArrayList>
+						<ui:DataGridColumn dataField="commodityName" headerText="货种名称"/>
+						<ui:DataGridColumn dataField="cas" headerText="CAS号"/>
+						<ui:DataGridColumn dataField="un" headerText="UN编号"/>
+						<ui:DataGridColumn dataField="fireRisk" headerText="火灾危险性"/>
+						<ui:DataGridColumn dataField="dangerChemical" headerText="危险化学品"/> 
+						<ui:DataGridColumn dataField="toxicChemical" headerText="剧毒化学品" />
+					</s:ArrayList>
+				</ui:columns>
+			</ui:DataGrid>	
+		</s:HGroup>
+		
+		<s:HGroup>
+			<s:Label text="近3个月作业情况" fontWeight="bold" paddingLeft="10" />
+			<ui:DataGrid id="grid2" width="80%" height="110">
+				<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="作业温度℃"/> 
+					</s:ArrayList>
+				</ui:columns>
+			</ui:DataGrid>	
+		</s:HGroup>
+		
+		<s:BorderContainer width="100%" borderVisible="false" height="32" > 
+			<s:HGroup width="100%" verticalAlign="middle" horizontalAlign="center">
+				<s:Label text="储罐设计及检测维护信息"  fontWeight="bold" paddingLeft="10"/>
+			</s:HGroup>
+		</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)"/>
+		</s:HGroup> 
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="设计单位名称"/>
+			<cus:QTextInput width="547" text="@{thisData.designOrgName}"/>
+		</s:HGroup> 
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="设计单位资质"/>
+			<cus:QTextInput width="547" text="@{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:QLabel width="135" text="设计温度℃"/>
+			<cus:QTextInput width="200" text="@{thisData.designTemp.toString()}"/> 
+		</s:HGroup>
+		<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)"/>
+		</s:HGroup>
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="建造单位名称"/>
+			<cus:QTextInput width="547" text="@{thisData.buildOrgName}"/>
+		</s:HGroup> 
+		<s:HGroup width="100%" verticalAlign="middle">
+			<cus:QLabel width="135" text="建造单位资质"/>
+			<cus:QTextInput width="547" text="@{thisData.buildOrgQualification}"/>
+		</s:HGroup> 
+		<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)"/>
+		</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>
+		<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> 
+		<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>
+		
+		<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="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

@@ -13,33 +13,33 @@ package com.jtgh.yjpt.vo.cginfo
 			super();
 		}
 		
-		public var id Number;
-		private var buildDate Date;
-		private var szgq GqVo;
-		private var bh String;
-		private var jyr JyrVo;
-		private var contactPerson String;
-		private var contactPhone String;
-		private var contactEmail String;
-		private var cgForm String;
-		private var zgVolume Number;
-		private var cgMaterial String;
-		private var haveDesignInfo String;
-		private var designOrgName String;
-		private var designOrgQualification String;
-		private var designPressure Number;
-		private var designTemp Number;
-		private var haveCompletionInfo String;
-		private var buildOrgName String;
-		private var buildOrgQualification String;
-		private var isRegularDetection String;
-		private var detectionTime Date;
-		private var detectionOrg String;
-		private var detectionConclusion String;
-		private var isRepaired String;
-		private var repairTime Date;
-		private var repairPart String;
-		private var repairWay String;
+		public var id:Number;
+		public var buildDate:Date;
+		public var szgq:GqVo;
+		public var bh:String;
+		public var jyr:JyrVo;
+		public var contactPerson:String;
+		public var contactPhone:String;
+		public var contactEmail:String;
+		public var cgForm:String;
+		public var cgVolume:Number;
+		public var cgMaterial:String;
+		public var haveDesignInfo:String;
+		public var designOrgName:String;
+		public var designOrgQualification:String;
+		public var designPressure:Number;
+		public var designTemp:Number;
+		public var haveCompletionInfo:String;
+		public var buildOrgName:String;
+		public var buildOrgQualification:String;
+		public var isRegularDetection:String;
+		public var detectionTime:Date;
+		public var detectionOrg:String;
+		public var detectionConclusion:String;
+		public var isRepaired:String;
+		public var repairTime:Date;
+		public var repairPart:String;
+		public var repairWay:String;
 		
 		
 	}

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

@@ -11,12 +11,11 @@ package com.jtgh.yjpt.vo.cginfo
 			super();
 		}
 		
-		private var id Number;
-		private var cgInfoId CgInfoVo;
-		private var operationTime Date;
-		private var operationCommodityName String;
-		private var operationPressure Number;
-		private var operationTemp Number;
-		
+		public var id:Number;
+		public var cgInfoId:CgInfoVo;
+		public var operationTime:Date;
+		public var operationCommodityName:String;
+		public var operationPressure:Number;
+		public var operationTemp:Number;		
 	}
 }

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

@@ -11,13 +11,13 @@ package com.jtgh.yjpt.vo.cginfo
 			super();
 		}
 		
-		private var id Number;
-		private var cgInfoId CgInfoVo;
-		private var commodityName String;
-		private var cas String;
-		private var un String;
-		private var fireRisk String;
-		private var dangerChemical String;
-		private var toxicChemical String;
+		public var id:Number;
+		public var cgInfoId:CgInfoVo;
+		public var commodityName:String;
+		public var cas:String;
+		public var un:String;
+		public var fireRisk:String;
+		public var dangerChemical:String;
+		public var toxicChemical:String;
 	}
 }

gkaq/yjpt-flex/trunk/src/module/JyrxxModule.as

@@ -8,6 +8,7 @@ package module
 	import com.jtgh.yjpt.view.jyrxxgl.gksssb.GksssbLayout;
 	import com.jtgh.yjpt.view.jyrxxgl.ryqk.RyjbxxLayout;
 	import com.jtgh.yjpt.view.aqpjjgxx.AqpjjgxxLayout;
+	import com.jtgh.yjpt.view.cginfo.CgInfo;
 	
 	import mx.modules.ModuleBase;
 
@@ -24,6 +25,7 @@ package module
 			CkList;
 			JyrOfJyrLayout;
 			AqpjjgxxLayout;
+			CgInfo;
 		}
 	}
 }