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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjAdd.jsp

@@ -72,35 +72,35 @@
 						<tr>
 							<th colspan="2">本月完成量：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bywcl" name="bywcl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+								<input type="text" class="form-control" id="bywcl" name="bywcl" onkeyup="num(this)">
 							</td>
 							<th colspan="2">本年累计量：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bnljl" name="bnljl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+								<input type="text" class="form-control" id="bnljl" name="bnljl" onkeyup="num(this)">
 							</td>
 							<th colspan="2">同比增长数（%）：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="tbzzs" name="tbzzs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+								<input type="text" class="form-control" id="tbzzs" name="tbzzs" onkeyup="num(this)">
 							</td>
 						</tr>
 						<tr>
 							<th rowspan="2">其中：</th>
 							<th>外贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" onkeyup="num(this)"></td>
 							<th rowspan="2">其中：</th>
 							<th>外贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" onkeyup="num(this)"></td>
 							<th rowspan="2">其中：</th>
 							<th>外贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>内贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" onkeyup="num(this)"></td>
 							<th>内贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" onkeyup="num(this)"></td>
 							<th>内贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" onkeyup="num(this)"></td>
 						</tr>
 					</table>
 					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
@@ -114,31 +114,31 @@
 						</tr>
 						<tr>
 							<th>远洋航线</th>
-							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 						<th>近洋航线</th>
-							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>外贸内支线</th>
-							<td><input type="text" class="form-control" id="nzxts" name="nzxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxts" name="nzxts" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>内贸航线</th>
-							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>填表人：</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjEdit.jsp

@@ -61,35 +61,35 @@
 						<tr>
 							<th colspan="2">本月完成量：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bywcl" name="bywcl" value="${record.bywcl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+								<input type="text" class="form-control" id="bywcl" name="bywcl" value="${record.bywcl }" onkeyup="num(this)">
 							</td>
 							<th colspan="2">本年累计量：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bnljl" name="bnljl" value="${record.bnljl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+								<input type="text" class="form-control" id="bnljl" name="bnljl" value="${record.bnljl }" onkeyup="num(this)">
 							</td>
 							<th colspan="2">同比增长数（%）：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="tbzzs" name="tbzzs" value="${record.tbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+								<input type="text" class="form-control" id="tbzzs" name="tbzzs" value="${record.tbzzs }" onkeyup="num(this)">
 							</td>
 						</tr>
 						<tr>
 							<th rowspan="2">其中：</th>
 							<th>外贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" value="${record.wmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" value="${record.wmjzxttl }" onkeyup="num(this)"></td>
 							<th rowspan="2">其中：</th>
 							<th>外贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" value="${record.nwmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" value="${record.nwmjzxttl }" onkeyup="num(this)"></td>
 							<th rowspan="2">其中：</th>
 							<th>外贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" value="${record.wmtbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" value="${record.wmtbzzs }" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>内贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" value="${record.nmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" value="${record.nmjzxttl }" onkeyup="num(this)"></td>
 							<th>内贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" value="${record.nnmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" value="${record.nnmjzxttl }" onkeyup="num(this)"></td>
 							<th>内贸：&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" value="${record.nmtbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" value="${record.nmtbzzs }" onkeyup="num(this)"></td>
 						</tr>
 					</table>
 					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
@@ -103,31 +103,31 @@
 						</tr>
 						<tr>
 							<th>远洋航线</th>
-							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" value="${record.yyhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" value="${record.yyhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" value="${record.yyxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" value="${record.yytkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" value="${record.yyhxts }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" value="${record.yyhxhbs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" value="${record.yyxkphxs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" value="${record.yytkhxs }" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 						<th>近洋航线</th>
-							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" value="${record.jyhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" value="${record.jyhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" value="${record.jyxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" value="${record.jytkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" value="${record.jyhxts }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" value="${record.jyhxhbs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" value="${record.jyxkphxs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" value="${record.jytkhxs }" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>外贸内支线</th>
-							<td><input type="text" class="form-control" id="nzxts" name="nzxts" value="${record.nzxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" value="${record.nzxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" value="${record.nzxxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" value="${record.nzxtkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxts" name="nzxts" value="${record.nzxts }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" value="${record.nzxhbs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" value="${record.nzxxkphxs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" value="${record.nzxtkhxs }" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>内贸航线</th>
-							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" value="${record.nmhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" value="${record.nmhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" value="${record.nmxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
-							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" value="${record.nmtkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" value="${record.nmhxts }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" value="${record.nmhxhbs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" value="${record.nmxkphxs }" onkeyup="num(this)"></td>
+							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" value="${record.nmtkhxs }" onkeyup="num(this)"></td>
 						</tr>
 						<tr>
 							<th>填表人：</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjpro.jsp

@@ -187,7 +187,7 @@
 							   		</a>
 							   		<c:if test="${dq == null}">
 							   			<a class="btn btn-default btn-sm" href="#" onclick="tjMain()" id="id_sum">
-								   			<i class="glyphicon glyphicon-list-alt"></i>统计
+								   			<i class="glyphicon glyphicon-import"></i>统计
 							   			</a>
 							   			<a class="btn btn-default btn-sm" href="#" onclick="saveMain()" id="id_save">
 								   			<i class="glyphicon glyphicon-floppy-disk"></i>保存

gkjsjy/trunk/WebContent/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjdetail.js

@@ -79,7 +79,7 @@ hxhbtj.detail.save=function(){
 
 hxhbtj.detail.stat=function(){
 	// 必填非空验证
-	if(vae($('#szgkid'), "所在港口")==false){return false;}
+	if(vae($('#dq'), "所在地区")==false){return false;}
 	if(vae($('#rq'), "日期")==false){return false;}
 	
 	location.href=$.app+"/hxhbtj/stat?szgkid="+$('#szgkid').val()+"&rq="+$('#rq').val();

gkjsjy/trunk/resources/deployments/jgsq.bpmn

@@ -148,7 +148,7 @@
     <sequenceFlow id="flow52" name="不通过" sourceRef="exclusivegateway13" targetRef="zjps">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!auditPass_fgldsh}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow54" name="不通过" sourceRef="exclusivegateway14" targetRef="endevent1">
+    <sequenceFlow id="flow54" name="不通过" sourceRef="exclusivegateway14" targetRef="endevent2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!auditPass_zjps}]]></conditionExpression>
     </sequenceFlow>
     <exclusiveGateway id="exclusivegateway15" name="Exclusive Gateway"></exclusiveGateway>
@@ -167,6 +167,7 @@
     <sequenceFlow id="flow60" name="通过" sourceRef="exclusivegateway16" targetRef="ldbl">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${auditPass_sljbr}]]></conditionExpression>
     </sequenceFlow>
+    <endEvent id="endevent2" name="End"></endEvent>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_jgsq">
     <bpmndi:BPMNPlane bpmnElement="jgsq" id="BPMNPlane_jgsq">
@@ -248,6 +249,9 @@
       <bpmndi:BPMNShape bpmnElement="exclusivegateway16" id="BPMNShape_exclusivegateway16">
         <omgdc:Bounds height="40.0" width="40.0" x="203.0" y="330.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
+        <omgdc:Bounds height="35.0" width="35.0" x="233.0" y="799.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
         <omgdi:waypoint x="65.0" y="287.0"></omgdi:waypoint>
         <omgdi:waypoint x="90.0" y="287.0"></omgdi:waypoint>
@@ -451,7 +455,8 @@
         <omgdi:waypoint x="1132.0" y="743.0"></omgdi:waypoint>
         <omgdi:waypoint x="1132.0" y="822.0"></omgdi:waypoint>
         <omgdi:waypoint x="437.0" y="822.0"></omgdi:waypoint>
-        <omgdi:waypoint x="437.0" y="662.0"></omgdi:waypoint>
+        <omgdi:waypoint x="302.0" y="819.0"></omgdi:waypoint>
+        <omgdi:waypoint x="268.0" y="816.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
           <omgdc:Bounds height="14.0" width="36.0" x="1040.0" y="809.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>

gkjsjy/trunk/resources/deployments/jsjdbg.bpmn

@@ -148,7 +148,7 @@
     <sequenceFlow id="flow52" name="不通过" sourceRef="exclusivegateway13" targetRef="zjps">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!auditPass_fgldsh}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow54" name="不通过" sourceRef="exclusivegateway14" targetRef="endevent1">
+    <sequenceFlow id="flow54" name="不通过" sourceRef="exclusivegateway14" targetRef="endevent2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!auditPass_zjps}]]></conditionExpression>
     </sequenceFlow>
     <exclusiveGateway id="exclusivegateway15" name="Exclusive Gateway"></exclusiveGateway>
@@ -167,6 +167,7 @@
     <sequenceFlow id="flow60" name="通过" sourceRef="exclusivegateway16" targetRef="ldbl">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${auditPass_sljbr}]]></conditionExpression>
     </sequenceFlow>
+    <endEvent id="endevent2" name="End"></endEvent>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_jsjdbg">
     <bpmndi:BPMNPlane bpmnElement="jsjdbg" id="BPMNPlane_jsjdbg">
@@ -248,6 +249,9 @@
       <bpmndi:BPMNShape bpmnElement="exclusivegateway16" id="BPMNShape_exclusivegateway16">
         <omgdc:Bounds height="40.0" width="40.0" x="203.0" y="330.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
+        <omgdc:Bounds height="35.0" width="35.0" x="420.0" y="760.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
         <omgdi:waypoint x="65.0" y="287.0"></omgdi:waypoint>
         <omgdi:waypoint x="90.0" y="287.0"></omgdi:waypoint>
@@ -451,7 +455,7 @@
         <omgdi:waypoint x="1132.0" y="743.0"></omgdi:waypoint>
         <omgdi:waypoint x="1132.0" y="822.0"></omgdi:waypoint>
         <omgdi:waypoint x="437.0" y="822.0"></omgdi:waypoint>
-        <omgdi:waypoint x="437.0" y="662.0"></omgdi:waypoint>
+        <omgdi:waypoint x="437.0" y="795.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
           <omgdc:Bounds height="14.0" width="36.0" x="1040.0" y="809.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>

gkjsjy/trunk/resources/deployments/jsjdcbsj.bpmn

@@ -148,7 +148,7 @@
     <sequenceFlow id="flow52" name="不通过" sourceRef="exclusivegateway13" targetRef="zjps">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!auditPass_fgldsh}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow54" name="不通过" sourceRef="exclusivegateway14" targetRef="endevent1">
+    <sequenceFlow id="flow54" name="不通过" sourceRef="exclusivegateway14" targetRef="endevent2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!auditPass_zjps}]]></conditionExpression>
     </sequenceFlow>
     <exclusiveGateway id="exclusivegateway15" name="Exclusive Gateway"></exclusiveGateway>
@@ -167,6 +167,7 @@
     <sequenceFlow id="flow60" name="通过" sourceRef="exclusivegateway16" targetRef="ldbl">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${auditPass_sljbr}]]></conditionExpression>
     </sequenceFlow>
+    <endEvent id="endevent2" name="End"></endEvent>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_jsjdcbsj">
     <bpmndi:BPMNPlane bpmnElement="jsjdcbsj" id="BPMNPlane_jsjdcbsj">
@@ -248,6 +249,9 @@
       <bpmndi:BPMNShape bpmnElement="exclusivegateway16" id="BPMNShape_exclusivegateway16">
         <omgdc:Bounds height="40.0" width="40.0" x="203.0" y="330.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
+        <omgdc:Bounds height="35.0" width="35.0" x="420.0" y="712.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
         <omgdi:waypoint x="65.0" y="287.0"></omgdi:waypoint>
         <omgdi:waypoint x="90.0" y="287.0"></omgdi:waypoint>
@@ -451,7 +455,7 @@
         <omgdi:waypoint x="1132.0" y="743.0"></omgdi:waypoint>
         <omgdi:waypoint x="1132.0" y="822.0"></omgdi:waypoint>
         <omgdi:waypoint x="437.0" y="822.0"></omgdi:waypoint>
-        <omgdi:waypoint x="437.0" y="662.0"></omgdi:waypoint>
+        <omgdi:waypoint x="437.0" y="747.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
           <omgdc:Bounds height="14.0" width="36.0" x="1040.0" y="809.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>