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

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

@@ -84,6 +84,7 @@ jyr.szd.empty=\u7ecf\u8425\u4eba\u6240\u5728\u5730\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.szgq.empty=\u7ecf\u8425\u4eba\u6240\u5728\u6e2f\u533a\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.qylx.empty=\u7ecf\u8425\u4eba\u4f01\u4e1a\u7c7b\u578b\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.gkjyr.empty=\u6e2f\u53e3\u7ecf\u8425\u4eba\u4e0d\u80fd\u4e3a\u7a7a\uff01
+jyr.gkjyr.exist=\u6e2f\u53e3\u7ecf\u8425\u4eba\u540d\u79f0\u5df2\u5b58\u5728\uff01
 jyr.qyxz.empty=\u7ecf\u8425\u4eba\u4f01\u4e1a\u6027\u8d28\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.gkjyxkzh.empty=\u7ecf\u8425\u4eba\u6e2f\u53e3\u7ecf\u8425\u8bb8\u53ef\u8bc1\u53f7\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.gkjyxkzh.error=\u7ecf\u8425\u4eba\u6e2f\u53e3\u7ecf\u8425\u8bb8\u53ef\u8bc1\u53f7\u683c\u5f0f\u4e0d\u5bf9\uff0c\u5e94\u4e3a\uff08***\uff09\u6e2f\u7ecf\u8bc1\uff08****\uff09\u53f7\uff01

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

@@ -226,9 +226,9 @@ package com.jtgh.yjpt.model.jyr
 		public function doSave():void{
 			//总资总额
 			if(thisView.tzze.text!="")
-			vo.tzze=new Number(thisView.tzze.text);
+				vo.tzze=new Number(thisView.tzze.text);
 			if(thisView.zczb.text!="")
-			vo.zczb=new Number(thisView.zczb.text);
+				vo.zczb=new Number(thisView.zczb.text);
 			vo.szd=thisView.szd.selectedVO as CodeVo;
 			vo.zs = thisView.zs.selectedVO as CodeVo;
 			vo.szgq=thisView.szgq.selectedVO as GqVo;
@@ -237,9 +237,9 @@ package com.jtgh.yjpt.model.jyr
 			vo.qylx=thisView.qylx.textValue as String;
 			vo.sfwhqy=thisView.sfwhqy.textValue as String;
 			if(thisView.rs.text!="")
-			vo.rs=new Number(thisView.rs.text);
+				vo.rs=new Number(thisView.rs.text);
 			if(thisView.zzagrysl.text!="")
-			vo.zzagrysl=new Number(thisView.zzagrysl.text);
+				vo.zzagrysl=new Number(thisView.zzagrysl.text);
 			vo.sshydl=thisView.sshydl.selectedVO as CodeVo;
 			vo.sshyz=thisView.sshyz.selectedVO as CodeVo;
 			vo.xzqh=thisView.xzqh.selectedVO as CodeVo;
@@ -325,12 +325,7 @@ package com.jtgh.yjpt.model.jyr
 				Utils.showInfoMessage("jyr.gkjyr.empty",null,"jlrxxgl");
 				return false;
 			}
-//			if(vo.qyxz == null)
-//			{
-//				Utils.showInfoMessage("jyr.qyxz.empty",null,"jlrxxgl");
-//				return false;
-//			}
-			
+  
 			if(vo.gkjyxkzh == null||vo.gkjyxkzh.length==0 )
 			{
 				Utils.showInfoMessage("jyr.gkjyxkzh.empty",null,"jlrxxgl");
@@ -409,6 +404,9 @@ package com.jtgh.yjpt.model.jyr
 				Utils.showInfoMessage("jyr.gjjgdm.empty",null,"jlrxxgl");
 				return false;
 			}
+			
+			
+			//是否危货企业及其连带值判断
 			if(vo.sfwhqy == null||vo.sfwhqy.length==0)
 			{
 				Utils.showInfoMessage("jyr.sfwhqy.empty",null,"jlrxxgl");
@@ -447,6 +445,8 @@ package com.jtgh.yjpt.model.jyr
 					
 				}
 			}
+			
+		 
 			return true;
 		}
 

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

@@ -118,6 +118,12 @@
 				swck.x=100;
 				mainLayout.width=this.width-16;
 				mapView.width=this.width-16;
+				
+				
+				Utils.callRemote("authenticateController","UserAuth",function(r:ResultEvent):void{
+					var bc:BusinessContext = r.result as BusinessContext;
+					userAuth.text = bc.result.toString();
+				});
 
 			}
 
@@ -936,11 +942,10 @@
 				<s:Group top="0" right="0"  width="360" height="100%" horizontalCenter="0" >
 					<s:HGroup left="0" top="5" width="100%" height="50%" verticalAlign="middle">
 						<mx:Label text="{Utils.getChinaTimeDate(new Date())}" fontFamily="宋体" fontSize="14" color="#a6d9f5" />
-						<s:Spacer width="5" />
-						<mx:Label text="欢迎您" fontFamily="宋体" fontSize="14" color="#dcf7fb" />
-						<s:Spacer width="5" />
+						<s:Spacer width="5" /> 
 						<s:Image  scaleMode="letterbox" source="resource/yjpt/map/user.png"/>
 						<mx:LinkButton label="{Global.user.name}" textAlign="left" toolTip="修改密码" click="changePwd(event)" textDecoration="underline" fontFamily="宋体" fontSize="13" color="#dcf7fb"/>
+						<mx:Label id="userAuth" fontFamily="宋体" fontSize="14" color="#dcf7fb" /> 
 					</s:HGroup>
 					<s:HGroup left="0" bottom="5" width="100%" height="50%" verticalAlign="middle">
 						<s:Image  scaleMode="letterbox" source="resource/yjpt/map/maodian.png"/>
@@ -1020,14 +1025,14 @@
 								   downIcon="@Embed('/resource/yjpt/map/wxpml_hover.png')"
 								   click="wxp()"/>
 
-					<s:Image  scaleMode="letterbox" source="resource/yjpt/map/sep.png"/>
+					<!--<s:Image  scaleMode="letterbox" source="resource/yjpt/map/sep.png"/>
 					<s:Spacer height="1"/>
 					<ui:MenuButton  label="{getLxfs()}" height="55" gap="15" color="#104370"
 								   visible="{Utils.getCurrentUser().sfcd==YesNoSelect.NO}" includeInLayout="{Utils.getCurrentUser().sfcd==YesNoSelect.NO}"
 								   icon="@Embed('/resource/yjpt/map/lxfs.png')" 
 								   overIcon="@Embed('/resource/yjpt/map/lxfs_hover.png')" 
 								   downIcon="@Embed('/resource/yjpt/map/lxfs_hover.png')"
-								   click="aqzrrFun()"/>
+								   click="aqzrrFun()"/>-->
 
 				</s:VGroup>
 			</s:BorderContainer>

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

@@ -70,7 +70,10 @@
 //				thridMenu.addEventListener(MouseEvent.MOUSE_OVER, onThridMenuBarMouseOver);
 //				thridMenu.addEventListener(MouseEvent.MOUSE_OUT, onThridMenuBarMouseOut);
 
-				
+				Utils.callRemote("authenticateController","UserAuth",function(r:ResultEvent):void{
+					var bc:BusinessContext = r.result as BusinessContext;
+					userAuth.text = bc.result.toString();
+				});
 			}
 
 			/* 菜单数据加载完成 */
@@ -745,10 +748,10 @@
 						<s:HGroup left="0" top="5" width="100%" height="50%" verticalAlign="middle">
 							<mx:Label text="{Utils.getChinaTimeDate(new Date())}" fontFamily="宋体" fontSize="14" color="#a6d9f5" />
 							<s:Spacer width="5" />
-							<mx:Label text="欢迎您" fontFamily="宋体" fontSize="14" color="#dcf7fb" />
 							<s:Spacer width="5" />
 							<s:Image  scaleMode="letterbox" source="resource/yjpt/map/user.png"/>
 							<mx:LinkButton label="{Global.user.name}" textAlign="left" toolTip="修改密码" click="changePwd(event)" textDecoration="underline" fontFamily="宋体" fontSize="13" color="#dcf7fb"/>
+							<mx:Label id="userAuth" fontFamily="宋体" fontSize="14" color="#dcf7fb" /> 
 						</s:HGroup>
 						<s:HGroup left="0" bottom="5" width="100%" height="50%" verticalAlign="middle">
 							<s:Image  scaleMode="letterbox" source="resource/yjpt/map/maodian.png"/>

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

@@ -190,7 +190,7 @@
 						<cus:QTextInput id="bgdz" text="@{thisModel.vo.bgdz}" width="51%"/>
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" gap="0">
-						<cus:QLabel id="lb" width="13%" text="类别" notNull="{!(thisModel.vo.sfwhqy=='N')}" />
+						<cus:QLabel id="lb" width="13%" text="类别" notNull="{!((thisModel.vo.sfwhqy==null?'N':thisModel.vo.sfwhqy)=='N')}" />
 						<mx:VBox width="83%">
 							<s:HGroup width="100%"  gap="0">
 								<!--码头企业-->