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

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

@@ -76,6 +76,9 @@ package com.jtgh.yjpt.common
 		/** 危险品审批是否启用签章,默认不启用*/
 		public static var iSignature:String = YesNoSelect.NO;
 		
+		/** 是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）,默认不关闭 */
+		public static var JyrDisbleEdit:String = YesNoSelect.NO;
+		
 		/** 超级管理员 */
 		public static var adminId:Number = 1;
 		/** 同步用户 */

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

@@ -175,6 +175,8 @@ package com.jtgh.yjpt.model
 				Global.version=bc.getAttribute("version") as  String;
 				//设置是否在危险品审批中使用签章功能的参数
 				Global.iSignature=bc.getAttribute("iSignature") as String;
+				//获得是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制） 
+				Global.JyrDisbleEdit = bc.getAttribute("JyrDisbleEdit") as String;
 			}
 			//界面，登陆界面换成主框架
 			thisModel.mainPane.removeAllElements();

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zysqbp/ShbpModel.as

@@ -527,8 +527,8 @@ package com.jtgh.yjpt.model.zysqbp
 			vo.bh = thisView.query_bh.text;
 			vo.mao = thisView.mao.textValue as String;
 			vo.cm = thisView.query_hmhc.text;
-			vo.wxwpmc = thisView.query_hwpmbh.text;
-			vo.wxhwmcbh = thisView.query_hwpm.text;
+			vo.wxwpmc = thisView.query_hwpm.text;
+			vo.wxhwmcbh = thisView.query_hwpmbh.text;
 			//根据流程状态查询
 			var lcStatus:String = "";
 			if(queryByFlowDisplay){
@@ -559,7 +559,7 @@ package com.jtgh.yjpt.model.zysqbp
 			var param:Vector.<String>=new Vector.<String>();
 			param.push(
 				vo.cm,
-				vo.wxwpmc,
+				vo.wxhwmcbh,
 				thisView.query_gkdw.text,
 				null==vo.szd?"":vo.szd.id+"",
 				null==vo.szgq?"":vo.szgq.id+"",
@@ -575,7 +575,8 @@ package com.jtgh.yjpt.model.zysqbp
 				vo.bh,
 				status,
 				thisView.query_shr.text,
-				null==vo.zydw?"":vo.zydw.id+""
+				null==vo.zydw?"":vo.zydw.id+"",
+				vo.wxwpmc
 			);
 			var params:URLVariables = new URLVariables();
 			params.title=title;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jsxmaqsc/GkjsxmaqscView.mxml

@@ -468,7 +468,7 @@
 							  visible="{model.isProvince}" includeInLayout="{model.isProvince}"
 							  paddingRight="5" paddingTop="5">
 						<s:HGroup width="100%" verticalAlign="middle">
-							<cus:QLabel width="120" text="代办人意见"/>
+							<cus:QLabel width="120" text="经办人意见"/>
 							<s:VGroup width="100%" verticalAlign="middle">
 								<cus:QTextArea id="zlsc" height="70"  width="530" text="@{vo.zlscTask.auditMsg}" editable="{model.isZlsc}"/>
 								<s:HGroup width="100%" horizontalAlign="center" verticalAlign="middle">
@@ -485,7 +485,7 @@
 							</s:VGroup>
 						</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle">
-							<cus:QLabel width="120" text="科室审查意见"/>
+							<cus:QLabel width="120" text="科室负责人意见"/>
 							<s:VGroup width="100%" verticalAlign="middle">
 								<cus:QTextArea id="kssc" height="70"  width="530" text="@{vo.ksscTask.auditMsg}" editable="{model.isKssc}"/>
 								<s:HGroup width="100%" horizontalAlign="center" verticalAlign="middle">

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

@@ -14,6 +14,7 @@
 			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.jyr.JyrModel;
 			import com.jtgh.yjpt.vo.jyr.JyrVo;
+			import com.jtgh.yjpt.select.YesNoSelect;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
@@ -24,12 +25,19 @@
 			public var vo:JyrVo = new JyrVo();
 			public var initParam:Array;
 			[Bindable]
-			public var screenWidth:Number;
+			public var screenWidth:Number; 
 			/**
 			 * 页面初始化
 			 */ 
 			protected function init(event:FlexEvent):void
 			{
+				//是否隐藏可编辑按钮
+				var disableEdit:Boolean = false;
+				disableEdit = (Global.JyrDisbleEdit==YesNoSelect.NO);
+
+				edit.visible = disableEdit;
+				edit.includeInLayout = disableEdit;
+				
 				jyrview.model.parentView=this;
 				editView.thisModel.parentView=this;
 				screenWidth=this.width;
@@ -84,7 +92,7 @@
 		]]>
 	</fx:Script>
 	<s:HGroup  width="100%" height="40" gap="10" horizontalAlign="left" verticalAlign="middle">
-		<button:IconButton id="edit" type="edit" visible="{Global.BUTTON_STATUS}" includeInLayout="{Global.BUTTON_STATUS}" toolTip="{resourceManager.getString('common','btn.edit')}"  click="edit_clickHandler(event)"/>
+		<button:IconButton id="edit" type="edit" toolTip="{resourceManager.getString('common','btn.edit')}"  click="edit_clickHandler(event)"/>
 		<button:IconButton id="print" type="print" toolTip="{resourceManager.getString('common','btn.print')}"  click="printView(event)"/>
 	</s:HGroup>
 	<s:HGroup width="100%"  gap="0" horizontalAlign="left" verticalAlign="middle">

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

@@ -18,6 +18,7 @@
 			import com.jtgh.yjpt.vo.gkgq.GqVo;
 			import com.jtgh.yjpt.vo.jyrxxgl.GksssbVo;
 			import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
+			import com.jtgh.yjpt.select.YesNoSelect;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
@@ -36,6 +37,21 @@
 			 */ 
 			protected function init(event:FlexEvent):void
 			{
+				//可编辑按钮显or隐   此页经营人和行政人员共用页面，首先需判断当前登录人员是否经营人
+				if(Global.user.sfjyr == YesNoSelect.YES){
+					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;
+				}
 				model.pager = pager;
 				model.doCreationComplete(this);
 				if("Y"==Global.user.sfjyr){

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

@@ -17,6 +17,7 @@
 			import com.jtgh.yjpt.vo.gkgq.GqVo;
 			import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
 			import com.jtgh.yjpt.vo.jyrxxgl.RyjbxxVo;
+			import com.jtgh.yjpt.select.YesNoSelect;
 			
 			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
@@ -37,6 +38,22 @@
 			 */ 
 			protected function init(event:FlexEvent):void
 			{
+				//可编辑按钮显or隐   此页经营人和行政人员共用页面，首先需判断当前登录人员是否经营人
+				if(Global.user.sfjyr == YesNoSelect.YES){
+					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;
+				}
+				
 				model.pager = pager;
 				query_gk.addEventListener(ListEvent.CHANGE,reloadGq);
 				if(Global.user.jyr){

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/yjgl/zdwxyfb/xxlr/ZdwxyfbLayout.mxml

@@ -2,7 +2,10 @@
 <s:VGroup xmlns:fx="http://ns.adobe.com/mxml/2009"
 		  xmlns:s="library://ns.adobe.com/flex/spark"
 		  xmlns:mx="library://ns.adobe.com/flex/mx"
-		  width="100%" height="100%" xmlns:xxlr="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.*" xmlns:button="com.jtgh.yjpt.common.component.ui.button.*" creationComplete="init(event)" >
+		  width="100%" height="100%" 
+		  xmlns:xxlr="com.jtgh.yjpt.view.yjgl.zdwxyfb.xxlr.*" 
+		  xmlns:button="com.jtgh.yjpt.common.component.ui.button.*" 
+		  creationComplete="init(event)" >
 
 	<fx:Script>
 		<![CDATA[
@@ -67,9 +70,26 @@
 					this.tab.removeElement(this.dwNav);
 //					this.tab.removeElement(this.mapNav);
 				}
-				if(Global.user.sfjyr=="Y"){
+				
+				
+				if(Global.user.sfjyr == YesNoSelect.YES){
 					this.tab.removeElement(this.qskNav);
 				}
+				
+				//可编辑按钮显or隐   此页经营人和行政人员共用页面，首先需判断当前登录人员是否经营人
+				if(Global.user.sfjyr == YesNoSelect.YES){
+					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; 
+				}
+				
 				if(null!=initParam){
 					initQueryConditon();
 				}