git-svn-id: https://192.168.57.71/svn/jsgkj@969 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.1.5", "flashContent", 
+                "${swf}.swf?version=4.2.0", "flashContent", 
                 "${width}", "${height}", 
                 swfVersionStr, xiSwfUrlStr, 
                 flashvars, params, attributes);

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

@@ -26,9 +26,13 @@
 			[Bindable]
 			public var view:ZysqKgEdit;
 			
+			
+			/**
+			 * 开工报save
+			  */
 			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 +133,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>
 	

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

@@ -24,6 +24,10 @@
 				public var model:ShbpModel;
 				[Bindable]
 				public var view:ZysqWgEdit;
+				
+				/**
+				 * 完工报save
+				 */
 				public function save(event:MouseEvent):void{
 					vo.wgsj=wgsj.dateTime;
 					if(kgsj.dateTime==null){
@@ -38,7 +42,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 +119,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>
 		

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

@@ -628,6 +628,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>
@@ -691,6 +695,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>

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

@@ -5,6 +5,7 @@ package com.jtgh.yjpt.vo.zysqbp
 	import com.jtgh.yjpt.select.ResultSelect;
 	import com.jtgh.yjpt.select.WorkflowStatusSelect;
 	import com.jtgh.yjpt.vo.BaseVo;
+	import com.jtgh.yjpt.vo.access.UserVo;
 	import com.jtgh.yjpt.vo.common.AccessoryVo;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.TaskInfoVo;
@@ -161,6 +162,13 @@ package com.jtgh.yjpt.vo.zysqbp
 		public var xg:String;
 		public var zysjq:Date;
 		
+		
+//		public var sr:UserVo;
+//		public var fr:UserVo;
+		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();