From d24be593002645af178d71f5bc3097721310aa39 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Wed, 12 Sep 2018 21:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E4=BA=BA=E5=90=88=E5=90=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=8A=E4=BC=A0=E5=90=88=E5=90=8C=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Tenwa/Comm/DocList/TriditionDocListInfo.jsp       | 2 ++
 WebContent/Tenwa/Comm/DocList/TriditionDocListUpload.jsp     | 2 ++
 .../Customer/Lessee/Comm/Stockholder/CustomerStockholder.jsp | 3 ++-
 .../Comm/LBContractTemplate/TraditionContractFileList.jsp    | 5 +++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WebContent/Tenwa/Comm/DocList/TriditionDocListInfo.jsp b/WebContent/Tenwa/Comm/DocList/TriditionDocListInfo.jsp
index 442623406..82725c9fe 100644
--- a/WebContent/Tenwa/Comm/DocList/TriditionDocListInfo.jsp
+++ b/WebContent/Tenwa/Comm/DocList/TriditionDocListInfo.jsp
@@ -5,6 +5,7 @@
 	String sObjectNo = "";//--对象编号
 	//获得组件参数
 	String flowNo=CurPage.getParameter("FlowNo");
+	String flowunid=CurPage.getParameter("flowunid");
 	String contractid = CurPage.getParameter("contractid");
 	String projectid = CurPage.getParameter("projectid");
 	
@@ -30,6 +31,7 @@
 		params["OBJECTTYPE"]="TriditionContract";
 		params["CONTRACTID"]="<%=contractid%>";
 		params["PROJECTID"]="<%=projectid%>";
+		params["flowunid"]="<%=flowunid%>";
 		params["FILENAMEX"]="";
 		params["REMARK2"]="";
 		params["FileSize2"]="";
diff --git a/WebContent/Tenwa/Comm/DocList/TriditionDocListUpload.jsp b/WebContent/Tenwa/Comm/DocList/TriditionDocListUpload.jsp
index 3d9c4fe78..f92c486ee 100644
--- a/WebContent/Tenwa/Comm/DocList/TriditionDocListUpload.jsp
+++ b/WebContent/Tenwa/Comm/DocList/TriditionDocListUpload.jsp
@@ -16,6 +16,7 @@
 	    
 	    String  contractid=(String)myAmarsoftUpload.getRequest().getParameter("CONTRACTID");
 	    String  projectid=(String)myAmarsoftUpload.getRequest().getParameter("PROJECTID");
+	    String  flowunid=(String)myAmarsoftUpload.getRequest().getParameter("flowunid");
 	    
 	    String sFileName =URLDecoder.decode((String)myAmarsoftUpload.getRequest().getParameter("FILENAMEX"),"UTF-8"); //文件名称
 	    System.out.println("文件名"+sFileName);
@@ -50,6 +51,7 @@
 	    attr.setAttributeValue("InputOrgId", CurUser.getOrgID());
 	    attr.setAttributeValue("InputTime",InputTime);
 	    attr.setAttributeValue("objectType", objectType);
+	    attr.setAttributeValue("FLOWUNID", flowunid);
 	    
 		//得到不带路径的文件名
 		sFileName = StringFunction.getFileName(sFileName);
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Stockholder/CustomerStockholder.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Stockholder/CustomerStockholder.jsp
index 88b49484f..8683ae378 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/Stockholder/CustomerStockholder.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/Stockholder/CustomerStockholder.jsp
@@ -80,7 +80,8 @@ window.onload=function(){
 		//判断组织机构代码合法性
 		if(certType =='Ent01' || certType =='Ent02'){
 			 if(!checkORGRight(certid) ){
-				setErrorTips("certid",getBusinessMessage('102')); 
+				 //setErrorTips("certid",getBusinessMessage('102')); 
+				setErrorTips("certid","统一社会信用代码有误！"); 
 				return false;
 			}else{
 				setErrorTips("certid",""); 
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp
index 5eff1c482..4544c5535 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/TraditionContractFileList.jsp
@@ -7,6 +7,7 @@
         History Log: 
     */
     String sObjectType = CurPage.getParameter("FlowNo");//流程类型
+    String flowunid = CurPage.getParameter("FlowUnid");
     String RightType= CurPage.getParameter("RightType");
     String contractid= CurPage.getParameter("ContractId");
     String projectid= CurPage.getParameter("ProjectId");
@@ -16,7 +17,7 @@
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
 	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow("");
+	dwTemp.genHTMLObjectWindow(flowunid);
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
@@ -64,7 +65,7 @@
 	}
 	
 	function upload(){
-		var param="contractid=<%=contractid%>&projectid=<%=projectid%>";
+		var param="contractid=<%=contractid%>&projectid=<%=projectid%>&flowunid=<%=flowunid%>";
 	 	var sUrl="/Tenwa/Comm/DocList/TriditionDocListInfo.jsp";
 		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
 // 			var str=RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","updateBussinessCheck","library_id="+id+",BussinessCheck=DocCheck_0");