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

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

@@ -16,6 +16,7 @@ btn.open=\u6253\u5f00
 btn.edit=\u7f16\u8f91
 btn.export=\u5bfc\u51fa
 btn.print=\u6253\u5370
+btn.signature=\u8865\u7b7e\u7ae0
 btn.first=\u9996\u9875
 btn.hideMap=\u9690\u85cf
 btn.last=\u5c3e\u9875

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

@@ -47,6 +47,7 @@ wf.qytj=\u4f01\u4e1a\u63d0\u4ea4
 
 task.complete=\u529e\u7406
 task.assign=\u7b7e\u6536
+task.signature=\u8865\u7b7e\u7ae0
 
 whzyfzsq-city=\u5371\u9669\u8d27\u7269\u4f5c\u4e1a\u9644\u8bc1\u7533\u8bf7
 whzyfzsq.name=\u5371\u9669\u8d27\u7269\u4f5c\u4e1a\u9644\u8bc1\u7533\u8bf7

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

@@ -32,6 +32,8 @@ package com.jtgh.yjpt.common.util
 		public  static  var TASK_ASSIGN:String = "1";
 		/** 0：任务未签收 */
 		public  static  var TASK_CANDIDATE:String = "0";
+		/** 2: 补签章 */
+		public  static  var TASK_SIGNATURE:String = "2";
 
 		/** date类型格式定义 */
 		public  static  var dateMode:String = "YYYY-MM-DD";

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jlrxxgl/GlzdxxModel.as

@@ -18,6 +18,8 @@ package com.jtgh.yjpt.model.jlrxxgl
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jlrxxgl.GlzdxxVo;
+	import com.jtgh.yjpt.common.Global;
+	import com.jtgh.yjpt.select.YesNoSelect;
 	
 	import flash.events.Event;
 	import flash.events.MouseEvent;
@@ -33,7 +35,7 @@ package com.jtgh.yjpt.model.jlrxxgl
 	import mx.events.CloseEvent;
 	import mx.formatters.DateFormatter;
 	import mx.managers.CursorManager;
-	import mx.rpc.events.ResultEvent;
+	import mx.rpc.events.ResultEvent; 
 
 	[Bindable]
 	public class GlzdxxModel extends BaseModel
@@ -52,7 +54,7 @@ package com.jtgh.yjpt.model.jlrxxgl
 		 * 此方法只能调用一次
 		 */ 
 		public function doCreationComplete(view:GlzdxxLayout):void
-		{
+		{ 
 			var pageVo:SinglePageRequestVo = pager.pageVo;
 			pageVo.direction = "desc";
 			pageVo.sortField = "id";
@@ -64,6 +66,25 @@ package com.jtgh.yjpt.model.jlrxxgl
 			thisView.del.addEventListener(MouseEvent.CLICK,doDeleteHandler);
 			thisView.edit.addEventListener(MouseEvent.CLICK,doEditHandler);
 			
+			//可编辑按钮显or隐   此页经营人和行政人员共用页面
+			//超级管理员始终可以看到可编辑按钮，其他人员需判断按钮显隐
+			if(Global.user.code != "admin"){
+				var disableEdit:Boolean = false;
+				disableEdit = (Global.JyrDisbleEdit==YesNoSelect.NO);
+				//添加
+				thisView.add.visible=disableEdit;
+				thisView.add.includeInLayout = disableEdit;
+				//删除
+				thisView.del.visible = disableEdit;
+				thisView.del.includeInLayout = disableEdit;
+				//编辑
+				thisView.edit.visible = disableEdit;
+				thisView.edit.includeInLayout = disableEdit; 
+				//导入					
+				thisView.im.visible = (Global.deployMode == Constants.DEPLOY_MODE_1) && disableEdit;
+				thisView.im.includeInLayout = (Global.deployMode == Constants.DEPLOY_MODE_1) && disableEdit;
+			}
+			
 			doQuery(null);
 		}
 		/**

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyr/JyrModel.as

@@ -22,6 +22,7 @@ package com.jtgh.yjpt.model.jyr
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
 	import com.jtgh.yjpt.vo.jyr.JyrVo;
 	import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
+	import com.jtgh.yjpt.select.YesNoSelect;
 	
 	import flash.display.DisplayObject;
 	import flash.events.Event;
@@ -71,6 +72,21 @@ package com.jtgh.yjpt.model.jyr
 			thisView.edit.addEventListener(MouseEvent.CLICK,doUpdate);
 			thisView.del.addEventListener(MouseEvent.CLICK,doDelete);
 			thisView.query.addEventListener(MouseEvent.CLICK,switchSearchBox);
+			
+			//是否隐藏可编辑按钮
+			var disableEdit:Boolean = false;
+			//配置为不可编辑后，只有超级管理员可以看到可编辑按钮
+			disableEdit = ((Global.JyrDisbleEdit==YesNoSelect.NO)|| (Global.user.code=="admin"));
+			//添加按钮
+			thisView.add.visible = disableEdit; 
+			thisView.add.includeInLayout = disableEdit;
+			//编辑按钮
+			thisView.edit.visible = disableEdit;
+			thisView.edit.includeInLayout = disableEdit;
+			//删除按钮
+			thisView.del.visible = disableEdit;
+			thisView.del.includeInLayout = disableEdit;
+			
 //			Utils.uiVisible(thisView.add,false);
 //			Utils.uiVisible(thisView.edit,false);
 //			Utils.uiVisible(thisView.del,false);

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

@@ -281,7 +281,7 @@
 			
 			<!-- 左下统计列表 province -->
 			<!--<tj:Zcdctj width="50%" height="100%" visible="{Constants.DEPLOY_MODE_0==Global.deployMode}" includeInLayout="{Constants.DEPLOY_MODE_0==Global.deployMode}"/>-->
-			<s:VGroup width="100%">
+			<s:VGroup width="100%" visible="{Constants.DEPLOY_MODE_0==Global.deployMode}" includeInLayout="{Constants.DEPLOY_MODE_0==Global.deployMode}">
 				<s:BorderContainer  borderVisible="false" height="55" backgroundColor="#23A5B8" width="100%">
 					<s:layout>
 						<s:HorizontalLayout horizontalAlign="center" verticalAlign="middle"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrOfJyrLayout.mxml

@@ -34,7 +34,7 @@
 				//是否隐藏可编辑按钮
 				var disableEdit:Boolean = false;
 				disableEdit = (Global.JyrDisbleEdit==YesNoSelect.NO);
-
+				//编辑按钮
 				edit.visible = disableEdit;
 				edit.includeInLayout = disableEdit;
 				

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/gksssb/GksssbLayout.mxml

@@ -37,18 +37,24 @@
 			 */ 
 			protected function init(event:FlexEvent):void
 			{
-				//可编辑按钮显or隐   此页经营人和行政人员共用页面，首先需判断当前登录人员是否经营人
-				if(Global.user.sfjyr == YesNoSelect.YES){
+				//可编辑按钮显or隐   此页经营人和行政人员共用页面
+				//超级管理员始终可以看到可编辑按钮，其他人员需判断按钮显隐
+				if(Global.user.code != "admin"){
 					var disableEdit:Boolean = false;
 					disableEdit = (Global.JyrDisbleEdit==YesNoSelect.NO);
+					//添加
 					add.visible=disableEdit;
 					add.includeInLayout = disableEdit;
+					//删除
 					del.visible = disableEdit;
 					del.includeInLayout = disableEdit;
+					//编辑
 					edit.visible = disableEdit;
 					edit.includeInLayout = disableEdit;
+					//复制
 					copy.visible = disableEdit;
 					copy.includeInLayout = disableEdit;
+					//导入
 					im.visible = (Global.deployMode == Constants.DEPLOY_MODE_1) && disableEdit;
 					im.includeInLayout = (Global.deployMode == Constants.DEPLOY_MODE_1) && disableEdit;
 				}

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyrxxgl/ryqk/RyjbxxLayout.mxml

@@ -38,18 +38,24 @@
 			 */ 
 			protected function init(event:FlexEvent):void
 			{
-				//可编辑按钮显or隐   此页经营人和行政人员共用页面，首先需判断当前登录人员是否经营人
-				if(Global.user.sfjyr == YesNoSelect.YES){
+				//可编辑按钮显or隐   此页经营人和行政人员共用页面
+				//超级管理员始终可以看到可编辑按钮，其他人员需判断按钮显隐
+				if(Global.user.code != "admin"){
 					var disableEdit:Boolean = false;
 					disableEdit = (Global.JyrDisbleEdit==YesNoSelect.NO);
+					//添加
 					add.visible=disableEdit;
 					add.includeInLayout = disableEdit;
+					//删除
 					del.visible = disableEdit;
 					del.includeInLayout = disableEdit;
+					//编辑
 					edit.visible = disableEdit;
 					edit.includeInLayout = disableEdit;
+					//复制
 					copy.visible = disableEdit;
 					copy.includeInLayout = disableEdit;
+					//导入					
 					im.visible = (Global.deployMode == Constants.DEPLOY_MODE_1) && disableEdit;
 					im.includeInLayout = (Global.deployMode == Constants.DEPLOY_MODE_1) && disableEdit;
 				}
@@ -70,6 +76,7 @@
 				query_gq.reload(query_gk.selectedVO);
 				query_qymc.reload(query_gk.selectedVO)
 			}
+			
 			private function labelFun(item:Object, column:GridColumn):String
 			{
 				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();

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

@@ -25,6 +25,7 @@
 			import mx.events.FlexEvent;
 			import mx.events.ListEvent;
 			import mx.rpc.events.ResultEvent;
+			import mx.core.FlexGlobals;
 			
 			import spark.components.gridClasses.GridColumn;
 			
@@ -105,6 +106,8 @@
 					return resourceManager.getString("workflow","task.complete");
 				else if(data.taskState==Constants.TASK_CANDIDATE)
 					return resourceManager.getString("workflow","task.complete");
+				else if(data.taskState == Constants.TASK_SIGNATURE)
+					return resourceManager.getString("workflow","task.signature");
 				return "";
 			}
 			
@@ -122,9 +125,14 @@
 					},data);	
 				}else if(data.recordStatus==Constants.RECORD_STATE_QXSUBMIT){//取消作业的审核办理
 					thisModel.doqxAudit(data.id,"audit",null);
-				}else{
+				}
+				else if(data.recordStatus == Constants.RECORD_STATE_COMPLETED || data.recordStatus == Constants.RECORD_STATE_BGCOMPLETED){
+					//完成或变更完成状态，显示操作按钮用来打开补签章页面
+					
+				}
+				else{
 					//办理 申请人不是经营人，提供的入口进行修改
-					if(data.recordStatus==Constants.RECORD_STATE_REJECT)
+					if(data.recordStatus==Constants.RECORD_STATE_REJECT)//结合linkButtonLabel函数，退回状态都不会显示操作按钮，此处代码有什么用处？
 					{
 						// 打回时修改
 						thisModel.toEdit(null);
@@ -135,9 +143,52 @@
 							thisModel.doViewPop(data.id,"audit",null);
 						},data);
 					}
-				}	
+				}
 			}
 			
+			
+			
+			 
+			/**
+			 * 打开补签章页面
+			 * 函数不放在model.as中是认为model.as也有其他页面引用，放置公共的都会使用的代码比较好，不适合都往其中添加，
+			 * 否则似乎会有一些不可预知的错误
+			 */
+			public function toSignature(id:Number):void
+			{
+				Utils.callRemote("zysqbpController","doViewInit",function (r:ResultEvent):void{
+					//get vo by id
+					var bc:BusinessContext=r.result as BusinessContext;
+					var zysqbp:ZysqbpVo=bc.result as ZysqbpVo;
+					
+					var view:ZysqbpView = new ZysqbpView();
+					view.zysqbp = zysqbp;
+					if(zysqbp.recordStatus!=Constants.RECORD_STATE_COMPLETED&&zysqbp.recordStatus!=Constants.RECORD_STATE_CALEL){//审核已经完成的数据才能显示签章
+						view.qianzhang=false;
+					}
+					view.enable = false;
+					view.mode = "signature";
+					Utils.popupWindow(resourceManager.getString('common','btn.view'), view as DisplayObject, FlexGlobals.topLevelApplication as DisplayObject,null, 0, 0);
+				},id);
+			}
+			
+//			public function doViewPop(id:Number,mode:String,taskModel:TaskModel):void{
+//				var	editView:ZysqbpAudit=new ZysqbpAudit();
+//				if(taskModel!=null&&instance.thisView is TaskLayout)
+//					editView.model = instance;
+//				else
+//					editView.model = this;
+//				Utils.callRemote("zysqbpController","doViewInit",function (r:ResultEvent):void{
+//					var bc:BusinessContext=r.result as BusinessContext;
+//					var vo:ZysqbpVo=bc.result as ZysqbpVo;
+//					editView.taskModel=taskModel;
+//					editView.zysqbp=vo;
+//					
+//					editView.mode=mode;
+//					Utils.popupWindow("审核",editView as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject);
+//				},id)
+//			}
+			
 		]]>
 	</fx:Script>
 	<ui:QueryLayout id="zysblayout" visible="true" includeInLayout="{zysblayout.visible}">

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

@@ -21,14 +21,14 @@
 			import com.jtgh.yjpt.select.YesNoSelect;
 			import com.jtgh.yjpt.vo.common.CodeVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
+			
 			import flash.external.ExternalInterface;
 			
 			import mx.collections.ArrayCollection;
+			import mx.controls.Alert;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
 			import mx.utils.StringUtil;
-			import mx.events.CloseEvent;
-			import mx.controls.Alert;
 			
 			import spark.formatters.DateTimeFormatter;
 			[Bindable]
@@ -44,7 +44,12 @@
 			public var zydd:Number;
 			[Bindable]
 			public var qianzhang:Boolean=true;//用来判断签章图片是否显示，默认是显示
-			
+			[Bindable]
+			public var mode:String;
+			[Bindable]
+			private var isShowSignatureBtn:Boolean = false;//是否显示补签章按钮
+			[Bindable]
+			private var isShowSignaturePrintBtn:Boolean = false;//是否显示开启签章后的打印按钮
 			
 			
 			/**
@@ -140,6 +145,19 @@
 					zhang.visible=false;
 					zhang.includeInLayout=false;
 				}
+				
+				
+				//button display set:
+				if(Global.iSignature==YesNoSelect.YES){
+					//开启签章
+					if(mode=='signature'){
+						//补签章打开
+						isShowSignatureBtn = true;
+					}else{
+						//view
+						isShowSignaturePrintBtn =true;
+					}
+				}//end if
 			}
 			
 			public function reloadGq(e:Event):void
@@ -709,10 +727,16 @@
 			</s:VGroup>
 		</s:BorderContainer>
 		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="center" verticalAlign="middle">
-			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print2(event)" skinClass="skins.cus.ButtonSkin" visible="{Global.iSignature==YesNoSelect.YES}" />
+			<!-- 补签章按钮，系统开启签章功能并且通过“补签章”按钮打开才会显示 -->
+			<s:Button label="{resourceManager.getString('common','btn.signature')}" skinClass="skins.cus.ButtonSkin" 
+					  visible="{isShowSignatureBtn}" includeInLayout="{isShowSignatureBtn}" />
+			<!-- 打开具有“签章”插件的打印页面的打印按钮，系统开启签章功能，并且是查看方式打开显示此按钮 -->
+			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print2(event)" skinClass="skins.cus.ButtonSkin" 
+					  visible="{isShowSignaturePrintBtn}" includeInLayout="{isShowSignaturePrintBtn}" />
+			<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" />
 			<s:Button label="{resourceManager.getString('common','btn.close')}" click="this.dispatchEvent(new CloseEvent(CloseEvent.CLOSE))" skinClass="skins.cus.ButtonSkin"/>
-			<s:Button label="{resourceManager.getString('common','btn.print')}" click="print(event)" skinClass="skins.cus.ButtonSkin" visible="{Global.iSignature!=YesNoSelect.YES}"/>
 		</s:HGroup>
 	</s:VGroup>
 </s:VGroup>