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

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

@@ -48,7 +48,8 @@ package com.jtgh.yjpt.common
 	import com.jtgh.yjpt.vo.gg.GgVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.hs.CbVo;
-	import com.jtgh.yjpt.vo.hs.HsHwVo;
+	import com.jtgh.yjpt.vo.cjhs.CjhsHwVo;
+	import com.jtgh.yjpt.vo.cjhs.CjhsVo;
 	import com.jtgh.yjpt.vo.hs.HsVo;
 	import com.jtgh.yjpt.vo.jlrxxgl.GlzdxxVo;
 	import com.jtgh.yjpt.vo.jsxmaqsc.GkjsxmaqscVo;
@@ -224,7 +225,8 @@ package com.jtgh.yjpt.common
 		CbVo;
 		ZysqbphsdbVo;
 		HsVo;
-		HsHwVo;
+		CjhsHwVo;
+		CjhsVo;
 		AqsszpscVo;
 		YhgzVo;
 		// Select

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

@@ -0,0 +1,56 @@
+package com.jtgh.yjpt.model.zysqbp
+{
+	import com.jtgh.yjpt.common.BusinessContext;
+	import com.jtgh.yjpt.common.util.Utils;
+	import com.jtgh.yjpt.model.BaseModel;
+	import com.jtgh.yjpt.view.zysqbp.Cjhssb;
+	import com.jtgh.yjpt.view.zysqbp.CjhssbInfo;
+	import com.jtgh.yjpt.vo.cjhs.CjhsVo;
+	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
+	import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
+	
+	import flash.events.Event;
+	import flash.events.MouseEvent;
+	
+	import mx.collections.ArrayCollection;
+	import mx.rpc.events.ResultEvent;
+
+	[Bindable]
+	public class CjhsModel extends BaseModel
+	{
+		public var parentView:Object;
+		public var view:Cjhssb;
+		public var thisDataList:ArrayCollection;
+		public var zysqbp:ZysqbpVo;
+		
+		public function CjhsModel()
+		{
+			super("");
+		}
+		
+		public function pageQuery(pager:SinglePageRequestVo):void
+		{
+			var ksq:Date = view.kszysjq.dateTime;
+			var ksz:Date = view.kszysjz.dateTime;
+			var jsq:Date = view.jszysjq.dateTime;
+			var jsz:Date = view.jszysjz.dateTime;
+			Utils.callRemote("zysqbpController","queryCjhsList",function (r:ResultEvent):void{
+				var bc:BusinessContext=r.result as BusinessContext;
+				thisDataList = bc.getAttribute("list") as ArrayCollection;
+				pager.totalCount =  bc.getAttribute("totalCount") as int;
+			},zysqbp,pager,ksq,ksz,jsq,jsz,view.zygk.text,zysqbp.cm)
+		}
+		
+		/**
+		 * 查询
+		 */
+		public function doQuery(e:Event):void{
+			if(view.pager!=null){
+				view.pager.doQuery();
+			}
+		}
+		
+
+	}
+}
+

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

@@ -3,47 +3,36 @@ package com.jtgh.yjpt.model.zysqbp
 	import com.jtgh.yjpt.common.BusinessContext;
 	import com.jtgh.yjpt.common.Global;
 	import com.jtgh.yjpt.common.IModule;
-	import com.jtgh.yjpt.common.MyEvent;
 	import com.jtgh.yjpt.common.component.ui.DataGridColumn;
 	import com.jtgh.yjpt.common.component.ui.Pager;
-	import com.jtgh.yjpt.common.component.ui.TitleWindow;
 	import com.jtgh.yjpt.common.util.Constants;
 	import com.jtgh.yjpt.common.util.Utils;
 	import com.jtgh.yjpt.model.BaseModel;
-	import com.jtgh.yjpt.model.SystemModel;
 	import com.jtgh.yjpt.model.task.TaskModel;
 	import com.jtgh.yjpt.select.YesNoSelect;
-	import com.jtgh.yjpt.view.access.UserEdit;
 	import com.jtgh.yjpt.view.task.TaskLayout;
 	import com.jtgh.yjpt.view.zysqbp.BgEdit;
 	import com.jtgh.yjpt.view.zysqbp.HsdbInfo;
-	import com.jtgh.yjpt.view.zysqbp.HwpmTree;
 	import com.jtgh.yjpt.view.zysqbp.QxEdit;
 	import com.jtgh.yjpt.view.zysqbp.ZdspszView;
 	import com.jtgh.yjpt.view.zysqbp.ZysqKgEdit;
 	import com.jtgh.yjpt.view.zysqbp.ZysqWgEdit;
 	import com.jtgh.yjpt.view.zysqbp.ZysqbpAudit;
-	import com.jtgh.yjpt.view.zysqbp.ZysqbpCount;
 	import com.jtgh.yjpt.view.zysqbp.ZysqbpEdit;
-	import com.jtgh.yjpt.view.zysqbp.ZysqbpLayout;
 	import com.jtgh.yjpt.view.zysqbp.ZysqbpView;
 	import com.jtgh.yjpt.view.zysqbp.ZysqqxAudit;
 	import com.jtgh.yjpt.view.zysqbp.count.WhzysbContainerCount;
 	import com.jtgh.yjpt.view.zysqbp.count.WhzysbCount;
 	import com.jtgh.yjpt.view.zysqbp.count.WhzysbCount1;
 	import com.jtgh.yjpt.view.zysqbp.count.WhzysbHuizongInformate;
-	import com.jtgh.yjpt.vo.access.UserVo;
 	import com.jtgh.yjpt.vo.common.AccessoryVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
-	import com.jtgh.yjpt.vo.common.PagerVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.common.TaskInfoVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
-	import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
 	import com.jtgh.yjpt.vo.zysqbp.ZysqbpBgVo;
 	import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
-	import com.smapp.sg186.appframework.datamodel.ext.ReturnCode;
 	
 	import flash.display.DisplayObject;
 	import flash.events.Event;
@@ -60,10 +49,8 @@ package com.jtgh.yjpt.model.zysqbp
 	import mx.controls.Alert;
 	import mx.core.FlexGlobals;
 	import mx.events.CloseEvent;
-	import mx.events.FlexEvent;
 	import mx.formatters.DateFormatter;
 	import mx.managers.CursorManager;
-	import mx.managers.PopUpManager;
 	import mx.rpc.events.ResultEvent;
 	import mx.utils.ObjectUtil;
 	import mx.utils.StringUtil;

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

@@ -314,7 +314,7 @@
 						<s:HGroup width="100%" verticalAlign="middle" visible="{Global.szd.id!=Constants.SZD_ID_PROVINCE}" includeInLayout="{Global.szd.id!=Constants.SZD_ID_PROVINCE}">
 							<s:Label text="安全评价报告备案" paddingLeft="5" color="#000000" fontSize="12" fontFamily="宋体"/>
 							<s:Spacer width="100%"/>
-							<mx:LinkButton id="pj" rollOverColor="#0002fe" focusColor="#0002fe" selectionColor="#ceeffe"  label="{'['+aqpjbaDB+'条]'}" mouseOver="labelMouseOver(pj,event)" mouseOut="labelMouseOut(pj,event)"  click="redirectDB(aqpjbaKey)" color="#000000"/>
+							<mx:LinkButton id="pj" rollOverColor="#ceeffe" focusColor="#0002fe" selectionColor="#ceeffe"  label="{'['+aqpjbaDB+'条]'}" mouseOver="labelMouseOver(pj,event)" mouseOut="labelMouseOut(pj,event)"  click="redirectDB(aqpjbaKey)" color="#000000"/>
 						</s:HGroup>
 					</s:Group>
 					<s:Group width="100%" height="25" visible="{Global.szd.id!=Constants.SZD_ID_PROVINCE}" includeInLayout="{Global.szd.id!=Constants.SZD_ID_PROVINCE}">

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ui:QueryLayout xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+		 xmlns:cus="com.jtgh.yjpt.common.cus.*"
+		 xmlns:button="com.jtgh.yjpt.common.component.ui.button.*"
+		 xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%" 
+		 xmlns:dateField="com.jtgh.yjpt.common.dataField.*" creationComplete="creationCompleteHandler(event)">
+	<fx:Script>
+		<![CDATA[
+			import com.anychart.axesPlot.scales.dateTime.DateUtils;
+			import com.jtgh.yjpt.vo.cjhs.CjhsVo;
+			import com.jtgh.yjpt.common.TypeBase;
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.model.zysqbp.CjhsModel;
+			import com.jtgh.yjpt.vo.hs.HsVo;
+			
+			import mx.core.FlexGlobals;
+			import mx.events.FlexEvent;
+			
+			
+			[Bindable]
+			public var thisModel:CjhsModel = new CjhsModel();
+			
+			protected function creationCompleteHandler(event:FlexEvent):void
+			{
+//				kszysjz.dateTime=new Date();
+//				var bgsj:Date = new Date();
+//				DateUtils.addFloatDays(bgsj,-7);
+//				kszysjq.dateTime=bgsj;
+				thisModel.doQuery(null);
+			}
+			
+			/**
+			 * 作业申请的签收/办理
+			 */ 
+			protected function linkButtonFunc(data:CjhsVo):void
+			{
+				var view:CjhssbInfo = new CjhssbInfo();
+				view.cjhs=data;	
+				view.model = thisModel;
+				Utils.popupWindow("详细信息",view as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject,null, 600, 350);
+			}
+		]]>
+	</fx:Script>
+	<s:HGroup width="100%" gap="0" top="3" horizontalAlign="left" verticalAlign="middle"  >
+		<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="45%">
+			<cus:QLabel text="" width="130"/>
+		</s:HGroup>
+	</s:HGroup>
+	<s:HGroup width="100%" gap="0" top="3" horizontalAlign="left" verticalAlign="middle"  >
+		<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="45%">
+			<cus:QLabel text="开始作业时间起" width="130"/>
+			<ui:DateTime id="kszysjq" width="200"/>
+		</s:HGroup>
+		<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="45%">
+			<cus:QLabel text="开始作业时间止" width="130"/>
+			<ui:DateTime id="kszysjz" width="200"/>
+		</s:HGroup>
+	</s:HGroup>
+	<s:HGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle"  >
+		<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="45%">
+			<cus:QLabel text="结束作业时间起" width="130"/>
+			<ui:DateTime id="jszysjq" width="200"/>
+		</s:HGroup>
+		<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="45%">
+			<cus:QLabel text="结束作业时间止" width="130"/>
+			<ui:DateTime id="jszysjz" width="200"/>
+		</s:HGroup>
+	</s:HGroup>
+	<s:HGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle"  >
+		<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="45%">
+			<cus:QLabel text="作业港口" width="130"/>
+			<cus:QTextInput id="zygk" text="" width="200" />		
+		</s:HGroup>
+		<s:HGroup  verticalAlign="middle" horizontalAlign="left" width="45%" >
+			<cus:QLabel text="" width="130"/>
+			<button:IconButton id="query" type="query"  toolTip="{resourceManager.getString('common','btn.query')}" click="thisModel.doQuery(event)"/>
+		</s:HGroup>
+	</s:HGroup>
+	<ui:DataGrid id="dataGrid" width="100%"  dataProvider="{thisModel.thisDataList}" >
+		<ui:columns><s:ArrayList>
+						<ui:DataGridColumn headerText="申报单编号"  dataField="sbdbh"  />
+						<ui:DataGridColumn headerText="码头（公司）"   dataField="ssmt" width="100" showDataTips="true" dataTipField="ssmt"/>
+						<ui:DataGridColumn headerText="船舶名称"  dataField="cbmc" />
+						<ui:DataGridColumn headerText="泊位名称" dataField="bwmc" width="100" showDataTips="true" dataTipField="bwmc"  />
+						<ui:DataGridColumn headerText="开始作业时间" dataField="kszysj" dateFormatString="YYYY-MM-DD JJ:NN:SS" />
+						<ui:DataGridColumn headerText="结束作业时间" dataField="jszysj"  dateFormatString="YYYY-MM-DD JJ:NN:SS"/>
+						<ui:DataGridColumn headerText="作业港口" dataField="zygkmc"  />
+						<ui:DataGridColumn headerText="是否匹配" dataField="sfppStr"  />
+						<ui:DataGridColumn type="{TypeBase.LINKBUTTON}" linkButtonLabel="查看详细"
+										   linkButtonFunc="{linkButtonFunc}" headerText="{resourceManager.getString('common','btn.cz')}"/>
+					</s:ArrayList></ui:columns>
+	</ui:DataGrid>
+	<ui:Pager id="pager" queryFunction="{thisModel.pageQuery}"/>
+</ui:QueryLayout>

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

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:VGroup xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
+		 xmlns:cus="com.jtgh.yjpt.common.cus.*"
+		 xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%" 
+		 xmlns:dateField="com.jtgh.yjpt.common.dataField.*" creationComplete="creationCompleteHandler(event)">
+	<fx:Script>
+		<![CDATA[
+			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.common.TypeBase;
+			import com.jtgh.yjpt.common.util.Utils;
+			import com.jtgh.yjpt.model.zysqbp.CjhsModel;
+			import com.jtgh.yjpt.vo.cjhs.CjhsHwVo;
+			import com.jtgh.yjpt.vo.cjhs.CjhsVo;
+			
+			import mx.collections.ArrayCollection;
+			import mx.events.FlexEvent;
+			import mx.rpc.events.ResultEvent;
+			
+			[Bindable]
+			public var list:ArrayCollection;
+			[Bindable]
+			public var cjhs:CjhsVo;
+			[Bindable]
+			public var model:CjhsModel;
+			
+			protected function creationCompleteHandler(event:FlexEvent):void
+			{
+				init();
+			}
+			
+			public function init():void{
+				Utils.callRemote("zysqbpController","queryCjhsHwList",function (r:ResultEvent):void{
+					var bc:BusinessContext=r.result as BusinessContext;
+					list= bc.getAttribute("list") as ArrayCollection;
+				},cjhs.sbdbh,model.zysqbp)
+			}
+			
+			/**
+			 * 作业申请的签收/办理
+			 */ 
+			protected function linkButtonFunc(data:CjhsHwVo):void
+			{
+				Utils.doOtherConfirm(function():void{
+					if(data.sfpp=="N"){
+						data.sfpp =="Y";
+						Utils.callRemote("zysqbpController","saveDb",function():void{ 
+							
+							init();						
+							if(model.view!=null){
+								model.view.pager.doQuery();
+							}
+							if(model.parentView!=null){
+								model.parentView.initCjhs();
+							}
+						},data,model.zysqbp.id);
+					}
+					
+				});
+			}
+			
+			/**
+			 * 按钮显示
+			 */
+			private function linkButtonLabel(data:CjhsHwVo):String
+			{
+				if(data.sfpp=="N")
+					return "匹配";
+				else 
+					return "";
+			}
+			
+		]]>
+	</fx:Script>
+	
+	<ui:DataGrid id="dataGrid" width="100%"  dataProvider="{list}" height="300">
+		<ui:columns><s:ArrayList>
+						<ui:DataGridColumn headerText="申报单编号"  dataField="sbdbh" />			
+						<ui:DataGridColumn headerText="危规编号"  dataField="wgbh"  />
+						<ui:DataGridColumn headerText="危险品名称"  dataField="zqysmczw"  />
+						<ui:DataGridColumn headerText="总重量" dataField="zzl"  />
+						<ui:DataGridColumn headerText="是否匹配" dataField="sfppStr"  />
+						<ui:DataGridColumn type="{TypeBase.LINKBUTTON}"  linklabelFunc="{linkButtonLabel}"
+										   linkButtonFunc="{linkButtonFunc}" headerText="{resourceManager.getString('common','btn.cz')}"/>
+					</s:ArrayList></ui:columns>
+	</ui:DataGrid>
+</s:VGroup>

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

@@ -10,19 +10,24 @@
 		 horizontalAlign="center">
 	<fx:Script>
 		<![CDATA[
-			import com.jtgh.yjpt.select.YesNoSelect;
+			import com.jtgh.yjpt.common.BusinessContext;
+			import com.jtgh.yjpt.model.zysqbp.CjhsModel;
 			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.task.TaskModel;
 			import com.jtgh.yjpt.model.zysqbp.ShbpEditModel;
 			import com.jtgh.yjpt.model.zysqbp.ShbpModel;
+			import com.jtgh.yjpt.select.YesNoSelect;
+			import com.jtgh.yjpt.vo.cjhs.CjhsHwVo;
+			import com.jtgh.yjpt.vo.cjhs.CjhsVo;
 			import com.jtgh.yjpt.vo.common.CodeVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
 			
 			import mx.core.FlexGlobals;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
+			import mx.rpc.events.ResultEvent;
 			import mx.utils.StringUtil;
 			[Bindable]
 			public var thisModel:ShbpEditModel = new ShbpEditModel();
@@ -42,12 +47,15 @@
 			public var mode:String;
 			[Bindable]
 			public var result:String="";
+			[Bindable]
+			public var cjhs:CjhsVo;
+			[Bindable]
+			public var cjhsHw:CjhsHwVo;
 			/**
 			 * 创建完成
 			 */
 			protected function creationComplete(event:FlexEvent):void
-			{
-				
+			{				
  				view=this;
 				thisModel.doCreationComplete(this);
 				if(zysqbp.hwxs!=null){
@@ -63,6 +71,26 @@
 					cds.visible=true;
 					cds.text= zysqbp.byzd3;
 				}
+				//初始化海事申报
+				initCjhs();
+			}
+			
+			/**
+			 * 初始化海事申报
+			 */
+			public function initCjhs():void{
+				if(zysqbp != null){
+					Utils.callRemote("zysqbpController","doCjhsInit",function(r:ResultEvent):void{
+						var bc:BusinessContext =  r.result as BusinessContext;
+						if(bc != null && bc.result != null){
+							cjhs =bc.result as CjhsVo;
+						}
+						if(cjhs!=null && cjhs.hshwList!=null){
+							cjhsHw = cjhs.hshwList.getItemAt(0) as CjhsHwVo;
+						}
+					},zysqbp.id);
+				}
+				
 			}
 			
 			
@@ -225,6 +253,17 @@
 				}
 			}
 			
+			/**
+			 * 打开海事申报页面
+			 */
+			public function doDisplayHS(e:Event):void{			
+				var view:Cjhssb = new Cjhssb();
+				view.thisModel.parentView=this;
+				view.thisModel.zysqbp=zysqbp;
+				view.thisModel.view=view;
+				Utils.popupWindow("海事申报信息",view as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject,null, 1000, 550);
+			}
+			
 		]]>
 	</fx:Script>
 	<s:VGroup width="780" height="100%" paddingBottom="5" paddingLeft="5"
@@ -436,9 +475,42 @@
 							<cus:QLabel width="120" text="海事审批报表"/>
 							<mx:LinkButton id="fileName" textDecoration="underline" textAlign="left"
 										   label="@{zysqbp.accessory.name}" width="200"/>
-							<cus:QLabel width="120" text="对比结果：" />
-							<cus:QLabel width="120" text="{zysqbp.mergeResult}" />
-							<s:Button  label="查看"  click="showInfo(event)" skinClass="skins.cus.ButtonSkin"/>
+						</s:HGroup>
+						<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="middle" >
+							<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%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="申报单编号" />
+							<cus:QTextInput width="200" text="@{cjhs.sbdbh}" editable="{enable}"/>
+							<cus:QLabel width="120" text="码头（企业）" />
+							<cus:QTextInput text="@{cjhs.ssmt}" width="200" editable="{enable}"/>
+						</s:HGroup>
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="作业港口名称" />
+							<cus:QTextInput  width="200" text="@{cjhs.zygkmc}" editable="{enable}"/>
+							<cus:QLabel width="120" text="作业泊位名称" />
+							<cus:QTextInput  width="200" text="@{cjhs.bwmc}" editable="{enable}"/>				
+						</s:HGroup>
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="物品名称" />
+							<cus:QTextInput  width="200" text="@{cjhsHw.zqysmczw}" editable="{enable}"/>
+							<cus:QLabel width="120" text="物品编号" />
+							<cus:QTextInput  width="200" text="@{cjhsHw.wgbh}" editable="{enable}"/>
+						</s:HGroup>
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel  width="120" text="作业开始时间" />
+							<ui:DateTime width="200" dateTime="{cjhs.kszysj}" hasTime="true" enabled="false" />
+							<cus:QLabel  width="120" text="作业结束时间" />
+							<ui:DateTime width="200" dateTime="{cjhs.jszysj}" enabled="false" hasTime="true"/>
+						</s:HGroup>	
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="总重量" />
+							<cus:QTextInput  width="200" text="@{cjhsHw.zzl}" editable="{enable}"/>		
+							<cus:QLabel  width="120" text="" />
+							<mx:LinkButton label="更多......" click="doDisplayHS(event)" fontWeight="bold" color="#0002fe" />
 						</s:HGroup>
 						<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="middle" >
 							<s:BorderContainer  width="100%" borderWeight="1">

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

@@ -117,7 +117,7 @@
 			/**
 			 * 作业申请的签收/办理
 			 */ 
-			protected function linkButtonFunc(data:ZysqbpVo):void
+			protected function linkButtonFunc1(data:ZysqbpVo):void
 			{
 //				if(data.taskState==Constants.TASK_ASSIGN)
 //				{
@@ -160,6 +160,26 @@
 //					},data);
 			}
 			
+			/**
+			 * 作业申请的签收/办理
+			 */ 
+			protected function linkButtonFunc(data:ZysqbpVo):void
+			{
+				if(data.recordStatus==Constants.RECORD_STATE_BGSUBMIT){
+					thisModel.dobgAudit(data.id,"audit",null);
+				}else if(data.recordStatus==Constants.RECORD_STATE_QXSUBMIT){//取消作业的审核办理
+					thisModel.doqxAudit(data.id,"audit",null);
+				}else{
+					//办理 申请人不是经营人，提供的入口进行修改
+					if(data.recordStatus==Constants.RECORD_STATE_REJECT)
+					{
+						// 打回时修改
+						thisModel.toEdit(null);
+					}else{
+						thisModel.doViewPop(data.id,"audit",null);
+					}
+				}
+			}
 		]]>
 	</fx:Script>
 	<ui:QueryLayout id="zysblayout" visible="true" includeInLayout="{zysblayout.visible}">

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

@@ -10,21 +10,27 @@
 		 horizontalAlign="center">
 	<fx:Script>
 		<![CDATA[
-			import com.jtgh.yjpt.select.YesNoSelect;
+			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.PrintParam;
 			import com.jtgh.yjpt.common.PrintTypes;
 			import com.jtgh.yjpt.common.util.Constants;
 			import com.jtgh.yjpt.common.util.PrintUtil;
+			import com.jtgh.yjpt.common.util.Utils;
 			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.cjhs.CjhsHwVo;
+			import com.jtgh.yjpt.vo.cjhs.CjhsVo;
 			import com.jtgh.yjpt.vo.common.CodeVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
 			
 			import mx.collections.ArrayCollection;
+			import mx.core.FlexGlobals;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
+			import mx.rpc.events.ResultEvent;
 			import mx.utils.StringUtil;
 			
 			import spark.formatters.DateTimeFormatter;
@@ -41,7 +47,10 @@
 			public var zydd:Number;
 			[Bindable]
 			public var qianzhang:Boolean=true;//用来判断签章图片是否显示，默认是显示
-			
+			[Bindable]
+			public var cjhs:CjhsVo;
+			[Bindable]
+			public var cjhsHw:CjhsHwVo;
 			
 			
 			/**
@@ -73,8 +82,27 @@
 				}		
 				zhang.visible=false;
 				zhang.includeInLayout=false;
+				//初始化海事申报
+				initCjhs();
 			}
 			
+			/**
+			 * 初始化海事申报
+			 */
+			public function initCjhs():void{
+				if(zysqbp != null){
+					Utils.callRemote("zysqbpController","doCjhsInit",function(r:ResultEvent):void{
+						var bc:BusinessContext =  r.result as BusinessContext;
+						if(bc != null && bc.result != null){
+							cjhs =bc.result as CjhsVo;
+						}
+						if(cjhs!=null && cjhs.hshwList!=null){
+							cjhsHw = cjhs.hshwList.getItemAt(0) as CjhsHwVo;
+						}
+					},zysqbp.id);
+				}
+				
+			}
 			public function reloadGq(e:Event):void
 			{
 				szgq.reload(szd.selectedVO);
@@ -185,6 +213,17 @@
 				PrintUtil.doPrint(param,"_blank");
 			}
 			
+			/**
+			 * 打开海事申报页面
+			 */
+			public function doDisplayHS(e:Event):void{			
+				var view:Cjhssb = new Cjhssb();
+				view.thisModel.parentView=this;
+				view.thisModel.zysqbp=zysqbp;
+				view.thisModel.view=view;
+				Utils.popupWindow("海事申报信息",view as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject,null, 1000, 550);
+			}
+			
 		]]>
 	</fx:Script>
 	<s:VGroup width="780" height="100%" paddingBottom="5" paddingLeft="5"
@@ -390,6 +429,42 @@
 										   
 										   label="@{zysqbp.accessory.name}" width="150"/>
 						</s:HGroup>
+						<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="middle" >
+							<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%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="申报单编号" />
+							<cus:QTextInput width="200" text="@{cjhs.sbdbh}" editable="{enable}"/>
+							<cus:QLabel width="120" text="码头（企业）" />
+							<cus:QTextInput text="@{cjhs.ssmt}" width="200" editable="{enable}"/>
+						</s:HGroup>
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="作业港口名称" />
+							<cus:QTextInput  width="200" text="@{cjhs.zygkmc}" editable="{enable}"/>
+							<cus:QLabel width="120" text="作业泊位名称" />
+							<cus:QTextInput  width="200" text="@{cjhs.bwmc}" editable="{enable}"/>				
+						</s:HGroup>
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="物品名称" />
+							<cus:QTextInput  width="200" text="@{cjhsHw.zqysmczw}" editable="{enable}"/>
+							<cus:QLabel width="120" text="物品编号" />
+							<cus:QTextInput  width="200" text="@{cjhsHw.wgbh}" editable="{enable}"/>
+						</s:HGroup>
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel  width="120" text="作业开始时间" />
+							<ui:DateTime width="200" dateTime="{cjhs.kszysj}" hasTime="true" enabled="false" />
+							<cus:QLabel  width="120" text="作业结束时间" />
+							<ui:DateTime width="200" dateTime="{cjhs.jszysj}" enabled="false" hasTime="true"/>
+						</s:HGroup>	
+						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="总重量" />
+							<cus:QTextInput  width="200" text="@{cjhsHw.zzl}" editable="{enable}"/>		
+							<cus:QLabel  width="120" text="" />
+							<mx:LinkButton label="更多......" click="doDisplayHS(event)" fontWeight="bold" color="#0002fe" />
+						</s:HGroup>
 						<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">

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/cjhs/CjhsHwVo.as

@@ -0,0 +1,28 @@
+package com.jtgh.yjpt.vo.cjhs
+{
+	import mx.collections.ArrayCollection;
+
+	[Bindable]
+	[RemoteClass(alias="com.jtgh.yjpt.entity.cjhs.CjhsHwEntity")]
+	public class CjhsHwVo
+	{
+		public function CjhsHwVo()
+		{
+		}
+
+		public var sbdbh:String;
+		public var bsxh:Number;
+		public var xh:Number;
+		public var wgbh:String;
+		public var zqysmczw:String;
+		public var zzl:String;
+		public var sfpp:String="N";
+		
+		public function get sfppStr():String{
+			if(sfpp=="Y") return "是";
+			if(sfpp=="N") return "否";
+			return "";
+		}
+		
+	}
+}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/cjhs/CjhsVo.as

@@ -0,0 +1,60 @@
+package com.jtgh.yjpt.vo.cjhs
+{
+	import mx.collections.ArrayCollection;
+	import mx.resources.ResourceManager;
+
+	[Bindable]
+	[RemoteClass(alias="com.jtgh.yjpt.entity.cjhs.CjhsEntity")]
+	public class CjhsVo
+	{
+		public function CjhsVo()
+		{
+		}
+		
+		public var sbdbh:String;
+		public var cbbh:String;
+		public var cbmc:String;
+		public var bwdm:String;
+		public var bwmc:String;
+		public var kszysj:Date;
+		public var jszysj:Date;
+		public var lzbz:String;
+		public var hc:String;
+		public var nwmbz:String;
+		public var jcgbz:String;
+		public var zqysmczw:String;
+		public var zygkmc:String;
+		public var ssmt:String;
+		public var zzl:Number;
+		public var hshwList:ArrayCollection;
+		public var sfpp:String="N";
+		public function get sfppStr():String{
+			if(sfpp=="Y") return "是";
+			if(sfpp=="N") return "否";
+			return "";
+		}
+		
+		public function get lzbzStr():String{
+			if(lzbz!=null){
+				var lname:String=ResourceManager.getInstance().getString("select","hs.spzt" + lzbz);
+				if(null == lname || lname=="")
+				{
+					lname = lzbz;
+				}
+				return lname;
+			}
+			return "";
+		}
+		
+		public function get nwm():String{
+			if(nwmbz=="1") return "外贸";
+			if(nwmbz=="0") return "内贸";
+			return "";
+		}
+		public function get jcg():String{
+			if(jcgbz=="1") return "进港";
+			if(jcgbz=="0") return "出港";
+			return "";
+		}
+	}
+}