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

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

@@ -272,6 +272,8 @@ 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/zyfzndjy/GkwxhwzyfzblhhzModel.as

@@ -171,10 +171,14 @@ package com.jtgh.yjpt.model.zyfzndjy
 		{
 			var jyr:JyrVo ;
 			var szd:CodeVo;
+			var zs:CodeVo;
 			var gq:GqVo;
 			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_zs.selectedVO&&"NaN"!=(thisView.query_zs.selectedVO as CodeVo).id.toString()){
+				zs = thisView.query_zs.selectedVO as CodeVo;
+			}
 			if(null!=thisView.jyr.selectedVO){
 				jyr = thisView.jyr.selectedVO;
 			}
@@ -219,7 +223,8 @@ package com.jtgh.yjpt.model.zyfzndjy
 				"",
 				blbh,
 				lcStatus,
-				Utils.getFunctionId(thisView)+""
+				Utils.getFunctionId(thisView)+"",
+				null==zs?"":zs.id+""
 				);
 			var params:URLVariables = new URLVariables();
 			params.title=title;
@@ -454,6 +459,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 		{
 			var jyr:JyrVo ;
 			var szd:CodeVo;
+			var zs:CodeVo;
 			var queryAction:String;
 			if(Global.user.jyr){
 				queryAction="listByQy";
@@ -464,6 +470,9 @@ package com.jtgh.yjpt.model.zyfzndjy
 			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_zs.selectedVO&&"NaN"!=(thisView.query_zs.selectedVO as CodeVo).id.toString()){
+				zs = thisView.query_zs.selectedVO as CodeVo;
+			}
 			if(null!=thisView.jyr.selectedVO){
 				jyr = thisView.jyr.selectedVO;
 			}
@@ -493,7 +502,7 @@ package com.jtgh.yjpt.model.zyfzndjy
 				}
 			}
 			Utils.callRemote("gkwxhwzyfzblhhzcontroller", queryAction, 
-				resultCallback,Utils.getFunctionId(thisView), pager, jyr,szd,gq,blbh,lcStatus,fddbr);
+				resultCallback,Utils.getFunctionId(thisView), pager, jyr,szd,gq,blbh,lcStatus,fddbr,zs);
 		}
 
 		/**

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

@@ -4,8 +4,8 @@ package com.jtgh.yjpt.model.zyfzndjy
 	import com.jtgh.yjpt.common.BusinessContext;
 	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;
@@ -16,8 +16,8 @@ package com.jtgh.yjpt.model.zyfzndjy
 	
 	import mx.binding.utils.BindingUtils;
 	import mx.collections.ArrayCollection;
-	import mx.events.ResourceEvent;
 	import mx.events.ListEvent;
+	import mx.events.ResourceEvent;
 	import mx.rpc.events.ResultEvent;
 
 	[Bindable]
@@ -72,6 +72,9 @@ package com.jtgh.yjpt.model.zyfzndjy
 			var jyr:JyrVo ;
 			var szd:CodeVo;
 			var gq:GqVo;
+			var szqy:CodeVo;
+			var zycs:CodeVo;
+			var zs:CodeVo;
 			if(null != thisView.query_szd.selectedVO&&"NaN"!=(thisView.query_szd.selectedVO as CodeVo).id.toString()){
 				szd = thisView.query_szd.selectedVO as CodeVo;
 			}
@@ -81,8 +84,17 @@ package com.jtgh.yjpt.model.zyfzndjy
 			if(null != thisView.query_gq.selectedVO ){
 				gq = thisView.query_gq.selectedVO as GqVo;
 			}
+			if(null != thisView.query_szqy.selectedVO){
+				szqy=thisView.query_szqy.selectedVO ;
+			}
+			if(null!=thisView.query_zycs.selectedVO){
+				zycs= thisView.query_zycs.selectedVO;
+			}
+			if(null!=thisView.query_zs.selectedVO){
+				zs= thisView.query_zs.selectedVO;
+			}
 		 Utils.callRemote("gkwxhwzyfzblhhzcontroller","listFzxx",resultCallback, 
-			 pager, jyr,szd,gq,thisView.query_yxrq_1.dateTime,thisView.query_yxrq_2.dateTime,thisView.query_wxpm.text);
+			 pager, jyr,szd,gq,thisView.query_yxrq_1.dateTime,thisView.query_yxrq_2.dateTime,thisView.query_wxpm.text,szqy,zycs,zs);
 		}	
 		public function resultCallback(r:ResultEvent):void
 		{

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

@@ -400,6 +400,10 @@ package com.jtgh.yjpt.model.zysqbp
 				var jyr:JyrVo =  thisView.query_gkdw.selectedVO;
 				vo.zydw = jyr;
 			}
+			var zs:CodeVo;
+			if(null !=thisView.query_zs.selectedVO&&"NaN"!=(thisView.query_zs.selectedVO as CodeVo).id.toString()){
+				zs  = thisView.query_zs.selectedVO as CodeVo;
+			}
 			vo.bh = thisView.query_bh.text;
 			vo.mao = thisView.mao.textValue as String;
 			vo.cm = thisView.query_hmhc.text;
@@ -433,7 +437,8 @@ package com.jtgh.yjpt.model.zysqbp
 				Utils.getFunctionId(thisView),vo,lcStatus,
 				thisView.query_bgsj_1.dateTime,thisView.query_bgsj_2.dateTime,
 				thisView.query_kgsj_1.dateTime,thisView.query_kgsj_2.dateTime,
-				thisView.query_wgsj_1.dateTime,thisView.query_wgsj_2.dateTime
+				thisView.query_wgsj_1.dateTime,thisView.query_wgsj_2.dateTime,
+				zs
 			);
 		}
 		public function doPrint(e:Event):void{
@@ -442,6 +447,10 @@ package com.jtgh.yjpt.model.zysqbp
 			if(null !=thisView.query_gk.selectedVO&&"NaN"!=(thisView.query_gk.selectedVO as CodeVo).id.toString()){
 				vo.szd = thisView.query_gk.selectedVO as CodeVo;
 			}
+			var zs:CodeVo;
+			if(null !=thisView.query_zs.selectedVO&&"NaN"!=(thisView.query_zs.selectedVO as CodeVo).id.toString()){
+				zs  = thisView.query_zs.selectedVO as CodeVo;
+			}
 			if(null != thisView.query_gq.selectedVO){
 				vo.szgq = thisView.query_gq.selectedVO as GqVo;
 			}
@@ -502,7 +511,8 @@ package com.jtgh.yjpt.model.zysqbp
 				null==thisView.query_wgsj_1.dateTime?"":fomaterDate.format(thisView.query_wgsj_1.dateTime),
 				null==thisView.query_wgsj_2.dateTime?"":fomaterDate.format(thisView.query_wgsj_2.dateTime),
 				vo.bh,
-				status
+				status,
+				null==zs?"":zs.id+""
 			);
 			var params:URLVariables = new URLVariables();
 			params.title=title;

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

@@ -940,18 +940,18 @@
 						<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" click="changePwd(event)" textDecoration="underline" fontFamily="宋体" fontSize="13" color="#dcf7fb"/>
+						<mx:LinkButton label="{Global.user.name}" textAlign="left" toolTip="修改密码" click="changePwd(event)" textDecoration="underline" fontFamily="宋体" fontSize="13" 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"/>
 						<mx:Label text="{Utils.getSZDName()}" fontSize="18" fontWeight="bold" fontFamily="微软雅黑" color="#dcf7fb" />
 						<s:Spacer width="5" />
-						<s:Image id="home" buttonMode="true" source="@Embed('resource/yjpt/map/home.png')" click="toIndex()"/>	
-						<s:Image id="map" buttonMode="true" source="@Embed('resource/yjpt/map/map.png')" click="showMap(event)"
+						<s:Image id="home" buttonMode="true" toolTip="首页" source="@Embed('resource/yjpt/map/home.png')" click="toIndex()"/>	
+						<s:Image id="map" buttonMode="true" toolTip="地图" source="@Embed('resource/yjpt/map/map.png')" click="showMap(event)"
 								 visible="{Global.OPEN_MAP==YesNoSelect.YES &amp;&amp; Global.user.sfyxckdt==YesNoSelect.YES}"
 								 includeInLayout="{Global.OPEN_MAP==YesNoSelect.YES &amp;&amp; Global.user.sfyxckdt==YesNoSelect.YES}"/>
-						<s:Image id="relogin" buttonMode="true" source="@Embed('resource/yjpt/map/relogin.png')"  click="logoutFunc(event)"/>
-						<s:Image id="help" buttonMode="true" source="@Embed('/resource/yjpt/map/help.png')"  fillMode="scale" click="showHelp(event)" />
+						<s:Image id="relogin" buttonMode="true" toolTip="退出" source="@Embed('resource/yjpt/map/relogin.png')"  click="logoutFunc(event)"/>
+						<s:Image id="help" buttonMode="true" toolTip="帮助" source="@Embed('/resource/yjpt/map/help.png')"  fillMode="scale" click="showHelp(event)" />
 						<s:Spacer width="10" />
 					</s:HGroup>
 				</s:Group>

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

@@ -8,9 +8,7 @@
 	<fx:Script>
 		<![CDATA[
 			import com.adobe.utils.StringUtil;
-			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.bagl.aqpjjgba.AqpjjgbaModel;
@@ -18,7 +16,6 @@
 			import com.jtgh.yjpt.view.jsxmaqsc.DataList;
 			import com.jtgh.yjpt.vo.aqpjjgxx.AqpjjgxxVo;
 			import com.jtgh.yjpt.vo.bagl.aqpjjgba.AqpjjgbaVo;
-			import com.jtgh.yjpt.vo.bagl.aqpjjgba.AqpjjgryVo;
 			import com.jtgh.yjpt.vo.common.AccessoryVo;
 			import com.jtgh.yjpt.vo.common.CodeVo;
 			
@@ -27,7 +24,6 @@
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			import mx.resources.ResourceManager;
-			import mx.rpc.events.ResultEvent;
 			
 			[Bindable]
 			public var vo:AqpjjgbaVo;

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

@@ -13,7 +13,6 @@
 			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.MyEvent;
-			import com.jtgh.yjpt.common.component.ui.MapView;
 			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.SystemModel;
 			import com.jtgh.yjpt.select.YesNoSelect;
@@ -28,7 +27,6 @@
 			import mx.core.FlexGlobals;
 			import mx.core.UIComponent;
 			import mx.events.CloseEvent;
-			import mx.managers.PopUpManager;
 			import mx.rpc.events.ResultEvent;
 			
 			import spark.components.Image;
@@ -742,18 +740,18 @@
 							<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" click="changePwd(event)" textDecoration="underline" fontFamily="宋体" fontSize="13" color="#dcf7fb"/>
+							<mx:LinkButton label="{Global.user.name}" textAlign="left" toolTip="修改密码" click="changePwd(event)" textDecoration="underline" fontFamily="宋体" fontSize="13" 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"/>
 							<mx:Label text="{Utils.getSZDName()}" fontSize="18" fontWeight="bold" fontFamily="微软雅黑" color="#dcf7fb" />
 							<s:Spacer width="5" />
-							<s:Image id="home" buttonMode="true" source="@Embed('resource/yjpt/map/home.png')" click="toIndex()"/>	
-							<s:Image id="map" buttonMode="true" source="@Embed('resource/yjpt/map/map.png')" click="showMap(event)"
+							<s:Image id="home" buttonMode="true" toolTip="首页" source="@Embed('resource/yjpt/map/home.png')" click="toIndex()"/>	
+							<s:Image id="map" buttonMode="true" toolTip="地图" source="@Embed('resource/yjpt/map/map.png')" click="showMap(event)"
 									 visible="{Global.OPEN_MAP==YesNoSelect.YES &amp;&amp; Global.user.sfyxckdt==YesNoSelect.YES}"
 									 includeInLayout="{Global.OPEN_MAP==YesNoSelect.YES &amp;&amp; Global.user.sfyxckdt==YesNoSelect.YES}"/>
-							<s:Image id="relogin" buttonMode="true" source="@Embed('resource/yjpt/map/relogin.png')"  click="logoutFunc(event)"/>
-							<s:Image id="help" buttonMode="true" source="@Embed('/resource/yjpt/map/help.png')"  fillMode="scale" click="showHelp(event)" />
+							<s:Image id="relogin" buttonMode="true" toolTip="退出" source="@Embed('resource/yjpt/map/relogin.png')"  click="logoutFunc(event)"/>
+							<s:Image id="help" buttonMode="true" toolTip="帮助" source="@Embed('/resource/yjpt/map/help.png')"  fillMode="scale" click="showHelp(event)" />
 							<s:Spacer width="10" />
 						</s:HGroup>
 					</s:Group>

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

@@ -186,6 +186,8 @@
 					<s:HGroup width="100%" verticalAlign="middle" gap="0">
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}"/>
 						<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{thisModel.vo.parentJyr}" hasBlank="true" width="19%"/>
+						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" notNull="true"/>
+						<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="类别" />
@@ -213,10 +215,6 @@
 						</mx:VBox>
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" gap="0">
-						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" notNull="true"/>
-						<cus:QTextInput id="bgdz" text="@{thisModel.vo.bgdz}" width="83%"/>
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" gap="0">
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','gkjyxkzh')}"  notNull="true"/>
 						<cus:QTextInput id="gkjyxkzh" text="@{thisModel.vo.gkjyxkzh}" width="16%" />
 						<s:Image width="3%"  source="@Embed(source='resource/photo/open.png')" toolTip="上传附件"  buttonMode="true"  click="thisModel.upload(event)"/>

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

@@ -281,6 +281,8 @@
 						<cus:QLabel id="parentJyrStr" click="shModel.showShyj1('parentJyr')" width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}" />
 						<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{model.vo.parentJyr}" hasBlank="true" width="19%" 
 									   enabled="false"/>
+						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" />
+						<cus:QTextInput id="bgdz" text="@{model.vo.bgdz}" width="51%" editable="false"/>
 					</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle" gap="0">
 							<cus:QLabel id="qyxzStr" click="shModel.showShyj1('qyxz')" width="13%" text="类别" />
@@ -301,10 +303,6 @@
 							</mx:VBox>
 						</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel id="bgdzStr" click="shModel.showShyj1('bgdz')" width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" />
-						<cus:QTextInput id="bgdz" text="@{model.vo.bgdz}" width="83%" editable="false" />
-					</s:HGroup>
-					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
 						<cus:QLabel id="gkjyxkzhStr" click="shModel.showShyj1('gkjyxkzh')" width="13%" text="{resourceManager.getString('jlrxxgl','gkjyxkzh')}" />
 						<cus:QTextInput id="gkjyxkzh" text="@{model.vo.gkjyxkzh}" width="16%" editable="false" />
 						<s:Image width="3%"  source="@Embed(source='resource/photo/open.png')" toolTip="上传附件"  buttonMode="true"  click="model.upload(event)"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/tj/Sjjyrxxtj.mxml

@@ -17,7 +17,6 @@
 			import mx.formatters.DateFormatter;
 			import mx.rpc.events.ResultEvent;
 			
-			import spark.events.IndexChangeEvent;
 			import spark.formatters.NumberFormatter;
 			[Bindable]
 			private var list:ArrayCollection;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/tj/whqytj.mxml

@@ -14,9 +14,8 @@
 			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.SystemModel;
 			import com.jtgh.yjpt.vo.sys.MenuVo;
-
+			
 			import mx.collections.ArrayCollection;
-			import mx.controls.dataGridClasses.DataGridColumn;
 			import mx.events.FlexEvent;
 			import mx.formatters.DateFormatter;
 			import mx.rpc.events.ResultEvent;	

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

@@ -162,8 +162,7 @@
 				</s:HGroup>
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('gkwxhwzyfzblhhz','ssgq')}" width="130"  textAlign="right"/>
-					<cus:QComboBox id="query_gq" width="180" comboxClass="GqBySzdSelect" parentId="{Global.szd}" hasBlank="true" />	
-					
+					<cus:QComboBox id="query_gq" width="180" comboxClass="GqBySzdSelect" parentId="{Global.szd}" hasBlank="true" />				
 				</s:HGroup>
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('gkwxhwzyfzblhhz','qymc')}" width="130"  textAlign="right"/>
@@ -171,17 +170,19 @@
 				</s:HGroup>
 			</s:HGroup>
 			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup width="31%" verticalAlign="middle" >
+					<cus:QLabel text="站所" width="130" textAlign="right"/>
+					<cus:QComboBox id="query_zs" enabled="{!Utils.getCurrentUser().sfsyzs}"  width="180" selectedVO="{Utils.getCurrentUser().zs}" comboxClass="ZsBySzdSelect" hasBlank="true" parentId="{Global.szd.id}"/>
+				</s:HGroup>
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="办理编号 " width="130"  textAlign="right"/>
 					<cus:QTextInput id="blbh" width="180" />
 				</s:HGroup>
-				<s:HGroup width="31%" verticalAlign="middle">
+				<s:HGroup width="30%" verticalAlign="middle">
 					<cus:QLabel text="{resourceManager.getString('gkwxhwzyfzblhhz','fddbr')}" width="130"  textAlign="right"/>
 					<cus:QTextInput id="fddbr" width="180" />
 				</s:HGroup>
-				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
-					<!--s:Button label="{resourceManager.getString('gkwxhwzyfzblhhz','shouqi')}" click="shouqi()" /-->
-					<cus:QLabel   width="130"/>
+				<s:HGroup  verticalAlign="middle" textAlign="right">
 					<button:QueryButton click="thisModel.doQuery(event)"/>
 				</s:HGroup>
 			</s:HGroup>

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

@@ -13,10 +13,10 @@
 			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.vo.zyfzndjy.GkwxhwzyfzblhhzVo;
 			
-			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
 			
 			import spark.components.gridClasses.GridColumn; 
@@ -130,6 +130,10 @@
 				</s:HGroup>
 			</s:HGroup>
 			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup width="31%" verticalAlign="middle" visible="false" includeInLayout="false" >
+					<cus:QLabel text="站所" width="130" textAlign="right"/>
+					<cus:QComboBox enabled="{!Utils.getCurrentUser().sfsyzs}" id="query_zs" width="180" comboxClass="ZsBySzdSelect" hasBlank="true" parentId="{Global.szd.id}"/>
+				</s:HGroup>
 				<s:HGroup width="31%" verticalAlign="middle">
 					<cus:QLabel text="办理编号 " width="130"  textAlign="right"/>
 					<cus:QTextInput id="blbh" width="180" />

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

@@ -72,6 +72,21 @@
 				</s:HGroup>
 			</s:HGroup>
 			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup width="31%" verticalAlign="middle" >
+					<cus:QLabel text="站所" width="130" textAlign="right"/>
+					<cus:QComboBox id="query_zs" enabled="{!Utils.getCurrentUser().sfsyzs}"  width="180" comboxClass="ZsBySzdSelect" hasBlank="true" parentId="{Global.szd.id}"/>
+				</s:HGroup>
+				<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>
+			<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"/>
 					<ui:DateTime id="query_yxrq_1" width="180"/>

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

@@ -91,6 +91,10 @@
 			{
 				query_gq.reload(query_gk.selectedVO);
 				query_gkdw.reload(query_gk.selectedVO as CodeVo);
+				if(query_gk.selectedVO != null)
+				{
+					query_zs.reload((query_gk.selectedVO as CodeVo).id)
+				}
 				
 			}
 			private function labelFun(item:Object, column:GridColumn):String
@@ -181,20 +185,32 @@
 		</s:Group>
 		<s:VGroup id="searchGroup" width="100%" paddingLeft="10" 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  horizontalAlign="left" verticalAlign="middle"  width="31%">
-						<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gk')}"  width="130"/>
-						<cus:QComboBox  id="query_gk" comboxClass="SzdSelect" selectedVO="{Global.szd}" parentId="{Global.szd.id}" width="180"/>
-					</s:HGroup>
-					<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
-						<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gq')}" width="130" />
-						<cus:QComboBox id="query_gq"  comboxClass="GqBySzdSelect" parentId="{Global.szd}" hasBlank="true" width="180"/>
-					</s:HGroup>
-					<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
-						<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gkdw')}"  width="130"/>
-						<cus:QComboBox id="query_gkdw" comboxClass="WhqySelect" parentId="{Global.szd}" hasBlank="true" width="180"/>
-					</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gk')}"  width="130"/>
+					<cus:QComboBox  id="query_gk" comboxClass="SzdSelect" selectedVO="{Global.szd}" parentId="{Global.szd.id}" width="180"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gq')}" width="130" />
+					<cus:QComboBox id="query_gq"  comboxClass="GqBySzdSelect" parentId="{Global.szd}" hasBlank="true" width="180"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gkdw')}"  width="130"/>
+					<cus:QComboBox id="query_gkdw" comboxClass="WhqySelect" parentId="{Global.szd}" hasBlank="true" width="180"/>
+				</s:HGroup>
+			</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_zs" enabled="{!Utils.getCurrentUser().sfsyzs}" comboxClass="ZsBySzdSelect" hasBlank="true" parentId="{Global.szd.id}" width="180"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="编号" width="130"/>
+					<cus:QTextInput id="query_bh" width="180"/>
 				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">			
+					<cus:QLabel text="船名" width="130"/>
+					<cus:QTextInput id="query_hmhc" width="180"/>
+				</s:HGroup>	
 			</s:HGroup>
 			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
 				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
@@ -226,35 +242,30 @@
 			</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:QTextInput id="query_bh" width="180"/>
-				</s:HGroup>
-				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
 					<cus:QLabel text="危险物品编号" width="130" />
 					<cus:QTextInput id="query_hwpmbh" width="180"/>
 				</s:HGroup>
 				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
 					<cus:QLabel text="危险物品名称"  width="130"/>
 					<cus:QTextInput id="query_hwpm" width="180"/>
-				</s:HGroup>
-			</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:QTextInput id="query_hmhc" width="180"/>
 				</s:HGroup>			
 				<s:HGroup width="31%"   horizontalAlign="left" verticalAlign="middle">			
 					<cus:QLabel  width="130" text="内外贸" />			
 					<cus:QComboBox id="mao" comboxClass="MaoSelect" hasBlank="true"
-							   width="180"/>		
+								   width="180"/>		
 				</s:HGroup>	
+			</s:HGroup>
+			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">		
 				<s:HGroup width="30%" horizontalAlign="left" verticalAlign="middle">
 					<cus:QLabel width="130" text="任务状态"/>
 					<ui:PsComboBox id="query_rwzt" dataProvider="{rwztList}" labelField="text"  width="180" selectedIndex="0"/>
 				</s:HGroup>
-				<s:HGroup  verticalAlign="middle" textAlign="left">				
+				<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
+				</s:HGroup>
+				<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">
+					<cus:QLabel width="130"/>
 					<button:QueryButton  click="thisModel.doQuery(event)" />
-				</s:HGroup>		
+				</s:HGroup>	
 			</s:HGroup>
 		</s:VGroup>	
 		<ui:DataGrid id="dataGrid"  width="100%" borderAlpha="1" minHeight="330" sortChange="thisModel.doSort(event)"

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

@@ -125,6 +125,10 @@
 					<cus:QLabel text="{resourceManager.getString('yjgl','yjwz.gkdw')}"  width="130"/>
 					<cus:QComboBox id="query_gkdw" comboxClass="WhqySelect" parentId="{Global.szd}" hasBlank="true" width="180"/>
 				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="站所"  width="130"/>
+					<cus:QComboBox  id="query_zs" comboxClass="ZsBySzdSelect" hasBlank="true" parentId="{Global.szd.id}" width="180"/>
+				</s:HGroup>
 			</s:HGroup>
 		</s:HGroup>
 		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">

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

@@ -390,28 +390,28 @@
 										   
 										   label="@{zysqbp.accessory.name}" width="150"/>
 						</s:HGroup>
-						<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}" 
-								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}">
+						<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}" 
+								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
 							<s:BorderContainer  width="100%" borderWeight="1">
 								<cus:QLabel fontWeight="bold" text="审批" 
 											width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
 							</s:BorderContainer>
 						</s:HGroup>
-						<s:HGroup width="100%" height="25"  verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}" 
-								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}">
+						<s:HGroup width="100%" height="25"  verticalAlign="middle" visible="{zysqbp.recordStatus==Constants.RECORD_STATE_COMPLETED || zysqbp.recordStatus == Constants.RECORD_STATE_COMPLETED|| zysqbp.recordStatus == Constants.RECORD_STATE_REJECT}" 
+								  includeInLayout="{zysqbp.recordStatus==Constants.RECORD_STATE_COMPLETED || zysqbp.recordStatus == Constants.RECORD_STATE_COMPLETED|| zysqbp.recordStatus == Constants.RECORD_STATE_REJECT}">
 							<cus:QLabel text="审批意见" width="120" textAlign="right"/>
 							<cus:QTextInput id="shyj" width="200" editable="false" text="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditMsg:zysqbp.xsscTask.auditMsg}"/>			
 							<cus:QLabel width="120"/>
 							<s:Image visible="{qianzhang}" 
 									  id="zhang"/>
 						</s:HGroup>
-						<s:HGroup width="100%" height="25"  verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}"
-								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}">
+						<s:HGroup width="100%" height="25"  verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}"
+								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
 							<cus:QLabel text="审批机构" width="120" textAlign="right"/>
 							<cus:QTextInput id="shjg" width="200"  editable="false" text="{zysqbp.xsscTask==null?zysqbp.zdspTask.byzd2:zysqbp.xsscTask.byzd2}"/>	
 						</s:HGroup>
-						<s:HGroup width="100%" height="25"  verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}" 
-								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8}">
+						<s:HGroup width="100%" height="25"  verticalAlign="middle" visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}" 
+								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
 							<cus:QLabel text="审批人" width="120" textAlign="right"/>
 							<cus:QTextInput id="shr" width="200"  editable="false" text="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditUsername:zysqbp.xsscTask.auditUsername}"/>	
 							<cus:QLabel text="审批时间" width="120" textAlign="right"/>

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

@@ -202,5 +202,9 @@ package com.jtgh.yjpt.vo.access
 				sfcd = YesNoSelect.NO;
 			}
 		}
+		
+		public function get sfsyzs():Boolean{
+			return zs != null;
+		}
 	}
 }