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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzhz/GkwxhwzyfzhzModel.as

@@ -452,6 +452,26 @@ package com.jtgh.yjpt.model.zyfzhz
 					}
 				}
 			}
+			
+			//任务状态筛选条件：
+			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;
+				}
+			}
 
 			var title:String="作业附证变更";
 			var columns:ArrayList=thisView.dataGrid.columns as ArrayList;

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

@@ -197,6 +197,28 @@ 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;
+				}
+			}
+			
 
 			var title:String="作业附证申请";
 			var columns:ArrayList=thisView.dataGrid.columns as ArrayList;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/yjdd/YjddLayout.mxml

@@ -351,8 +351,8 @@
 			selectionDuration: "0";
 		}
 	</fx:Style>
-	<s:HGroup width="100%" height="100%" gap="0" paddingBottom="10" paddingLeft="10" paddingRight="10" paddingTop="10">
-		<s:VGroup width="500" height="100%" horizontalAlign="center">
+	<s:HGroup width="100%" height="100%" gap="0" paddingBottom="10" paddingLeft="10" paddingRight="10" paddingTop="10" horizontalAlign="center">
+		<s:VGroup width="500" height="100%" horizontalAlign="center" >
 			<s:HGroup width="100%" horizontalAlign="center" verticalAlign="middle">
 				<cus:QLabel width="50" text="所在地"/>
 				<cus:QComboBox width="100" id="yaszd"  comboxClass="SzdSelect" selectedVO="{Global.szd}" parentId="{Global.szd.id}" requireSelection="true" 

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

@@ -11,15 +11,16 @@
 		<![CDATA[
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.TypeBase;
-			import com.jtgh.yjpt.model.task.TaskModel;
+			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.zyfzhz.GkwxhwzyfzhzModel;
 			import com.jtgh.yjpt.select.WorkflowStatusSelect;
 			import com.jtgh.yjpt.view.zyfzhz.GkwxhwzyfzhzView;
 			import com.jtgh.yjpt.vo.zyfzhz.GkwxhwzyfzhzVo;
 			import com.jtgh.yjpt.vo.zyfzndjy.Gkwxhwzyfzbl_fzVo;
-			import com.jtgh.yjpt.common.util.Constants;
 			
+			import mx.controls.Alert;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			
@@ -38,6 +39,8 @@
 			public var enableflg:Boolean=false;
 			[Bindable]
 			public var  taskModel:TaskModel;
+			[Bindable]
+			public var showFlag:Boolean=false;
 			
 			
 			/**
@@ -76,6 +79,7 @@
 						yj1.enabled=false;
 						yj2.enabled=false;
 						yj3.enabled=false;
+						showFlag = yanxu.selected;
 					}
 				}
 				if(thisModel.fileList != null && thisModel.fileList.length > 0)
@@ -91,6 +95,23 @@
 			 */
 			public function doPass(e:Event):void{
 				getShyj();
+				
+				if(flag=="4"){
+					var checkFlag:Boolean = true;
+					//发正时间
+					var _fzsj:Date  = fzsj.data as Date;
+					//有效期开始时间
+					var _yxqkssj:Date = yxqkssj.data as Date;
+					//有效期结束时间
+					var _yxqjssj:Date = yxqjssj.data as Date;
+					if(_fzsj==null || _yxqkssj==null || _yxqjssj==null)
+						checkFlag = false;
+					if(!checkFlag){
+						Alert.show("请完善附证延续的时间信息！",resourceManager.getString("common","tip"));
+						return;
+					} 
+				}
+				
 				Utils.doOtherConfirm(function():void{
 					Utils.callRemote("gkwxhwzyfzhzController","audit",function():void{
 						if(taskModel!=null){
@@ -206,13 +227,13 @@
 							<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}">
+						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" visible="{showFlag}" includeInLayout="{showFlag}">
 							<cus:QLabel width="120" text="{resourceManager.getString('Gkwxhwzyfzblhhz','fzrq')}"/>
-							<ui:DateField   width="150" selectedDate="@{vo.fzsj}"/>
+							<ui:DateField id="fzsj"  width="150" selectedDate="@{vo.fzsj}"/>
 							<cus:QLabel width="120" text="{resourceManager.getString('Gkwxhwzyfzblhhz','yxrq')}"/>
-							<ui:DateField   width="150" selectedDate="@{vo.yxqkssj}"/>
+							<ui:DateField id="yxqkssj"  width="150" selectedDate="@{vo.yxqkssj}"/>
 							<cus:QLabel text="起" width="15"/>
-							<ui:DateField   width="150" selectedDate="@{vo.yxqjssj}"/>
+							<ui:DateField id="yxqjssj" width="150" selectedDate="@{vo.yxqjssj}"/>
 							<cus:QLabel text="止" width="15"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">