所在地显示异常

git-svn-id: https://192.168.57.71/svn/hbghj@25 201dd7a2-ec1b-f84b-8b06-88221118ff88

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

@@ -98,6 +98,7 @@ jcsj.empty=\u7533\u62a5\u65e5\u671f\u4e0d\u80fd\u4e3a\u7a7a\uff01
 mqzt.empty=\u8bf7\u9009\u62e9\u6574\u6539\u72b6\u6001\uff01
 zcsj.empty=\u81ea\u67e5\u65e5\u671f\u4e0d\u80fd\u4e3a\u7a7a\uff01
 dcsj.empty=\u7763\u67e5\u65e5\u671f\u4e0d\u80fd\u4e3a\u7a7a\uff01
+jcwcsj.empty=\u6574\u6539\u671f\u9650\u4e0d\u80fd\u4e3a\u7a7a\uff01
 
 jclx=\u68c0\u67e5\u7c7b\u578b
 jcyj=\u68c0\u67e5\u4f9d\u636e

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

@@ -1089,6 +1089,7 @@ qyaqdj.d=D
 #\u9690\u60a3\u7c7b\u522b
 YHDL.JCGL=\u57fa\u7840\u7ba1\u7406
 YHDL.XCGL=\u73b0\u573a\u7ba1\u7406
+YHDL.QT=\u5176\u4ed6
 
 
 YHZL.ZZZZ=\u8d44\u8d28\u8bc1\u7167
@@ -1117,6 +1118,8 @@ YHZL.FZDLXT=\u8f85\u52a9\u52a8\u529b\u7cfb\u7edf
 YHZL.XGFXCGL=\u76f8\u5173\u65b9\u73b0\u573a\u7ba1\u7406
 YHZL.QTXCGL=\u5176\u4ed6\u73b0\u573a\u7ba1\u7406
 
+YHZL.QT=\u5176\u4ed6
+
 
 ##\u7ecf\u8425\u4eba\u6240\u5c5e\u884c\u4e1a\u5927\u7c7b\u548c\u4e2d\u7c7b
 SSHYDL1=\u519c\u3001\u6797\u3001\u7267\u3001\u6e14\u4e1a\uff08A\uff09

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/bagl/aqpjjgba/AqpjjgbaModel.as

@@ -350,7 +350,7 @@ package com.jtgh.yjpt.model.bagl.aqpjjgba
 		 */
 		public function doDateSave(event:MouseEvent):void
 		{
-			if(!editView.validParams()){
+			if(!editView.validParams()||!editView.submitVaildParams()){
 				return;
 			}
 			editView.vo.szd=editView.szd.selectedVO as CodeVo;

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

@@ -340,7 +340,7 @@ package com.jtgh.yjpt.model.jyr
 			}
 			if(vo.bgdz == null||vo.bgdz.length==0)
 			{
-				Utils.showInfoMessage("jyr.bgdz.empty",null,"jlrxxgl");9
+				Utils.showInfoMessage("jyr.bgdz.empty",null,"jlrxxgl");
 				return false;
 			}
 			if(vo.xzqh == null)

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

@@ -374,7 +374,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 				return;
 			}
 			editView = new GkwxhwzyfzblhhzEdit();
-			editView.mode=Constants.mode_edit;
+			editView.mode=Constants.mode_add;
 			editView.flag =true;
 			editView.layoutModel=this;
 			editView.functionId = Utils.getFunctionId(thisView);

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

@@ -963,7 +963,7 @@
 				<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="135" notNull="true"/>
 				<cus:QComboBox id="yhjb" selectedVO="{dcModel.dcVo.yhjb}" width="200" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" enabled="false"/>
 			</s:HGroup>
-			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="120"/>
+			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="120" notNull="true"/>
 			<ui:DateTime id="jhwcsj" dateTime="{dcModel.dcVo.jhwcsj}" width="200" editable="false" enabled="false"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">

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

@@ -245,7 +245,8 @@
 
 			protected function getYhzlType(event:IndexChangeEvent):void
 			{
-				yhzl.reload((yhdl.selectedVO as CodeVo).id);
+				if(null!=(yhdl.selectedVO as CodeVo))
+					yhzl.reload((yhdl.selectedVO as CodeVo).id);
 			}
 			protected function wzgFun():void
 			{
@@ -341,13 +342,17 @@
 					return false;
 				}
 				if(null==dcModel.dcVo.cjdcry||""==StringUtil.trim(dcModel.dcVo.cjdcry)){
-					Utils.showInfoMessage("jdjcnr.empty",null,"check");
+					Utils.showInfoMessage("cjdcry.empty",null,"check");
 					return false;
 				}
 				if(null==yhjb.selectedVO){
 					Utils.showInfoMessage("yhjb.empty",null,"check");
 					return false;
 				}
+				if(null==jhwcsj.dateTime){
+					Utils.showInfoMessage("jcwcsj.empty",null,"check");
+					return false;
+				}
 				if(null==dcModel.dcVo.jdjcnr||""==StringUtil.trim(dcModel.dcVo.jdjcnr)){
 					Utils.showInfoMessage("jdjcnr.empty",null,"check");
 					return false;
@@ -739,7 +744,7 @@
 				<cus:QLabel text="{resourceManager.getString('check','yhjb')}" textAlign="right" width="135" notNull="true"/>
 				<cus:QComboBox id="yhjb" selectedVO="{dcModel.dcVo.yhjb}" width="200" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_YHJB}" hasBlank="true" enabled="{!isJyr}"/>
 			</s:HGroup>
-			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="120"/>
+			<cus:QLabel text="{resourceManager.getString('check','jhwcsj')}" textAlign="right" width="120" notNull="true"/>
 			<ui:DateTime id="jhwcsj" dateTime="{dcModel.dcVo.jhwcsj}" width="200" />
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">

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

@@ -94,27 +94,20 @@
 				help.addEventListener(MouseEvent.MOUSE_OVER, onHelpMouseOver);
 				help.addEventListener(MouseEvent.MOUSE_OUT, onHelpMouseOut);
 				swMenuBtn.addEventListener(MouseEvent.MOUSE_OVER, onSwMenuBtnMouseOver);
-				swMenuBtn.addEventListener(MouseEvent.MOUSE_OUT, onSwMenuBtnMouseOut);
-				
-				if(Constants.SZD_ID_PROVINCE == Global.szd.id){
-					// 省级部署
-					var customMap:CustomMap = new CustomMap();
-					customMap.percentHeight=100;
-					customMap.percentWidth=100;
-					mapView.addElement(customMap);
-//					help.visible=false;
-//					help.includeInLayout=false;
-					
-					
-				}else{
-					// 市级部署
+				swMenuBtn.addEventListener(MouseEvent.MOUSE_OUT, onSwMenuBtnMouseOut);		
+					// 市级部署--武汉
 					if(Global.szd.id.toString().indexOf("4201")==0){
 						var whMap:WuHanMap=new WuHanMap();
 						whMap.percentHeight=100;
 						whMap.percentWidth=100;
 						mapView.addElement(whMap);
+					} else {
+						// 省级部署
+						var customMap:CustomMap = new CustomMap();
+						customMap.percentHeight=100;
+						customMap.percentWidth=100;
+						mapView.addElement(customMap);
 					}
-				}
 //				zdwxy.x = this.width-zdwxy.width-10;
 //				zdwxy.y = 140;
 //				yfssg.x = zdwxy.x;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/aqsszpsc/AqsszpscEdit.mxml

@@ -52,7 +52,7 @@
 			
 			//保存数据
 			private function doSave():void{
-				if(!validParams()){
+				if(!validParams()||!submitVaildParams()){
 					return;
 				}
 				dataValue();
@@ -128,10 +128,10 @@
 				}
 				//判断是否已经上传必填附件
 				if(fileListView!=null && fileListView.filesList!=null ) {
-					for(var i:int ;i <fileListView.fileTypeList.length-1 ;i ++){	
+					for(var i:int=0 ;i <fileListView.fileTypeList.length-1 ;i ++){	
 						var type:CodeVo = fileListView.fileTypeList.getItemAt(i) as CodeVo;
 						var flag:Boolean=true;
-						for(var j:int ;j<fileListView.filesList.length;j++){
+						for(var j:int=0 ;j<fileListView.filesList.length;j++){
 							var file:AccessoryVo=fileListView.filesList.getItemAt(j) as AccessoryVo;
 							if(type.id==file.type.id) {
 								flag=false;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/aqpjjgba/AqpjjgbaEdit.mxml

@@ -119,10 +119,10 @@
 				}
 				//判断是否已经上传必填附件
 				if(fileListView!=null && fileListView.filesList!=null ) {
-					for(var i:int ;i <fileListView.fileTypeList.length ;i ++){	
+					for(var i:int=0 ;i <fileListView.fileTypeList.length ;i ++){	
 						var type:CodeVo = fileListView.fileTypeList.getItemAt(i) as CodeVo;
 						var flag:Boolean=true;
-						for(var j:int ;j<fileListView.filesList.length;j++){
+						for(var j:int=0 ;j<fileListView.filesList.length;j++){
 							var file:AccessoryVo=fileListView.filesList.getItemAt(j) as AccessoryVo;
 							if(type.id==file.type.id) {
 								flag=false;

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

@@ -169,7 +169,7 @@
 						<cus:QLabel width="13%" text="{resourceManager.getString('common','gkjyr')}" notNull="true"/>
 						<cus:QTextInput id="gkjyr" text="@{thisModel.vo.gkjyr}" width="19%" />	
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','glzd.szd')}" notNull="true"/>
-						<cus:QComboBox id="szd" comboxClass="SzdEditSelect" parentId="{Global.szd.id}" enabled="{mode==Constants.mode_add}"
+						<cus:QComboBox id="szd" comboxClass="SzdEditSelect" parentId="{Global.szd.id}" 
 									   selectedVO="{thisModel.vo.szd==null?Global.user.szd:thisModel.vo.szd}" width="19%"/>
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','szgq')}" notNull="true" />
 						<cus:QComboBox id="szgq" comboxClass="GqBySzdSelect" selectedVO="{thisModel.vo.szgq}" parentId="{thisModel.vo.szd==null?Global.user.szd:thisModel.vo.szd}" width="19%"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/map/CustomMap.mxml

@@ -9,29 +9,18 @@
 	</fx:Declarations>
 	<fx:Script>
 		<![CDATA[
-			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.map.Shape;
 			import com.jtgh.yjpt.view.SuperMapMain;
-			import com.jtgh.yjpt.view.access.Aqzrr;
 			import com.jtgh.yjpt.view.workflow.component.util.ImagesDataLoader;
 			import com.jtgh.yjpt.view.workflow.component.util.ImagesInfo;
-			import com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.SuperMap;
-			import com.jtgh.yjpt.vo.access.UserVo;
-			
-			import flash.net.navigateToURL;
 			
 			import mx.collections.ArrayCollection;
-			import mx.controls.Alert;
 			import mx.core.UIComponent;
 			import mx.effects.Glow;
-			import mx.events.CloseEvent;
 			import mx.graphics.SolidColor;
 			import mx.graphics.SolidColorStroke;
-			import mx.managers.PopUpManager;
-			import mx.rpc.events.ResultEvent;
 			
 			import spark.components.Image;
 			import spark.components.Label;
@@ -107,11 +96,15 @@
 					img.y=imgInfo.y;
 					img.styleName=imgInfo.label;
 					img.source = imgInfo.bitmapData;
-
-					//
-					img.addEventListener(MouseEvent.CLICK, imgOnClick);
-					img.addEventListener(MouseEvent.MOUSE_OVER, imgOnOver);
-					img.addEventListener(MouseEvent.MOUSE_OUT, imgOnOut);
+					
+					
+					//省局添加所有，市级添加本地
+					if(Constants.SZD_ID_PROVINCE==Global.systemSzd.id||imgInfo.name==Global.systemSzd.id.toString()){
+						img.addEventListener(MouseEvent.CLICK, imgOnClick);
+						img.addEventListener(MouseEvent.MOUSE_OVER, imgOnOver);
+						img.addEventListener(MouseEvent.MOUSE_OUT, imgOnOut);
+					}
+					
 
 					//
 					gkData.addItem(img);

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/map/TipWindow.mxml

@@ -99,7 +99,7 @@
 //			}
 
 			public function doQuery():void{
-				if(Global.szd.id==Constants.SZD_ID_PROVINCE){
+				if(true){
 					var gkid:Number = Number(data);
 					Utils.callRemote("cgController", "statisticsByGk", function(event:ResultEvent):void{
 						var bc:BusinessContext=event.result as BusinessContext;

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

@@ -86,7 +86,7 @@
 			}
 			
 			private function doSave():void{
-				if(validParams()){
+				if(validParams()&&submitValid()){
 					doCheck();
 					//复制的附证进行数据初始化
 					if(flag) {
@@ -122,10 +122,10 @@
 				}
 				//判断是否已经上传必填附件
 				if(fileListView!=null && fileListView.filesList!=null ) {
-					for(var i:int ;i <fileListView.fileTypeList.length-1 ;i ++){	
+					for(var i:int=0 ;i <fileListView.fileTypeList.length-1 ;i ++){	
 						var type:CodeVo = fileListView.fileTypeList.getItemAt(i) as CodeVo;
 						var flag:Boolean=true;
-						for(var j:int ;j<fileListView.filesList.length;j++){
+						for(var j:int=0 ;j<fileListView.filesList.length;j++){
 							var file:AccessoryVo=fileListView.filesList.getItemAt(j) as AccessoryVo;
 							if(type.id==file.type.id) {
 								flag=false;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/bagl/zdsgdyhpchzlqkba/ZdsgdyhpchzlqkbaVo.as

@@ -10,7 +10,6 @@ package com.jtgh.yjpt.vo.bagl.zdsgdyhpchzlqkba
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	
 	import mx.collections.ArrayCollection;
-	import mx.formatters.DateFormatter;
 	import mx.resources.IResourceManager;
 	import mx.resources.ResourceManager;
 
@@ -98,7 +97,7 @@ package com.jtgh.yjpt.vo.bagl.zdsgdyhpchzlqkba
 		public function get szdName():String
 		{
 			if(szd!=null)
-				return ResourceManager.getInstance().getString("select",szd.name);
+				return szd.localeName;
 			return  "";
 		}
 		

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

@@ -51,7 +51,7 @@ package com.jtgh.yjpt.vo.check
 		
 		public function get szdName():String{
 			
-			return ResourceManager.getInstance().getString("select",szd);
+			return szd;
 		}
 		
 		

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/gkgq/MtVo.as

@@ -86,7 +86,7 @@ package com.jtgh.yjpt.vo.gkgq
 		public function get szdName():String
 		{
 			if(szd!=null)
-				return ResourceManager.getInstance().getString("select",szd.name);
+				return szd.localeName;
 			return  "";
 		}
 		

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/sgalgl/SgalglVo.as

@@ -87,11 +87,9 @@ package com.jtgh.yjpt.vo.sgalgl
 		//所在定市的显示
 		public function get szdsName():String
 		{
-			if(szd!=null){
-				return resourceManager.getString('select',szd.name) ;
-			}else{
-				return "";
-			}
+			if(szd!=null)
+				return szd.localeName;
+			return  "";
 		}
 		
 		//得到港区的名称

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

@@ -105,11 +105,9 @@ package com.jtgh.yjpt.vo.yjgl
 		//所在定市的显示
 		public function get szdsName():String
 		{
-			if(szd!=null){
-			return resourceManager.getString('select',szd.name) ;
-			}else{
-			return "";
-			}
+			if(szd!=null)
+				return szd.localeName;
+			return  "";
 		}
 		
 		//得到港区的名称

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

@@ -79,12 +79,9 @@ package com.jtgh.yjpt.vo.yjgl
 		//所在定市的显示
 		public function get szdsName():String
 		{
-			
-			if(szd!=null){
-				return resourceManager.getString('select',szd.name) ;
-			}else{
-				return "";
-			}
+			if(szd!=null)
+				return szd.localeName;
+			return  "";
 		}
 		//得到港区的名称
 		public function  get szgqName():String

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

@@ -77,11 +77,9 @@ package com.jtgh.yjpt.vo.yjgl
 		//所在定市的显示
 		public function get szdsName():String
 		{
-			if(szd!=null){
-			return resourceManager.getString('select',szd.name) ;
-			}else{
-			return "";
-			}
+			if(szd!=null)
+				return szd.localeName;
+			return  "";
 		}
 		
 		//得到港区的名称

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjzyxxgl/YjwzVo.as

@@ -32,7 +32,7 @@ package com.jtgh.yjpt.vo.yjzyxxgl
 		private var resourceManager:IResourceManager=ResourceManager.getInstance();
 		
 		public function get szdName():String{
-			return szd!=null?szd.name:"";
+			return szd!=null?szd.localeName:"";
 		}
 		public function get gqName():String{
 			return gq!=null?gq.gqmc:"";

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/yjzyxxgl/ZyyjjydwVo.as

@@ -41,7 +41,7 @@ package com.jtgh.yjpt.vo.yjzyxxgl
 		public function get szdName():String
 		{
 			if(szd!=null)
-				return ResourceManager.getInstance().getString("select",szd.name);
+				return szd.localeName;
 			return  "";
 		}
 		

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/zysqbp/ZysqbpCountVo.as

@@ -16,7 +16,7 @@ package com.jtgh.yjpt.vo.zysqbp
 		public var jd1_jzxsl:String;//季度1集装箱数量
 		
 		public function get szdName():String{
-			return ResourceManager.getInstance().getString("select",szd);
+			return ResourceManager.getInstance().getString("select",szd)==null?szd:ResourceManager.getInstance().getString("select",szd);
 		}
 		 public function   toString() : String 
 		{