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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyrxxgl/ryqk/RyjbxxAddModel.as

@@ -102,7 +102,7 @@ package com.jtgh.yjpt.model.jyrxxgl.ryqk
 				var ryjbxxVo:RyjbxxVo = bc.result as RyjbxxVo;
 				doCloseThis();
 				PopUpManager.removePopUp(thisView.parent as IFlexDisplayObject);
-			},vo,zsList,delete_zsList,view.functionId);
+			},vo,zsList,delete_zsList,view.functionId,vo.zp.id);
 		}
 		
 		/**

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyrxxgl/ryqk/RyjbxxModel.as

@@ -13,6 +13,7 @@ package com.jtgh.yjpt.model.jyrxxgl.ryqk
 	import com.jtgh.yjpt.view.jyrxxgl.ryqk.RyjbxxLayout;
 	import com.jtgh.yjpt.view.jyrxxgl.ryqk.RyjbxxView;
 	import com.jtgh.yjpt.view.jyrxxgl.ryqk.count.RyjbxxCount;
+	import com.jtgh.yjpt.vo.common.AccessoryVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
@@ -20,13 +21,18 @@ package com.jtgh.yjpt.model.jyrxxgl.ryqk
 	import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
 	import com.jtgh.yjpt.vo.jyrxxgl.RyjbxxVo;
 	
+	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.binding.utils.BindingUtils;
 	import mx.collections.ArrayCollection;
@@ -49,6 +55,7 @@ package com.jtgh.yjpt.model.jyrxxgl.ryqk
 		public var vo:RyjbxxVo;
 		public var thisDataList:ArrayCollection;
 		public var pager:Pager;
+		public var view:Object;
 
 		public function RyjbxxModel()
 		{
@@ -203,12 +210,37 @@ package com.jtgh.yjpt.model.jyrxxgl.ryqk
 			}
 			Utils.callRemote("ryjbxxController","doView",function(r:ResultEvent):void{
 				var bc:BusinessContext = r.result as BusinessContext;
-				var updateView:RyjbxxAdd = new RyjbxxAdd();
-				updateView.model.vo = bc.result as RyjbxxVo;
-				updateView.model.zsList = bc.getAttribute("zss") as ArrayCollection;
-				Utils.popupWindow("人员基本信息修改",updateView as DisplayObject,thisView,doQuery,780,560);
+				view = new RyjbxxAdd();
+				view.model.vo = bc.result as RyjbxxVo;
+				view.model.zsList = bc.getAttribute("zss") as ArrayCollection;
+				var acc:ByteArray = bc.getAttribute("acc") as ByteArray;
+				if(null!=acc){
+					var img:BitmapData=new BitmapData(100,100);
+					var loader:Loader=new Loader;
+					loader.contentLoaderInfo.addEventListener(Event.COMPLETE, loadCompleterHandler);
+					loader.loadBytes(acc);
+				}
+				else{
+					view.tx.source=null;
+				}
+				Utils.popupWindow("人员基本信息修改",view as DisplayObject,thisView,doQuery,780,560);
 			},thisView.dataGrid.selectedItem.id);
 		}
+		
+		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);
+			}
+			view.tx.source=bitdata;
+		}
 
 		/**
 		 * 查看
@@ -222,14 +254,49 @@ package com.jtgh.yjpt.model.jyrxxgl.ryqk
 			}
 			Utils.callRemote("ryjbxxController","doView",function(r:ResultEvent):void{
 				var bc:BusinessContext = r.result as BusinessContext;
-				var view:RyjbxxView = new RyjbxxView();
+				view = new RyjbxxView();
 				view.enable = false;
 				view.model.vo = bc.result as RyjbxxVo;
 				view.model.zsList = bc.getAttribute("zss") as ArrayCollection;
+				var acc:ByteArray = bc.getAttribute("acc") as ByteArray;
+				if(null!=acc){
+					var img:BitmapData=new BitmapData(100,100);
+					var loader:Loader=new Loader;
+					loader.contentLoaderInfo.addEventListener(Event.COMPLETE, loadCompleterHandler);
+					loader.loadBytes(acc);
+				}
+				else{
+					view.tx.source=null;
+				}
+				var data:ByteArray = bc.getAttribute("qrcode") as ByteArray;
+				if(null!=data){
+					var img2:BitmapData=new BitmapData(100,100);
+					var loader2:Loader=new Loader;
+					loader2.contentLoaderInfo.addEventListener(Event.COMPLETE, loadCompleterHandler2);
+					loader2.loadBytes(data);
+				}
+				else{
+					view.qrcode.source=null;
+				}
 				Utils.popupWindow("人员基本信息查看",view as DisplayObject,thisView,null,0,0);
 			},thisView.dataGrid.selectedItem.id);
 		}
 		
+		private  function loadCompleterHandler2(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);
+			}
+			view.qrcode.source=bitdata;
+		}
+		
 		public function doCountHandler(e:Event):void{
 			var view:RyjbxxCount=new RyjbxxCount();
 			Utils.popupWindow("统计查询",view as DisplayObject,thisView,null,0,0);

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

@@ -246,7 +246,8 @@
 
 			protected function getYhzlType(event:IndexChangeEvent):void
 			{
-				yhzl.reload(yhdl.selectedVO);
+				if(null!=(yhdl.selectedVO as CodeVo))
+					yhzl.reload((yhdl.selectedVO as CodeVo).id);
 			}
 			protected function wzgFun():void
 			{

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/ryqk/RyjbxxAdd.mxml

@@ -135,9 +135,9 @@
 								   selectedVO="{model.vo.ssgq}" hasBlank="false" width="60%" enabled="{enable}"/>
 				</s:HGroup>
 			</s:VGroup>
-			<s:VGroup width="50%" horizontalAlign="left">
-				<s:Image id="tx"  width="96" height="96"/>
-				<s:Button id="browseFile" width="96" label="{resourceManager.getString('common','btn.uploadPhoto')}" enabled="{enable}"/>
+			<s:VGroup width="50%" horizontalAlign="center">
+				<s:Image id="tx"  width="100" height="100"/>
+				<s:Button id="browseFile" width="100" label="{resourceManager.getString('common','btn.uploadPhoto')}" enabled="{enable}"/>
 			</s:VGroup>
 		</s:HGroup>	
 		<s:HGroup width="100%" verticalAlign="middle">

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/ryqk/RyjbxxLayout.mxml

@@ -8,20 +8,14 @@
 				width="100%" height="100%" creationComplete="init(event)">
 	<fx:Script>
 		<![CDATA[
-			import com.anychart.context.AboutAnyChart;
-			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.util.Constants;
-			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.jyrxxgl.ryqk.RyjbxxModel;
-			import com.jtgh.yjpt.vo.gkgq.GqVo;
-			import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
 			import com.jtgh.yjpt.vo.jyrxxgl.RyjbxxVo;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
 			import mx.events.ListEvent;
-			import mx.rpc.events.ResultEvent;
 			
 			import spark.components.gridClasses.GridColumn;
 

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/ryqk/RyjbxxView.mxml

@@ -76,26 +76,39 @@
 					<mx:VBox width="100%" paddingBottom="5" paddingLeft="5"
 							 paddingRight="5" paddingTop="5" id="vv">
 						<s:HGroup width="100%" verticalAlign="middle">
-							<cus:QLabel width="18%"  text="姓名" />
-							<cus:QTextInput width="30%" text="@{model.vo.xm}" editable="{enable}"/>
-						</s:HGroup>
-						<s:HGroup width="100%" verticalAlign="middle">
-							<cus:QLabel width="18%"  text="证件类型"  notNull="true"/>
-							<cus:QComboBox id="zjlx" codeType="{Constants.GROUP_CODE_ZJLX}"
-										   comboxClass="CodeSelect" hasBlank="true"
-										   selectedVO="{model.vo.zjlx}" width="30%"
-										   enabled="{enable}"/>
-							<cus:QLabel width="18%"  text="证件号码"  />
-							<cus:QTextInput width="30%" id="sfzh" text="@{model.vo.sfzh}" editable="{enable}" />
-						</s:HGroup>
-						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
-							<cus:QLabel text="所在地" width="18%"/>
-							<cus:QComboBox width="30%" id="szd" codeType="{Constants.GROUP_CODE_SZD}"
-										   comboxClass="CodeSelect" hasBlank="true"
-										   selectedVO="{model.vo.szd}"
-										   enabled="{Global.deployMode==Constants.DEPLOY_MODE_0?enable:false}"/>
-							<cus:QLabel text="所在港区" width="18%"/>
-							<cus:QComboBox width="30%" id="szgq"  comboxClass="GqBySzdSelect" selectedVO="{model.vo.ssgq}" hasBlank="true" enabled="{enable}"/>
+							<s:VGroup width="50%">
+								<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+									<cus:QLabel width="36%"  text="姓名"  notNull="true"/>
+									<cus:QTextInput width="60%" id="xm" text="@{model.vo.xm}" editable="{enable}"/>
+								</s:HGroup>
+								<s:HGroup width="100%" verticalAlign="middle">
+									<cus:QLabel width="36%"  text="证件类型"  notNull="true"/>
+									<cus:QComboBox id="zjlx" codeType="{Constants.GROUP_CODE_ZJLX}"
+												   comboxClass="CodeSelect" hasBlank="true"
+												   selectedVO="{model.vo.zjlx}" width="60%"
+												   enabled="{enable}"/>
+								</s:HGroup>
+								<s:HGroup width="100%" verticalAlign="middle">
+									<cus:QLabel width="36%"  text="证件号码"  notNull="true"/>
+									<cus:QTextInput width="60%" id="sfzh" text="@{model.vo.sfzh}" editable="{enable}" />
+								</s:HGroup>
+								<s:HGroup width="100%" verticalAlign="middle">
+									<cus:QLabel text="所在地" width="36%" notNull="true"/>
+									<cus:QComboBox id="szd" comboxClass="SzdEditSelect" hasBlank="false"
+												   selectedVO="{model.vo.szd==null?Global.user.szd:model.vo.szd}" width="60%" parentId="{Global.szd.id}"/>					
+								</s:HGroup>
+								<s:HGroup width="100%" verticalAlign="middle">
+									<cus:QLabel text="所在港区" width="36%" notNull="true"/>
+									<cus:QComboBox id="szgq"  comboxClass="GqBySzdSelect" parentId="{model.vo.szd==null?Global.user.szd:model.vo.szd}"
+												   selectedVO="{model.vo.ssgq}" hasBlank="false" width="60%" enabled="{enable}"/>
+								</s:HGroup>
+							</s:VGroup>
+							<s:VGroup width="25%" horizontalAlign="center">
+								<s:Image id="tx"  width="100" height="100"/>
+							</s:VGroup>
+							<s:VGroup width="25%" horizontalAlign="center">
+								<s:Image id="qrcode"  width="100" height="100"/>
+							</s:VGroup>
 						</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle">
 							<cus:QLabel width="18%" text="{resourceManager.getString('common','gkjyr')}"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyrxxgl/RyjbxxVo.as

@@ -2,9 +2,12 @@ package com.jtgh.yjpt.vo.jyrxxgl
 {
 	import com.jtgh.yjpt.common.util.Constants;
 	import com.jtgh.yjpt.vo.BaseVo;
+	import com.jtgh.yjpt.vo.common.AccessoryVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
+	
+	import mx.formatters.DateFormatter;
 
 	[Bindable]
 	[RemoteClass(alias="com.jtgh.yjpt.entity.jyrxxgl.RyjbxxEntity")]
@@ -55,6 +58,7 @@ package com.jtgh.yjpt.vo.jyrxxgl
 		public var  zjlx:CodeVo;//证件类型
 		public var  bz:String;//备注
 		public var firstZs:RyjbxxZSVo;
+		public var zp:AccessoryVo;
 		/**证书名称**/
 		public function get zsmcName():String{
 			return firstZs==null?"":firstZs.zsmc;
@@ -66,6 +70,14 @@ package com.jtgh.yjpt.vo.jyrxxgl
 		public function get yxqName():Date{
 			return  firstZs==null?null:firstZs.yxq;
 		}
+		public function get yxqString():String{
+			var df:DateFormatter = new DateFormatter;
+			df.formatString="YYYY-MM-DD";
+			if(firstZs!=null){
+				df.format(firstZs.yxq);
+			}
+			return  "";
+		}
 		public function get zszlName():String{
 			return firstZs==null?"":firstZs.zszl;
 		}