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

gkaq/yjpt-flex/trunk/html-template/index.template.html

@@ -157,13 +157,13 @@
   				mainForm.SignatureControl.Position(0,0);                        //签章位置
   				mainForm.SignatureControl.DocumentList=documentID;                        //签章页面ID
   				mainForm.SignatureControl.WebSetFontOther("True","同意通过","0","宋体","11","000128","True");  //默认签章附加信息及字体,具体参数信息参阅技术白皮书
-  				mainForm.SignatureControl.SaveHistory="True";                    //是否自动保存历史记录,true保存  false不保存  默认值false
   				mainForm.SignatureControl.UserName="wjd";                          //文件版签章用户
   				mainForm.SignatureControl.WebCancelOrder=0;			                 //签章撤消原则设置, 0无顺序 1先进后出  2先进先出  默认值0
   				mainForm.SignatureControl.DivId = "yfdiv";                    //签章所在层
   				mainForm.SignatureControl.EnableMove = "false";
   				mainForm.SignatureControl.AutoCloseBatchWindow=true;		//为true当批量签章完成后，系统自动关闭进度窗口，否则不自动关闭，系统默认为false。
   				mainForm.SignatureControl.ExtParam = ExtParam;						//输入的附加信息
+  				mainForm.SignatureControl.SaveHistory="True";                    //是否自动保存历史记录,true保存  false不保存  默认值false
   				return mainForm.SignatureControl.RunBatchSignature();                //执行批量签章 
 			}
 			

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

@@ -936,6 +936,7 @@ wf.pz=\u5f85\u6279\u51c6
 wf.complete=\u5df2\u5b8c\u6210
 wf.zf=\u4f5c\u5e9f
 wf.hx=\u5f85\u6838\u9500
+wf.qb=\u5168\u90e8
 
 whzy.recordStatus2=\u901a\u8fc7
 whzy.recordStatus8=\u4e0d\u901a\u8fc7

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

@@ -38,7 +38,7 @@ wf.fjsp=\u5206\u5c40\u5ba1\u6279
 wf.zjsp=\u603b\u5c40\u5ba1\u6279
 wf.sjxg=\u5e02\u7ea7\u4fee\u6539
 wf.xf=\u4e0b\u53d1
-wf.qytj=\u4f01\u4e1a\u63d0\u4ea4
+wf.qytj=\u4f01\u4e1a\u63d0\u4ea4 
 
 task.complete=\u529e\u7406
 task.assign=\u7b7e\u6536

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

@@ -242,6 +242,7 @@ package com.jtgh.yjpt.common
 		JyrrySelect;
 		JyrxxBySzgqSelect;
 		WorkflowStatusSelect;
+		WHWorkflowSelect;
 		JyrSelect;
 		SeasonSelect;
 		MenuSelect;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/ui/DataGridColumn.as

@@ -27,7 +27,8 @@ package com.jtgh.yjpt.common.component.ui
 		//编辑按钮事件
 		private var _editFunction:Function;
 		//导出按钮事件
-		private var _exportFunction:Function;
+		private var _exportFunction:Function; 
+		
 		
 		// 渲染器
 		private var _myRenderer:ClassFactory;
@@ -35,7 +36,7 @@ package com.jtgh.yjpt.common.component.ui
 		private var _type:String;
 		private var _enabled:Boolean=false;
 		private var _textInputEditFunc:Function;
-		private var _fieldName:String=null;
+		private var _fieldName:String=null; 
 		
 		public function DataGridColumn(columnName:String=null)
 		{
@@ -54,13 +55,13 @@ package com.jtgh.yjpt.common.component.ui
 			}
 		}
 		
-		
+		 
 		
 		// 属性必须是全的
 		public function set type(colType:String):void
 		{
-			_type = colType;
-			if(TypeBase.CHECKBOX == colType)
+			_type = colType; 
+			if(TypeBase.CHECKBOX == _type)
 			{
 				if(this.dataField==null||this.dataField=="checkbox")
 				{
@@ -72,7 +73,7 @@ package com.jtgh.yjpt.common.component.ui
 				_myRenderer.properties = {dataField:dataField,
 					                      enabled:_enabled};
 			}
-			else if(TypeBase.LINKBUTTON == colType)
+			else if(TypeBase.LINKBUTTON == _type)
 			{
 				_myRenderer = new ClassFactory(LinkButtonRenderer);
 				_myRenderer.properties = {linkButtonFunc:_linkButtonFunc,
@@ -81,14 +82,14 @@ package com.jtgh.yjpt.common.component.ui
 										  linkEnableFunc:_linkEnableFunc
 				};
 			}
-			else if(TypeBase.MULTIBUTTON == colType)
+			else if(TypeBase.MULTIBUTTON == _type)
 			{
 				_myRenderer = new ClassFactory(MultiButtonItemRenderer);
 				_myRenderer.properties = {delFunction:_delFunction,
 					editFunction:_editFunction,
 					exportFunction:_exportFunction
 				};
-			}else if(TypeBase.TEXTINPUT==colType){
+			}else if(TypeBase.TEXTINPUT == _type){
 				_myRenderer = new ClassFactory(TextInputRenderer);
 				_myRenderer.properties = {textInputEditFunc:_textInputEditFunc,
 					fieldName:_fieldName	

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

@@ -391,10 +391,9 @@ package com.jtgh.yjpt.model.zyfzndjy
 		 * 删除
 		 */
 		public function doDel(event:MouseEvent):void
-		{
-
+		{ 
 			if(thisView.dataGrid.selectedItems == null){
-				Utils.showInfoMessage("msg.select");
+				Utils.showInfoMessage("msg.select");//请选择记录！
 				return;
 			}
 			var items:Vector.<Object> = thisView.dataGrid.selectedItems;
@@ -403,10 +402,11 @@ package com.jtgh.yjpt.model.zyfzndjy
 			{
 				for(var i : int=0;i< items.length;i++){
 					var obj:GkwxhwzyfzblhhzVo = GkwxhwzyfzblhhzVo(items[i]);
-					if(obj.recordStatus!=Constants.RECORD_STATE_VALID){
+					if(obj.recordStatus!=Constants.RECORD_STATE_VALID && obj.recordStatus!=Constants.RECORD_STATE_REJECT){
+						//该记录处于流程中，不能删除
 						Alert.show(resourceManager.getString("common","msg.no.del"),resourceManager.getString("common","tip"));
 						return;
-					}
+					} 
 					records.addItem(obj);
 				}
 			}
@@ -480,6 +480,29 @@ package com.jtgh.yjpt.model.zyfzndjy
 					}
 				}
 			}
+			
+			//任务状态筛选条件：
+			var _status:String = '';
+			if(thisView.query_lcStatus!=null && thisView.query_lcStatus.selectedItem!=null){
+				var _xml:XML = thisView.query_lcStatus.selectedItem as XML;
+				_status = _xml.@id;
+			}
+			if(_status=='' && _status.length==0){
+				//任务状态下拉为空状态是默认状态，查看非未提交、非待填报状态的记录
+				lcStatus = 'default';
+			}
+			else{
+				if(_status=='wf.qb'){
+					//全部
+					lcStatus = '';
+				}
+				else{
+					lcStatus = _status;
+				}
+			}
+			
+			
+			
 			Utils.callRemote("gkwxhwzyfzblhhzcontroller", queryAction, 
 				resultCallback,Utils.getFunctionId(thisView), pager, jyr,szd,gq,whdj,lcStatus,fddbr);
 		}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/select/WHWorkflowSelect.as

@@ -0,0 +1,73 @@
+package com.jtgh.yjpt.select
+{
+	public class WHWorkflowSelect
+	{
+		public function WHWorkflowSelect()
+		{
+		}
+		
+		public static function getDataXML():XMLList
+		{
+			return dataXML..item;
+		}
+		
+		public static function getName(id:String):String
+		{
+			return SelectUtils.getName(dataXML,id);
+		}
+		
+		/** 记录状态-流程-填报 */
+		public static const RECORD_STATE_WF_TB:String="wf.tb";
+		/** 记录状态-流程-形式审查 */
+		public static const RECORD_STATE_WF_XSSC:String="wf.xssc";
+		/** 记录状态-流程-准予受理 */
+		public static const RECORD_STATE_WF_ZYSL:String="wf.zysl";
+		/** 记录状态-流程-审查 */
+		public static const RECORD_STATE_WF_SC:String="wf.sc";
+		/** 记录状态-流程-审查 */
+		public static const RECORD_STATE_WF_YQSC:String="wf.yqsc";
+		/** 记录状态-流程-科长审查 */
+		public static const RECORD_STATE_WF_KZSC:String="wf.kzsc";
+		/** 记录状态-流程-审核 */
+		public static const RECORD_STATE_WF_SH:String="wf.sh";
+		/** 记录状态-流程-批准 */
+		public static const RECORD_STATE_WF_PZ:String="wf.pz";
+		/** 记录状态-流程-企业提交 */
+		public static const RECORD_STATE_WF_QYTJ:String="wf.qytj";
+		/** 记录状态-流程-省级退回 */
+		public static const RECORD_STATE_WF_TH:String="wf.th";
+		/** 记录状态-流程-转报省级 */
+		public static const RECORD_STATE_WF_ZB:String="wf.zb";
+		/** 记录状态-流程-转报省级 */
+		public static const RECORD_STATE_WF_TJSJ:String="wf.tjsj";
+		
+		/** 记录状态-流程-省级受理 */
+		public static const RECORD_STATE_WF_SL:String="wf.sl";
+		/** 记录状态-流程-省级受理 */
+		public static const RECORD_STATE_WF_ZLSC:String="wf.zlsc";
+		/** 记录状态-流程-科室审查 */
+		public static const RECORD_STATE_WF_KSSC:String="wf.kssc";
+		/** 记录状态-流程-省级受理 */
+		public static const RECORD_STATE_WF_ZJ:String="wf.zj";
+		/** 记录状态-流程-省级受理 */
+		public static const RECORD_STATE_WF_FJSP:String="wf.fjsp";
+		/** 记录状态-流程-省级受理 */
+		public static const RECORD_STATE_WF_ZJSP:String="wf.zjsp";
+		
+		protected static var dataXML:XML=
+			<RecordStatusSelect>
+				<item id="wf.qb" localeName="wf.qb" />
+				<item id="1" localeName="wf.wtj" />
+				<item id="wf.tb" localeName="wf.tb" />
+				<item id="wf.xssc" localeName="wf.xssc" />
+				<item id="wf.sc" localeName="wf.sc" />
+				<item id="wf.sh" localeName="wf.sh" />
+				<item id="wf.pz" localeName="wf.pz" />
+				<item id="2" localeName="wf.complete" />
+			</RecordStatusSelect>
+			//				<item id="wf.zysl" localeName="wf.zysl" />
+			//				<item id="4" localeName="wf.reject" />
+			//				<item id="8" localeName="wf.zf" />
+			;
+	}
+}

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

@@ -276,13 +276,39 @@
 			}
 			
 			/**
+			 * 文件类型判断，是常规图片类型文件，文件名加下划线
+			 */
+			protected function IsImage(data:Object):Boolean{
+				var fileName:String = data.name;
+				//.jpg .gif .bmp .png
+				var rtn:Boolean=false;
+				if(fileName.indexOf('.jpg')>-1)
+					rtn =true;
+				else if(fileName.indexOf('.gif')>-1)
+					rtn=true;
+				else if(fileName.indexOf('.bmp')>-1)
+					rtn=true;
+				else if(fileName.indexOf('.png')>-1)
+					rtn=true;
+				return rtn;
+			}
+			/**
+			 * 在线打开图片
+			 */ 
+			protected function ShowPicFunc(data:Object):void
+			{
+				 
+			}
+			
+			
+			/**
 			 * 下载填充
 			 */ 
 		    public function linkButtonLabel(data:Object):String
 			{
 				if(!isNaN(data.id) &&　0 != data.id)
 				{
-					return resourceManager.getString('common','btn.open');
+					return resourceManager.getString('common','btn.download');
 				}else{
 					return "";
 				}
@@ -325,9 +351,9 @@
 					<ui:DataGridColumn dataField="typeName"  showDataTips="true" dataTipField="typeName"
 									   headerText="{resourceManager.getString('fileType','fileType')}" id="lx"/>
 					<ui:DataGridColumn dataField="name"
-									   headerText="{resourceManager.getString('common','col.name')}"/>
+									   headerText="{resourceManager.getString('common','col.name')}"  />
 					<ui:DataGridColumn dataField="id"
-									   headerText="{resourceManager.getString('common','btn.open')}" type="{TypeBase.LINKBUTTON}" 
+									   headerText="{resourceManager.getString('common','btn.download')}" type="{TypeBase.LINKBUTTON}" 
 									   linkButtonFunc="{linkButtonFunc}" linklabelFunc="{linkButtonLabel}"/>
 				</s:ArrayList>
 			</ui:columns>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<s:Group xmlns:fx="http://ns.adobe.com/mxml/2009" 
+		 xmlns:s="library://ns.adobe.com/flex/spark" 
+		 xmlns:mx="library://ns.adobe.com/flex/mx" 
+		 horizontalAlign="center"
+		 verticalAlign="middle"
+		 width="400" height="300">
+	<fx:Declarations>
+		<!-- 将非可视元素（例如服务、值对象）放在此处 -->
+	</fx:Declarations>
+	<s:HGroup id="fztp" width="100%" height="200" horizontalAlign="left" verticalAlign="middle" >
+		<mx:VBox width="{fztp.width*0.99}" height="200" borderVisible="true" borderStyle="inset" borderColor="#d2d2d2">
+			<s:HGroup  id="fztps" width="100%" horizontalAlign="left" verticalAlign="middle" height="200">
+			</s:HGroup>
+		</mx:VBox>
+	</s:HGroup>
+</s:Group>

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

@@ -3,7 +3,7 @@
 		 xmlns:s="library://ns.adobe.com/flex/spark"
 		 xmlns:mx="library://ns.adobe.com/flex/mx"
 		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
-		 width="100%" height="100%" creationComplete="doCreationCompleteHandler(event)" >
+		 width="100%" height="100%" creationComplete="doCreationCompleteHandler(event)">
 	<fx:Script>
 		<![CDATA[
 			import cn.com.jsepri.common.util.DateFormator;
@@ -37,6 +37,7 @@
 //				dealFun["GKWHZYFZNSTX"]=null;
 				model.doCreationComplete(this);
 			}
+			
 
 			/**
 			 * 时间格式化

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

@@ -201,13 +201,18 @@
 							<cus:QLabel width="120" text="发证机关"/>
 							<cus:QTextInput enabled="{enableflg}" text="@{vo.fzjg}" width="150"/>
 						</s:HGroup>
+						<!-- 延续 -->
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="延续"/>
+							<s:CheckBox id="yanxu" enabled="{enableflg}" selected="{vo.byzd2 == 'Y'}" />
+						</s:HGroup>
+						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" visible="{yanxu.selected}" includeInLayout="{yanxu.selected}">
 							<cus:QLabel width="120" text="{resourceManager.getString('Gkwxhwzyfzblhhz','fzrq')}"/>
-							<ui:DateField enabled="{enableflg}" width="150" selectedDate="@{vo.fzsj}"/>
+							<ui:DateField   width="150" selectedDate="@{vo.fzsj}"/>
 							<cus:QLabel width="120" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yxrq')}"/>
-							<ui:DateField enabled="{enableflg}" width="150" selectedDate="@{vo.yxqkssj}"/>
+							<ui:DateField   width="150" selectedDate="@{vo.yxqkssj}"/>
 							<cus:QLabel text="起" width="15"/>
-							<ui:DateField enabled="{enableflg}" width="150" selectedDate="@{vo.yxqjssj}"/>
+							<ui:DateField   width="150" selectedDate="@{vo.yxqjssj}"/>
 							<cus:QLabel text="止" width="15"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
@@ -249,7 +254,6 @@
 					</s:HGroup>		
 				</s:BorderContainer>
 				
-				<!-- 审批流程意见 -->
 				<s:BorderContainer  width="100%" borderWeight="1">
 					<cus:QLabel fontWeight="bold" text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqsm')}" 
 								width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
@@ -272,33 +276,32 @@
 					</s:VGroup>
 				</s:BorderContainer>
 				
+				<!-- 审批流程意见 -->
 				<s:HGroup gap="0" width="100%">
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj1">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj1"   width="150" text="{vo.xsscTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm1"   width="150" text="{vo.xsscTask.auditUsername}" enabled="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj1" width="250" height="50" text="{vo.xsscTask.auditMsg}" />
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm1" width="100" text="{vo.xsscTask.auditUsername}" enabled="false"/>
+						 
 								<ui:DateField  width="150" selectedDate="{vo.xsscTask.auditTime}" id="shsj1" enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj2">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj2"   width="150" text="{vo.scTask.auditMsg}"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj2" width="250" height="50" text="{vo.scTask.auditMsg}"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm2"  width="150" text="{vo.scTask.auditUsername}" enabled="false"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm2"  width="100" text="{vo.scTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj2"  width="150" selectedDate="{vo.scTask.auditTime}"  enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>
@@ -307,30 +310,28 @@
 				<s:HGroup gap="0" width="100%">
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj3" >
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj3"   width="150" text="{vo.shTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm3"   width="150" text="{vo.shTask.auditUsername}" enabled="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj3"   width="250" height="50" text="{vo.shTask.auditMsg}"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm3"   width="100" text="{vo.shTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj3"  width="150" selectedDate="{vo.shTask.auditTime}"  enabled="false" />
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj4">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj4"   width="150" text="{vo.pzTask.auditMsg}"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm4"   width="150" text="{vo.pzTask.auditUsername}" enabled="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj4"   width="250" height="50" text="{vo.pzTask.auditMsg}"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textalign="left"/>
+								<cus:QTextInput id="shqm4"   width="100" text="{vo.pzTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj4"  width="150" selectedDate="{vo.pzTask.auditTime}"  enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>

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

@@ -100,6 +100,12 @@
 			}
 			
 			private function doSave(e:Event):void{
+				//延续
+				if(yanxu.selected)
+					thisVo.byzd2 = 'Y';
+				else
+					thisVo.byzd2 = 'N';
+				
 				if(getVo()){
 					saveBtn.enabled=false;
 					submitBtn.enabled=false;
@@ -107,6 +113,12 @@
 				}
 			}
 			private function doSubmit(e:Event):void{
+				//延续
+				if(yanxu.selected)
+					thisVo.byzd2 = 'Y';
+				else
+					thisVo.byzd2 = 'N';
+				
 				if(getVo()){
 					saveBtn.enabled=false;
 					submitBtn.enabled=false;
@@ -166,6 +178,15 @@
 			{
 				model.doFzDelete(data);
 			}
+			
+			
+			private function YanXu(e:MouseEvent):void {
+				if(yanxu.selected){ 
+					yanxuTime.visible=true;
+				}else{ 
+					yanxuTime.visible=false;
+				}
+			}
 		]]>
 	</fx:Script>	
 	<s:VGroup width="95%" height="100%"  paddingLeft="10" paddingTop="10" paddingBottom="10" >	
@@ -232,6 +253,10 @@
 			<mx:VBox width="100%"  label="变更信息"  paddingBottom="5" paddingLeft="5"
 					 paddingRight="5" paddingTop="5">	
 				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+					<cus:QLabel width="100" text="延续"/>
+					<s:CheckBox id="yanxu" click="YanXu(event)" selected="{thisVo.byzd2 == 'Y'}" />
+				</s:HGroup>
+				<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" id="yanxuTime" visible="{yanxu.selected}" includeInLayout="{yanxu.selected}">
 					<cus:QLabel width="100" text="{resourceManager.getString('Gkwxhwzyfzblhhz','fzrq')}"/>
 					<ui:DateField  width="150" selectedDate="@{thisVo.fzsj}"/>
 					<cus:QLabel width="100" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yxrq')}"/>

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

@@ -141,16 +141,22 @@
 										   headerText="港口经营人名称"/>
 						<ui:DataGridColumn  dataField="bh" showDataTips="true" dataTipField="bh" width="120"
 										   headerText="附证编号"/>
-						<ui:DataGridColumn dataField="fddbr"
-										   headerText="{resourceManager.getString('Gkwxhwzyfzblhhz','fddbr')}"/>
+						<!--<ui:DataGridColumn dataField="fddbr"
+										   headerText="{resourceManager.getString('Gkwxhwzyfzblhhz','fddbr')}"/>-->
+						<ui:DataGridColumn  dataField="TJDate"
+											headerText="提交日期"/>
+						<ui:DataGridColumn  dataField="SLDate"
+											headerText="受理日期"/>
+						<ui:DataGridColumn  dataField="XKDate"
+											headerText="许可日期"/>
 						<ui:DataGridColumn dataField="status" id="status"
 										   headerText="任务状态"/>
 						<ui:DataGridColumn id="col_taskCurrName" dataField="taskCurrName"
 										   headerText="{resourceManager.getString('workflow','task.currName')}"/>
 						<ui:DataGridColumn id="col_taskRunner" dataField="taskRunner"
 										   headerText="{resourceManager.getString('workflow','task.runner')}"/>
-						<ui:DataGridColumn dataField="aqgljg"
-										   headerText="安全管理机构"/>
+						<!--<ui:DataGridColumn dataField="aqgljg"
+										   headerText="安全管理机构"/>-->
 						<ui:DataGridColumn dataField="gqgljgfzrlxdh"
 										   headerText="{resourceManager.getString('Gkwxhwzyfzblhhz','lxdh')}"/>
 						<ui:DataGridColumn dataField="ssgq"  labelFunction="labelFunc_szgq"

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

@@ -118,7 +118,12 @@
 							<cus:QLabel width="120" text="发证机关"/>
 							<cus:QTextInput enabled="{enableflg}" text="@{vo.fzjg}" width="150"/>
 						</s:HGroup>
+						<!-- 延续 -->
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="延续"/>
+							<s:CheckBox id="yanxu" enabled="{enableflg}" selected="{vo.byzd2 == 'Y'}" />
+						</s:HGroup>
+						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" visible="{yanxu.selected}" includeInLayout="{yanxu.selected}">
 							<cus:QLabel width="120" text="{resourceManager.getString('Gkwxhwzyfzblhhz','fzrq')}"/>
 							<ui:DateField enabled="{enableflg}" width="150" selectedDate="@{vo.fzsj}"/>
 							<cus:QLabel width="120" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yxrq')}"/>
@@ -165,7 +170,7 @@
 						<cus:QLabel id="gkwxhwzyfzhz_fj" text="缺" color="#ff0000"/>
 					</s:HGroup>		
 				</s:BorderContainer>
-				<!-- 审批流程意见 -->
+				
 				<s:BorderContainer  width="100%" borderWeight="1">
 					<cus:QLabel fontWeight="bold" text="{resourceManager.getString('Gkwxhwzyfzblhhz','sqsm')}" 
 								width="100%" textalign="center" height="100%" fontSize="22" verticalAlign="middle"/>
@@ -188,33 +193,32 @@
 					</s:VGroup>
 				</s:BorderContainer>
 				
+				<!-- 审批流程意见 -->
 				<s:HGroup gap="0" width="100%" visible="{!Utils.getCurrentUser().jyr}" includeInLayout="{!Utils.getCurrentUser().jyr}">
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj1">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj1"   width="150" text="{vo.xsscTask.auditMsg}" editable="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj1')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj1" width="250" height="50" text="{vo.xsscTask.auditMsg}" editable="false"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm1"   width="150" text="{vo.xsscTask.auditUsername}" enabled="false"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textAlign="left"/>
+								<cus:QTextInput id="shqm1"   width="100" text="{vo.xsscTask.auditUsername}" enabled="false"/>
+						 
 								<ui:DateField  width="150" selectedDate="{vo.xsscTask.auditTime}" id="shsj1" enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj2">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj2"   width="150" text="{vo.scTask.auditMsg}" editable="false"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm2"  width="150" text="{vo.scTask.auditUsername}" enabled="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj2')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj2" width="250" height="50" text="{vo.scTask.auditMsg}" editable="false"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textAlign="left"/>
+								<cus:QTextInput id="shqm2"  width="100" text="{vo.scTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj2"  width="150" selectedDate="{vo.scTask.auditTime}"  enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>
@@ -223,30 +227,28 @@
 				<s:HGroup gap="0" width="100%" visible="{!Utils.getCurrentUser().jyr}" includeInLayout="{!Utils.getCurrentUser().jyr}">
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj3" >
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj3"   width="150" text="{vo.shTask.auditMsg}" editable="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj3')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj3" width="250" height="50" text="{vo.shTask.auditMsg}" editable="false"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm3"   width="150" text="{vo.shTask.auditUsername}" enabled="false"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textAlign="left"/>
+								<cus:QTextInput id="shqm3"   width="100" text="{vo.shTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj3"  width="150" selectedDate="{vo.shTask.auditTime}"  enabled="false" />
 							</s:HGroup>
 						</s:VGroup>
 					</s:BorderContainer>
 					<s:BorderContainer  width="100%" borderWeight="1" id="yj4">
 						<s:VGroup width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" >
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100%" textalign="left"/>
-								<cus:QTextInput id="shyj4"   width="150" text="{vo.pzTask.auditMsg}" editable="false"/>
-							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
-								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}"/>
-								<cus:QTextInput id="shqm4"   width="150" text="{vo.pzTask.auditUsername}" enabled="false"/>
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="top">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','yj4')}" width="100" textalign="left"/>
+								<cus:QTextArea id="shyj4" width="250" height="50" text="{vo.pzTask.auditMsg}" editable="false"/>
 							</s:HGroup>
-							<s:HGroup width="100%" horizontalAlign="right" verticalAlign="middle">
+							<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
+								<cus:QLabel text="{resourceManager.getString('Gkwxhwzyfzblhhz','qm')}" width="100" textAlign="left"/>
+								<cus:QTextInput id="shqm4"   width="100" text="{vo.pzTask.auditUsername}" enabled="false"/>
+							 
 								<ui:DateField id="shsj4"  width="150" selectedDate="{vo.pzTask.auditTime}"  enabled="false"/>
 							</s:HGroup>
 						</s:VGroup>

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

@@ -179,10 +179,14 @@
 					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="thisModel.doQuery(event)"/>
 				</s:HGroup>
 			</s:HGroup>
-			<!--<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
-				<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="100"/>
-				<cus:QComboBox id="query_lcStatus" comboxClass="WorkflowStatusSelect" hasBlank="true" />
-			</s:HGroup>-->
+			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
+					<!-- 任务状态 -->
+					<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="130" textAlign="right"/>
+					<cus:QComboBox id="query_lcStatus" comboxClass="WHWorkflowSelect" hasBlank="true" width="180"  />
+				</s:HGroup>
+				
+			</s:HGroup>
 		</s:VGroup>
 		<s:VGroup width="100%" height="100%" >
 			<ui:DataGrid id="dataGrid" sortChange="{thisModel.doSort(event)}" rowColorFunction="thisModel.fzgqFun" >
@@ -192,8 +196,10 @@
 										   headerText="{resourceManager.getString('yjzyxxgl','yjzjk.xh')}" width="40"/>
 						<ui:DataGridColumn dataField="byzd1"
 										   headerText="办理编号"/>
+						<!-- 港口经营人名称 -->
 						<ui:DataGridColumn dataField="qymc"
 										   headerText="{resourceManager.getString('Gkwxhwzyfzblhhz','qymc')}"/>
+						<!-- 任务状态 -->
 						<ui:DataGridColumn id="col_taskCurrName" dataField="taskCurrName" visible="{Global.deployMode==Constants.DEPLOY_MODE_1}"
 										   headerText="{resourceManager.getString('workflow','task.currName')}"/>
 						<ui:DataGridColumn id="col_taskRunner" dataField="fzjg" 

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

@@ -151,6 +151,14 @@
 				<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="100"/>
 				<cus:QComboBox id="query_lcStatus" comboxClass="WorkflowStatusSelect" hasBlank="true" />
 			</s:HGroup>-->
+			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">
+				<s:HGroup  verticalAlign="middle" width="31%" textAlign="right">
+					<!-- 任务状态 -->
+					<cus:QLabel text="{resourceManager.getString('workflow','task.currName')}" width="130" textAlign="right"/>
+					<cus:QComboBox id="query_lcStatus" comboxClass="WHWorkflowSelect" hasBlank="true" width="180"  />
+				</s:HGroup>
+				
+			</s:HGroup>
 		</s:VGroup>
 		<s:VGroup width="100%" height="100%" >
 			<ui:DataGrid id="dataGrid" sortChange="{thisModel.doSort(event)}" rowColorFunction="thisModel.fzgqFun">

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

@@ -333,7 +333,7 @@
 								<ui:DataGridColumn id="fr5" dataField="xzxdrmc"  headerText="行政相对人名称" minWidth="100" dataTipField="xzxdrmc" />
 								<ui:DataGridColumn id="fr6" dataField="tyshxydm"  headerText="统一社会信用代码" minWidth="100" dataTipField="tyshxydm" />
 								<ui:DataGridColumn id="fr7" dataField="zzjgdm"  headerText="组织机构代码" minWidth="100" dataTipField="zzjgdm" />
-								<ui:DataGridColumn id="fr8" dataField="xksxq"  headerText="许可决定期" minWidth="100" dateFormatString="YYYY-MM-DD JJ:NN:SS"  dataTipField="xksxq"  />
+								<ui:DataGridColumn id="fr8" dataField="xksxq"  headerText="许可决定日期" minWidth="100" dateFormatString="YYYY-MM-DD JJ:NN:SS"  dataTipField="xksxq"  />
 								<ui:DataGridColumn id="fr9" dataField="xkjzq"  headerText="许可截止期" minWidth="100" dateFormatString="YYYY-MM-DD JJ:NN:SS"  dataTipField="xkjzq" />
 								<ui:DataGridColumn id="fr10" dataField="xkjg"  headerText="许可机关" minWidth="100" dataTipField="xkjg" />
 								<ui:DataGridColumn id="fr11" dataField="bz"  headerText="备注" minWidth="100" dataTipField="bz" />

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

@@ -5,8 +5,8 @@
 		 xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%"
 		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
 		 xmlns:cus="com.jtgh.yjpt.common.cus.*" 
-		 xmlns:zysqbp="com.jtgh.yjpt.view.zysqbp.*"
-		 creationComplete="creationComplete(event)" 
+		 xmlns:zysqbp="com.jtgh.yjpt.view.zysqbp.*"  
+		 creationComplete="creationComplete(event)"  
 		 horizontalAlign="center">
 	<fx:Script>
 		<![CDATA[
@@ -27,6 +27,8 @@
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			import mx.utils.StringUtil;
+			import mx.events.CloseEvent;
+			import mx.controls.Alert;
 			
 			import spark.formatters.DateTimeFormatter;
 			[Bindable]
@@ -146,6 +148,7 @@
 			}
 			
 			
+			
 //			/**
 //			 * 保存方法 
 //			 */
@@ -303,6 +306,7 @@
 				param.format="pdf";
 				PrintUtil.doPrint(param,"_blank");
 			}
+	 
 			
 		]]>
 	</fx:Script>
@@ -696,9 +700,9 @@
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="center" verticalAlign="middle">
 			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print2(event)" skinClass="skins.cus.ButtonSkin" visible="{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.close')}" click="this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE))" skinClass="skins.cus.ButtonSkin"/>
 			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print(event)" skinClass="skins.cus.ButtonSkin" visible="{Global.iSignature!=YesNoSelect.YES}"/>
-			<s:Button label="{resourceManager.getString('common','btn.download')}" click="download(event)" skinClass="skins.cus.ButtonSkin" visible="{Global.iSignature!=YesNoSelect.YES}"/>
 		</s:HGroup>
 	</s:VGroup>
 </s:VGroup>

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

@@ -87,7 +87,7 @@ package com.jtgh.yjpt.vo.common
 		public function get txsjTime():String
 		{
 			var df:DateFormatter = new DateFormatter();
-			df.formatString="YYYY-MM-DD ";
+			df.formatString="YYYY-MM-DD JJ:NN:SS";//时间格式加时分秒
 			return  df.format(txsj);
 		}		
 		public function get lxfs():String

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

@@ -67,5 +67,13 @@ package com.jtgh.yjpt.vo.common
 			df.formatString="YYYY-MM-DD";
 			return  df.format(startTime);
 		}
+		
+		public function get auditTimedf():String
+		{
+			var df:DateFormatter = new DateFormatter();
+			df.formatString="YYYY-MM-DD";
+			return  df.format(auditTime); 
+		}
+		
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/zyfzhz/GkwxhwzyfzhzVo.as

@@ -56,6 +56,8 @@ package com.jtgh.yjpt.vo.zyfzhz
 		public var ygkjyxkz:String;
 		public var taskState:String;//签收状态
 		
+		//使用byzd2作为是否延续表示字段 Y是 N否  edit by xuhao 2016-09-08 
+		
 		public function get qymc():String{
 			if(jyrVo!=null){
 				return jyrVo.gkjyr;
@@ -97,7 +99,10 @@ package com.jtgh.yjpt.vo.zyfzhz
 					{
 						task = item;
 						break;
-					}
+					} 
+				}
+				for each (var item:TaskInfoVo in l)
+				{ 
 					if(item.currName==WorkflowStatusSelect.RECORD_STATE_WF_XSSC)
 						xsscTask = item;
 					else if(item.currName==WorkflowStatusSelect.RECORD_STATE_WF_SC)
@@ -106,12 +111,28 @@ package com.jtgh.yjpt.vo.zyfzhz
 						shTask = item;
 					else if(item.currName==WorkflowStatusSelect.RECORD_STATE_WF_PZ)
 						pzTask = item;
+					else 
+						tbTask = item;
 				}
 				if(task==null)
 					task = l.getItemAt(l.length-1) as TaskInfoVo;
 			}
 		}
 		
+		//提交日期
+		public function get TJDate():String{
+			return tbTask.auditTimedf;
+		}
+		//受理日期
+		public function get SLDate():String{
+			return xsscTask.auditTimedf;
+		}
+		//许可日期
+		public function get XKDate():String{
+			return pzTask.auditTimedf;
+		}
+		
+		
 		private var _currentTask:TaskInfoVo=null;
 		/** 当前任务 */
 		public function get task():TaskInfoVo
@@ -157,6 +178,14 @@ package com.jtgh.yjpt.vo.zyfzhz
 			return null;
 		}
 		
+		private var _tbTask:TaskInfoVo = new TaskInfoVo();
+		public function get tbTask():TaskInfoVo{
+			return _tbTask;
+		}
+		public function set tbTask(t:TaskInfoVo):void{
+			_tbTask = t;
+		}
+		
 		private var _xsscTask:TaskInfoVo = new TaskInfoVo();
 		public function get xsscTask():TaskInfoVo{
 			return _xsscTask;