剧毒化学品备案

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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjModel.as

@@ -587,6 +587,7 @@ package com.jtgh.yjpt.model.bagl.jdhxpandzdwxyba
 			}
 			var djbabVo:GqnwxydjbabVo = this.hxView.gqnwxydjbabVo;
 			Utils.callRemote("jdhxpZdwxyBadjController","doHx", function (r:ResultEvent):void{
+				action = "submit";
 				var bc:BusinessContext=r.result as BusinessContext;
 				var vo:GqnwxydjbabVo=bc.getAttribute("record") as GqnwxydjbabVo;
 				if(null!=hxView.fileListView){
@@ -597,8 +598,7 @@ package com.jtgh.yjpt.model.bagl.jdhxpandzdwxyba
 				}
 				if(thisView!=null){
 					doQuery(null);
-				}
-				Alert.show("提交成功","提示");
+				}			
 				doPopupClose(hxView as UIComponent);
 				return;
 			}, djbabVo, Utils.getFunctionId(thisView));

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjEdit.mxml

@@ -5,7 +5,9 @@
 		 xmlns:ui="com.jtgh.yjpt.common.component.ui.*"
 		 xmlns:aqsszxyssc="com.jtgh.yjpt.view.aqsszxyssc.*"
 		 xmlns:cus="com.jtgh.yjpt.common.cus.*"
-		 height="100%" width="100%" creationComplete="creationCompleteHandler(event)" xmlns:jdhxpandzdwxyba="com.jtgh.yjpt.view.bagl.jdhxpandzdwxyba.*">
+		 height="100%" width="100%" 
+		 creationComplete="creationCompleteHandler(event)"
+		 xmlns:jdhxpandzdwxyba="com.jtgh.yjpt.view.bagl.jdhxpandzdwxyba.*">
 	<fx:Script>
 		<![CDATA[
 			import com.adobe.utils.StringUtil;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjHxAudit.mxml

@@ -299,8 +299,8 @@
 							<s:Label id="JDHXPZDWXY_FJ3" name="{Constants.GGDM_ID_YJYABA_FJ3}" text="缺" color="#ff0000"/>
 						</s:HGroup>
 						<s:HGroup  width="100%" verticalAlign="middle" > 
-							<cus:QLabel text="{resourceManager.getString('bagl','zdwxyba.sqhxly')}" width="15%" textAlign="right"/>
-							<cus:QTextArea id="sqhxly" width="85%" height="80" textAlign="left" text="@{_gqnwxydjbabVo.sqhxly}" enabled="false"/>
+							<cus:QLabel text="{resourceManager.getString('bagl','zdwxyba.sqhxly')}" width="100" textAlign="right"/>
+							<cus:QTextArea id="sqhxly" width="450" height="80" textAlign="left" text="@{_gqnwxydjbabVo.sqhxly}" enabled="false"/>
 						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjLayout.mxml

@@ -115,31 +115,12 @@
 			 */ 
 			protected function linkButtonFunc(data:GqnwxydjbabVo):void
 			{
-//				if(data.taskState==Constants.TASK_ASSIGN)
-//				{
-					//办理 申请人不是经营人，提供的入口进行修改
-					if(data.recordStatus==Constants.RECORD_STATE_REJECT)
-					{
-						// 打回时修改
-						thisModel.toEdit(null);
-					}else{
-						thisModel.doPop(data.id,"audit",null);
-					}
-//				}
-//				else if(data.taskState==Constants.TASK_CANDIDATE)
-//					//签收
-//					Utils.callRemote("jdhxpZdwxyBadjController","claim",function(r:ResultEvent):void{
-//						var bc:BusinessContext = r.result as BusinessContext;
-//						if(bc.getAttribute("success"))
-//						{
-//							data.taskState=Constants.TASK_ASSIGN;// claim  change the status
-//							data.task.runner=Global.user;//who claims the task
-//						}
-//						else
-//						{
-//							Utils.showInfoMessage(bc.getAttribute("message") as String);
-//						}
-//					},data);
+			 if(data.recordStatus==Constants.RECORD_STATE_REJECT){
+					// 打回时修改
+					thisModel.toEdit(null);
+				}else{
+					thisModel.doPop(data.id,"audit",null);
+				}	
 			}
 
 		]]>

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjController.java

@@ -888,8 +888,8 @@ public class JdhxpZdwxyBadjController extends BaseController {
 	public BusinessContext doHxPass(Boolean ifPass, GqnwxydjbabEntity ba,
 			GqnwxydjbabFlowEntity baFlow, String shyj, Date shsj) {
 		if (djbaFlowService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser()
-				.getId().toString(), ba.getId().toString()) != null) {
-			djbaFlowService.claim(ba.getId().toString(), Utils.getCurrentUser()
+				.getId().toString(), baFlow.getId().toString()) != null) {
+			djbaFlowService.claim(baFlow.getId().toString(), Utils.getCurrentUser()
 					.getId().toString());
 		}
 		BusinessContext bc = createBusinessContext();
@@ -906,10 +906,22 @@ public class JdhxpZdwxyBadjController extends BaseController {
 			djbaFlowService.logicDelete(baFlow.getId());
 			if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
 					&& Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
-				JdwxphzdwxybaWebService webService = djbaService
-						.getWebService();
-				if (null != webService) {
-					webService.delete(ba.getId());
+				try {
+					JdwxphzdwxybaWebService webService = djbaService
+							.getWebService();
+					ba =  djbaService.findById(ba.getId());
+					if (null != webService) {
+						webService.delete(ba.getId());
+						ba.setTbzt(Constants.YES);
+						djbaService.save(ba);
+					} else {
+						ba.setTbzt(Constants.NO);
+						djbaService.save(ba);
+					}
+				} catch (Exception e) {
+					ba.setTbzt(Constants.NO);
+					djbaService.save(ba);
+					e.printStackTrace();
 				}
 			}
 		} else {