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

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

@@ -58,7 +58,6 @@ btn.wharf=\u5371\u8d27\u4f01\u4e1a\u4fe1\u606f\u7edf\u8ba1
 btn.storage=\u5b58\u50a8\u8bbe\u65bd\u4fe1\u606f\u7edf\u8ba1
 btn.administrative=\u6cd5\u4eba\u884c\u653f\u8bb8\u53ef
 btn.message=\u6d88\u606f\u7ba1\u7406
-btn.status=\u50a8\u7f50\u4fe1\u606f\u76d1\u63a7
 
 col.code=\u7f16\u7801
 col.id=ID
@@ -84,6 +83,7 @@ form.no=\u5426
 form.yes=\u662f
 login.title=\u6c5f\u82cf\u7701\u6e2f\u53e3\u5b89\u5168\u76d1\u7ba1\u4e0e\u5e94\u6025\u7ba1\u7406\u7cfb\u7edf
 loginError=\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef\uff0c\u767b\u5f55\u5931\u8d25\uff01
+loginPasswordError=\u8be5\u7528\u6237\u7981\u6b62\u767b\u9646\uff0c\u767b\u9646\u5931\u8d25\uff01
 login.btnLogin=\u767b\u5f55
 login.btnRegist=\u6ce8\u518c
 login.download=\u7528\u6237\u64cd\u4f5c\u624b\u518c\u4e0b\u8f7d
@@ -112,6 +112,7 @@ changePwd.inconsistentNewPwd=\u4e24\u6b21\u8f93\u5165\u65b0\u5bc6\u7801\u4e0d\u4
 changePwd.errStylepwd=\u5bc6\u7801\u592a\u8fc7\u7b80\u5355\uff0c\u5fc5\u987b\u75318\u4f4d\u4ee5\u4e0a\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff08-`=\[];',./~!@#$%^&*()_+|{}:<>"\uff09\u7ec4\u5408\uff01
 changePwd.stylepwd=\u75318\u4f4d\u4ee5\u4e0a\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff08-`=\[];',./~!@#$%^&*()_+|{}:<>"\uff09\u7ec4\u5408
 
+
 main.exit=\u9000\u51fa
 main.gkjyr=\u6e2f\u53e3\u7ecf\u8425\u4eba
 main.map.gzt=\u5de5\u4f5c\u53f0
@@ -190,8 +191,6 @@ save.fail=\u4fdd\u5b58\u5931\u8d25\uff01
 save.success=\u4fdd\u5b58\u6210\u529f\uff01
 del.fail=\u5220\u9664\u5931\u8d25\uff01
 del.success=\u5220\u9664\u6210\u529f\uff01
-submit.fail=\u63d0\u4ea4\u5931\u8d25\uff01
-submit.success=\u63d0\u4ea4\u6210\u529f\uff01
 
 saveConfirm=\u786e\u8ba4\u4fdd\u5b58\uff1f
 saveConfirmTitle=\u4fdd\u5b58\u6761\u76ee
@@ -206,6 +205,7 @@ logoutConfirmTitle=\u767b\u51fa\u7cfb\u7edf
 otherConfirm=\u786e\u8ba4\u64cd\u4f5c\uff1f
 otherConfirmTitle=\u786e\u8ba4\u4fe1\u606f
 
+password.yxq= \u60a8\u5f53\u524d\u5bc6\u7801\u4e0d\u6ee1\u8db3\u590d\u6742\u5ea6\u8981\u6c42\uff088\u4f4d\u53ca\u4ee5\u4e0a\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u5f53\u524d\u5bc6\u7801\u8fd8\u53ef\u4ee5\u7ee7\u7eed\u4f7f\u7528\u81f3{0}\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
 session.timeout=\u4f1a\u8bdd\u8d85\u65f6\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\uff01
 systemError=\u7cfb\u7edf\u9519\u8bef
 systemTip=\u7cfb\u7edf\u63d0\u793a
@@ -224,22 +224,4 @@ yjyl.hint=*\u9644\u4ef6\u4e3a\uff1a1. \u6f14\u7ec3\u65b9\u6848\uff0c2. \u6f14\u7
 
 btn.backtotb=\u9000\u81f3\u586b\u62a5\u4eba
 btn.backtoqy=\u9000\u81f3\u4f01\u4e1a
-del.no=\u4e13\u9879\u68c0\u67e5\u5df2\u5173\u8054\uff0c\u4e0d\u80fd\u5220\u9664
-
-whzyfzsq-city=\u5371\u9669\u8d27\u7269\u4f5c\u4e1a\u9644\u8bc1\u7533\u8bf7
-aqyssc-city=\u5b89\u5168\u8bbe\u65bd\u4e13\u9879\u9a8c\u6536\u5ba1\u67e5
-jyrUser=\u7528\u6237\u5ba1\u6279
-zdsgyhpc-city=\u91cd\u5927\u4e8b\u6545\u7684\u9690\u60a3\u6392\u67e5\u548c\u6cbb\u7406\u60c5\u51b5\u5907\u6848
-yjyaba-city=\u5e94\u6025\u9884\u6848\u5907\u6848
-jdhxpyjzdwxy-city=\u5267\u6bd2\u5316\u5b66\u54c1\u53ca\u91cd\u5927\u5371\u9669\u6e90\u5907\u6848
-aqpjbgjzgfa-city=\u5b89\u5168\u8bc4\u4ef7\u62a5\u544a\u53ca\u6574\u6539\u65b9\u6848\u843d\u5b9e\u5907\u6848
-zysbsp-city=\u5371\u9669\u8d27\u7269\u7684\u4f5c\u4e1a\u7533\u8bf7 
-qxzysbsp-city=\u5371\u9669\u8d27\u7269\u7684\u53d6\u6d88\u4f5c\u4e1a 
-bgzysbsp-city=\u5371\u9669\u8d27\u7269\u7684\u4f5c\u4e1a\u53d8\u66f4 
-whzyfzns-city=\u9644\u8bc1\u4f5c\u4e1a\u5e74\u5ba1
-whzyfzhz-city=\u9644\u8bc1\u4f5c\u4e1a\u53d8\u66f4
-jsxmaqtjsc-city=\u5efa\u8bbe\u9879\u76ee\u5b89\u5168\u6761\u4ef6\u5ba1\u67e5
-dc-city=\u76d1\u7763\u68c0\u67e5
-aqpjjgba-city=\u5b89\u5168\u8bc4\u4ef7\u673a\u6784\u5907\u6848
-aqyssc-province=\u5b89\u5168\u8bbe\u65bd\u4e13\u9879\u9a8c\u6536\u5ba1\u67e5
-jsxmaqtjsc-province=\u7701\u7ea7\u5efa\u8bbe\u9879\u76ee\u5b89\u5168\u6761\u4ef6\u5ba1\u67e5
+del.no=\u4e13\u9879\u68c0\u67e5\u5df2\u5173\u8054\uff0c\u4e0d\u80fd\u5220\u9664

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/ui/DateTime.mxml

@@ -349,12 +349,14 @@
 			private function minuteChangeHandler(evt:NumericStepperEvent):void{
 				nowTime.setHours(nowTime.hours,evt.value,nowTime.seconds,nowTime.milliseconds);
 				newTime.setFullYear(nowTime.fullYear,nowTime.month,nowTime.date);
+				newTime.setHours(nowTime.hours,nowTime.minutes,nowTime.seconds,nowTime.milliseconds);
 				returnTime.text = dateToStr(newTime);
 			}
 			
 			private function hourChangeHandler(evt:NumericStepperEvent):void{
 				nowTime.setHours(evt.value,nowTime.minutes,nowTime.seconds,nowTime.milliseconds);
 				newTime.setFullYear(nowTime.fullYear,nowTime.month,nowTime.date);
+				newTime.setHours(nowTime.hours,nowTime.minutes,nowTime.seconds,nowTime.milliseconds);
 				returnTime.text = dateToStr(newTime);
 			}
 			
@@ -379,6 +381,7 @@
 						newTime=new Date;
 					} 
 					nowTime.setFullYear(newTime.fullYear,newTime.month,newTime.date);
+					nowTime.setHours(newTime.hours,newTime.minutes,newTime.seconds,newTime.milliseconds);
 					pop = PopUpManager.createPopUp(this, mx.containers.TitleWindow, false);
 					this.addEventListener(Event.REMOVED_FROM_STAGE,function(e:Event):void{
 						PopUpManager.removePopUp(pop as IFlexDisplayObject);

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

@@ -240,6 +240,9 @@ package com.jtgh.yjpt.common.util
 		public static var GROUP_CODE_BWYT:String="BWYT";
 		/**各地市港口局*/
 		public static var GROUP_CODE_SZDGKJ:String="SZDGKJ";
+		/**作业场所类型 */
+		public static var	GROUP_CODE_ZYCS:String = "ZYCS";
+
 
 		/**权力阳光*/
 		public static var GROUP_CODE_SUPERVISE:String="SUPERVISE";

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

@@ -8,8 +8,8 @@ package com.jtgh.yjpt.model
 	import com.jtgh.yjpt.select.MenuTypeSelect;
 	import com.jtgh.yjpt.select.YesNoSelect;
 	import com.jtgh.yjpt.view.Workspace;
-	import com.jtgh.yjpt.view.core.ChangePwd;
 	import com.jtgh.yjpt.view.core.LoginPanel;
+	import com.jtgh.yjpt.view.core.PassWordYxq;
 	import com.jtgh.yjpt.vo.access.UserVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.sys.ButtonVo;
@@ -18,25 +18,27 @@ package com.jtgh.yjpt.model
 	import flash.display.DisplayObject;
 	import flash.events.Event;
 	import flash.utils.Dictionary;
+	import flash.utils.flash_proxy;
 	import flash.utils.getDefinitionByName;
 	
-	import mx.controls.Alert;
+	import mx.core.FlexGlobals;
 	import mx.core.UIComponent;
 	import mx.core.mx_internal;
-	import mx.events.CloseEvent;
 	import mx.events.FlexEvent;
+	import mx.formatters.DateFormatter;
+	import mx.formatters.Formatter;
 	import mx.resources.ResourceManager;
 	
 	import spark.components.Group;
-
+	
 	use namespace mx_internal;
-
+	
 	public class SystemModel
 	{
 		//instance
 		private static var thisModel:SystemModel;
 		private static var listEntryMap:Dictionary;
-
+		
 		public static function init():void
 		{
 			if(!thisModel)
@@ -49,7 +51,7 @@ package com.jtgh.yjpt.model
 		{
 			init();
 			return thisModel;
-
+			
 		}
 		/**************************
 		 * 配置相关
@@ -62,11 +64,11 @@ package com.jtgh.yjpt.model
 			}
 			thisModel.mainLayout.viewStack.selectedIndex  = (thisModel.mainLayout.viewStack.selectedIndex + 1) % 2;
 			// 同步选中菜单
-//			if(Global.selectedFirstMenuVo){
-//				if(thisModel.mainLayout.mapView){
-//					thisModel.mainLayout.mapView.selectFirstMenuItem();
-//				}
-//			}
+			//			if(Global.selectedFirstMenuVo){
+			//				if(thisModel.mainLayout.mapView){
+			//					thisModel.mainLayout.mapView.selectFirstMenuItem();
+			//				}
+			//			}
 			//不再同步。。取消高亮
 			if(thisModel.mainLayout.mapView.selectedFirstMenuBtn)
 				thisModel.mainLayout.mapView.selectedFirstMenuBtn.selected=false;
@@ -75,13 +77,13 @@ package com.jtgh.yjpt.model
 			thisModel.mainLayout.mapView.secondMenu.removeAllElements();
 			thisModel.mainLayout.mapView.thridMenuBar.visible=false;
 		}
-
+		
 		private var parameterXML:XML = null;
 		private function get configLoadOK():Boolean
 		{
 			return moduleGroupXML&&parameterXML;
 		}
-
+		
 		public static function getConfigureParameter(modId:String):XML
 		{
 			var paramXML:XML = thisModel.parameterXML;
@@ -95,16 +97,16 @@ package com.jtgh.yjpt.model
 			}
 			return null;
 		}
-
-
+		
+		
 		//----------------------------------------------------------------------
-
+		
 		//--------------------------------------------------------------
 		// 模块组
 		//--------------------------------------------------------------
 		private var moduleGroupMap:Object = new Object;
 		private var moduleGroupXML:XML = null;
-
+		
 		public static function getModuleGroupURL(modId:String):String
 		{
 			var swfUrl:String="";
@@ -125,11 +127,11 @@ package com.jtgh.yjpt.model
 			return swfUrl;
 		}
 		//----------------------------------------------------------------------
-
+		
 		//--设置
 		private var settingXML:XML = null;
-
-
+		
+		
 		/**************************
 		 * 界面相关对象以及方法
 		 */ 
@@ -147,7 +149,7 @@ package com.jtgh.yjpt.model
 		{
 			thisModel.mainLayout = ml;
 		}
-
+		
 		/*********
 		 * 登陆成功
 		 */ 
@@ -164,7 +166,7 @@ package com.jtgh.yjpt.model
 				Global.tbUserId = bc.getAttribute("tbUserId") as Number;
 				Global.birtUrl = bc.getAttribute("birtUrl") as String;
 				Global.initMenu = bc.getAttribute("initMenu") as MenuVo;
-//				Global.MAP_URL=bc.getAttribute("mapUrl") as String;
+				//				Global.MAP_URL=bc.getAttribute("mapUrl") as String;
 				Global.OPEN_MAP=bc.getAttribute("openMap") as String;
 				Global.upload_file_size=bc.getAttribute("uploadFileSize") as Number;
 				Global.upload_image_size=bc.getAttribute("uploadImageSize") as Number;
@@ -181,13 +183,19 @@ package com.jtgh.yjpt.model
 			thisModel.mainLayout.percentWidth=100;
 			if(Global.user.sfjyr==YesNoSelect.YES )
 			{
-//				var initMenu:MenuVo = new MenuVo;
+				//				var initMenu:MenuVo = new MenuVo;
 				Global.selectedFirstMenuVo=Global.initMenu.parent;
 				Global.selectedSecondMenuVo=Global.initMenu;
 				menuClick(Global.initMenu);
 			}
+			if(Global.user.pdwx){
+				thisModel.mainLayout.addEventListener(FlexEvent.CREATION_COMPLETE,function(e:Event):void{		
+					var yxq:PassWordYxq= new PassWordYxq;
+					Utils.popupWindow(ResourceManager.getInstance().getString("common","tip"),yxq,FlexGlobals.topLevelApplication as DisplayObject,null,300,150);
+				});	
+			}				
 		}
-
+		
 		/*********
 		 * 登出
 		 */ 
@@ -205,7 +213,7 @@ package com.jtgh.yjpt.model
 			loginUI.percentHeight = 100;
 			thisModel.mainPane.addElement(loginUI);				
 		}
-
+		
 		/*********
 		 * 切换用户
 		 */ 
@@ -215,7 +223,7 @@ package com.jtgh.yjpt.model
 			Global.cleanData();
 			doLoginSuccess(bc);
 		}
-
+		
 		/*********
 		 * 点击菜单，确定modId，创建对应的视图
 		 */ 
@@ -224,8 +232,8 @@ package com.jtgh.yjpt.model
 			Global.menuFlag=true;
 			addTab(thisModel.mainLayout,menuVo,args);
 		}
-
-
+		
+		
 		/**************
 		 * 打开一个新窗口，加载模块的列表或者编辑界面
 		 * 触发条件可能是菜单点击、程序新开窗口
@@ -243,7 +251,7 @@ package com.jtgh.yjpt.model
 						// 普通应用，先初始化列表页面
 						workspace.viewStack.selectedIndex=1;
 						var cls:Class = getDefinitionByName(menuVo.path) as Class;
-
+						
 						var ui:Object = new cls;
 						// 初始化参数
 						if(ui.hasOwnProperty("initParam"))
@@ -287,7 +295,7 @@ package com.jtgh.yjpt.model
 				}
 			});
 		}
-
+		
 	}
 }
 

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzndjy/GkwxhwzyfzxxModel.as

@@ -2,10 +2,11 @@ package com.jtgh.yjpt.model.zyfzndjy
 {
 	
 	import com.jtgh.yjpt.common.BusinessContext;
+	import com.jtgh.yjpt.common.component.ui.DataGridColumn;
 	import com.jtgh.yjpt.common.component.ui.Pager;
 	import com.jtgh.yjpt.common.util.Utils;
-	import com.jtgh.yjpt.model.SystemModel;
 	import com.jtgh.yjpt.model.BaseModel;
+	import com.jtgh.yjpt.model.SystemModel;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
@@ -13,13 +14,20 @@ package com.jtgh.yjpt.model.zyfzndjy
 	
 	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 mx.binding.utils.BindingUtils;
 	import mx.collections.ArrayCollection;
-	import mx.events.ResourceEvent;
+	import mx.collections.ArrayList;
 	import mx.events.ListEvent;
+	import mx.events.ResourceEvent;
+	import mx.formatters.DateFormatter;
+	import mx.managers.CursorManager;
 	import mx.rpc.events.ResultEvent;
-
+	
 	[Bindable]
 	public class GkwxhwzyfzxxModel extends BaseModel
 	{
@@ -52,7 +60,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 				thisView.searchGroup.includeInLayout=true;
 			}
 		}
-	
+		
 		/**
 		 * 查询
 		 */
@@ -67,11 +75,17 @@ package com.jtgh.yjpt.model.zyfzndjy
 			thisView.parentView.fzlayout.visible=true;		
 			thisView.parentView.thisModel.doQuery(null);
 		}
+		
+		/**
+		 * 查询附证信息
+		 */
 		public function pageQuery(pager:SinglePageRequestVo):void
 		{
 			var jyr:JyrVo ;
 			var szd:CodeVo;
 			var gq:GqVo;
+			var szqy:CodeVo;
+			var zycs:CodeVo;
 			if(null != thisView.query_szd.selectedVO&&"NaN"!=(thisView.query_szd.selectedVO as CodeVo).id.toString()){
 				szd = thisView.query_szd.selectedVO as CodeVo;
 			}
@@ -81,9 +95,84 @@ package com.jtgh.yjpt.model.zyfzndjy
 			if(null != thisView.query_gq.selectedVO ){
 				gq = thisView.query_gq.selectedVO as GqVo;
 			}
-		 Utils.callRemote("gkwxhwzyfzblhhzcontroller","listFzxx",resultCallback, 
-			 pager, jyr,szd,gq,thisView.query_yxrq_1.dateTime,thisView.query_yxrq_2.dateTime,thisView.query_wxpm.text);
+			if(null != thisView.query_szqy.selectedVO){
+				szqy=thisView.query_szqy.selectedVO ;
+			}
+			if(null!=thisView.query_zycs.selectedVO){
+				zycs= thisView.query_zycs.selectedVO;
+			}
+			Utils.callRemote("gkwxhwzyfzblhhzcontroller","listFzxx",resultCallback, 
+				pager, jyr,szd,gq,thisView.query_yxrq_1.dateTime,thisView.query_yxrq_2.dateTime,thisView.query_wxpm.text,szqy,zycs);
 		}	
+		
+		/**
+		 * 
+		 *导出附证信息 
+		 */
+		public function printFzxx(e:MouseEvent):void
+		{
+			var jyr:JyrVo ;
+			var szd:CodeVo;
+			var gq:GqVo;
+			var szqy:CodeVo;
+			var zycs:CodeVo;
+			if(null != thisView.query_szd.selectedVO&&"NaN"!=(thisView.query_szd.selectedVO as CodeVo).id.toString()){
+				szd = thisView.query_szd.selectedVO as CodeVo;
+			}
+			if(null!=thisView.query_jyr.selectedVO){
+				jyr = thisView.query_jyr.selectedVO;
+			}
+			if(null != thisView.query_gq.selectedVO ){
+				gq = thisView.query_gq.selectedVO as GqVo;
+			}
+			if(null != thisView.query_szqy.selectedVO){
+				szqy=thisView.query_szqy.selectedVO  as CodeVo;
+			}
+			if(null!=thisView.query_zycs.selectedVO){
+				zycs= thisView.query_zycs.selectedVO  as CodeVo;
+			}
+			
+			var title:String="作业附证信息";
+			var columns:ArrayList=thisView.dataGrid.columns as ArrayList;
+			var headers:Array=new Array;
+			for each(var column:DataGridColumn in columns.source){
+				if(column.visible&&""!=column.headerText&&resourceManager.getString('common','btn.cz')!=column.headerText)
+					headers.push(column.headerText);				
+			}
+			var fomaterDate:DateFormatter=new DateFormatter();
+			fomaterDate.formatString="YYYY-MM-DD";
+			var param:Vector.<String>=new Vector.<String>();
+			param.push(
+				null==szd?"":szd.id+"",
+				null==gq?"":gq.id+"",
+				null==jyr?"":jyr.id+"",
+				null==thisView.query_yxrq_1.dateTime?"":fomaterDate.format(thisView.query_yxrq_1.dateTime),
+				null==thisView.query_yxrq_2.dateTime?"":fomaterDate.format(thisView.query_yxrq_2.dateTime),
+				thisView.query_wxpm.text,
+				null==szqy?"":szqy.id+"",
+				null==zycs?"":zycs.id+""			
+			);
+			var params:URLVariables = new URLVariables();
+			params.title=title;
+			params.headers=headers;
+			params.controller="gkwxhwzyfzblhhzController";
+			params.method="printFzxx";
+			params.param=param;
+			var url:String = Utils.getBaseUrl()+"exportExcel.do";
+			var request:URLRequest = new URLRequest(url);
+			request.data = params;
+			request.method = URLRequestMethod.POST;
+			var file:FileReference = new FileReference();
+			file.addEventListener(Event.COMPLETE, downloadCompleteHandler);
+			file.addEventListener(Event.CANCEL, downloadCompleteHandler);
+			file.download(request, title+".xls");
+			CursorManager.setBusyCursor();
+		}
+		
+		private function downloadCompleteHandler(event:Event):void {
+			CursorManager.removeBusyCursor();
+		}
+		
 		public function resultCallback(r:ResultEvent):void
 		{
 			var doAction:String = r.token.message["operation"];
@@ -96,12 +185,4 @@ package com.jtgh.yjpt.model.zyfzndjy
 			}
 		}
 	}
-}
-
-
-
-
-
-
-
-
+}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/core/PassWordYxq.mxml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:mx="library://ns.adobe.com/flex/mx" 
+		 creationComplete="creationCompleteHandler(event)"
+		 width="100%" height="100%">
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.common.Global;
+			import com.jtgh.yjpt.common.util.Utils;
+			
+			import mx.events.CloseEvent;
+			import mx.events.FlexEvent;
+			import mx.resources.ResourceManager;
+			[Bindable]
+			public var thisView:PassWordYxq;
+			protected function creationCompleteHandler(event:FlexEvent):void
+			{
+			}
+			
+			protected function doChange(event:MouseEvent):void{
+				var changePwdView:ChangePwd = new ChangePwd;
+				changePwdView.changeByAdmin = false;
+				changePwdView.userCode = Global.user.code;
+				Utils.popupWindow(ResourceManager.getInstance().getString("common","changePwd.title"),changePwdView, this as DisplayObject ,function():void{			
+					doClose(null);
+				},300,220);			
+			}
+			
+			protected function doClose(event:MouseEvent):void
+			{
+				this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE));		
+			}
+			
+		]]>
+	</fx:Script>
+	<s:VGroup width="100%" height="100%" horizontalAlign="center" verticalAlign="middle" top="10" bottom="10" >
+		<s:Label id="tx" text="{'     '+resourceManager.getString('common','password.yxq')}"  width="100%" />
+		<s:Group height="100%"/>
+		<s:HGroup width="100%" height="40" horizontalAlign="center">
+			<s:Button id="saveBtn" label="修改" click="doChange(event)" enabled="true" skinClass="skins.cus.ButtonSkin"/>
+			<s:Button id="closeBtn" label="{resourceManager.getString('common','btn.close')}" click="doClose(event)"  skinClass="skins.cus.ButtonSkin"/>
+		</s:HGroup>
+	</s:VGroup>
+</s:Group>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzxxLayout.mxml

@@ -10,25 +10,12 @@
 	</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.Constants;
-			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.zyfzndjy.GkwxhwzyfzblhhzModel;
 			import com.jtgh.yjpt.model.zyfzndjy.GkwxhwzyfzxxModel;
-			import com.jtgh.yjpt.vo.common.CodeVo;
-			import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
-			import com.jtgh.yjpt.vo.gkgq.GqVo;
-			import com.jtgh.yjpt.vo.jyr.JyrVo;
-			import com.jtgh.yjpt.vo.sys.ButtonVo;
-			import com.jtgh.yjpt.vo.sys.MenuVo;
-			import com.jtgh.yjpt.vo.zyfzndjy.GkwxhwzyfzblhhzVo;
 			
-			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
-			import mx.rpc.events.ResultEvent;
-			
+			import com.jtgh.yjpt.common.util.Constants;
 			import spark.components.gridClasses.GridColumn;
 			[Bindable]
 			public var model:GkwxhwzyfzxxModel=new GkwxhwzyfzxxModel();
@@ -48,16 +35,17 @@
 			{
 				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();
 			}
-
+			
 		]]>
 	</fx:Script>
 	<s:VGroup width="100%">
 		<s:HGroup width="100%" height="40" paddingLeft="10" gap="10"  horizontalAlign="left" verticalAlign="middle">
 			<button:IconButton id="query" type="query" click="model.switchSearchBox(event)" toolTip="{resourceManager.getString('common','btn.query')}"/>
+			<button:IconButton id="print" type="print" click="model.printFzxx(event)" toolTip="{resourceManager.getString('common','btn.print')}"/>
 			<button:IconButton id="back" type="back" click="model.toBack(event)"  toolTip="{resourceManager.getString('common','btn.back')}"/>
 		</s:HGroup>
 		<s:VGroup id="searchGroup" width="100%"  visible="false" includeInLayout="false">
-			 <s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','szd')}" width="130" textAlign="right"/>
 					<cus:QComboBox id="query_szd" width="180" comboxClass="SzdSelect" selectedVO="{Global.szd}" parentId="{Global.szd.id}"/>
@@ -80,11 +68,23 @@
 					<cus:QLabel text="有效日期止" width="130"/>
 					<ui:DateTime id="query_yxrq_2" width="180"/>
 				</s:HGroup>
-				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="30%">
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
 					<cus:QLabel text="危险物品名称" width="130"/>
 					<cus:QTextInput id="query_wxpm" width="180"/>
 				</s:HGroup>
-				<s:HGroup  verticalAlign="middle" textAlign="right">
+			</s:HGroup>
+			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="所在区域" width="130"/>
+					<cus:QComboBox id="query_szqy" width="180" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SYLX}" 
+								   hasBlank="true"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="作业场所" width="130"/>
+					<cus:QComboBox id="query_zycs" width="180" comboxClass="CodeSelect"  codeType="{Constants.GROUP_CODE_ZYCS}"  hasBlank="true"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel width="130"/>
 					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="model.doQuery(event)"/>
 				</s:HGroup>
 			</s:HGroup>
@@ -94,7 +94,7 @@
 				<ui:columns>
 					<s:ArrayList>
 						<ui:DataGridColumn  labelFunction="labelFun" 
-										   headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>
+											headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>
 						<ui:DataGridColumn dataField="fzblbhStr"
 										   headerText="{resourceManager.getString('Gkwxhwzyfzblhhz','fzblbh')}"/>
 						<ui:DataGridColumn dataField="qymcName"

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

@@ -18,10 +18,9 @@
 			import com.jtgh.yjpt.model.zysqbp.ShbpEditModel;
 			import com.jtgh.yjpt.model.zysqbp.ShbpModel;
 			import com.jtgh.yjpt.select.MaoSelect;
+			import com.jtgh.yjpt.select.YesNoSelect;
 			import com.jtgh.yjpt.vo.common.CodeVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
-			import com.jtgh.yjpt.select.YesNoSelect;
-			import flash.external.ExternalInterface;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.CloseEvent;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/access/UserVo.as

@@ -5,7 +5,9 @@ package com.jtgh.yjpt.vo.access
 	import com.jtgh.yjpt.vo.aqpjjgxx.AqpjjgxxVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
-
+	
+	import mx.formatters.DateFormatter;
+	
 	[Bindable]
 	[RemoteClass(alias="com.jtgh.yjpt.entity.auth.UserEntity")]
 	
@@ -20,7 +22,7 @@ package com.jtgh.yjpt.vo.access
 		public var name:String;//姓名
 		public var code:String;// 登录账号
 		public var password:String;// 登录密码
-//		public var jyrdryxx:RyjbxxVo;//经营人人员基本信息
+		//		public var jyrdryxx:RyjbxxVo;//经营人人员基本信息
 		/** 所在地市ID */
 		public var szd:CodeVo;
 		/** 所在地市名称 */
@@ -59,12 +61,18 @@ package com.jtgh.yjpt.vo.access
 		public var  jsdw:JsfxxwhVo;
 		/**是否船代*/
 		public var sfcd:String=YesNoSelect.NO;
-
+		/**密码是否有效*/
+		public var pdsfyx:String=YesNoSelect.YES;
+		
+		public function get pdwx():Boolean{
+			return pdsfyx== YesNoSelect.NO;
+		}
+		
 		public function get yxdl():Boolean
 		{
 			return sfyxdl== YesNoSelect.YES;
 		}
-
+		
 		public function set yxdl(value:Boolean):void
 		{
 			if(value)
@@ -75,12 +83,12 @@ package com.jtgh.yjpt.vo.access
 				sfyxdl = YesNoSelect.NO;
 			}
 		}
-
+		
 		public function get aqfzr():Boolean
 		{
 			return sfaqfzr == YesNoSelect.YES;
 		}
-
+		
 		public function set aqfzr(value:Boolean):void
 		{
 			if(value)
@@ -200,6 +208,7 @@ package com.jtgh.yjpt.vo.access
 			{
 				sfcd = YesNoSelect.NO;
 			}
-		}
+		}		
+		
 	}
 }