git-svn-id: https://192.168.57.71/svn/jsgkj@1683 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/aqpjjgxx/AqpjjgxxModel.as

@@ -195,9 +195,11 @@ package com.jtgh.yjpt.model.aqpjjgxx
 			Utils.callRemote("aqpjjgxxController","findOne",
 				function(r:ResultEvent):void{
 					var bc:BusinessContext = r.result  as BusinessContext;
-					editView.parentView = thisView;
-					editView.vo=bc.result as AqpjjgxxVo;
-					Utils.popupWindow("编辑", editView, thisView as DisplayObject, null, 780, 600);
+					if(bc!=null){
+						editView.parentView = thisView;
+						editView.vo=bc.result as AqpjjgxxVo;
+						Utils.popupWindow("编辑", editView, thisView as DisplayObject, null, 780, 600);
+					}
 				}, vo.id);
 		}
 		

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

@@ -515,7 +515,7 @@
 								rowHeight="30" textAlign="center" dataProvider="{model.cgList}" >
 						<ui:columns>
 							<s:ArrayList>
-								<ui:DataGridColumn dataField="jyrName" headerText="{resourceManager.getString('yjgl','cg.dwmc')}" />
+								<ui:DataGridColumn dataField="cgmc" headerText="{resourceManager.getString('yjgl','cg.cgmc')}" />
 								<ui:DataGridColumn dataField="cgqmc" headerText="{resourceManager.getString('yjgl','cg.cgqmc')}" />
 								<ui:DataGridColumn dataField="cgqmj_s" headerText="{resourceManager.getString('yjgl','cg.cgqmj')}"/>
 								<ui:DataGridColumn dataField="cggs_s" headerText="{resourceManager.getString('yjgl','cg.cggs')}"/>

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

@@ -96,7 +96,7 @@
 			public function doPass(e:Event):void{
 				getShyj();
 				
-				if(flag=="4"){
+				if(flag=="4" && yanxu.selected){
 					var checkFlag:Boolean = true;
 					//发正时间
 					var _fzsj:Date  = vo.fzsj;

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

@@ -485,7 +485,8 @@
 				</s:HGroup>		-->		
 			
 			<!--<s:BorderContainer  width="100%" borderWeight="0" visible="{enableflg}" includeInLayout="{enableflg}">-->
-				<cus:QLabel fontWeight="bold" text="证书扫描件"  width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
+				<cus:QLabel fontWeight="bold" text="证书扫描件"  width="100%" visible="{enableflg}" includeInLayout="{enableflg}"
+							textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
 			<!--</s:BorderContainer>-->
 			<cus:QLabel width="200" text="建议图片大小：300*200" textAlign="left" visible="{enableflg}" includeInLayout="{enableflg}"/>
 			<s:HGroup id="fztp" width="100%" height="200" horizontalAlign="left" verticalAlign="middle" visible="{enableflg}" includeInLayout="{enableflg}">

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

@@ -16,9 +16,10 @@
 			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.common.CodeVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
-			import com.jtgh.yjpt.select.YesNoSelect;
+			
 			import flash.external.ExternalInterface;
 			
 			import mx.collections.ArrayCollection;
@@ -105,7 +106,7 @@
 				}
 				else{
 					Utils.doOtherConfirm(function():void{
-					var shDate:Date=shsj.selectedDate;
+					var shDate:Date=shsj.dateTime;
 					Utils.callRemote("zysqbpController","aduit",function():void{ 				
 						if(taskModel!=null){
 							taskModel.thisView.doQuery();
@@ -137,7 +138,7 @@
 			
 			public function CallSignatue():Boolean{
 				var shjy:String=StringUtil.trim(shyj.text);
-				var shDate:String=shsj.selectedDate.fullYear+"-"+ (shsj.selectedDate.month+1)+"-"+ shsj.selectedDate.date;  
+				var shDate:String=shsj.dateTime.toString();  
 				var shr_txt:String=StringUtil.trim(shr.text);  
 				var ExtParam:String = "SHYJ=" +shjy + "\r\n"+
 					                  "SHR=" +shr_txt+ "\r\n"+
@@ -157,7 +158,7 @@
 					return;
 				}
 				
-				var shDate:Date=shsj.selectedDate;
+				var shDate:Date=shsj.dateTime;
 				Utils.callRemote("zysqbpController","aduit",function():void{
 					
 					if(taskModel!=null){
@@ -182,7 +183,7 @@
 					return;
 				}
 				Utils.doOtherConfirm(function():void{
-					var shDate:Date=shsj.selectedDate;
+					var shDate:Date=shsj.dateTime;
 					Utils.callRemote("zysqbpController","back",function():void{
 						if(taskModel!=null){
 							taskModel.thisView.doQuery();
@@ -204,7 +205,7 @@
 					return;
 				}
 				Utils.doOtherConfirm(function():void{
-					var shDate:Date=shsj.selectedDate;
+					var shDate:Date=shsj.dateTime;
 					Utils.callRemote("zysqbpController","back",function():void{
 						if(taskModel!=null){
 							taskModel.thisView.doQuery();
@@ -562,7 +563,8 @@
 							<cus:QLabel text="审批人" width="120" textAlign="right"/>
 							<cus:QTextInput id="shr" width="200"  enabled="false" text="{Global.user.name}"/>	
 							<cus:QLabel text="审批时间" width="120" textAlign="right" />
-							<ui:DateField id="shsj" formatString="YYYY-MM-DD" width="200"  enabled="false" selectedDate="{new Date()}"/>
+							<!--<ui:DateField id="shsj" formatString="YYYY-MM-DD" width="200"  enabled="false" selectedDate="{new Date()}"/>-->
+							<ui:DateTime id="shsj" width="200" hasTime="true" enabled="false" dateTime="{new Date()}" />
 						</s:HGroup>	
 						
 					</s:VGroup>

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

@@ -941,7 +941,7 @@
 		</s:HGroup>
 		
 		<s:HGroup width="100%" height="25" horizontalAlign="left" verticalAlign="middle">
-			<cus:QLabel width="20%" text="海事签证审批表"/>
+			<cus:QLabel width="120" text="海事签证审批表"/>
 			<mx:LinkButton id="fileName" width="150" label="@{zysqbp.accessory.name}"
 						   enabled="{!(zysqbp.accessory==null||mode==Constants.mode_view)}"
 						   textAlign="left" textDecoration="underline"/>

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

@@ -128,7 +128,7 @@
 				}
 				else if(data.recordStatus == Constants.RECORD_STATE_COMPLETED || data.recordStatus == Constants.RECORD_STATE_BGCOMPLETED){
 					//完成或变更完成状态，显示操作按钮用来打开补签章页面
-					
+					toSignature(data.id);
 				}
 				else{
 					//办理 申请人不是经营人，提供的入口进行修改

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

@@ -50,6 +50,8 @@
 			private var isShowSignatureBtn:Boolean = false;//是否显示补签章按钮
 			[Bindable]
 			private var isShowSignaturePrintBtn:Boolean = false;//是否显示开启签章后的打印按钮
+			[Bindlable]
+			private var isShowDownloadBtn:Boolean = false;//是否显示下载按钮
 			
 			
 			/**
@@ -153,11 +155,13 @@
 					if(mode=='signature'){
 						//补签章打开
 						isShowSignatureBtn = true;
+						isShowDownloadBtn = false;
 					}else{
 						//view
 						isShowSignaturePrintBtn =true;
+						isShowDownloadBtn = true;
 					}
-				}//end if
+				}//end if  enable signature
 			}
 			
 			public function reloadGq(e:Event):void
@@ -327,6 +331,21 @@
 			}
 	 
 			
+			/**
+			 *签章  
+			 * */
+			public function CallSignatue():Boolean{
+				var shjy:String=StringUtil.trim(shyj.text);//审批意见
+				var shDate:String=shsj.dateTime.toString();  //审批时间
+				var shr_txt:String=StringUtil.trim(shr.text);//审批意见  
+				var ExtParam:String = "SHYJ=" +shjy + "\r\n"+
+					"SHR=" +shr_txt+ "\r\n"+
+					"SHSJ=" + shDate + "\r\n";
+				//签章
+				var SignatureResult:Boolean =ExternalInterface.call("RunBatchSignature",zysqbp.id,Global.user.name,ExtParam);
+				return SignatureResult;
+			}
+			
 		]]>
 	</fx:Script>
 	<s:VGroup width="780" height="100%" paddingBottom="5" paddingLeft="5"
@@ -548,33 +567,34 @@
 							<cus:QTextInput text="@{zysqbp.byzd2}" width="200" editable="{enable}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" height="25" horizontalAlign="left" verticalAlign="middle" >
-							<cus:QLabel width="20%" text="海事签证审批表"/>
-							<mx:LinkButton id="fileName" textDecoration="underline" textAlign="left"
-										   
-										   label="@{zysqbp.accessory.name}" width="150"/>
+							<cus:QLabel width="120" text="海事签证审批表"/>
+							<mx:LinkButton id="fileName" textDecoration="underline" textAlign="left" label="@{zysqbp.accessory.name}" width="150"/>
 						</s:HGroup>
-						<s:HGroup width="100%"  horizontalAlign="left" 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}">
+						<s:HGroup width="100%"  horizontalAlign="left" verticalAlign="middle"
+								  visible="{zysqbp.recordStatus==Constants.RECORD_STATE_COMPLETED || zysqbp.recordStatus == Constants.RECORD_STATE_COMPLETED|| zysqbp.recordStatus == Constants.RECORD_STATE_REJECT || zysqbp.recordStatus ==10 }" 
+								  includeInLayout="{zysqbp.recordStatus==Constants.RECORD_STATE_COMPLETED || zysqbp.recordStatus == Constants.RECORD_STATE_COMPLETED|| zysqbp.recordStatus == Constants.RECORD_STATE_REJECT || zysqbp.recordStatus ==10 }">
 							<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|| zysqbp.recordStatus ==4}" 
-								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
+						<s:HGroup width="100%" height="25"  verticalAlign="middle" 
+								  visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4 || zysqbp.recordStatus ==10}" 
+								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4 || zysqbp.recordStatus ==10 }">
 							<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:Image visible="{qianzhang}" id="zhang" />
 						</s:HGroup>
-						<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}">
+						<s:HGroup width="100%" height="25"  verticalAlign="middle" 
+								  visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4 || zysqbp.recordStatus ==10 }"
+								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4 || zysqbp.recordStatus ==10 }">
 							<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|| zysqbp.recordStatus ==4}" 
-								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
+						<s:HGroup width="100%" height="25"  verticalAlign="middle" 
+								  visible="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4 || zysqbp.recordStatus ==10 }" 
+								  includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4 || zysqbp.recordStatus ==10 }">
 							<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"/> 
@@ -728,14 +748,15 @@
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="center" verticalAlign="middle">
 			<!-- 补签章按钮，系统开启签章功能并且通过“补签章”按钮打开才会显示 -->
-			<s:Button label="{resourceManager.getString('common','btn.signature')}" skinClass="skins.cus.ButtonSkin" 
+			<s:Button label="{resourceManager.getString('common','btn.signature')}" click="CallSignatue()" skinClass="skins.cus.ButtonSkin" 
 					  visible="{isShowSignatureBtn}" includeInLayout="{isShowSignatureBtn}" />
 			<!-- 打开具有“签章”插件的打印页面的打印按钮，系统开启签章功能，并且是查看方式打开显示此按钮 -->
 			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print2(event)" skinClass="skins.cus.ButtonSkin" 
 					  visible="{isShowSignaturePrintBtn}" includeInLayout="{isShowSignaturePrintBtn}" />
 			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print(event)" skinClass="skins.cus.ButtonSkin" 
 					  visible="{Global.iSignature!=YesNoSelect.YES}" includeInLayout="{Global.iSignature!=YesNoSelect.YES}" />
-			<s:Button label="{resourceManager.getString('common','btn.download')}" click="download(event)" skinClass="skins.cus.ButtonSkin" />
+			<s:Button label="{resourceManager.getString('common','btn.download')}" click="download(event)" skinClass="skins.cus.ButtonSkin" 
+					  visible="{isShowDownloadBtn}" includeInLayout="{isShowDownloadBtn}" />
 			<s:Button label="{resourceManager.getString('common','btn.close')}" click="this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE))" skinClass="skins.cus.ButtonSkin"/>
 		</s:HGroup>
 	</s:VGroup>