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

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

@@ -104,6 +104,7 @@ yhfl=\u9690\u60a3\u5206\u7c7b
 yhqy=\u9690\u60a3\u533a\u57df
 jhwcsj=\u6574\u6539\u671f\u9650
 fxrq=\u53d1\u73b0\u65e5\u671f
+szcg=\u6240\u5728\u50a8\u7f50
 mqzt=\u76ee\u524d\u72b6\u6001
 wzg=\u672a\u6574\u6539
 yzg=\u5df2\u6574\u6539

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/check/ZcModel.as

@@ -20,6 +20,7 @@ package com.jtgh.yjpt.model.check
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
+	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 	
 	import flash.display.Bitmap;
 	import flash.display.BitmapData;
@@ -425,6 +426,7 @@ package com.jtgh.yjpt.model.check
 			zcyhEdit.thisData.yhjb=zcyhEdit.yhjb.selectedVO as CodeVo;
 			zcyhEdit.thisData.yhfl=zcyhEdit.yhfl.textValue as String;
 			zcyhEdit.thisData.yhqy=zcyhEdit.yhqy.textValue as String;
+			zcyhEdit.thisData.cg=zcyhEdit.szcg.selectedVO as CgVo;
 			zcyhEdit.thisData.jhwcsj=zcyhEdit.jhwcsj.dateTime;
 			zcyhEdit.thisData.fxrq=zcyhEdit.fxrq.dateTime;
 			if(zcyhEdit.yzg.selected){zcyhEdit.thisData.mqzt="1";}

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

@@ -1,15 +1,23 @@
 package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 {
 	import com.jtgh.yjpt.common.BusinessContext;
+	import com.jtgh.yjpt.common.util.Constants;
 	import com.jtgh.yjpt.common.util.Utils;
 	import com.jtgh.yjpt.model.SystemModel;
+	import com.jtgh.yjpt.model.check.ZcModel;
+	import com.jtgh.yjpt.model.zysqbp.ShbpModel;
 	import com.jtgh.yjpt.select.YesNoSelect;
+	import com.jtgh.yjpt.view.Check.ZcyhView;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.count.CgCount;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgEdit;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgView;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgztEdit;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgztLayout;
+	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.WhsbOfCgLayout;
+	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.YhOfCgLayout;
 	import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.ZdwxyfbLayout;
+	import com.jtgh.yjpt.view.zysqbp.ZysqbpView;
+	import com.jtgh.yjpt.vo.check.ZcyhVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
@@ -18,21 +26,28 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgsyVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
 	import com.jtgh.yjpt.vo.yjgl.zdwxyfb.ZbhjjbqkVo;
+	import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
 	
+	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;
 	import flash.net.FileReference;
 	import flash.net.URLRequest;
 	import flash.net.URLRequestMethod;
 	import flash.net.URLVariables;
+	import flash.utils.ByteArray;
 	
 	import mx.collections.ArrayCollection;
 	import mx.collections.ArrayList;
 	import mx.controls.Alert;
+	import mx.core.FlexGlobals;
 	import mx.events.CloseEvent;
+	import mx.events.FlexEvent;
 	import mx.managers.CursorManager;
-	import mx.managers.FocusManager;
 	import mx.resources.IResourceManager;
 	import mx.resources.ResourceManager;
 	import mx.rpc.events.ResultEvent;
@@ -49,9 +64,13 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 		public var cgView:CgView;
 		public var cgVo:CgVo;
 		public var cgztLayout:CgztLayout;
+		public var yhOfCgLayout:YhOfCgLayout;
+		public var whsbOfCgLayout:WhsbOfCgLayout;
 		public var queryVo:CgVo=new CgVo;
 		public var thisDataList:ArrayCollection=new ArrayCollection;
 		public var  cgztList:ArrayCollection=new ArrayCollection;
+		public var  yhList:ArrayCollection=new ArrayCollection;
+		public var  whsbList:ArrayCollection=new ArrayCollection;
 //		public var mapModel:MapModel;
 		public var resourceManager:IResourceManager=ResourceManager.getInstance();
 		public var jmqList:ArrayCollection;
@@ -109,11 +128,38 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 					scdwList=bc.getAttribute("scdw") as ArrayCollection;
 					ggcsList=bc.getAttribute("ggcs") as ArrayCollection;
 					delIdList=new ArrayCollection;
+					var data:ByteArray = bc.getAttribute("qrcode") as ByteArray;
 //					mapModel.mapId=cgVo.mapid;
 					Utils.popupWindow(title,view,SystemModel.getInstance().getMainLayout(),null,x,y);	
+					if(view is CgView){
+						view.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+							if(null!=data){
+								var img:BitmapData=new BitmapData(100,100);
+								var loader:Loader=new Loader;
+								loader.contentLoaderInfo.addEventListener(Event.COMPLETE, loadCompleterHandler);
+								loader.loadBytes(data);
+							}
+						});	
+					}			
 				}
 			},cgId)
 		}
+		
+		
+		private  function loadCompleterHandler(event:Event):void
+		{
+			var bitdata:BitmapData;
+			var loaderInfo:LoaderInfo = event.target as LoaderInfo;
+			if(loaderInfo.content is Bitmap){
+				bitdata = (loaderInfo.content  as Bitmap).bitmapData;
+			}
+			else
+			{
+				bitdata = new BitmapData(100,100);
+				bitdata.draw(loaderInfo.content);
+			}
+			cgView.qrcode.source=bitdata;
+		}
 
 		public function doEdit():void
 		{
@@ -536,6 +582,27 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 				cgztLayout.query_tbsj1.dateTime,cgztLayout.query_tbsj2.dateTime)	
 		}
 		
+		public function pageQueryYh(pager:SinglePageRequestVo):void
+		{
+			
+			Utils.callRemote("cgController","listYh",function(r:ResultEvent):void{
+				var bc:BusinessContext = r.result as BusinessContext;
+				yhList = bc.getAttribute("records") as ArrayCollection;
+				var pageVo:SinglePageRequestVo = yhOfCgLayout.pager.pageVo;
+				pageVo.totalCount = bc.getAttribute("totalCount") as int;
+			},pager,cgVo)	
+		}
+		public function pageQueryWhsb(pager:SinglePageRequestVo):void
+		{
+			
+			Utils.callRemote("cgController","listWhsb",function(r:ResultEvent):void{
+				var bc:BusinessContext = r.result as BusinessContext;
+				whsbList = bc.getAttribute("records") as ArrayCollection;
+				var pageVo:SinglePageRequestVo = whsbOfCgLayout.pager.pageVo;
+				pageVo.totalCount = bc.getAttribute("totalCount") as int;
+			},pager,cgVo)	
+		}
+		
 		//新增
 		public function addZt(event:MouseEvent):void
 		{
@@ -546,7 +613,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			view.functionId=Utils.getFunctionId(zdwxyView);
 			Utils.popupWindow("新增", view,cgztLayout,function():void{
 				queryZt(null);
-			},550,250);
+			},700,400);
 		}
 		
 		//编辑
@@ -563,7 +630,7 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			view.functionId=Utils.getFunctionId(zdwxyView);
 			Utils.popupWindow("编辑", view,cgztLayout,function():void{
 				queryZt(null);
-			},550,250);
+			},700,400);
 		}
 		
 		//删除
@@ -587,6 +654,105 @@ package com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr
 			cgztLayout.pager.doQuery();
 		}
 		
+		public function doViewYhxx(event:MouseEvent):void{
+			var records:ArrayCollection = zdwxyView.cg.getSelectedRecords();
+			if(records.length != 1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}
+			cgVo=zdwxyView.cg.dataGrid.selectedItem as CgVo;
+			this.functionId=Utils.getFunctionId(zdwxyView); 
+			yhOfCgLayout= new YhOfCgLayout;
+			yhOfCgLayout.thisModel=this;
+			Utils.popupWindow("隐患记录",yhOfCgLayout as DisplayObject,cgView as DisplayObject,function():void{
+			},800, 400);
+		}
+		
+		public function doViewWhsq(event:MouseEvent):void{
+			var records:ArrayCollection = zdwxyView.cg.getSelectedRecords();
+			if(records.length != 1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}
+			cgVo=zdwxyView.cg.dataGrid.selectedItem as CgVo;
+			this.functionId=Utils.getFunctionId(zdwxyView); 
+			whsbOfCgLayout= new WhsbOfCgLayout();
+			whsbOfCgLayout.thisModel=this;
+			Utils.popupWindow("危货作业申报记录",whsbOfCgLayout as DisplayObject,cgView as DisplayObject,function():void{
+			},0, 400);
+		}
+		
+		public function toViewYh(event:MouseEvent):void{
+			//检查选中项
+			if(yhOfCgLayout.dataGrid.selectedIndex==-1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}
+			var zcyhView:ZcyhView=new ZcyhView;
+			zcyhView.zcModel= new ZcModel;
+			zcyhView.thisData=yhOfCgLayout.dataGrid.selectedItem as ZcyhVo;
+			if(zcyhView["zpShow"])
+				(zcyhView["zpShow"]).removeAllElements();
+			if(zcyhView["zghzpShow"])
+				(zcyhView["zghzpShow"]).removeAllElements();
+			for each(var yhzp:ByteArray in zcyhView.thisData.yhzp){
+				var image:mx.controls.Image=new mx.controls.Image;
+				image.width=90;
+				image.height=90;
+				image.source=yhzp;
+				image.useHandCursor=true;
+				image.addEventListener(MouseEvent.CLICK,Utils.showImageHandler);
+				if(zcyhView["zpShow"]){
+					zcyhView["zpShow"].addElement(image);
+				}else {
+					zcyhView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+						zcyhView["zpShow"].addElement(image);
+					});
+				}
+			}
+			for each(var zghzp:ByteArray in zcyhView.thisData.zghzp){
+				var image1:mx.controls.Image=new mx.controls.Image;
+				image1.width=90;
+				image1.height=90;
+				image1.source=zghzp;
+				image1.useHandCursor=true;
+				image1.addEventListener(MouseEvent.CLICK,Utils.showImageHandler);
+				if(zcyhView["zghzpShow"]){
+					zcyhView["zghzpShow"].addElement(image1);
+				}else {
+					zcyhView.addEventListener(FlexEvent.CREATION_COMPLETE,function():void{
+						zcyhView["zghzpShow"].addElement(image1);
+					});
+				}
+			}
+			Utils.popupWindow(resourceManager.getString("common","btn.view"),zcyhView,yhOfCgLayout,null,650,450)	
+		}
+		
+		/**
+		 * 双击显示查看用户
+		 */
+		public function toViewWhsb(event:MouseEvent):void
+		{
+			//检查选中项
+			if(whsbOfCgLayout.dataGrid.selectedIndex==-1){
+				Utils.showInfoMessage("msg.select.one");
+				return;
+			}
+			// 获取选中项
+			var zysqbp:ZysqbpVo = whsbOfCgLayout.dataGrid.selectedItem as ZysqbpVo;
+			var editView:ZysqbpView = new ZysqbpView();
+			editView.model =  new ShbpModel;
+			editView.zysqbp = zysqbp;
+			if(zysqbp.recordStatus!=Constants.RECORD_STATE_COMPLETED&&zysqbp.recordStatus!=Constants.RECORD_STATE_CALEL){//审核已经完成的数据才能显示签章
+				editView.qianzhang=false;
+			}
+			editView.enable = false;
+			if(null != zysqbp.zydd){
+				editView.zydd = zysqbp.zydd.id;
+			}
+			Utils.popupWindow(resourceManager.getString('common','btn.view'), editView as DisplayObject, FlexGlobals.topLevelApplication as DisplayObject, whsbOfCgLayout.pager.doQuery, 0, 0);
+		}
+		
 
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zysqbp/ShbpEditModel.as

@@ -329,6 +329,8 @@ package com.jtgh.yjpt.model.zysqbp
 			var view:Wxhwpm=new Wxhwpm();
 		//view.hwpm=thisView.hwpm.text;
 //			view.hint.text=wxhwmcString;
+			view.wxhwmcString=wxhwmcString;
+			view.flag=true;
 			view.selectMode="singleRow";
 			view.addEventListener(MyEvent.SAVE_OK,saveWxhwpmBh)
 			Utils.popupWindow("危险品信息",view,thisView as DisplayObject,null,800,600);

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/ZcyhEdit.mxml

@@ -6,6 +6,7 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.Global;
+			import com.jtgh.yjpt.vo.jyr.JyrVo;
 			import com.jtgh.yjpt.common.util.Constants;
 			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.check.ZcModel;
@@ -42,6 +43,18 @@
 				uploadFiles.addEventListener(Event.SELECT,selectFilesHandle);
 				
 				if(wzg.selected){fileListView.filesList=thisData.zgcs;}
+				if(thisData.yhqy=="2" ){
+					szcgStr.visible=true;
+					szcgStr.includeInLayout=true;
+					szcg.visible=true;
+					szcg.includeInLayout=true;
+				} else if(thisData.yhqy=="1" ){
+					szcgStr.visible=false;
+					szcgStr.includeInLayout=false;
+					szcg.visible=false;
+					szcg.includeInLayout=false;
+				}
+				szcg.parentId=zcModel.zcVo.qymc;
 			}
 			public function doDownload(acc:AccessoryVo):void
 			{
@@ -233,6 +246,26 @@
 
 			}
 
+			protected function yhqy_changeHandler(event:IndexChangeEvent):void
+			{
+				if((yhqy.textValue as String)=="2" ){
+					szcgStr.visible=true;
+					szcgStr.includeInLayout=true;
+					szcg.visible=true;
+					szcg.includeInLayout=true;
+					if(zcModel!=null&&zcModel.zcEdit!=null){
+						szcg.reload(zcModel.zcEdit.dwmc.selectedVO as JyrVo);
+					}				
+				} else if((yhqy.textValue as String)=="1" ){
+					szcgStr.visible=false;
+					szcgStr.includeInLayout=false;
+					szcg.visible=false;
+					szcg.includeInLayout=false;
+					szcg.selectedIndex=0;
+				}
+				
+			}
+			
 		]]>
 	</fx:Script>
 	<fx:Declarations>
@@ -255,7 +288,7 @@
 			<cus:QLabel text="{resourceManager.getString('check','yhfl')}" textAlign="right" width="100" notNull="true"/>
 			<cus:QComboBox id="yhfl"  dataField="{thisData.yhfl}"  comboxClass="YhflSelect"  hasBlank="false"  width="200"/>
 			<cus:QLabel text="{resourceManager.getString('check','yhqy')}" textAlign="right" width="100" notNull="true"/>
-			<cus:QComboBox id="yhqy" dataField="{thisData.yhqy}" width="200" comboxClass="YhqySelect"   hasBlank="false"/>
+			<cus:QComboBox id="yhqy" dataField="{thisData.yhqy}" width="200" comboxClass="YhqySelect"   hasBlank="false" change="yhqy_changeHandler(event)"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="100" notNull="true"/>
@@ -266,6 +299,8 @@
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel text="{resourceManager.getString('check','fxrq')}" textAlign="right" width="100"/>
 			<ui:DateTime id="fxrq" dateTime="{thisData.fxrq}" width="200" />
+			<cus:QLabel id="szcgStr"  text="{resourceManager.getString('check','szcg')}" textAlign="right" width="100" visible="false" includeInLayout="false"/>
+			<cus:QComboBox id="szcg" selectedVO="{thisData.cg}" width="200" comboxClass="CgSelect"   hasBlank="true" visible="false" includeInLayout="false"/>
 		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="100" text="{resourceManager.getString('check','zcyh.bz')}"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/Check/ZcyhView.mxml

@@ -30,6 +30,17 @@
 			public function doDownload(acc:AccessoryVo):void
 			{
 				downLoadFunction(acc);
+				if(thisData.yhqy=="2" ){
+					szcgStr.visible=true;
+					szcgStr.includeInLayout=true;
+					szcg.visible=true;
+					szcg.includeInLayout=true;
+				} else if(thisData.yhqy=="1" ){
+					szcgStr.visible=false;
+					szcgStr.includeInLayout=false;
+					szcg.visible=false;
+					szcg.includeInLayout=false;
+				}
 			}
 
 
@@ -121,6 +132,12 @@
 			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="100"/>
 			<ui:DateTime id="jhwcsj" dateTime="{thisData.jhwcsj}" width="200" enabled="false" />
 		</s:HGroup>
+		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+			<cus:QLabel text="{resourceManager.getString('check','fxrq')}" textAlign="right" width="100"/>
+			<ui:DateTime id="fxrq" dateTime="{thisData.fxrq}" width="200" />
+			<cus:QLabel id="szcgStr"  text="{resourceManager.getString('check','szcg')}" textAlign="right" width="100" visible="false" includeInLayout="false"/>
+			<cus:QComboBox id="szcg" selectedVO="{thisData.cg}" width="200" comboxClass="CgSelect"   hasBlank="true" visible="false" includeInLayout="false"/>
+		</s:HGroup>
 		<s:HGroup width="100%" verticalAlign="middle">
 			<cus:QLabel width="100" text="{resourceManager.getString('check','zcyh.yhzp')}"/>
 			<mx:VBox width="300" height="100" borderVisible="true" borderStyle="inset" borderColor="#d2d2d2">

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

@@ -76,55 +76,37 @@
 					rs.text="";
 				if(model.vo.zzagrysl.toString()=="NaN")
 					zzagrysl.text="";
-//				if(model.vo!=null){
-//				if(model.vo.fzyxq!=null&&ObjectUtil.dateCompare(model.vo.fzyxq,new Date())<0){
-//					fzyxq.setStyle("disabledColor","#FF0033");
-//					fzyxq.setStyle("fontWeight","bold");
-//					fzyxq.toolTip="附证编号已过期";
-//				}
-//					if(model.vo.bafzrq!=null){
-//						var tempDate:Date = new Date();
-//						tempDate["date"]+=Constants.YXQ;
-//						if(ObjectUtil.dateCompare(model.vo.bafzrq,tempDate)<=0){
-//						xkzyxq.setStyle("disabledColor","#FF0033");
-//							xkzyxq.setStyle("fontWeight","bold");
-//						xkzyxq.toolTip="即将到期";
-//						}
-//					}
-				if(model.vo.bayxq!=null){
-					var tempDate1:Date = new Date();
-					tempDate1["date"]+=Constants.YXQ;
-					if(ObjectUtil.dateCompare(model.vo.bayxq,tempDate1)<=0){
-							bayxq.setStyle("disabledColor","#FF0033");
-						    bayxq.setStyle("fontWeight","bold");
-							bayxq.toolTip="即将到期";
-					}
-				}
-				if(model.vo.fzyxq!=null){
-					var tempDate2:Date = new Date();
-					tempDate2["date"]+=Constants.YXQ;
-					if(ObjectUtil.dateCompare(model.vo.fzyxq,tempDate2)<=0){
-						fzyxq.setStyle("disabledColor","#FF0033");
-						fzyxq.setStyle("fontWeight","bold");
-						fzyxq.toolTip="即将到期";
-					}
-				}
+				//				if(model.vo!=null){
+				//				if(model.vo.fzyxq!=null&&ObjectUtil.dateCompare(model.vo.fzyxq,new Date())<0){
+				//					fzyxq.setStyle("disabledColor","#FF0033");
+				//					fzyxq.setStyle("fontWeight","bold");
+				//					fzyxq.toolTip="附证编号已过期";
+				//				}
+				//					if(model.vo.bafzrq!=null){
+				//						var tempDate:Date = new Date();
+				//						tempDate["date"]+=Constants.YXQ;
+				//						if(ObjectUtil.dateCompare(model.vo.bafzrq,tempDate)<=0){
+				//						xkzyxq.setStyle("disabledColor","#FF0033");
+				//							xkzyxq.setStyle("fontWeight","bold");
+				//						xkzyxq.toolTip="即将到期";
+				//						}
+				//					}
 				var i:Number;
 				if(null!==model.vo.qyxz&&model.vo.qyxz.length>6){
-				for(i=0;i<7;i++){
-					var name:String="bw"+i;
-					this[name].selected=model.vo.qyxz.charAt(i)=='Y';
-				}
-				if(bw0.selected){
-					mtqy.visible=true;
-					mtqy.includeInLayout=true;
-				}
-				if(bw1.selected){
-					ccqy.visible=true;
-					ccqy.includeInLayout=true;
+					for(i=0;i<7;i++){
+						var name:String="bw"+i;
+						this[name].selected=model.vo.qyxz.charAt(i)=='Y';
+					}
+					if(bw0.selected){
+						mtqy.visible=true;
+						mtqy.includeInLayout=true;
+					}
+					if(bw1.selected){
+						ccqy.visible=true;
+						ccqy.includeInLayout=true;
+					}
+					
 				}
-				
-			}
 				//设置 投资 泊位 仓库 堆场表单的初始值
 				model.fjList=new GlzdFileList();
 				model.fjList.entityId=model.vo.id;
@@ -152,21 +134,21 @@
 						var shzt:String=this.shVo.sfsh;
 						var zd:String = this.shVo.zd;
 						var shyj:String = this.shVo.shyj;
-					    if(shzt=="N"){
+						if(shzt=="N"){
 							if( zd =="qyxz"){
 								for(var j:int;j<7;j++){
 									if(model.vo.qyxz.charAt(i)=='Y'){
 										var name1:String="bw"+j;
-				 					    this[name1].setStyle("color","#FF0033");
+										this[name1].setStyle("color","#FF0033");
 										this[name1].setStyle("fontWeight","bold");
 										this[name1].toolTip=shyj;
-									 }
+									}
 								}
 							} else{
 								this[zd].setStyle("color","#FF0033");
 								this[zd].setStyle("fontWeight","bold");
 								this[zd].toolTip=shyj;
-						 	}
+							}
 							this[zd+"Str"].setStyle("color","#FF0033");
 							this[zd+"Str"].setStyle("fontWeight","bold");
 							this[zd+"Str"].toolTip=shyj;
@@ -191,8 +173,32 @@
 						}
 					}
 				}
+				if(model.vo.bayxq!=null){
+					var tempDate1:Date = new Date();
+					tempDate1["date"]+=Constants.YXQ;
+					if(ObjectUtil.dateCompare(model.vo.bayxq,tempDate1)<=0){
+						bayxq.setStyle("disabledColor","#FF0033");
+						bayxq.setStyle("fontWeight","bold");
+						bayxq.toolTip="即将到期";
+					}
+					if(ObjectUtil.dateCompare(model.vo.bayxq,new Date())<0){
+						bayxq.toolTip="已经过期";
+					}
+				}
+				if(model.vo.fzyxq!=null){
+					var tempDate2:Date = new Date();
+					tempDate2["date"]+=Constants.YXQ;
+					if(ObjectUtil.dateCompare(model.vo.fzyxq,tempDate2)<=0){
+						fzyxq.setStyle("disabledColor","#FF0033");
+						fzyxq.setStyle("fontWeight","bold");
+						fzyxq.toolTip="即将到期";
+					}
+					if(ObjectUtil.dateCompare(model.vo.fzyxq,new Date())<0){
+						fzyxq.toolTip="已经过期";
+					}
+				}
 			}				
-
+			
 			protected function vboxClick(event:Event):void
 			{
 				
@@ -230,7 +236,7 @@
 				PrintUtil.doPrint(param);
 			}
 			
-
+			
 			protected function linkButtonFunc2(data:Gkwxhwzyfzbl_fzVo):void
 			{
 				model.link(data); 
@@ -259,39 +265,39 @@
 			<s:VGroup width="100%"  gap="0" verticalAlign="middle" horizontalAlign="center">
 				<s:BorderContainer  width="100%"  borderWeight="1" >
 					<s:VGroup width="100%" verticalAlign="middle" horizontalAlign="center" paddingBottom="10" paddingTop="10"> 
-					<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel text="经营人基础信息" verticalAlign="middle" textalign="center"  width="100%"   fontSize="22"   fontWeight="bold"/>
-				    </s:HGroup>
-					<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0"  includeInLayout="{Global.deployMode == Constants.DEPLOY_MODE_1}">
-						<cus:QLabel id="shbz"  text="备注：标红的表示该字段数据审核不通过，点击该数据可以得到审核信息！" verticalAlign="middle" textalign="left"  width="80%"   
-									visible="{Global.deployMode == Constants.DEPLOY_MODE_1}" includeInLayout="{Global.deployMode == Constants.DEPLOY_MODE_1}"/>
-						<s:Button id="check" label="审核" click="doCheck(event)" skinClass="skins.cus.ButtonSkin" 
-								  visible="{flag}" includeInLayout="{Global.deployMode == Constants.DEPLOY_MODE_1}"/>
-					</s:HGroup>
-				   </s:VGroup>
+						<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel text="经营人基础信息" verticalAlign="middle" textalign="center"  width="100%"   fontSize="22"   fontWeight="bold"/>
+						</s:HGroup>
+						<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0"  includeInLayout="{Global.deployMode == Constants.DEPLOY_MODE_1}">
+							<cus:QLabel id="shbz"  text="备注：标红的表示该字段数据审核不通过，点击该数据可以得到审核信息！" verticalAlign="middle" textalign="left"  width="80%"   
+										visible="{Global.deployMode == Constants.DEPLOY_MODE_1}" includeInLayout="{Global.deployMode == Constants.DEPLOY_MODE_1}"/>
+							<s:Button id="check" label="审核" click="doCheck(event)" skinClass="skins.cus.ButtonSkin" 
+									  visible="{flag}" includeInLayout="{Global.deployMode == Constants.DEPLOY_MODE_1}"/>
+						</s:HGroup>
+					</s:VGroup>
 				</s:BorderContainer>
 				<s:BorderContainer  width="100%"  borderWeight="1" >
 					<s:VGroup width="100%" verticalAlign="middle" horizontalAlign="center" paddingBottom="10" paddingTop="10"> 
-					<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="szdStr" click="shModel.showShyj1('szd')"  width="13%" text="{resourceManager.getString('jlrxxgl','szd')}" />
-						<cus:QComboBox id="szd" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SZD}" hasBlank="true" 
-									   selectedVO="{model.vo.szd}" width="19%" enabled="false"   />
-						<cus:QLabel id="szgqStr" click="shModel.showShyj1('szgq')" width="13%" text="{resourceManager.getString('jlrxxgl','szgq')}" />
-						<cus:QComboBox id="szgq" comboxClass="GqBySzdSelect" hasBlank="false"  selectedVO="{model.vo.szgq}" width="19%" 
-									   enabled="false"  />
-						<cus:QLabel id="qylxStr" click="shModel.showShyj1('qylx')" width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" />
-						<cus:QComboBox id="qylx"  comboxClass="QylxSelect" hasBlank="true" width="19%" dataField="{model.vo.qylx}" 
-									   enabled="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="gkjyrStr"  click="shModel.showShyj1('gkjyr')" width="13%" text="{resourceManager.getString('jlrxxgl','gkjyr')}" />
-						<cus:QTextInput id="gkjyr" text="@{model.vo.gkjyr}" width="19%" editable="false"  />
-						<cus:QLabel id="yzbmStr"  click="shModel.showShyj1('yzbm')"  width="13%" text="{resourceManager.getString('jlrxxgl','yzbm')}" />
-						<cus:QTextInput id="yzbm" text="@{model.vo.yzbm}" width="19%" editable="false"  />
-						<cus:QLabel id="parentJyrStr" click="shModel.showShyj1('parentJyr')" width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}" />
-						<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{model.vo.parentJyr}" hasBlank="true" width="19%" 
-									   enabled="false"/>
-					</s:HGroup>
+						<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="szdStr" click="shModel.showShyj1('szd')"  width="13%" text="{resourceManager.getString('jlrxxgl','szd')}" />
+							<cus:QComboBox id="szd" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SZD}" hasBlank="true" 
+										   selectedVO="{model.vo.szd}" width="19%" enabled="false"   />
+							<cus:QLabel id="szgqStr" click="shModel.showShyj1('szgq')" width="13%" text="{resourceManager.getString('jlrxxgl','szgq')}" />
+							<cus:QComboBox id="szgq" comboxClass="GqBySzdSelect" hasBlank="false"  selectedVO="{model.vo.szgq}" width="19%" 
+										   enabled="false"  />
+							<cus:QLabel id="qylxStr" click="shModel.showShyj1('qylx')" width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" />
+							<cus:QComboBox id="qylx"  comboxClass="QylxSelect" hasBlank="true" width="19%" dataField="{model.vo.qylx}" 
+										   enabled="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="gkjyrStr"  click="shModel.showShyj1('gkjyr')" width="13%" text="{resourceManager.getString('jlrxxgl','gkjyr')}" />
+							<cus:QTextInput id="gkjyr" text="@{model.vo.gkjyr}" width="19%" editable="false"  />
+							<cus:QLabel id="yzbmStr"  click="shModel.showShyj1('yzbm')"  width="13%" text="{resourceManager.getString('jlrxxgl','yzbm')}" />
+							<cus:QTextInput id="yzbm" text="@{model.vo.yzbm}" width="19%" editable="false"  />
+							<cus:QLabel id="parentJyrStr" click="shModel.showShyj1('parentJyr')" width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}" />
+							<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{model.vo.parentJyr}" hasBlank="true" width="19%" 
+										   enabled="false"/>
+						</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle" gap="0">
 							<cus:QLabel id="qyxzStr" click="shModel.showShyj1('qyxz')" width="13%" text="类别" />
 							<mx:VBox width="83%">
@@ -310,52 +316,52 @@
 								</s:HGroup>
 							</mx:VBox>
 						</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="bgdzStr" click="shModel.showShyj1('bgdz')" width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" />
-						<cus:QTextInput id="bgdz" text="@{model.vo.bgdz}" width="83%" editable="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="gkjyxkzhStr" click="shModel.showShyj1('gkjyxkzh')" width="13%" text="{resourceManager.getString('jlrxxgl','gkjyxkzh')}" />
-						<cus:QTextInput id="gkjyxkzh" text="@{model.vo.gkjyxkzh}" width="16%" editable="false" />
-						<s:Image width="3%"  source="@Embed(source='resource/photo/open.png')" toolTip="上传附件"  buttonMode="true"  click="model.upload(event)"/>
-						<cus:QLabel id="fzrqStr" click="shModel.showShyj1('fzrq')" width="13%" text="{resourceManager.getString('jlrxxgl','fzrq')}" />
-						<ui:DateField id="fzrq"  selectedDate="@{model.vo.fzrq}" width="19%" enabled="false" />
-						<cus:QLabel id="xkzyxqStr" click="shModel.showShyj1('xkzyxq')" width="13%" text="{resourceManager.getString('jlrxxgl','yxq')}"/>
-						<ui:DateField id="xkzyxq"  selectedDate="@{model.vo.bafzrq}" width="19%" enabled="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" gap="0">
-						<cus:QLabel id="fzjgStr" click="shModel.showShyj1('fzjg')" width="13%" text="{resourceManager.getString('jlrxxgl','fzjg')}" />
-						<cus:QTextInput id="fzjg" text="@{model.vo.fzjg}" width="19%" editable="false" />
-						<cus:QLabel id="xzqhStr" click="shModel.showShyj1('xzqh')" width="13%" text="{resourceManager.getString('jlrxxgl','xzqh')}" />
-						<cus:QComboBox id="xzqh" comboxClass="XzqhSelect" parentId="{Global.deploySzd}"
-									   selectedVO="{model.vo.xzqh}" width="19%" enabled="false" />
-						<cus:QLabel id="zyhzStr" click="shModel.showShyj1('zyhz')" width="13%" text="{resourceManager.getString('jlrxxgl','zyhz')}"/>
-						<cus:QTextInput id="zyhz" text="@{model.vo.zyhz}" width="19%" editable="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" gap="0">
-						<cus:QLabel id="jyfwStr" click="shModel.showShyj1('jyfw')" width="13%" text="{resourceManager.getString('jlrxxgl','jyfw')}" />
-						<cus:QTextInput id="jyfw" text="@{model.vo.jyfw}" width="83%" editable="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" gap="0">
-						<cus:QLabel id="jyqyStr" click="shModel.showShyj1('jyqy')" width="13%" text="{resourceManager.getString('jlrxxgl','jyqy')}" />
-						<cus:QTextInput id="jyqy" text="@{model.vo.jyqy}" width="83%" editable="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="fddbrStr" click="shModel.showShyj1('fddbr')" width="13%" text="{resourceManager.getString('jlrxxgl','fddbr')}" />
-						<cus:QTextInput id="fddbr" text="@{model.vo.fddbr}" width="19%" editable="false" />
-						<cus:QLabel id="lxdhStr" click="shModel.showShyj1('lxdh')" width="13%" text="{resourceManager.getString('jlrxxgl','lxdh')}" />
-						<cus:QTextInput id="lxdh" text="@{model.vo.lxdh}" width="19%" editable="false" />
-						<cus:QLabel id="czStr" click="shModel.showShyj1('cz')" width="13%" text="{resourceManager.getString('jlrxxgl','cz')}" />
-						<cus:QTextInput id="cz" text="@{model.vo.cz}" width="19%" editable="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','frsfzh')}"/>
-						<cus:QTextInput id="frsfzh" text="@{model.vo.byzd3}" width="19%" toolTip="可填法人身份证、护照、台胞证等证件号码" />						
-						<cus:QLabel id="aqbmfzrStr" click="shModel.showShyj1('aqbmfzr')" width="13%" text="{resourceManager.getString('jlrxxgl','aqbmfzr')}" />
-						<cus:QTextInput id="aqbmfzr" text="@{model.vo.aqbmfzr}" width="19%" editable="false" />
-						<cus:QLabel id="aqfzrlxdhStr" click="shModel.showShyj1('aqfzrlxdh')" width="13%" text="{resourceManager.getString('jlrxxgl','aqfzrlxdh')}" />
-						<cus:QTextInput id="aqfzrlxdh" text="@{model.vo.aqfzrlxdh}" width="19%" editable="false" />
-					</s:HGroup>	
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="bgdzStr" click="shModel.showShyj1('bgdz')" width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" />
+							<cus:QTextInput id="bgdz" text="@{model.vo.bgdz}" width="83%" editable="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="gkjyxkzhStr" click="shModel.showShyj1('gkjyxkzh')" width="13%" text="{resourceManager.getString('jlrxxgl','gkjyxkzh')}" />
+							<cus:QTextInput id="gkjyxkzh" text="@{model.vo.gkjyxkzh}" width="16%" editable="false" />
+							<s:Image width="3%"  source="@Embed(source='resource/photo/open.png')" toolTip="上传附件"  buttonMode="true"  click="model.upload(event)"/>
+							<cus:QLabel id="fzrqStr" click="shModel.showShyj1('fzrq')" width="13%" text="{resourceManager.getString('jlrxxgl','fzrq')}" />
+							<ui:DateField id="fzrq"  selectedDate="@{model.vo.fzrq}" width="19%" enabled="false" />
+							<cus:QLabel id="xkzyxqStr" click="shModel.showShyj1('xkzyxq')" width="13%" text="{resourceManager.getString('jlrxxgl','yxq')}"/>
+							<ui:DateField id="xkzyxq"  selectedDate="@{model.vo.bafzrq}" width="19%" enabled="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" gap="0">
+							<cus:QLabel id="fzjgStr" click="shModel.showShyj1('fzjg')" width="13%" text="{resourceManager.getString('jlrxxgl','fzjg')}" />
+							<cus:QTextInput id="fzjg" text="@{model.vo.fzjg}" width="19%" editable="false" />
+							<cus:QLabel id="xzqhStr" click="shModel.showShyj1('xzqh')" width="13%" text="{resourceManager.getString('jlrxxgl','xzqh')}" />
+							<cus:QComboBox id="xzqh" comboxClass="XzqhSelect" parentId="{Global.deploySzd}"
+										   selectedVO="{model.vo.xzqh}" width="19%" enabled="false" />
+							<cus:QLabel id="zyhzStr" click="shModel.showShyj1('zyhz')" width="13%" text="{resourceManager.getString('jlrxxgl','zyhz')}"/>
+							<cus:QTextInput id="zyhz" text="@{model.vo.zyhz}" width="19%" editable="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" gap="0">
+							<cus:QLabel id="jyfwStr" click="shModel.showShyj1('jyfw')" width="13%" text="{resourceManager.getString('jlrxxgl','jyfw')}" />
+							<cus:QTextInput id="jyfw" text="@{model.vo.jyfw}" width="83%" editable="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" gap="0">
+							<cus:QLabel id="jyqyStr" click="shModel.showShyj1('jyqy')" width="13%" text="{resourceManager.getString('jlrxxgl','jyqy')}" />
+							<cus:QTextInput id="jyqy" text="@{model.vo.jyqy}" width="83%" editable="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="fddbrStr" click="shModel.showShyj1('fddbr')" width="13%" text="{resourceManager.getString('jlrxxgl','fddbr')}" />
+							<cus:QTextInput id="fddbr" text="@{model.vo.fddbr}" width="19%" editable="false" />
+							<cus:QLabel id="lxdhStr" click="shModel.showShyj1('lxdh')" width="13%" text="{resourceManager.getString('jlrxxgl','lxdh')}" />
+							<cus:QTextInput id="lxdh" text="@{model.vo.lxdh}" width="19%" editable="false" />
+							<cus:QLabel id="czStr" click="shModel.showShyj1('cz')" width="13%" text="{resourceManager.getString('jlrxxgl','cz')}" />
+							<cus:QTextInput id="cz" text="@{model.vo.cz}" width="19%" editable="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','frsfzh')}"/>
+							<cus:QTextInput id="frsfzh" text="@{model.vo.byzd3}" width="19%" toolTip="可填法人身份证、护照、台胞证等证件号码" />						
+							<cus:QLabel id="aqbmfzrStr" click="shModel.showShyj1('aqbmfzr')" width="13%" text="{resourceManager.getString('jlrxxgl','aqbmfzr')}" />
+							<cus:QTextInput id="aqbmfzr" text="@{model.vo.aqbmfzr}" width="19%" editable="false" />
+							<cus:QLabel id="aqfzrlxdhStr" click="shModel.showShyj1('aqfzrlxdh')" width="13%" text="{resourceManager.getString('jlrxxgl','aqfzrlxdh')}" />
+							<cus:QTextInput id="aqfzrlxdh" text="@{model.vo.aqfzrlxdh}" width="19%" editable="false" />
+						</s:HGroup>	
 						<s:HGroup width="100%" verticalAlign="middle" gap="0">
 							<cus:QLabel id="aqfzrzbdhStr" click="shModel.showShyj1('aqfzrzbdh')" width="13%"  />
 							<cus:QTextInput id="aqfzrzbdh" text="@{model.vo.aqfzrzbdh}" width="19%" editable="false"/>
@@ -401,27 +407,27 @@
 							<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','gjjgdm')}" />
 							<cus:QTextInput id="gjjgdm" text="@{model.vo.gjjgdm}" width="19%" />
 						</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="sfwhqyStr" click="shModel.showShyj1('sfwhqy')" width="13%" text="{resourceManager.getString('jlrxxgl','sfwhqy')}" />
-						<cus:QComboBox id="sfwhqy"  comboxClass="JyrSfwhqySelect" hasBlank="false" width="19%" dataField="{model.vo.sfwhqy}" enabled="false" />
-						<cus:QLabel id="gkwxhwzyfzbhStr" click="shModel.showShyj1('gkwxhwzyfzbh')" width="13%"  />
-						<cus:QTextInput id="gkwxhwzyfzbh" text="@{model.vo.gkwxhwzyfzbh}" width="19%" editable="false" />
-						<cus:QLabel id="fzyxqStr" click="shModel.showShyj1('fzyxq')" width="13%" text="{resourceManager.getString('jlrxxgl','yxq')}"/>
-						<ui:DateField id="fzyxq"  selectedDate="@{model.vo.fzyxq}" width="19%"  enabled="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="gkssbafhzsbhStr" click="shModel.showShyj1('qylx')" width="13%"/>
-						<cus:QTextInput id="gkssbafhzsbh" text="@{model.vo.gkssbafhzsbh}" width="19%" editable="false" />
-						<cus:QLabel id="bayxqStr" click="shModel.showShyj1('bayxq')" width="13%" text="{resourceManager.getString('jlrxxgl','bayxq')}" />
-						<ui:DateField id="bayxq"  selectedDate="@{model.vo.bayxq}" width="19%" enabled="false" />
-						<cus:QLabel id="bafzjgStr" click="shModel.showShyj1('bafzjg')" width="13%" text="{resourceManager.getString('jlrxxgl','bafzjg')}" />
-						<cus:QTextInput id="bafzjg" text="@{model.vo.bafzjg}" width="19%" editable="false" />
-			
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="54" gap="0">
-						<cus:QLabel id="zywxhwpmStr" click="shModel.showShyj1('zywxhwpm')" width="13%" />
-						<cus:QTextArea id="zywxhwpm" text="@{model.vo.zywxhwpm}"  width="83%" editable="false" height="54" />
-					</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="sfwhqyStr" click="shModel.showShyj1('sfwhqy')" width="13%" text="{resourceManager.getString('jlrxxgl','sfwhqy')}" />
+							<cus:QComboBox id="sfwhqy"  comboxClass="JyrSfwhqySelect" hasBlank="false" width="19%" dataField="{model.vo.sfwhqy}" enabled="false" />
+							<cus:QLabel id="gkwxhwzyfzbhStr" click="shModel.showShyj1('gkwxhwzyfzbh')" width="13%"  />
+							<cus:QTextInput id="gkwxhwzyfzbh" text="@{model.vo.gkwxhwzyfzbh}" width="19%" editable="false" />
+							<cus:QLabel id="fzyxqStr" click="shModel.showShyj1('fzyxq')" width="13%" text="{resourceManager.getString('jlrxxgl','yxq')}"/>
+							<ui:DateField id="fzyxq"  selectedDate="@{model.vo.fzyxq}" width="19%"  enabled="false" />
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+							<cus:QLabel id="gkssbafhzsbhStr" click="shModel.showShyj1('qylx')" width="13%"/>
+							<cus:QTextInput id="gkssbafhzsbh" text="@{model.vo.gkssbafhzsbh}" width="19%" editable="false" />
+							<cus:QLabel id="bayxqStr" click="shModel.showShyj1('bayxq')" width="13%" text="{resourceManager.getString('jlrxxgl','bayxq')}" />
+							<ui:DateField id="bayxq"  selectedDate="@{model.vo.bayxq}" width="19%" enabled="false" />
+							<cus:QLabel id="bafzjgStr" click="shModel.showShyj1('bafzjg')" width="13%" text="{resourceManager.getString('jlrxxgl','bafzjg')}" />
+							<cus:QTextInput id="bafzjg" text="@{model.vo.bafzjg}" width="19%" editable="false" />
+							
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" height="54" gap="0">
+							<cus:QLabel id="zywxhwpmStr" click="shModel.showShyj1('zywxhwpm')" width="13%" />
+							<cus:QTextArea id="zywxhwpm" text="@{model.vo.zywxhwpm}"  width="83%" editable="false" height="54" />
+						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>
 				<s:BorderContainer  width="100%" height="25" borderWeight="1">
@@ -430,7 +436,7 @@
 				<s:BorderContainer  width="100%"  borderWeight="1">
 					<s:HGroup width="100%" >
 						<ui:DataGrid id="fzdataGrid" width="100%" borderAlpha="1" 
-									rowHeight="30" textAlign="center" dataProvider="{model.fzList}"   minHeight="207" height="207">
+									 rowHeight="30" textAlign="center" dataProvider="{model.fzList}"   minHeight="207" height="207">
 							<ui:columns>
 								<s:ArrayList>
 									<!--ui:DataGridColumn dataField="fzbhName" headerText="附证编号" /-->
@@ -508,19 +514,19 @@
 				</s:BorderContainer>
 				<s:BorderContainer  width="100%"  borderWeight="1">
 					<s:HGroup width="100%" >
-					<ui:DataGrid id="cgdataGrid" width="100%" borderAlpha="1" minHeight="207" height="207"
-								doubleClickEnabled="true"   doubleClick="model.cgDouble(event)"
-								rowHeight="30" textAlign="center" dataProvider="{model.cgList}" >
-						<ui:columns>
-							<s:ArrayList>
-								<ui:DataGridColumn dataField="jyrName" headerText="{resourceManager.getString('yjgl','cg.dwmc')}" />
-								<ui:DataGridColumn dataField="cgqmc" headerText="{resourceManager.getString('yjgl','cg.cgqmc')}" />
-								<ui:DataGridColumn dataField="cgqmj_s" headerText="{resourceManager.getString('yjgl','cg.cgqmj')}"/>
-								<ui:DataGridColumn dataField="cggs_s" headerText="{resourceManager.getString('yjgl','cg.cggs')}"/>
-								<ui:DataGridColumn dataField="tbr" headerText="{resourceManager.getString('yjgl','cg.tbr')}"/>
-							</s:ArrayList>
-						</ui:columns>
-					</ui:DataGrid>
+						<ui:DataGrid id="cgdataGrid" width="100%" borderAlpha="1" minHeight="207" height="207"
+									 doubleClickEnabled="true"   doubleClick="model.cgDouble(event)"
+									 rowHeight="30" textAlign="center" dataProvider="{model.cgList}" >
+							<ui:columns>
+								<s:ArrayList>
+									<ui:DataGridColumn dataField="jyrName" headerText="{resourceManager.getString('yjgl','cg.dwmc')}" />
+									<ui:DataGridColumn dataField="cgqmc" headerText="{resourceManager.getString('yjgl','cg.cgqmc')}" />
+									<ui:DataGridColumn dataField="cgqmj_s" headerText="{resourceManager.getString('yjgl','cg.cgqmj')}"/>
+									<ui:DataGridColumn dataField="cggs_s" headerText="{resourceManager.getString('yjgl','cg.cggs')}"/>
+									<ui:DataGridColumn dataField="tbr" headerText="{resourceManager.getString('yjgl','cg.tbr')}"/>
+								</s:ArrayList>
+							</ui:columns>
+						</ui:DataGrid>
 					</s:HGroup>
 				</s:BorderContainer>
 				<s:BorderContainer  width="100%" height="25" borderWeight="1">
@@ -529,8 +535,8 @@
 				<s:BorderContainer  width="100%"  borderWeight="1">
 					<s:HGroup width="100%" >
 						<ui:DataGrid id="mtdataGrid" width="100%" borderAlpha="1" minHeight="207" height="207"
-									doubleClickEnabled="true"   doubleClick="model.mtDouble(event)"
-									rowHeight="30" textAlign="center" dataProvider="{model.mtList}" >
+									 doubleClickEnabled="true"   doubleClick="model.mtDouble(event)"
+									 rowHeight="30" textAlign="center" dataProvider="{model.mtList}" >
 							<ui:columns>
 								<s:ArrayList>
 									<ui:DataGridColumn dataField="mtmc" headerText="码头名称" />

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

@@ -15,7 +15,7 @@
 			import mx.events.FlexEvent;
 			import mx.rpc.events.ResultEvent;
 			import mx.utils.StringUtil;
-
+			
 			[Bindable]
 			public var list:ArrayCollection=new ArrayCollection();
 			
@@ -27,6 +27,10 @@
 			public var selectMode:String="multipleRows";
 			[Bindable]
 			public var showHint:Boolean=false;
+			[Bindable]
+			public var flag:Boolean=false;
+			[Bindable]
+			public var wxhwmcString:String;
 			/**
 			 * 页面初始化
 			 */ 
@@ -49,12 +53,76 @@
 				var lb:String="%"+StringUtil.trim(lb1.text)+"%";
 				if(authentication){
 					Utils.callRemote("jyrController","findWxpm",function(r:ResultEvent):void{
-						list = r.result as ArrayCollection;
+						var list2:ArrayCollection= r.result as ArrayCollection;
+						if(flag&&wxhwmcString!=null){
+							for(var i:int=0;i<list2.length;i++){
+								var wxpVo:WxhwpmVo=list2[i] as WxhwpmVo;
+								var index:int =  wxhwmcString.indexOf(StringUtil.trim(wxpVo.bh)+" ");
+								if(index==-1){
+									// 是否为允许货种
+									var flag2:Boolean=false;
+									var lb:String = wxpVo.byzd2;
+									// 类别检查
+									if(wxhwmcString.indexOf("LB")!=-1 && lb!=null && lb.length>0){
+										for each (var j:String in wxhwmcString.split(";")) {
+											if(flag2){
+												break;
+											}
+											for each (var t:String in j.split(" ")) {
+												if(lb == t){
+													flag2 = true;
+													break;
+												}
+											}
+										}
+									}
+									if(flag2){
+										list.addItem(wxpVo);
+									}
+								} else {
+									list.addItem(wxpVo);
+								}
+							} 
+						}else {
+							list= r.result as ArrayCollection;
+						}
 					},mc,bhstr,bzstr,lb);
 				}
 				else{
 					Utils.callRemote("authenticateController","findWxpm",function(r:ResultEvent):void{
-						list = r.result as ArrayCollection;
+						var list2:ArrayCollection= r.result as ArrayCollection;
+						if(flag&&wxhwmcString!=null){
+							for(var i:int=0;i<list2.length;i++){
+								var wxpVo:WxhwpmVo=list2[i] as WxhwpmVo;
+								var index:int =  wxhwmcString.indexOf(StringUtil.trim(wxpVo.bh)+" ");
+								if(index==-1){
+									// 是否为允许货种
+									var flag2:Boolean=false;
+									var lb:String = wxpVo.byzd2;
+									// 类别检查
+									if(wxhwmcString.indexOf("LB")!=-1 && lb!=null && lb.length>0){
+										for each (var j:String in wxhwmcString.split(";")) {
+											if(flag2){
+												break;
+											}
+											for each (var t:String in j.split(" ")) {
+												if(lb == t){
+													flag2 = true;
+													break;
+												}
+											}
+										}
+									}
+									if(flag2){
+										list.addItem(wxpVo);
+									}
+								} else {
+									list.addItem(wxpVo);
+								}
+							} 
+						}else {
+							list= r.result as ArrayCollection;
+						}
 					},mc,bhstr,bzstr,lb);
 				}
 			}
@@ -64,22 +132,22 @@
 				//保存用户最近选择过的危险品名称
 				Utils.callRemote("wxhwpmController","saveWxhwpmMem",null,this.dataGrid.selectedData);
 				if(selectMode=="multipleRows"){
-				var selectList:Array=this.dataGrid.selectedData as Array;
-				if(selectList!=null){
-				for(var i:int=0;i<selectList.length;i++){
-					var vo:WxhwpmVo=selectList[i] as WxhwpmVo;
-					if(hwpm.indexOf(vo.bh+" ")==-1)
-					{
-						hwpm=hwpm+vo.bh+" "+vo.mchsm+";";
-						hwpmStr=hwpmStr+vo.mchsm+";\n";
+					var selectList:Array=this.dataGrid.selectedData as Array;
+					if(selectList!=null){
+						for(var i:int=0;i<selectList.length;i++){
+							var vo:WxhwpmVo=selectList[i] as WxhwpmVo;
+							if(hwpm.indexOf(vo.bh+" ")==-1)
+							{
+								hwpm=hwpm+vo.bh+" "+vo.mchsm+";";
+								hwpmStr=hwpmStr+vo.mchsm+";\n";
+							}
+						}
+						var res:Object=new Object;
+						res["hwpm"]=hwpm;
+						res["hwpmStr"]=hwpmStr;
+						this.dispatchEvent(new MyEvent(MyEvent.SAVE_OK,res));
 					}
 				}
-				var res:Object=new Object;
-				res["hwpm"]=hwpm;
-				res["hwpmStr"]=hwpmStr;
-				this.dispatchEvent(new MyEvent(MyEvent.SAVE_OK,res));
-				}
-				}
 				else if(selectMode=="singleRow"){
 					this.dispatchEvent(new MyEvent(MyEvent.SAVE_OK,this.dataGrid.selectedItem as WxhwpmVo));
 				}
@@ -117,15 +185,15 @@
 	</s:HGroup>
 	<ui:DataGrid id="dataGrid" width="100%" selectionMode="{selectMode}" dataProvider="{list}" height="400">
 		<ui:columns><s:ArrayList>
-				<ui:DataGridColumn dataField="bh"  headerText="系统编号" width="70"/>
-				<ui:DataGridColumn dataField="byzd1"  headerText="编号(UN号)" width="80"/>		
-				<ui:DataGridColumn dataField="mchsm"  headerText="危险物品名称" width="100" showDataTips="true" dataTipField="mchsm"/>
-				<ui:DataGridColumn dataField="byzd3"  headerText="名称和说明" width="100" showDataTips="true" dataTipField="byzd3"/>
-				<ui:DataGridColumn dataField="lbhxb"  headerText="类别与项别" width="80"/>
-				<ui:DataGridColumn dataField="hzwxxName"  headerText="火灾危险性" width="80"/>
-				<ui:DataGridColumn dataField="dxdjName"  headerText="毒性等级" width="80"/>
-				<ui:DataGridColumn dataField="wrlbName"  headerText="污染类别" width="80"/>
-				<ui:DataGridColumn dataField="bz"  headerText="备注(CN号)"/>
-			</s:ArrayList></ui:columns>
+						<ui:DataGridColumn dataField="bh"  headerText="系统编号" width="70"/>
+						<ui:DataGridColumn dataField="byzd1"  headerText="编号(UN号)" width="80"/>		
+						<ui:DataGridColumn dataField="mchsm"  headerText="危险物品名称" width="100" showDataTips="true" dataTipField="mchsm"/>
+						<ui:DataGridColumn dataField="byzd3"  headerText="名称和说明" width="100" showDataTips="true" dataTipField="byzd3"/>
+						<ui:DataGridColumn dataField="lbhxb"  headerText="类别与项别" width="80"/>
+						<ui:DataGridColumn dataField="hzwxxName"  headerText="火灾危险性" width="80"/>
+						<ui:DataGridColumn dataField="dxdjName"  headerText="毒性等级" width="80"/>
+						<ui:DataGridColumn dataField="wrlbName"  headerText="污染类别" width="80"/>
+						<ui:DataGridColumn dataField="bz"  headerText="备注(CN号)"/>
+					</s:ArrayList></ui:columns>
 	</ui:DataGrid>
 </ui:QueryLayout>

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

@@ -341,7 +341,7 @@
 				</s:HGroup>
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.whzyfzbh')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.whzyfzbh}" width="200" />
+					<cus:QTextInput text="@{cgModel.cgVo.whzyfzbh}" width="200" editable="false" />
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.qyccbh')}" notNull="true" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.qyccbh}" width="200" />
 				</s:HGroup>
@@ -356,7 +356,7 @@
 				</s:HGroup>
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.hxpmc')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.hxpmc}" width="612"/>
+					<cus:QTextInput text="@{cgModel.cgVo.hxpmc}" width="612" editable="false"/>
 				</s:HGroup>
 				<s:HGroup width="100%" verticalAlign="middle">
 					<!--cus:QLabel text="{resourceManager.getString('yjgl','cg.hxppz')}" width="200"/>
@@ -485,13 +485,13 @@
 				</s:HGroup>
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjyl')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.sjyl_s}" width="200" restrict="{TypeBase.NUM_RESTRICT}"/>
-					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjgzyl')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.sjgzyl_s}" width="200" restrict="{TypeBase.NUM_RESTRICT}"/>
-				</s:HGroup>
-				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QTextInput text="@{cgModel.cgVo.sjyl_s}" width="200" restrict="{TypeBase.NUM_RESTRICT}"/>				
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjwd')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.sjwd}" width="200" id="sjwd"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle" visible="false" includeInLayout="false">
+					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjgzyl')}" width="200"/>
+					<cus:QTextInput text="@{cgModel.cgVo.sjgzyl_s}" width="200" restrict="{TypeBase.NUM_RESTRICT}"/>
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjgzwd')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.sjgzwd}" width="200" id="sjgzwd"/>
 				</s:HGroup>

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:GridItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009" 
+					xmlns:s="library://ns.adobe.com/flex/spark" 
+					xmlns:mx="library://ns.adobe.com/flex/mx" clipAndEnableScrolling="true" >
+	
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.select.JyrSfwhqySelect;
+			import com.jtgh.yjpt.vo.jyr.JyrVo;
+			import com.jtgh.yjpt.vo.sgalgl.SgalglWzddVo;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgsyVo;
+			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
+			import com.jtgh.yjpt.vo.yjzyxxgl.YjwzFlxxVo;
+			
+			import mx.utils.StringUtil;
+			override public function prepare(hasBeenRecycled:Boolean):void {
+				if(this.data) {
+					if(this.data  is CgVo){
+						var cgVo:CgVo = this.data as CgVo;
+						var cgztVo:CgztVo = cgVo.cgzt;
+						var cgsyVo:CgsyVo = cgVo.cgsy;
+						if(cgztVo!=null && cgsyVo!=null && cgztVo.zt=="2"){
+							if(column.dataField == 'wd' && cgztVo.wd!=null&&StringUtil.trim(cgztVo.wd)!=""
+								&&StringUtil.trim(cgsyVo.zdwd)!=""&&new Number(cgztVo.wd)>new Number(cgsyVo.zdwd) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							} else if(column.dataField == 'wd' && cgztVo.wd!=null && StringUtil.trim(cgztVo.wd)!=""
+								&&StringUtil.trim(cgsyVo.zxwd)!=""&&new Number(cgztVo.wd)<new Number(cgsyVo.zxwd) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							}else if(column.dataField == 'yl' && cgztVo.yl!=null&&StringUtil.trim(cgztVo.yl)!=""
+								&&StringUtil.trim(cgsyVo.zdyl)!=""&&new Number(cgztVo.yl)>new Number(cgsyVo.zdyl) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							} else if(column.dataField == 'yl' && cgztVo.yl!=null && StringUtil.trim(cgztVo.yl)!=""
+								&&StringUtil.trim(cgsyVo.zxyl)!=""&&new Number(cgztVo.yl)<new Number(cgsyVo.zxyl) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							}else if(column.dataField == 'yw' && cgztVo.yw!=null&&StringUtil.trim(cgztVo.yw)!=""
+								&&StringUtil.trim(cgsyVo.zdyw)!=""&&new Number(cgztVo.yw)>new Number(cgsyVo.zdyw) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							} else if(column.dataField == 'yw' && cgztVo.yw!=null && StringUtil.trim(cgztVo.yw)!=""
+								&&StringUtil.trim(cgsyVo.zxyw)!=""&&new Number(cgztVo.yw)<new Number(cgsyVo.zxyw) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							}
+							else
+							{
+								bgColor.alpha = 0;
+							}
+						}
+						else
+						{
+							bgColor.alpha = 0;
+						}
+					}
+					else if(this.data  is CgztVo ){
+						var cgzt:CgztVo = this.data as CgztVo;
+						var cg:CgVo = cgzt.cg;
+						var cgsy:CgsyVo = cg.cgsy;
+						if(cgzt!=null && cgsy!=null && cgzt.zt=="2"){
+							if(column.dataField == 'wd' && cgzt.wd!=null&&StringUtil.trim(cgzt.wd)!=""
+								&&StringUtil.trim(cgsy.zdwd)!=""&&new Number(cgzt.wd)>new Number(cgsy.zdwd) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							} else if(column.dataField == 'wd' && cgzt.wd!=null && StringUtil.trim(cgzt.wd)!=""
+								&&StringUtil.trim(cgsy.zxwd)!=""&&new Number(cgzt.wd)<new Number(cgsy.zxwd) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							}else if(column.dataField == 'yl' && cgzt.yl!=null&&StringUtil.trim(cgzt.yl)!=""
+								&&StringUtil.trim(cgsy.zdyl)!=""&&new Number(cgzt.yl)>new Number(cgsy.zdyl) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							} else if(column.dataField == 'yl' && cgzt.yl!=null && StringUtil.trim(cgzt.yl)!=""
+								&&StringUtil.trim(cgsy.zxyl)!=""&&new Number(cgzt.yl)<new Number(cgsy.zxyl) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							}else if(column.dataField == 'yw' && cgzt.yw!=null&&StringUtil.trim(cgzt.yw)!=""
+								&&StringUtil.trim(cgsy.zdyw)!=""&&new Number(cgzt.yw)>new Number(cgsy.zdyw) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							} else if(column.dataField == 'yw' && cgzt.yw!=null && StringUtil.trim(cgzt.yw)!=""
+								&&StringUtil.trim(cgsy.zxyw)!=""&&new Number(cgzt.yw)<new Number(cgsy.zxyw) )
+							{
+								bgColor.color = 0xE39BA0;//红色
+								bgColor.alpha = 1;
+							}	
+							else
+							{
+								bgColor.alpha = 0;
+							}
+						}else
+						{
+							bgColor.alpha = 0;
+						}
+					}				
+				}
+			}				
+		]]>
+	</fx:Script>
+	
+	<s:Rect top="0" bottom="0" left="0" right="0">
+		<s:fill>
+			<s:SolidColor id="bgColor" color="0xFFFFFF"/>
+		</s:fill>
+	</s:Rect>
+	<s:Label id="labelDisplay" width="100%" height="100%" textAlign="center" verticalAlign="middle"/>
+	
+</s:GridItemRenderer>

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

@@ -142,7 +142,8 @@
 			</s:VGroup>
 			<s:DataGrid id="dataGrid" width="100%" borderAlpha="1" minHeight="330" height="100%"
 						doubleClickEnabled="true"  verticalScrollPolicy="off" horizontalScrollPolicy="off"
-						rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.thisDataList}" doubleClick="{thisModel.doView()}">
+						rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.thisDataList}" doubleClick="{thisModel.doView()}"
+						itemRenderer="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgGridItemRenderer"  >
 				<s:columns>
 					<s:ArrayList>
 						<s:GridColumn  labelFunction="labelFun" 

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

@@ -121,16 +121,28 @@
 			</s:BorderContainer>
 			<s:VGroup width="100%" height="100%" paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5">
 				<s:HGroup width="100%" verticalAlign="middle">
-					<cus:QLabel width="200" text="{resourceManager.getString('yjgl','cg.szd')}"/>
-					<cus:QComboBox width="200" id="szd" selectedVO="{cgModel.cgVo.szd}" comboxClass="CodeSelect" enabled="false" 
-								   codeType="{Constants.GROUP_CODE_SZD}"   hasBlank="true"/>
-					<cus:QLabel width="200" text="{resourceManager.getString('yjgl','cg.szgq')}"/>
-					<cus:QComboBox width="200" id="szgq" selectedVO="{cgModel.cgVo.gq}" comboxClass="GqBySzdSelect" hasBlank="true" enabled="false" parentId="{cgModel.cgVo.szd}"/>
-				</s:HGroup>
-				<s:HGroup width="100%" verticalAlign="middle">
-					<cus:QLabel text="{resourceManager.getString('common','gkjyr')}" width="200"/>
-					<cus:QComboBox id="dwmc" selectedVO="{cgModel.cgVo.dwmc}" comboxClass="JyrSelect" hasBlank="true" parentId="{cgModel.cgVo.szd}" width="612" enabled="false"/>
-				</s:HGroup>
+					<s:VGroup width="50%">
+						<s:HGroup width="100%" verticalAlign="middle">			
+							<cus:QLabel width="200" text="{resourceManager.getString('yjgl','cg.szd')}"/>
+							<cus:QComboBox width="200" id="szd" selectedVO="{cgModel.cgVo.szd}" comboxClass="CodeSelect" enabled="false" 
+										   codeType="{Constants.GROUP_CODE_SZD}"   hasBlank="true"/>
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel width="200" text="{resourceManager.getString('yjgl','cg.szgq')}"/>
+							<cus:QComboBox width="200" id="szgq" selectedVO="{cgModel.cgVo.gq}" comboxClass="GqBySzdSelect" hasBlank="true" enabled="false" parentId="{cgModel.cgVo.szd}"/>
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel text="{resourceManager.getString('common','gkjyr')}" width="200"/>
+							<cus:QComboBox id="dwmc" selectedVO="{cgModel.cgVo.dwmc}" comboxClass="JyrSelect" hasBlank="true" parentId="{cgModel.cgVo.szd}" width="200" enabled="false"/>
+						</s:HGroup>
+					</s:VGroup>
+					<s:VGroup width="50%">
+						<s:HGroup width="100%" verticalAlign="middle">
+							<cus:QLabel  width="200"/>
+							<s:Image id="qrcode"  width="100" height="100" fillMode="scale"/>
+						</s:HGroup>				
+					</s:VGroup>
+				</s:HGroup>		
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.whzyfzbh')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.whzyfzbh}" width="200" editable="false"/>
@@ -279,13 +291,13 @@
 				</s:HGroup>
 				<s:HGroup width="100%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjyl')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.sjyl_s}" width="200" editable="false"/>
-					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjgzyl')}" width="200"/>
-					<cus:QTextInput text="@{cgModel.cgVo.sjgzyl_s}" width="200" editable="false"/>
-				</s:HGroup>
-				<s:HGroup width="100%" verticalAlign="middle">
+					<cus:QTextInput text="@{cgModel.cgVo.sjyl_s}" width="200" editable="false"/>				
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjwd')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.sjwd}" width="200" editable="false"/>
+				</s:HGroup>
+				<s:HGroup width="100%" verticalAlign="middle" visible="false" includeInLayout="false">
+					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjgzyl')}" width="200"/>
+					<cus:QTextInput text="@{cgModel.cgVo.sjgzyl_s}" width="200" editable="false"/>
 					<cus:QLabel text="{resourceManager.getString('yjgl','cg.sjgzwd')}" width="200"/>
 					<cus:QTextInput text="@{cgModel.cgVo.sjgzwd}" width="200" editable="false"/>
 				</s:HGroup>
@@ -482,6 +494,20 @@
 					<ui:DateField selectedDate="@{cgModel.cgVo.tbsj}" width="612" enabled="false"/>
 				</s:HGroup>
 			</s:VGroup>
+			<s:BorderContainer width="100%" borderVisible="false" height="32" backgroundColor="#23A5B8">
+				<s:layout>
+					<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle" paddingLeft="5"/>
+				</s:layout>
+				<cus:QLabel width="100%" textAlign="left" text="储罐相关隐患及危货作业作业申报记录"/>
+			</s:BorderContainer>
+			<s:VGroup width="100%" height="100%"  paddingRight="5" paddingTop="5" paddingLeft="5" paddingBottom="5" verticalAlign="middle">
+				<s:HGroup width="100%">
+					<mx:LinkButton label="隐患记录" 
+								   click="cgModel.doViewYhxx(event)"/>
+					<mx:LinkButton label="危货作业申报记录" 
+								   click="cgModel.doViewWhsq(event)"/>			
+				</s:HGroup>
+			</s:VGroup>
 		</s:VGroup>
 	</s:BorderContainer>
 	<s:HGroup width="100%" horizontalAlign="center">

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

@@ -6,10 +6,16 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.common.MyEvent;
 			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.view.jyr.Wxhwpm;
+			import com.jtgh.yjpt.vo.jyr.JyrVo;
+			import com.jtgh.yjpt.vo.jyr.WxhwpmVo;
 			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgVo;
 			import com.jtgh.yjpt.vo.yjgl.zdwxyfb.CgztVo;
+			import com.jtgh.yjpt.vo.zyfzndjy.Gkwxhwzyfzbl_fzVo;
 			
+			import mx.collections.ArrayCollection;
 			import mx.controls.Alert;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
@@ -24,6 +30,8 @@
 			public var functionId:Number;
 			[Bindable]
 			public var  parentView:CgztLayout;
+			[Bindable]
+			public var  wxhwmcString:String;
 			
 			protected function save(event:MouseEvent):void
 			{
@@ -76,30 +84,83 @@
 			{
 				if(vo.tbsj==null){
 					tbsj.dateTime=new Date();
-				}				
+				}	
+				if(cgVo!=null){
+					var jyrVo:JyrVo = cgVo.dwmc;
+					if(jyrVo!=null){
+						Utils.callRemote("gkwxhwzyfzblhhzcontroller", "findFzs", function(r:ResultEvent):void{
+							var bc:BusinessContext=r.result as BusinessContext;
+							var array:ArrayCollection = bc.result as ArrayCollection;
+							for each(var fzvo:Gkwxhwzyfzbl_fzVo in array)
+							{
+								var wxhwm:String=fzvo.wxhwm;
+								wxhwmcString+=wxhwm;
+							}
+						},jyrVo);
+					}
+				}
+			}
+			
+			public function selectHandler():void
+			{
+				if(wxhwmcString==null|| wxhwmcString==""){
+					Alert.show("请先进行附证申请","提示");
+					return;
+				}
+				var view:Wxhwpm=new Wxhwpm();
+				view.flag=true;
+				view.wxhwmcString=wxhwmcString;
+				view.selectMode="singleRow";
+				view.addEventListener(MyEvent.SAVE_OK,saveHxpm)
+				Utils.popupWindow("危险品信息",view,this as DisplayObject,null,800,600);						
+			}
+			
+			/***
+			 * 选择货品名树后返回的值
+			 * 
+			 */
+			private function saveHxpm(event:MyEvent):void{
+				var wxhwpmVo:WxhwpmVo=event.data as WxhwpmVo;			
+				hz.text=wxhwpmVo.mchsm;//中文名称
+				vo.xtbh=StringUtil.trim(wxhwpmVo.bh);//用来存系统编号
+				vo.bh = StringUtil.trim(wxhwpmVo.byzd1); //号国际危规编号（UN号）
+				vo.lhxz=wxhwpmVo.lhxz;
+				vo.aqffcs=wxhwpmVo.aqffcs;
+
 			}
 			
 		]]>
 	</fx:Script>
 	<s:VGroup width="100%" height="100%" verticalAlign="middle" horizontalAlign="center" >
-		<s:HGroup width="100%" horizontalAlign="center">
-			<cus:QLabel  text="储罐名称" width="13%"  />
-			<ui:TextInput text="{cgVo.cgmc}"  width="30%" enabled="false"/>
-			<cus:QLabel  text="货种"  width="13%" />
-			<ui:TextInput text="@{vo.hz}"  width="30%"/>
+		<s:HGroup width="100%" horizontalAlign="left">
+			<cus:QLabel  text="储罐名称" width="120"  />
+			<ui:TextInput text="{cgVo.cgmc}"  width="200" enabled="false"/>
+			<cus:QLabel  text="货种"  width="120" />
+			<ui:TextInput id="hz" text="@{vo.hz}" editable="false"  width="173"/>
+			<s:Button width="22" click="selectHandler()"
+					  icon="@Embed(source='resource/images/view_dis.gif')" toolTip="选择"/>
 		</s:HGroup>
-		<s:HGroup width="100%" horizontalAlign="center">
-			<cus:QLabel text="温度(℃)" width="13%"  />
-			<cus:QTextInput text="@{vo.wd}"  width="30%" type="double"/>
-			<cus:QLabel  text="压力(MPa)" width="13%"  />
-			<cus:QTextInput text="@{vo.yl}"  width="30%" type="double"/>
+		<s:HGroup width="100%" horizontalAlign="left">
+			<cus:QLabel text="温度(℃)" width="120"  />
+			<cus:QTextInput text="@{vo.wd}"  width="200" type="double"/>
+			<cus:QLabel  text="压力(MPa)" width="120"  />
+			<cus:QTextInput text="@{vo.yl}"  width="200" type="double"/>
+		</s:HGroup>
+		<s:HGroup width="100%" horizontalAlign="left">
+			<cus:QLabel  text="液位" width="120"  />
+			<cus:QTextInput text="@{vo.yw}"  width="200" type="double"/>
+			<cus:QLabel text="填报时间" width="120" notNull="true"/>
+			<ui:DateTime id="tbsj" dateTime="{vo.tbsj}"  width="200" hasTime="true"/>
+		</s:HGroup>
+		<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
+			<cus:QLabel width="120"  text="理化性质"/>
+			<cus:QTextArea id="lhxz" width="530" height="70"  text="@{vo.lhxz}"/>	
+		</s:HGroup>
+		<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
+			<cus:QLabel width="120"  text="安全防范措施"/>
+			<cus:QTextArea id="aqffcs" width="530" height="70" 
+						   text="@{vo.aqffcs}"/>
 		</s:HGroup>
-		<s:HGroup width="100%" horizontalAlign="center">
-			<cus:QLabel  text="液位" width="13%"  />
-			<cus:QTextInput text="@{vo.yw}"  width="30%" type="double"/>
-			<cus:QLabel text="填报时间" width="13%" notNull="true"/>
-			<ui:DateTime id="tbsj" dateTime="{vo.tbsj}"  width="30%" hasTime="true"/>
-		</s:HGroup>	
 		<s:HGroup width="100%" height="40" horizontalAlign="center">
 			<ui:Button label="保存" click="save(event)" />
 			<ui:Button label="取消"  click="this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE))"/>

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

@@ -73,7 +73,8 @@
 		</s:VGroup>
 		<s:DataGrid id="dataGrid" width="100%" borderAlpha="1" minHeight="330" height="100%"
 					doubleClickEnabled="true"  verticalScrollPolicy="off" horizontalScrollPolicy="off"
-					rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.cgztList}">
+					rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.cgztList}"
+					itemRenderer="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.CgGridItemRenderer">
 			<s:columns>
 				<s:ArrayList>
 					<s:GridColumn  labelFunction="labelFun" 

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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ui:QueryLayout xmlns:fx="http://ns.adobe.com/mxml/2009"
+				xmlns:s="library://ns.adobe.com/flex/spark"
+				xmlns:mx="library://ns.adobe.com/flex/mx"
+				xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+				xmlns:xxlr="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.*"
+				width="100%" height="100%" creationComplete="creationComplete(event)" 
+				xmlns:cus="com.jtgh.yjpt.common.cus.*" xmlns:button="com.jtgh.yjpt.common.component.ui.button.*" >
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr.CgModel;
+			
+			import mx.events.FlexEvent;
+			
+			import spark.components.gridClasses.GridColumn;
+			[Bindable]
+			public var thisModel:CgModel;
+			
+			/**
+			 *初始化
+			 */
+			protected function creationComplete(event:FlexEvent):void
+			{
+				this.pager.doQuery();				
+			}
+			private function labelFun(item:Object, column:GridColumn):String
+			{
+				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();
+			}
+			
+		]]>
+	</fx:Script>
+	<s:VGroup width="100%">
+		<s:DataGrid id="dataGrid" width="100%" borderAlpha="1" minHeight="330" height="100%"
+					doubleClickEnabled="true"  verticalScrollPolicy="off" horizontalScrollPolicy="off"
+					rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.whsbList}"
+					doubleClick="{thisModel.toViewWhsb(event)}">
+			<s:columns>
+				<s:ArrayList>
+					<ui:DataGridColumn width="50" headerText="序号" labelFunction="labelFun"/>
+					<ui:DataGridColumn width="150" dataField="bh" headerText="编号"/>
+					<ui:DataGridColumn dataField="cm" headerText="船名"/>
+					<ui:DataGridColumn visible="false" dataField="jcg" headerText="进出港"/>
+					<ui:DataGridColumn dataField="zysl" headerText="作业数量"/>
+					<ui:DataGridColumn dataField="bgsj" dateFormatString="YYYY-MM-DD JJ:NN:SS"
+									   headerText="报告时间" sortable="true"/>
+					<ui:DataGridColumn  dataField="wxhwmcbh" dataTipField="wxhwmcbh"
+									   headerText="危险物品名称" showDataTips="true"/>
+					<ui:DataGridColumn dataField="maoName" headerText="内外贸"/>
+					<ui:DataGridColumn  dataField="kgsj" dataTipField="kgsjStr"
+									   dateFormatString="YYYY-MM-DD JJ:NN:SS" headerText="开工时间"
+									   showDataTips="true" sortable="true"/>
+					<ui:DataGridColumn  dataField="wgsj" dataTipField="wgsjStr"
+									   dateFormatString="YYYY-MM-DD JJ:NN:SS" headerText="完工时间"
+									   showDataTips="true" sortable="true"/>
+				</s:ArrayList> 
+			</s:columns>
+		</s:DataGrid>
+		<ui:Pager id="pager" queryFunction="{thisModel.pageQueryWhsb}"/>
+	</s:VGroup>
+</ui:QueryLayout>

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ui:QueryLayout xmlns:fx="http://ns.adobe.com/mxml/2009"
+				xmlns:s="library://ns.adobe.com/flex/spark"
+				xmlns:mx="library://ns.adobe.com/flex/mx"
+				xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+				xmlns:xxlr="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.*"
+				width="100%" height="100%" creationComplete="creationComplete(event)" 
+				xmlns:cus="com.jtgh.yjpt.common.cus.*" xmlns:button="com.jtgh.yjpt.common.component.ui.button.*" >
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.model.yjgl.zdwxyfb.xxlr.CgModel;
+			
+			import mx.events.FlexEvent;
+			
+			import spark.components.gridClasses.GridColumn;
+			[Bindable]
+			public var thisModel:CgModel;
+			
+			/**
+			 *初始化
+			 */
+			protected function creationComplete(event:FlexEvent):void
+			{
+				this.pager.doQuery();				
+			}
+			private function labelFun(item:Object, column:GridColumn):String
+			{
+				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();
+			}
+
+		
+			
+		]]>
+	</fx:Script>
+	<s:VGroup width="100%">
+		<s:DataGrid id="dataGrid" width="100%" borderAlpha="1" minHeight="330" height="100%"
+					doubleClickEnabled="true"  verticalScrollPolicy="off" horizontalScrollPolicy="off"
+					rowHeight="30" selectionMode="singleRow" textAlign="center" dataProvider="{thisModel.yhList}"
+					doubleClick="{thisModel.toViewYh(event)}">
+			<s:columns>
+				<s:ArrayList>
+					<ui:DataGridColumn dataField="xmmc" headerText="{resourceManager.getString('check','zcyh.xmmc')}"/>
+					<ui:DataGridColumn dataField="yhjbName" editable="false"  headerText="{resourceManager.getString('check','zcyh.yhjb')}"/>
+					<ui:DataGridColumn dataField="mqzt_s" editable="false"  headerText="{resourceManager.getString('check','mqzt')}"/>
+					<ui:DataGridColumn dataField="jhwcsj_s" editable="false"  headerText="{resourceManager.getString('check','jhwcsj')}"/>
+				</s:ArrayList> 
+			</s:columns>
+		</s:DataGrid>
+		<ui:Pager id="pager" queryFunction="{thisModel.pageQueryYh}"/>
+	</s:VGroup>
+</ui:QueryLayout>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpAudit.mxml

@@ -99,9 +99,9 @@
 				} 
 				if(Global.iSignature== YesNoSelect.YES){
 					var view_self:ZysqbpAudit = this; 
-					var view:zysqbpConfirm = new zysqbpConfirm(); 
-					view.v = view_self;
-					Utils.popupWindow("确认信息",view as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject,null, 300, 150);  
+					var viewConfirm:zysqbpConfirm = new zysqbpConfirm(); 
+					viewConfirm.v = view_self;
+					Utils.popupWindow("确认信息",viewConfirm as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject,null, 300, 150);  
 				}
 				else{
 					Utils.doOtherConfirm(function():void{

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpEdit.mxml

@@ -823,7 +823,7 @@
 		<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" notNull="true" text="安全防范措施"/>
 			<cus:QTextArea id="tsyqhsm" width="530" height="70" editable="{enable}"
-						   text="{zysqbp.aqffcs}"/>
+						   text="@{zysqbp.aqffcs}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle"> 
 			<cus:QLabel width="120" notNull="true" text="作业时间起"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/check/ZcyhVo.as

@@ -5,6 +5,7 @@ package com.jtgh.yjpt.vo.check
 	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.yjgl.zdwxyfb.CgVo;
 	
 	import mx.collections.ArrayCollection;
 	import mx.formatters.DateFormatter;
@@ -67,6 +68,10 @@ package com.jtgh.yjpt.vo.check
 		 * 隐患级别
 		 */
 		public var yhjb:CodeVo;
+		/**
+		 * 所在储罐
+		 */
+		public var cg:CgVo;
 		public function get yhjbName():String{
 			return null==yhjb?"":yhjb.localeName;
 		}

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

@@ -24,6 +24,15 @@ package com.jtgh.yjpt.vo.yjgl.zdwxyfb
 		public var tbsj:Date;
 		/** 状态*/
 		public var zt:String="1";
+		/** 理化性质 */
+		public var lhxz:String;
+		/** 安全防范措施 */
+		public var aqffcs:String;
+		/** 国际编号 */
+		public var bh:String;
+		/**系统 内部编号 */
+		public var xtbh:String;
+		
 		public function get cgName():String{
 			if(cg!=null)
 				return cg.cgmc;