git-svn-id: https://192.168.57.71/svn/lyggkj@99 1a6f6e3a-4066-fe46-b609-79c204482ece

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

@@ -716,6 +716,7 @@ package com.jtgh.yjpt.common.util
 			{id:"zdsgyhpc-city", text:"重大事故的隐患排查和治理情况备案"},
 			{id:"yjyaba-city", text:"应急预案备案"},
 			{id:"jdhxpyjzdwxy-city", text:"剧毒化学品及重大危险源备案"},
+			{id:"jdwxyhx-city", text:"剧毒化学品及重大危险源备案核销"},
 			{id:"aqpjbgjzgfa-city", text:"安全评价报告及整改方案落实备案"},			
 			{id:"jdjc",text:"监督检查"}
 		]);

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

@@ -374,6 +374,9 @@
 				dcModel.dcVo.yhjb=yhjb.selectedVO as CodeVo;
 				dcModel.dcVo.jhwcsj=jhwcsj.dateTime;
 				dcModel.dcVo.sj=sj.dateTime;
+				if(yqzgqx != null){
+					dcModel.dcVo.yqzgqx=yqzgqx.dateTime;
+				}
 				dcModel.dcVo.yhfl=yhfl.textValue as String;
 				dcModel.dcVo.yhqy=yhqy.textValue as String;
 				if(yzg.selected){dcModel.dcVo.mqzt="1";}

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

@@ -389,6 +389,9 @@
 				dcModel.dcVo.yhjb=yhjb.selectedVO as CodeVo;
 				dcModel.dcVo.jhwcsj=jhwcsj.dateTime;
 				dcModel.dcVo.sj=sj.dateTime;
+				if(yqzgqx != null){
+					dcModel.dcVo.yqzgqx=yqzgqx.dateTime;
+				}
 				dcModel.dcVo.byzd1=jclx.textValue as String;
 				dcModel.dcVo.jcyj=jcyj.selectedVO as GgVo;
 				dcModel.dcVo.yhfl=yhfl.textValue as String;
@@ -464,6 +467,9 @@
 				dcModel.dcVo.yhjb=yhjb.selectedVO as CodeVo;
 				dcModel.dcVo.jhwcsj=jhwcsj.dateTime;
 				dcModel.dcVo.sj=sj.dateTime;
+				if(yqzgqx != null){
+					dcModel.dcVo.yqzgqx=yqzgqx.dateTime;
+				}
 				dcModel.dcVo.byzd1=jclx.textValue as String;
 				dcModel.dcVo.jcyj=jcyj.selectedVO as GgVo;
 				dcModel.dcVo.yhfl=yhfl.textValue as String;
@@ -529,6 +535,9 @@
 				dcModel.dcVo.yhjb=yhjb.selectedVO as CodeVo;
 				dcModel.dcVo.jhwcsj=jhwcsj.dateTime;
 				dcModel.dcVo.sj=sj.dateTime;
+				if(yqzgqx != null){
+					dcModel.dcVo.yqzgqx=yqzgqx.dateTime;
+				}
 				dcModel.dcVo.byzd1=jclx.textValue as String;
 				dcModel.dcVo.jcyj=jcyj.selectedVO as GgVo;
 				dcModel.dcVo.yhfl=yhfl.textValue as String;

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

@@ -125,7 +125,8 @@
 				if((item as DcVo).yhjb.id==10001138){
 					return 0xff6666;
 				}
-				if(ObjectUtil.dateCompare((item as DcVo).jhwcsj,new Date())<0&&"-1"==(item as DcVo).mqzt)
+				if((ObjectUtil.dateCompare((item as DcVo).jhwcsj,new Date())<0&&"-1"==(item as DcVo).mqzt)||
+					(ObjectUtil.dateCompare((item as DcVo).yqzgqx,new Date())<0&&"2"==(item as DcVo).mqzt))
 					return 0xFFFF33;
 				return 0xffffff;
 			}

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

@@ -8,26 +8,18 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.BusinessContext;
-			import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 			import com.jtgh.yjpt.common.MyEvent;
-			import com.jtgh.yjpt.common.util.Constants;
 			import com.jtgh.yjpt.common.util.Utils;
-			import com.jtgh.yjpt.vo.common.CodeVo;
+			import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 			import com.jtgh.yjpt.vo.jyr.JyrVo;
 			import com.jtgh.yjpt.vo.sgalgl.SgalglWzddVo;
 			import com.jtgh.yjpt.vo.yjzyxxgl.YjwzFlxxVo;
 			import com.jtgh.yjpt.vo.yjzyxxgl.YjwzVo;
 			
-			import mx.collections.ArrayCollection
+			import mx.collections.ArrayCollection;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			import mx.rpc.events.ResultEvent;
-			
-			import org.osmf.elements.F4MElement;
-			
-			import skins.cus.MyAccordion;
-			
-			import spark.components.gridClasses.GridColumn;
 
 			[Bindable]
 			public var yjwzVo:YjwzVo=new YjwzVo();

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

@@ -529,28 +529,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==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="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"/>