Bläddra i källkod

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

xt_xuhao 8 år sedan
förälder
incheckning
359442298f

+ 11 - 0
gkaq/yjpt-flex/trunk/.project

@@ -37,4 +37,15 @@
 			<location>E:/code/lyggkj/flex_release</location>
 		</link>
 	</linkedResources>
+	<filteredResources>
+		<filter>
+			<id>1484197097129</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.svn</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

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

@@ -209,7 +209,7 @@ 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\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

+ 19 - 18
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="大数据分析">
 			<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">

+ 5 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqKgEdit.mxml

@@ -28,7 +28,7 @@
 			
 			public function save(event:MouseEvent):void{
 				vo.kgsj=kgsj.dateTime;
-				vo.kgzt='Y';
+				vo.kgzt='K';
 				vo.kpsj=kbsj.dateTime;
 				if(kbsj.dateTime==null){
 					Utils.showInfoMessage("kpsj.empty",null,"zysqbp");
@@ -129,6 +129,10 @@
 				<cus:QLabel text="作业类型" width="35%" textAlign="right"/>
 				<cus:QTextInput   width="55%" text="{vo.zylx}" textAlign="left" editable="false"/>
 			</s:HGroup>
+			<s:HGroup width="50%" verticalAlign="middle">
+				<cus:QLabel text="填报人" width="35%" textAlign="right"/>
+				<cus:QTextInput   width="55%" text="{vo.sr}" textAlign="left" editable="false"/>
+			</s:HGroup>
 		</s:HGroup>
 	</s:VGroup>
 	

+ 5 - 1
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqWgEdit.mxml

@@ -38,7 +38,7 @@
 						Utils.showInfoMessage("wgsj.kgsj",null,"zysqbp");
 						return;
 					}
-					vo.wgzt="Y";
+					vo.wgzt="W";
 					Utils.callRemote("zysqbpController", "save", function(res:ResultEvent):void{
 						var bc:BusinessContext=res.result as BusinessContext;
 						// success, close
@@ -115,6 +115,10 @@
 					<cus:QLabel text="作业类型" width="35%" textAlign="right"/>
 					<cus:QTextInput   width="55%" text="{vo.zylx}" textAlign="left" editable="false"/>
 				</s:HGroup>
+				<s:HGroup width="50%" verticalAlign="middle">
+					<cus:QLabel text="填报人" width="35%" textAlign="right"/>
+					<cus:QTextInput   width="55%" text="{vo.fr}" textAlign="left" editable="false"/>
+				</s:HGroup>
 			</s:HGroup>
 		</s:VGroup>
 		

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

@@ -297,7 +297,8 @@
 				//审核
 				param.setParameter("SHR",shr.text);
 				param.setParameter("SHYJ",shyj.text);
-				param.setParameter("SHSJ",shsj.selectedDate);
+				//param.setParameter("SHSJ",shsj.selectedDate);
+				param.setParameter("SHSJ",shsj.dateTime);
 				param.setParameter("SHJG",shjg.text);
 				param.format="pdf";
 				PrintUtil.doPrint(param,"_blank");
@@ -554,7 +555,8 @@
 							<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"/>
-							<ui:DateField id="shsj" formatString="YYYY-MM-DD" width="200"  enabled="false" selectedDate="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditTime:zysqbp.xsscTask.auditTime}"/>
+							<!--<ui:DateField id="shsj" width="200" formatString="YYYY-MM-DD" enabled="false" selectedDate="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditTime:zysqbp.xsscTask.auditTime}"/>-->
+							<ui:DateTime id="shsj" width="200" hasTime="true" enabled="{enable}" dateTime="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditTime:zysqbp.xsscTask.auditTime}" /> 
 						</s:HGroup>	 
 					</s:VGroup>
 				</s:BorderContainer>
@@ -621,6 +623,10 @@
 								<cus:QLabel text="作业类型" width="35%" textAlign="right"/>
 								<cus:QTextInput   width="55%" text="{zysqbp.zylx}" textAlign="left"/>
 							</s:HGroup>
+							<s:HGroup width="50%" verticalAlign="middle">
+								<cus:QLabel text="填报人" width="35%" textAlign="right"/>
+								<cus:QTextInput   width="55%" text="{zysqbp.sr}" textAlign="left" editable="false"/>
+							</s:HGroup>
 						</s:HGroup>
 						</s:VGroup>
 				</s:BorderContainer>
@@ -684,6 +690,10 @@
 								<cus:QLabel text="作业类型" width="35%" textAlign="right"/>
 								<cus:QTextInput   width="55%" text="{zysqbp.zylx}" textAlign="left" editable="false"/>
 							</s:HGroup>
+							<s:HGroup width="50%" verticalAlign="middle">
+								<cus:QLabel text="填报人" width="35%" textAlign="right"/>
+								<cus:QTextInput   width="55%" text="{zysqbp.fr}" textAlign="left" editable="false"/>
+							</s:HGroup>
 						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>

+ 9 - 2
gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/access/UserVo.as

@@ -61,13 +61,20 @@ package com.jtgh.yjpt.vo.access
 		public var  jsdw:JsfxxwhVo;
 		/**是否船代*/
 		public var sfcd:String=YesNoSelect.NO;
+		
+		/**密码是否有效*/
+		/*public var pdsfyx:String=YesNoSelect.YES;*/
 		/**密码是否有效*/
-		public var pdsfyx:String=YesNoSelect.YES;
+		/*public function get pdwx():Boolean{
+			return pdsfyx== YesNoSelect.NO;
+		}*/
+		public var pdyxq:Date;
 		
 		public function get pdwx():Boolean{
-			return pdsfyx== YesNoSelect.NO;
+			return pdyxq!=null;
 		}
 		
+		
 		public function get yxdl():Boolean
 		{
 			return sfyxdl== YesNoSelect.YES;

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

@@ -161,6 +161,9 @@ package com.jtgh.yjpt.vo.zysqbp
 		public var xg:String;
 		public var zysjq:Date;
 		
+		public var sr:String;//开工报填报账号名
+		public var fr:String;//完工报填报账号名
+		
 		public function  get auditDateStr():String{
 			var  forString:String="YYYY-MM-DD JJ:NN:SS";
 			var format:DateFormatter=new DateFormatter();