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

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

@@ -325,11 +325,11 @@ 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.qyxz == null)
+//			{
+//				Utils.showInfoMessage("jyr.qyxz.empty",null,"jlrxxgl");
+//				return false;
+//			}
 			
 			if(vo.gkjyxkzh == null||vo.gkjyxkzh.length==0 )
 			{
@@ -426,11 +426,25 @@ package com.jtgh.yjpt.model.jyr
 //						Utils.showInfoMessage("jyr.fzyxq.empty",null,"jlrxxgl");
 //						return false;
 //					}
-					if(vo.qyxz.length >7 && vo.qyxz=="NNNNNNNN")
+//					if(vo.qyxz.length >7 && vo.qyxz=="NNNNNNNN")
+//					{
+//						Utils.showInfoMessage("jyr.qyxz.empty",null,"jlrxxgl");
+//						return false;					
+//					}
+					
+					if(vo.qyxz.length >6 && (vo.qyxz.substring(0,2)=="NN" ||vo.qyxz.substring(2,7)=="NNNNN"))
 					{
+						//解决“是否危货企业”选择是，点击保存check失败后，类别没有显示红色必填“*”的bug
+						//edit by xuhao 2016-8-5
+						//begin：  
+						thisView.lb.notNull=true;
+						thisView.gkwxhwzyfzbh.editable=true;  
+						//：end
+						
 						Utils.showInfoMessage("jyr.qyxz.empty",null,"jlrxxgl");
 						return false;					
 					}
+					
 				}
 			}
 			return true;

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

@@ -153,7 +153,12 @@ package com.jtgh.yjpt.model.jyr
 			}
 			var updateView:JyrEdit= new JyrEdit();
 			updateView.mode = Constants.mode_edit;
-			updateView.thisModel.vo = thisView.dataGrid.selectedItem as JyrVo;
+			
+			//updateView.thisModel.vo = thisView.dataGrid.selectedItem as JyrVo;
+			var jyrVo:JyrVo = new JyrVo();
+			jyrVo = ObjectUtil.copy(thisView.dataGrid.selectedItem) as JyrVo;
+			updateView.thisModel.vo = jyrVo;
+			
 			updateView.functionId = Utils.getFunctionId(e.target);
 			updateView.parentModel=this;
 			Utils.callRemote("jyrController","doEditInit",function(r:ResultEvent):void{

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

@@ -400,7 +400,7 @@
 				isOnSecondMenuItem=true;
 				var btn:SecondNavButton = UIComponent(event.target).parentDocument as SecondNavButton;
 				if(btn.name != onHover_S_BtnName){
-					var xCenter:Number = (btn.width/2+btn.x+600);				
+					var xCenter:Number = (btn.width/2+btn.x+500);				
 					var node:MenuVo = btn.data as MenuVo;
 					if(node.children && node.children.length>0){
 						thridMenuBar.visible=true;

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

@@ -272,7 +272,9 @@
 				var btn:SecondNavButton = UIComponent(event.target).parentDocument as SecondNavButton;
 				var node:MenuVo;
 				//if(btn.name != onHover_S_BtnName){
-				var xCenter:Number = btn.width/2+btn.x+500;
+				
+				var xCenter:Number = btn.width/2+secondMenuContainer.x+200;//var xCenter:Number = btn.width/2+btn.x+750;
+				
 				node = btn.data as MenuVo;
 				if(node.children && node.children.length>0){
 					thridMenuBar.visible=true;
@@ -433,7 +435,11 @@
 							////btnWorkSpace.selected = false;
 							btn.selected = true;
 							selectedFirstMenuBtn = btn;
-							var xCenter:Number = selectedFirstMenuBtn.width/2+selectedFirstMenuBtn.x+500;
+							
+							//var xCenter:Number = selectedFirstMenuBtn.width/2+selectedFirstMenuBtn.x+500;
+							//从主页点进来时：selectedFirstMenuBtn.width、selectedFirstMenuBtn.x 的值一直为0，所以二级菜单位置不对
+							var xCenter:Number = 35 + 70 * i + 500;
+							
 							secondMenuBar.visible=true;
 							createSecondMenu(node,xCenter);
 							break;
@@ -484,7 +490,9 @@
 							lazyTimer.addEventListener(TimerEvent.TIMER, function(event:TimerEvent):void{
 								//++++
 								if(selectedSecondMenuBtn.name != onHover_S_BtnName){
-									var xCenter:Number = selectedSecondMenuBtn.width/2+selectedSecondMenuBtn.x+500;//(selectedSecondMenuBtn.width/2+selectedSecondMenuBtn.x);
+									
+									var xCenter:Number = selectedSecondMenuBtn.width/2+secondMenuContainer.x+200;//(selectedSecondMenuBtn.width/2+selectedSecondMenuBtn.x);
+									
 									// trace(selectedSecondMenuBtn.width+","+selectedSecondMenuBtn.x+","+xCenter);
 									var tempNode:MenuVo = selectedSecondMenuBtn.data as MenuVo;
 									if(tempNode.children && tempNode.children.length>0){

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="类别" />
+						<cus:QLabel id="lb" width="13%" text="类别" notNull="{!(thisModel.vo.sfwhqy=='N')}" />
 						<mx:VBox width="83%">
 							<s:HGroup width="100%"  gap="0">
 								<!--码头企业-->

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

@@ -305,8 +305,21 @@
 					}else if(type == "zyfs"){
 						if(vo.zyfs!=null&&vo.zyfs!="")
 						{
-							vo.zyfs = vo.zyfs.replace(("," + checkbox.data),"").replace((checkbox.data+","),"");
-						} 
+							var arr:Array;
+							arr = vo.zyfs.split(",");
+							var strZyfs:String;
+							for(var i:int=0 ;i < arr.length;i ++){	
+								if(arr[i]!= checkbox.data.toString()){
+									if(i==0){
+										strZyfs = arr[i];
+									}
+									else{
+										strZyfs += ","+arr[i];
+									}
+								}
+							}//end for
+							vo.zyfs = strZyfs; 
+						}//end if  
 					}
 				}
 			}
@@ -458,12 +471,12 @@
 				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('gkwxhwzyfzblhhz','zycs')}" width="120" notNull="true"/>
 					<mx:HBox width="100%">
-						<mx:Repeater id="Repeaterckzycs" dataProvider="{model.zycsList}"> 
+						<mx:Repeater id="Repeaterckzycs" dataProvider="{model.zycsList}" width="300"> 
 							<mx:CheckBox id="zycs" selected="{Repeaterckzycs.currentItem.id == vo.zycs.id}" click="ck_clickHandler(event,'zycs')"
 										 label="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"
 										 data="{Repeaterckzycs.currentItem.id}"
 										 name="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"
-										 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}"/>
+										 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="150"/>
 						</mx:Repeater>
 					</mx:HBox>
 				</s:HGroup>
@@ -495,7 +508,7 @@
 										 label="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
 										 data="{RepeaterckZyfs.currentItem.id}"
 										 name="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
-										 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="100" />
+										 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="150" />
 						</mx:Repeater>
 					</mx:Tile> 
 				</s:HGroup>

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

@@ -155,7 +155,7 @@
 								<mx:CheckBox enabled="{enableflg}" id="zycs" selected="{Repeaterckzycs.currentItem.id == gkwxhwzyfzblhhz.zycs.id}"
 											 label="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"
 											 data="{Repeaterckzycs.currentItem.id}"
-											 name="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}"/>
+											 name="{resourceManager.getString('select',Repeaterckzycs.currentItem.name)}" width="150"/>
 							</mx:Repeater>
 						</mx:HBox>
 					</s:HGroup>

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

@@ -387,7 +387,7 @@
 											 label="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
 											 data="{RepeaterckZyfs.currentItem.id}"
 											 name="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
-											 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="100" enabled="{enableflg}" /> 
+											 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="150" enabled="{enableflg}" /> 
 								</mx:Repeater>
 							</mx:Tile>
 						</s:HGroup>

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

@@ -224,7 +224,7 @@
 												 label="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
 												 data="{RepeaterckZyfs.currentItem.id}"
 												 name="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
-												 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="120" enabled="{false}" />
+												 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="130" enabled="{false}" />
 									</mx:Repeater>
 								</mx:Tile> 
 							</s:HGroup>

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

@@ -201,7 +201,7 @@
 								 label="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
 								 data="{RepeaterckZyfs.currentItem.id}"
 								 name="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
-								 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="120" enabled="false" />
+								 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="130" enabled="false" />
 					</mx:Repeater> 
 				</mx:Tile>
 				 

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

@@ -138,7 +138,7 @@
 												 label="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
 												 data="{RepeaterckZyfs.currentItem.id}"
 												 name="{resourceManager.getString('select',RepeaterckZyfs.currentItem.name)}"
-												 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="100" enabled="{false}" />
+												 toolTip="{resourceManager.getString('gkwxhwzyfzblhhz','qzdyxhdgtip')}" width="130" enabled="{false}" />
 									</mx:Repeater>
 								</mx:Tile>
 							</s:HGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/JyrVo.as

@@ -18,6 +18,59 @@ package com.jtgh.yjpt.vo.jyr
 		{
 			super();
 		}	
+		
+		
+//		public function JyrVo(jyrVo:JyrVo)
+//		{
+//			super();
+//			this.id = jyrVo.id;
+//			this.szd = jyrVo.szd;
+//			this.zs = jyrVo.zs;
+//			this.xzqh = jyrVo.xzqh;
+//			this.szgq = jyrVo.szgq;
+//			this.gkjyr = jyrVo.gkjyr;
+//			this.qyxz = jyrVo.qyxz;
+//			this.yzbm = jyrVo.yzbm;
+//			this.bgdz = jyrVo.bgdz;
+//			this.gkjyxkzh = jyrVo.gkjyxkzh;
+//			this.fzrq = jyrVo.fzrq;
+//			this.fzjg = jyrVo.fzjg;
+//			this.jyfw  = jyrVo.jyfw;
+//			this.jyqy = jyrVo.jyqy;
+//			this.zyhz = jyrVo.zyhz;
+//			this.fddbr = jyrVo.fddbr;
+//			this.lxdh = jyrVo.lxdh;
+//			this.cz = jyrVo.cz;
+//			this.aqbmfzr = jyrVo.aqbmfzr;
+//			this.aqfzrlxdh = jyrVo.aqfzrlxdh;
+//			this.aqfzrsj = jyrVo.aqfzrsj;
+//			this.gsyyzzbh = jyrVo.gsyyzzbh;
+//			this.tzze = jyrVo.tzze;
+//			this.zczb = jyrVo.zczb;
+//			this.gkwxhwzyfzbh = jyrVo.gkwxhwzyfzbh;
+//			this.gkssbafhzsbh = jyrVo.gkssbafhzsbh;
+//			this.bafzjg = jyrVo.bafzjg; 
+//			this.bafzrq = jyrVo.bafzrq;
+//			this.bayxq = jyrVo.bayxq;
+//			this.zywxhwpm = jyrVo.zywxhwpm;
+//			this.qylx = jyrVo.qylx;
+//			this.sfwhqy  = jyrVo.sfwhqy;
+//			this.qyzzjgdm = jyrVo.qyzzjgdm;
+//			this.sshydl = jyrVo.sshydl;
+//			this.sshyz = jyrVo.sshyz;
+//			this.qyaqdj = jyrVo.qyaqdj;
+//			this.rs = jyrVo.rs;	
+//			this.aqzgbm = jyrVo.aqzgbm;
+//			this.aqgljg = jyrVo.aqgljg;
+//			this.zzagrysl = jyrVo.zzagrysl;
+//			this.zcze  = jyrVo.zcze;
+//			this.xsje = jyrVo.xsje;
+//			this.aqfzrzbdh = jyrVo.aqfzrzbdh;
+//			this.fzyxq = jyrVo.fzyxq;
+//			this.gjjgdm = jyrVo.gjjgdm;
+//			this.parentJyr = jyrVo.parentJyr;
+//			this.sfzdsp = jyrVo.sfzdsp;
+//		}
 
 		public var id:Number;
 		// 所在地