From ead6b107a158543526066103fccfd134df0af485 Mon Sep 17 00:00:00 2001
From: tangft <32189@DESKTOP-M6TAG3K>
Date: Mon, 14 Jan 2019 17:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B=E4=B8=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=A4=84=E7=90=86=E4=BA=BA=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=8F=90=E4=BA=A4=E5=92=8C=E4=BF=9D=E5=AD=98=E7=A7=9F?=
 =?UTF-8?q?=E8=B5=81=E7=89=A9=E4=B8=8A=E7=89=8C=E5=9C=B0=E5=8C=BA=E7=9A=84?=
 =?UTF-8?q?=E7=9C=81=E5=B8=82code=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Common/WorkFlow/FlowSubmitDialog.jsp               | 4 ++++
 .../Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
index b9850587f..bb180dc91 100644
--- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
+++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp
@@ -229,6 +229,10 @@
 		}
 		var phaseOpinion=getPhaseOpinion();
 		var nodeType=getNextPhaseNodeType(phaseOpinion);
+		if(nodeType==null||nodeType==""){
+			alert("请选择下一步处理人员!");
+			return ;
+		}
 		var phaseAction=getFlowUser();
 		if(nodeType.indexOf("JOIN")>=0){
 			//并行合并判断是否选人
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index c0f6b1b07..9e5d84992 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -212,9 +212,9 @@
 			}else{
 				 if(typeof(sAreaCodeInfo) != "undefined" && sAreaCodeInfo != ""){
 						sAreaCodeInfo = sAreaCodeInfo.split('@');
-						//sAreaCodeValue = sAreaCodeInfo[0];//-- 行政区划代码
+						sAreaCodeValue = sAreaCodeInfo[0].substring(0,4);//-- 行政区划代码
 						sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
-						//setItemValue(0,getRow(),"province",sAreaCodeValue);
+						setItemValue(0,getRow(),"retainfield1",sAreaCodeValue);
 						//setItemValue(0,getRow(),"provincename",sAreaCodeName);
 						setItemValue(0,getRow(),"zone",sAreaCodeName);			
 				}