git-svn-id: https://192.168.57.71/svn/hbghj@150 201dd7a2-ec1b-f84b-8b06-88221118ff88

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

@@ -63,7 +63,7 @@
 						jyrview.model.cgList=bc.getAttribute("cgList") as ArrayCollection;
 						jyrview.model.mtList=bc.getAttribute("mtList") as ArrayCollection;
 						jyrview.model.fzList=bc.getAttribute("fzList") as ArrayCollection;
-						jyrview.model.shxxList=bc.getAttribute("shxxList") as ArrayCollection;
+						jyrview.shModel.shxxList=bc.getAttribute("shxxList") as ArrayCollection;
 						jyrview.visible=true;
 						jyrview.init(null);
 					},Global.user.jyrjcxx.id);

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

@@ -107,12 +107,14 @@
 				gkssbafhzsbhStr.text="港口设施保安\r\n符合证书编号";
 				zywxhwpmStr.text="作业危险货物\r\n品名";
 				
+				//审核信息
 				if(shModel.shxxList!=null) {
-					for(i=0;i<shModel.shxxList.length;i++)
-					{
+					for(i=0;i<shModel.shxxList.length;i++) {
 						this.shVo=shModel.shxxList.getItemAt(i) as JyrShxxVo;
-						if(this.shVo.sfsh=="N")
+						if(this.shVo.sfsh=="N"){
 							this.shbz.setStyle("color","#FF0033");
+							break;							
+						}
 					}
 					for(i=0;i<shModel.shxxList.length;i++){
 						this.shVo=shModel.shxxList.getItemAt(i) as JyrShxxVo;
@@ -158,6 +160,7 @@
 						}
 					}
 				}
+				
 				if(model.vo.bayxq!=null){
 					var tempDate1:Date = new Date();
 					tempDate1["date"]+=Constants.YXQ;
@@ -254,7 +257,7 @@
 						<cus:QLabel text="经营人基础信息" verticalAlign="middle" textalign="center"  width="100%"   fontSize="22"   fontWeight="bold"/>
 				    </s:HGroup>
 					<s:HGroup width="100%"  verticalAlign="middle" height="25" gap="0"  includeInLayout="{Global.szd.id!=Constants.SZD_ID_PROVINCE}">
-						<cus:QLabel id="shbz"  text="备注：标红的表示该字段数据审核不通过，点击该数据可以得到审核信息！" verticalAlign="middle" textalign="left"  width="80%"   
+						<cus:QLabel id="shbz"  text="备注：标红的表示该字段数据审核不通过，点击该字段数据描述可以得到审核信息！" verticalAlign="middle" textalign="left"  width="80%"   
 									visible="{Global.szd.id!=Constants.SZD_ID_PROVINCE}" includeInLayout="{Global.szd.id!=Constants.SZD_ID_PROVINCE}"/>
 						<s:Button id="check" label="审核" click="doCheck(event)" skinClass="skins.cus.ButtonSkin" 
 								  visible="{flag}" includeInLayout="{Global.szd.id!=Constants.SZD_ID_PROVINCE}"/>
@@ -274,7 +277,7 @@
 									   enabled="false"  />
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
-						<cus:QLabel width="13%" text="站所"/>
+						<cus:QLabel id="zsStr" width="13%" text="站所" click="shModel.showShyj1('zs')"/>
 						<cus:QComboBox id="zs" comboxClass="ZsBySzdSelect" parentId="{model.vo.szd==null?Global.user.szd.id.toString():model.vo.szd.id.toString()}"
 									   selectedVO="{model.vo.zs}" width="19%" enabled="false"/>
 						<cus:QLabel id="qylxStr" click="shModel.showShyj1('qylx')" width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" />
@@ -287,7 +290,7 @@
 						<cus:QLabel id="parentJyrStr" click="shModel.showShyj1('parentJyr')" width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}" />
 						<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{model.vo.parentJyr}" hasBlank="true" width="19%" 
 									   enabled="false"/>
-						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','bgdz')}" />
+						<cus:QLabel width="13%" id="bgdzStr" text="{resourceManager.getString('jlrxxgl','bgdz')}" />
 						<cus:QTextInput id="bgdz" text="@{model.vo.bgdz}" width="51%" editable="false"/>
 					</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle" gap="0">
@@ -392,7 +395,7 @@
 							<cus:QComboBox id="qyaqdj"  comboxClass="QyaqdjSelect" hasBlank="true" width="19%" dataField="{model.vo.qyaqdj}" enabled="false" />
 							<cus:QLabel id="rsStr" click="shModel.showShyj1('rs')" width="13%" text="{resourceManager.getString('jlrxxgl','rs')}"/>
 							<cus:QTextInput id="rs" text="{model.vo.rs}" width="19%" editable="false" restrict="0-9"/>
-							<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','gjjgdm')}"/>
+							<cus:QLabel width="13%" id="gjjgdmStr" text="{resourceManager.getString('jlrxxgl','gjjgdm')}"/>
 							<cus:QTextInput id="gjjgdm" text="@{model.vo.gjjgdm}" width="19%" />
 						</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">

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

@@ -117,27 +117,31 @@
 							<mx:CheckBox id="szgq_sh"   click="model.shFun('szgq')" width="3%" selected="true"/>
 						</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="1">
+							<!-- 站所 -->
+							<cus:QLabel width="10%" text="站所"/>
+							<cus:QTextInput id="zs" text="{vo.zsName}"  width="19%"  editable="false" doubleClick="model.showShyj('zs')"/>
+							<mx:CheckBox id="zs_sh"   click="model.shFun('zs')" width="3%" selected="true"/>
 							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','qylx')}"/>
 							<cus:QTextInput id="qylx" text="{vo.qylxname}"  width="19%"  editable="false" doubleClick="model.showShyj('qylx')"/>	
-							<mx:CheckBox id="qylx_sh"   click="model.shFun('gkjyr')" width="3%" selected="true"/>
+							<mx:CheckBox id="qylx_sh"   click="model.shFun('qylx')" width="3%" selected="true"/>
 							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','yzbm')}"/>
 							<cus:QTextInput id="yzbm" text="@{vo.yzbm}" width="19%" editable="false" doubleClick="model.showShyj('yzbm')"/>
 							<mx:CheckBox id="yzbm_sh"   click="model.shFun('yzbm')" width="3%" selected="true"/>
+						</s:HGroup>
+						<s:HGroup width="100%" verticalAlign="middle" gap="1">
 							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','sjjyr')}"/>
 							<cus:QTextInput id="parentJyr" text="{vo.parentJyrName}" width="19%" editable="false" doubleClick="model.showShyj('parentJyr')"/>
 							<mx:CheckBox id="parentJyr_sh"   click="model.shFun('parentJyr')" width="3%" selected="true"/>
+							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','bgdz')}"/>
+							<cus:QTextInput id="bgdz" text="@{vo.bgdz}" width="51%" editable="false" doubleClick="model.showShyj('bgdz')"/>
+							<mx:CheckBox id="bgdz_sh"   click="model.shFun('bgdz')" width="3%" selected="true"/>
 						</s:HGroup>
-						<s:HGroup width="100%" verticalAlign="middle" gap="1">
+						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="1">
 							<cus:QLabel width="10%" text="类别" />
 							<cus:QTextInput id="qyxz" text="{vo.lbName}" width="84%" editable="false" doubleClick="model.showShyj('qyxz')"/>
 							<mx:CheckBox id="qyxz_sh"   click="model.shFun('qyxz')" width="3%" selected="true"/>
 						</s:HGroup>
 						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="1">
-							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','bgdz')}"/>
-							<cus:QTextInput id="bgdz" text="@{vo.bgdz}" width="84%" editable="false" doubleClick="model.showShyj('bgdz')"/>
-							<mx:CheckBox id="bgdz_sh"   click="model.shFun('bgdz')" width="3%" selected="true"/>
-						</s:HGroup>
-						<s:HGroup width="100%" verticalAlign="middle" height="25" gap="1">
 							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','gkjyxkzh')}"/>
 							<cus:QTextInput id="gkjyxkzh" text="@{vo.gkjyxkzh}" width="16%" editable="false" doubleClick="model.showShyj('gkjyxkzh')"/>
 							<s:Image width="3%"  source="@Embed(source='resource/photo/open.png')" toolTip="上传附件"  buttonMode="true"  click="parentModel.upload(event)"/>
@@ -154,7 +158,7 @@
 							<cus:QTextInput id="fzjg" text="@{vo.fzjg}" width="19%" editable="false" doubleClick="model.showShyj('fzjg')"/>
 							<mx:CheckBox id="fzjg_sh"   click="model.shFun('fzjg')" width="3%" selected="true"/>
 							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','xzqh')}"/>
-							<cus:QTextInput id="xzqh" text="{vo.xzqhName}" width="19%" editable="false" doubleClick="model.showShyj('szqh')"/>
+							<cus:QTextInput id="xzqh" text="{vo.xzqhName}" width="19%" editable="false" doubleClick="model.showShyj('xzqh')"/>
 							<mx:CheckBox id="xzqh_sh"   click="model.shFun('xzqh')" width="3%" selected="true"/>
 							<cus:QLabel width="10%" text="{resourceManager.getString('jlrxxgl','zyhz')}"/>
 							<cus:QTextInput id="zyhz" text="@{vo.zyhz}" width="19%" editable="false" doubleClick="model.showShyj('zyhz')"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/check/DcVo.as

@@ -311,8 +311,10 @@ package com.jtgh.yjpt.vo.check
 			if(recordStatus==Constants.RECORD_STATE_ISSUED && Global.szd.id!=Constants.SZD_ID_PROVINCE){
 				return "已下发";
 			}
+			//_currentTask!=null plus by xuhao 20160208 
+			//对于流程异常的情况，虽然record_status为提交状态，但实际流程没有发起
 			if(recordStatus==Constants.RECORD_STATE_SUBMIT && Global.szd.id!=Constants.SZD_ID_PROVINCE
-			    && _currentTask.currName==WorkflowStatusSelect.RECORD_STATE_WF_QYTJ){
+			    && _currentTask!=null && _currentTask.currName==WorkflowStatusSelect.RECORD_STATE_WF_QYTJ){
 				return "待企业整改";
 			}
 			if(recordStatus==Constants.RECORD_STATE_SUBMIT){

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/JyrVo.as

@@ -278,6 +278,14 @@ package com.jtgh.yjpt.vo.jyr
 				return szgq.gqmc;
 			return  "";
 		}
+		
+		public function get zsName():String
+		{
+			if(zs!=null)
+				return zs.bz;
+			return  "";
+		}
+		
 		public function get szdName():String
 		{
 			if(szd!=null)