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

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.1.9", "flashContent", 
                 "${width}", "${height}", 
                 swfVersionStr, xiSwfUrlStr, 
                 flashvars, params, attributes);

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

@@ -389,8 +389,14 @@ package com.jtgh.yjpt.model.zysqbp
 			 //cn号
 			 thisView.zysqbp.cnno = wxhwpmVo.bz;
 			 //物品类别和包装类型
-			 thisView.zysqbp.wxplb=wxhwpmVo.lbhxb;
-			 thisView.zysqbp.byzd4=wxhwpmVo.bzlb;
+			 thisView.zysqbp.wxplb=wxhwpmVo.lbhxb;//类别和项别
+			 thisView.zysqbp.byzd4=wxhwpmVo.bzlb;//包装类别
+			 //plus by xuhao 20170214 (single dog)
+			 //当“包装类别”只有一种时，给“包装”赋个初值,就为“包装类别”的值，因为此货种只有一种包装类别，那么实际操作肯定只有一种包装方式
+			 //当“包装类别”的值中没有“、”和“，”做分割时，就认定包装类别只有一种
+			 if(wxhwpmVo.bzlb.indexOf("、")==-1 && wxhwpmVo.bzlb.indexOf("，")==-1){
+				 thisView.zysqbp.bz = wxhwpmVo.bzlb;
+			 }
 			 //技术品名默认的就是危险物品名称
 			 thisView.zysqbp.jspm=wxhwpmVo.mchsm;
 			 // 清空作业场所，重新选择

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

@@ -352,16 +352,16 @@
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" >	
 							<cus:QLabel width="120" text="船名/船队名" />
 							<cus:QTextInput text="@{zysqbp.cm}" width="200" editable="{enable}"/>
-							<cus:QLabel  width="120" text="作业委托人" />
-							<cus:QTextInput text="@{zysqbp.zywtr}" width="200" editable="{enable}"/>						
+							<cus:QLabel width="120" text="航次" />
+							<cus:QTextInput text="@{zysqbp.hc}" width="200" editable="{enable}"/>				
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" >
 							<cus:QLabel width="120" text="是否船队" />
 							<mx:CheckBox id="cd" width="10" selected="false" enabled="{enable}"/>
 							<cus:QLabel id="cdStr" visible="false" width="78" text="船数" />
 							<cus:QTextInput id="cds" visible="{cdStr.visible}" text="@{zysqbp.byzd3}" type="int" width="100" editable="{enable}"/>						
-							<cus:QLabel width="120" text="航次" />
-							<cus:QTextInput text="@{zysqbp.hc}" width="200" editable="{enable}"/>
+							<cus:QLabel  width="120" text="作业委托人" />
+							<cus:QTextInput text="@{zysqbp.zywtr}" width="200" editable="{enable}"/>	
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="危险物品名称" />
@@ -523,6 +523,13 @@
 							<cus:QLabel width="120" text="安全防范措施" />
 							<cus:QTextArea id="tsyqhsm" text="@{zysqbp.aqffcs}" width="530" height="70" editable="{enable}"/>
 						</s:HGroup>
+						
+						<!-- 加危货申报申报单备注 plus by xuhao 20170214 (single dog)-->
+						<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="备注"/>
+							<cus:QTextArea id="txtNote" text="@{zysqbp.byzd3}" width="530" height="70" editable="{enable}"/>
+						</s:HGroup>
+						
 						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="报告人" />
 							<cus:QTextInput text="@{zysqbp.bgr}" width="200" editable="{enable}"/>

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

@@ -667,20 +667,17 @@
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" notNull="true" text="船名/船队名"/>
 			<cus:QTextInput id="cm" width="173" editable="{enable}" text="@{zysqbp.cm}"/>
-			<s:Button width="22" click="thisModel.cmClickHandler()"
-					  icon="@Embed(source='resource/images/view_dis.gif')" toolTip="选择"/>
-			<cus:QLabel width="120" notNull="true" text="作业委托人"/>
-			<cus:QTextInput id="zywtr" width="200" editable="{enable}" text="@{zysqbp.zywtr}"/>
+			<s:Button width="22" click="thisModel.cmClickHandler()" icon="@Embed(source='resource/images/view_dis.gif')" toolTip="选择"/>
+			<cus:QLabel width="120" text="航次"/>
+			<cus:QTextInput id="hc" width="200" editable="{enable}" text="@{zysqbp.hc}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" text="是否船队"/>
-			<mx:CheckBox id="cd" width="10" click="changeCh(event)" enabled="{enable}"
-						 selected="false"/>
+			<mx:CheckBox id="cd" width="10" click="changeCh(event)" enabled="{enable}" selected="false"/>
 			<cus:QLabel id="cdStr" visible="false" width="79" notNull="true" text="船数"/>
-			<cus:QTextInput id="cds" visible="{cdStr.visible}" width="100" editable="{enable}"
-							text="@{zysqbp.byzd3}" type="int"/>
-			<cus:QLabel width="120" text="航次"/>
-			<cus:QTextInput id="hc" width="200" editable="{enable}" text="@{zysqbp.hc}"/>
+			<cus:QTextInput id="cds" visible="{cdStr.visible}" width="100" editable="{enable}" text="@{zysqbp.byzd3}" type="int"/>
+			<cus:QLabel width="120" notNull="true" text="作业委托人"/>
+			<cus:QTextInput id="zywtr" width="200" editable="{enable}" text="@{zysqbp.zywtr}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" notNull="true" text="危险物品名称"/>
@@ -693,9 +690,7 @@
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" notNull="true" text="技术品名"/>
 			<cus:QTextInput id="jspm" width="200" editable="{enable}" text="@{zysqbp.jspm}"/>
-			<cus:QLabel  width="120"
-						notNull="{null!=zysqbp.jzxsl&amp;&amp;''!=StringUtil.trim(zysqbp.jzxsl)}"
-						text="包装"/>
+			<cus:QLabel width="120" notNull="{null!=zysqbp.jzxsl&amp;&amp;''!=StringUtil.trim(zysqbp.jzxsl)}" text="包装"/>
 			<cus:QTextInput id="bz" width="200" editable="{enable}" text="@{zysqbp.bz}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
@@ -822,9 +817,15 @@
 		</s:HGroup>
 		<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" notNull="true" text="安全防范措施"/>
-			<cus:QTextArea id="tsyqhsm" width="530" height="70" editable="{enable}"
-						   text="@{zysqbp.aqffcs}"/>
+			<cus:QTextArea id="tsyqhsm" width="530" height="70" editable="{enable}" text="@{zysqbp.aqffcs}"/>
 		</s:HGroup>
+		
+		<!-- 加危货申报申报单备注 plus by xuhao 20170214 (single dog)-->
+		<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
+			<cus:QLabel width="120" text="备注"/>
+			<cus:QTextArea id="txtNote" width="530" height="70" text="@{zysqbp.byzd3}"/>
+		</s:HGroup>
+		
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle"> 
 			<cus:QLabel width="120" notNull="true" text="作业时间起"/>
 			<ui:DateTime id="zysjq" width="200" dateTime="{zysqbp.zysjq}" hasTime="true"/>

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

@@ -201,7 +201,7 @@
 				<ui:DataGridColumn dataField="status"
 								   headerText="任务状态"/>
 				<ui:DataGridColumn dataField="zywtr"
-								   headerText="作业委托人" visible="false"/>
+								   headerText="作业委托人" />
 				<ui:DataGridColumn dataField="cm"
 								   headerText="船名"/>
 				<ui:DataGridColumn dataField="xcglfzr" 

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

@@ -335,16 +335,16 @@
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" >
 							<cus:QLabel width="120" text="船名/船队名" />
 							<cus:QTextInput text="@{zysqbp.cm}" width="200" editable="{enable}"/>
-							<cus:QLabel  width="120" text="作业委托人" />
-							<cus:QTextInput text="@{zysqbp.zywtr}" width="200" editable="{enable}"/>						
+							<cus:QLabel width="120" text="航次" />
+							<cus:QTextInput text="@{zysqbp.hc}" width="200" editable="{enable}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle" >
 							<cus:QLabel width="120" text="是否船队" />
 							<mx:CheckBox id="cd" width="10" selected="false" enabled="{enable}"/>
 							<cus:QLabel id="cdStr" visible="false" width="78" text="船数"  />
 							<cus:QTextInput id="cds" visible="{cdStr.visible}" text="@{zysqbp.byzd3}" type="int" width="100" editable="{enable}"/>
-							<cus:QLabel width="120" text="航次" />
-							<cus:QTextInput text="@{zysqbp.hc}" width="200" editable="{enable}"/>
+							<cus:QLabel  width="120" text="作业委托人" />
+							<cus:QTextInput text="@{zysqbp.zywtr}" width="200" editable="{enable}"/>						
 						</s:HGroup>
 						<!--s:HGroup  width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="危险品类别"  />
@@ -514,6 +514,13 @@
 							<cus:QLabel width="120" text="安全防范措施" />
 							<cus:QTextArea id="tsyqhsm" text="@{zysqbp.aqffcs}" width="530" height="70" editable="{enable}"/>
 						</s:HGroup>
+						
+						<!-- 加危货申报申报单备注 plus by xuhao 20170214 (single dog)-->
+						<s:HGroup width="100%" height="90" horizontalAlign="left" verticalAlign="middle">
+							<cus:QLabel width="120" text="备注"/>
+							<cus:QTextArea id="txtNote" text="@{zysqbp.byzd3}" width="530" height="70" editable="{enable}"/>
+						</s:HGroup>
+						
 						<s:HGroup  width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="报告人" />
 							<cus:QTextInput text="@{zysqbp.bgr}" width="200" editable="{enable}"/>

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

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