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

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

@@ -54,7 +54,7 @@
             attributes.name = "${application}";
             attributes.align = "middle";
             swfobject.embedSWF(
-                "${swf}.swf?version=4.2.0", "flashContent", 
+                "${swf}.swf?version=4.2.2", "flashContent", 
                 "${width}", "${height}", 
                 swfVersionStr, xiSwfUrlStr, 
                 flashvars, params, attributes);

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

@@ -209,7 +209,8 @@ logoutConfirmTitle=\u767b\u51fa\u7cfb\u7edf
 otherConfirm=\u786e\u8ba4\u64cd\u4f5c\uff1f
 otherConfirmTitle=\u786e\u8ba4\u4fe1\u606f
 
-password.yxq=   \u60a8\u5f53\u524d\u5bc6\u7801\u4e0d\u6ee1\u8db3\u590d\u6742\u5ea6\u8981\u6c42\uff088\u4f4d\u53ca\u4ee5\u4e0a\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u5f53\u524d\u5bc6\u7801\u8fd8\u53ef\u4ee5\u7ee7\u7eed\u4f7f\u7528\u81f3{0}\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
+#password.yxq=   \u60a8\u5f53\u524d\u5bc6\u7801\u4e0d\u6ee1\u8db3\u590d\u6742\u5ea6\u8981\u6c42\uff088\u4f4d\u53ca\u4ee5\u4e0a\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u5f53\u524d\u5bc6\u7801\u8fd8\u53ef\u4ee5\u7ee7\u7eed\u4f7f\u7528\u81f3{0}\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
+password.yxq= \u60a8\u5f53\u524d\u5bc6\u7801\u590d\u6742\u5ea6\u8f83\u4f4e\uff0c\uff08\u590d\u6742\u5ea6\u8981\u6c42\uff1a\u5bc6\u7801\u957f\u5ea68\u4f4d\u53ca\u4ee5\u4e0a\uff0c\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u4e3a\u4e86\u60a8\u7684\u8d26\u53f7\u5b89\u5168\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
 session.timeout=\u4f1a\u8bdd\u8d85\u65f6\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\uff01
 systemError=\u7cfb\u7edf\u9519\u8bef
 systemTip=\u7cfb\u7edf\u63d0\u793a

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/core/PassWordYxq.mxml

@@ -21,11 +21,11 @@
 			public var arr:Array = new Array;
 			protected function creationCompleteHandler(event:FlexEvent):void
 			{
-				var  forString:String="YYYY-MM-DD";
+				/* var  forString:String="YYYY-MM-DD";
 				var format:DateFormatter=new DateFormatter();
 				format.formatString=forString;
 				arr[0]=format.format(Global.user.pdyxq);
-				tx.text='     '+resourceManager.getString('common','password.yxq',arr);
+				tx.text='     '+resourceManager.getString('common','password.yxq',arr); */
 			}
 			
 			protected function doChange(event:MouseEvent):void{
@@ -45,7 +45,8 @@
 		]]>
 	</fx:Script>
 	<s:VGroup width="100%" height="100%" horizontalAlign="center" verticalAlign="middle" top="10" bottom="10" >
-		<s:Label id="tx" text="{'     '+resourceManager.getString('common','password.yxq',arr)}"  width="100%" />
+		<!--<s:Label id="tx" text="{'     '+resourceManager.getString('common','password.yxq',arr)}"  width="100%" />-->
+		<s:Label id="tx" text="{'     '+resourceManager.getString('common','password.yxq')}"  width="100%" />
 		<s:Group height="100%"/>
 		<s:HGroup width="100%" height="40" horizontalAlign="center">
 			<s:Button id="saveBtn" label="修改" click="doChange(event)" enabled="true" skinClass="skins.cus.ButtonSkin"/>

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

@@ -28,8 +28,8 @@
 			import spark.components.gridClasses.GridColumn;
 
 			public const FRXZXK_INDEX:Number=0;
-			public const DSJ_INDEX:Number=1;
-			public const XKSB_INDEX:Number=2;
+//			public const DSJ_INDEX:Number=1;
+			public const XKSB_INDEX:Number=1;
 			[Bindable]
 			public var index:Number=FRXZXK_INDEX;
 			public var last_index:Number=XKSB_INDEX;
@@ -76,7 +76,7 @@
 						}
 						frPager.doQuery();
 					}
-					if(e.newIndex==DSJ_INDEX) {						
+					/* if(e.newIndex==DSJ_INDEX) {						
 						if(bdString.length>39){
 							var bdName:String="bd";
 							for(var j:int=0;j<40;j++){
@@ -84,7 +84,7 @@
 							}
 						}
 						bdPager.doQuery();
-					}
+					} */
 					if(e.newIndex==XKSB_INDEX) {						
 						if(xkString.length>14){
 							var xkName:String="xk";
@@ -101,9 +101,9 @@
 				if(index==FRXZXK_INDEX){
 					frPager.doQuery();
 				}
-				if(index==DSJ_INDEX) {
+				/* if(index==DSJ_INDEX) {
 					bdPager.doQuery();
-				}
+				} */
 				if(index==XKSB_INDEX) {
 					xkPager.doQuery();
 				}	
@@ -127,7 +127,7 @@
 				},pager,Utils.getFunctionId(thisView),szdId,start,stop);			
 			}
 			
-			protected function query_bd(pager:SinglePageRequestVo):void{
+		/* 	protected function query_bd(pager:SinglePageRequestVo):void{
 				pager.sortField="bgsj";
 				pager.direction="desc";
 				var szdId:Number;
@@ -143,7 +143,7 @@
 					bdList = bc.getAttribute("list") as ArrayCollection;
 					(thisView.bdPager.pageVo as SinglePageRequestVo).totalCount = bc.getAttribute("totalCount") as int;
 				},pager,Utils.getFunctionId(thisView),szdId,start,stop);			
-			}
+			} */
 			
 			protected function query_xk(pager:SinglePageRequestVo):void{
 				pager.sortField="bgsj";
@@ -168,9 +168,9 @@
 				if(index == FRXZXK_INDEX){
 					return (this.frPager.pageVo.page*10+this.frGrid.dataProvider.getItemIndex(item)+1).toString();
 				}
-				if(index == DSJ_INDEX){
+				/* if(index == DSJ_INDEX){
 					return (this.bdPager.pageVo.page*10+this.bdGrid.dataProvider.getItemIndex(item)+1).toString();
-				} 	
+				}  */	
 				if(index == XKSB_INDEX){
 					return (this.xkPager.pageVo.page*10+this.xkGrid.dataProvider.getItemIndex(item)+1).toString();
 				} 	
@@ -189,12 +189,12 @@
 				var columns:ArrayList=thisView.frGrid.columns as ArrayList;
 				var method:String="printFrxzxk";
 				var cString:String=frString;
-				if(index==DSJ_INDEX){
+				/* if(index==DSJ_INDEX){
 					 title="大数据分析";
 					 columns=thisView.bdGrid.columns as ArrayList;
 					 method="printBigData";
 					 cString = bdString;
-				}
+				} */
 				if(index==XKSB_INDEX){
 					title="危险货物港口作业申报许可";
 					columns=thisView.xkGrid.columns as ArrayList;
@@ -248,12 +248,12 @@
 					view.columns=frString;
 					title="法人行政许可";
 				}
-				if(index == DSJ_INDEX) {
+				/* if(index == DSJ_INDEX) {
 					view.index=index;
 					view.columns=bdString;
 					title="大数据分析";
 					width=330;
-				} 
+				}  */
 				if(index == XKSB_INDEX) {
 					view.index=index;
 					view.columns=xkString;
@@ -273,7 +273,7 @@
 						}
 					}
 				}
-				if(index == DSJ_INDEX) {
+				/* if(index == DSJ_INDEX) {
 					bdString=e.data as String;
 					if(bdString.length>39){
 						var bdName:String="bd";
@@ -281,7 +281,7 @@
 							this[bdName+j].visible=bdString.charAt(j)=="Y";
 						}
 					}
-				}
+				} */
 				if(index == XKSB_INDEX) {
 					xkString=e.data as String;
 					if(xkString.length>14){
@@ -347,7 +347,8 @@
 				<ui:Pager id="frPager"  queryFunction="{query_fr}"/>
 			</s:VGroup>
 		</s:NavigatorContent>
-		<s:NavigatorContent label="大数据分析">
+		
+		<!--<s:NavigatorContent label="大数据分析" visible="false" includeInLayout="false">
 			<s:VGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">
 				<ui:DataGrid id="bdGrid" width="100%" selectionMode="{selectMode}" dataProvider="{bdList}" minHeight="330"
 							 verticalScrollPolicy="off" horizontalScrollPolicy="on">
@@ -396,7 +397,7 @@
 				</ui:DataGrid>
 				<ui:Pager id="bdPager"  queryFunction="{query_bd}"/>
 			</s:VGroup>		
-		</s:NavigatorContent>
+		</s:NavigatorContent>-->
 		
 		<s:NavigatorContent label="作业申报许可">
 			<s:VGroup width="100%" gap="0" horizontalAlign="left" verticalAlign="middle">

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

@@ -46,12 +46,12 @@
 			public var qianzhang:Boolean=true;//用来判断签章图片是否显示，默认是显示
 			[Bindable]
 			public var mode:String;
-			[Bindable]
-			private var isShowSignatureBtn:Boolean = false;//是否显示补签章按钮
-			[Bindable]
-			private var isShowSignaturePrintBtn:Boolean = false;//是否显示开启签章后的打印按钮
-			[Bindlable]
-			private var isShowDownloadBtn:Boolean = false;//是否显示下载按钮
+//			[Bindable]
+//			private var isShowSignatureBtn:Boolean;//是否显示补签章按钮
+//			[Bindable]
+//			private var isShowSignaturePrintBtn:Boolean;//是否显示开启签章后的打印按钮
+//			[Bindlable]
+//			private var isShowDownloadBtn:Boolean;//是否显示下载按钮
 			
 			
 			/**
@@ -154,14 +154,39 @@
 					//开启签章
 					if(mode=='signature'){
 						//补签章打开
-						isShowSignatureBtn = true;
-						isShowDownloadBtn = false;
+						/* isShowSignatureBtn = true;
+						isShowSignaturePrintBtn = false;
+						isShowDownloadBtn = false; */
+						iSignature.visible = true;
+						iSignature.includeInLayout = true;
+						print_signature.visible = false;
+						print_signature.includeInLayout = false;
+						expWord.visible = false;
+						expWord.includeInLayout = false;
 					}else{
 						//view
+						/* isShowSignatureBtn = false;
 						isShowSignaturePrintBtn =true;
-						isShowDownloadBtn = true;
+						isShowDownloadBtn = true; */
+						iSignature.visible = false;
+						iSignature.includeInLayout = false;
+						print_signature.visible = true;
+						print_signature.includeInLayout = true;
+						expWord.visible = true;
+						expWord.includeInLayout = true;
 					}
 				}//end if  enable signature
+				else{
+					/* isShowSignatureBtn = false;//是否显示补签章按钮 
+					isShowSignaturePrintBtn = false;//是否显示开启签章后的打印按钮 
+					isShowDownloadBtn = true; */
+					iSignature.visible = false;
+					iSignature.includeInLayout = false;
+					print_signature.visible = false;
+					print_signature.includeInLayout = false;
+					expWord.visible = true;
+					expWord.includeInLayout = true;
+				}
 			}
 			
 			public function reloadGq(e:Event):void
@@ -748,15 +773,13 @@
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="center" verticalAlign="middle">
 			<!-- 补签章按钮，系统开启签章功能并且通过“补签章”按钮打开才会显示 -->
-			<s:Button label="{resourceManager.getString('common','btn.signature')}" click="CallSignatue()" skinClass="skins.cus.ButtonSkin" 
-					  visible="{isShowSignatureBtn}" includeInLayout="{isShowSignatureBtn}" />
+			<s:Button id="iSignature" label="{resourceManager.getString('common','btn.signature')}" click="CallSignatue()" skinClass="skins.cus.ButtonSkin" />
 			<!-- 打开具有“签章”插件的打印页面的打印按钮，系统开启签章功能，并且是查看方式打开显示此按钮 -->
-			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print2(event)" skinClass="skins.cus.ButtonSkin" 
-					  visible="{isShowSignaturePrintBtn}" includeInLayout="{isShowSignaturePrintBtn}" />
+			<s:Button id="print_signature" label="{resourceManager.getString('common','btn.print')}" click="print2(event)" skinClass="skins.cus.ButtonSkin" />
+			<!-- 原打印按钮 -->
 			<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" 
-					  visible="{isShowDownloadBtn}" includeInLayout="{isShowDownloadBtn}" />
+			<s:Button id="expWord" 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:HGroup>
 	</s:VGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/zysqbp/ZysqbpVo.as

@@ -165,8 +165,8 @@ package com.jtgh.yjpt.vo.zysqbp
 		
 //		public var sr:UserVo;
 //		public var fr:UserVo;
-		public var sr:String;
-		public var fr:String;
+		public var sr:String;//开工报填报账号名
+		public var fr:String;//完工报填报账号名
 		
 		
 		public function  get auditDateStr():String{