Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhangjun

2018-06-14 09:18:39 +08:00 · 2018-06-14 09:18:39 +08:00 · 8d6e85ce82
commit 8d6e85ce82
parent c0afa97ac1 182ee4e9d0
35 changed files with 32917 additions and 45 deletions
--- a/WebContent/AppConfig/OrgUserManage/UserInfo.jsp
+++ b/WebContent/AppConfig/OrgUserManage/UserInfo.jsp
@ -10,7 +10,7 @@
 	//获得页面参数	
 	String sUserID =  CurPage.getParameter("UserID");
 	if(sUserID==null) sUserID="";
-	ASObjectModel doTemp = new ASObjectModel("UserInfo");
+	ASObjectModel doTemp = new ASObjectModel("UserInfo_Type");
 	String orgId=CurPage.getParameter("OrgID");
 	if(orgId==null) orgId="";
 	String userNo="";
--- a/WebContent/AppConfig/OrgUserManage/UserList.jsp
+++ b/WebContent/AppConfig/OrgUserManage/UserList.jsp
@ -40,7 +40,7 @@
 <script type="text/javascript">
 	function my_add(){
 		var sOrgLeval="<%=orgLevel%>";
-		if(sOrgLeval!=6){alert("人员必须登记在部门之下");return false;}
+		if(sOrgLeval!=6&&sOrgLeval!=9){alert("人员必须登记在部门之下");return false;}
 		OpenPage("/AppConfig/OrgUserManage/UserInfo.jsp?OrgID=<%=sOrgID%>","_self","");
 	}
 	
--- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
@ -25,6 +25,13 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
+	setItemValue(0,0,"MONEY_TYPE","ÍË¿î");
+	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+	setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
 	function save(){
 		var sFlowUnid = "<%=sFlowUnid%>";
 		setItemValue(0,getRow(),'FlowUnid',sFlowUnid);
--- a/WebContent/DealerDeposit/DDepositReturn_TempList.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempList.jsp
@ -17,7 +17,7 @@
 	String sButtons[][] = {
 		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@ -24,9 +24,15 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
+	setItemValue(0,0,"MONEY_TYPE","ÊÕ¿î");
+	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+	setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
 	function save(){
 		var sFlowUnid = "<%=sFlowUnid%>";
-		//alert(sFlowUnid);
 		setItemValue(0,getRow(),"FlowUnid",sFlowUnid);//³õÊ¼»¯Á÷³Ì±àºÅ
 		as_save("myiframe0","returnList()");
 	}
--- a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp
@ -17,7 +17,7 @@
 	String sButtons[][] = {
 		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""} 
+		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""} 
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
--- a/WebContent/Frame/page/jspf/include/jsp_mainmenu.jspf
+++ b/WebContent/Frame/page/jspf/include/jsp_mainmenu.jspf
@ -6,7 +6,10 @@ request.setAttribute("as_main", new com.amarsoft.awe.ui.layout.ASMain(CurPage).i
 <title>${as_main.title}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=GBK"><%@
 	 include file="/Frame/page/jspf/include/jsp_head_res.jspf" 
-%><script type='text/javascript' src='${as_main.page.application}/Frame/resources/js/jquery/plugins/jquery.bgiframe.js'></script>
+%>
+<script type="text/javascript" src="${as_main.page.application}/js/jquery-ui/external/jquery/jquery.js"></script>
+<script type="text/javascript" src="${as_main.page.application}/js/jquery-ui/jquery-ui.js"></script>
+<script type='text/javascript' src='${as_main.page.application}/Frame/resources/js/jquery/plugins/jquery.bgiframe.js'></script>
 <script type="text/javascript" src="${as_main.page.application}/Frame/resources/js/dialog/dialog-min.js"></script>
 <script type="text/javascript" src="${as_main.page.application}/Frame/page/js/widget/main.js"></script>
 <link rel="stylesheet" type="text/css" href="${as_main.page.application}/Frame/page/resources/css/comp_dialog.css">
--- a/WebContent/Tenwa/ChannelPortal/BusinessHanding/FundRentAdjust/LBInsuranceDocumentUpload.jsp
+++ b/WebContent/Tenwa/ChannelPortal/BusinessHanding/FundRentAdjust/LBInsuranceDocumentUpload.jsp
@ -0,0 +1,119 @@
+<%@page import="java.net.URLDecoder"%>
+<%@page import="com.amarsoft.are.jbo.impl.BizObjectTableMapper"%>
+<%@page import="com.amarsoft.awe.util.DBKeyHelp"%>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="com.amarsoft.dict.als.manage.NameManager" %>
+<%@page import="com.amarsoft.awe.common.attachment.*"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%><%
+		AmarsoftUpload myAmarsoftUpload = new AmarsoftUpload();
+		myAmarsoftUpload.initialize(pageContext);
+		myAmarsoftUpload.upload(); 
+	    String sFileName = myAmarsoftUpload.getFiles().getFile(0).getFileName(); //文件名称
+	    
+	    String libraryId=""; //附件编号
+	    String InputTime= StringFunction.getTodayNow(); //附件上传时间
+	    String contract_id= (String)myAmarsoftUpload.getRequest().getParameter("contract_id"); //合同编号
+	    String  ObjectType=(String)myAmarsoftUpload.getRequest().getParameter("OBJECTTYPE");//附件类型
+	   	
+	    String otherParamWhere="";
+	    BizObjectManager relaBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCRELATIVE");
+	    BizObjectManager libBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCLIBRARY");
+	    BizObjectManager attrBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE");
+	    
+	    BizObject lib=null;
+	    
+	    
+	    	String sql="select * from O left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on O.Relative_Id=rela.id where rela.contract_id=:contract_id and rela.objecttype=:objecttype ";
+	    	
+	    	BizObjectQuery query=libBm.createQuery(sql);
+	    	query.setParameter("contract_id",contract_id);
+	    	query.setParameter("objecttype",ObjectType);
+	    	lib=query.getSingleResult(true);
+	    
+	    
+	    
+	    if(lib!=null){
+	    	libBm.saveObject(lib);
+	    	libraryId=lib.getAttribute("id").getString();
+	    }else{
+	    	sql="select * from O left join jbo.app.tenwa.doc.LB_DOCLIBRARY lib on O.id=lib.Relative_Id where O.contract_id=:contract_id and O.objecttype=:objecttype ";
+	    	query=relaBm.createQuery(sql);
+	    	query.setParameter("contract_id",contract_id);
+	    	query.setParameter("objecttype",ObjectType);
+	    	BizObject rela=query.getSingleResult(true);
+	    	String relativeid="";
+	    	if(rela==null){
+		    	//初始化附件关联对象
+		    	rela=relaBm.newObject();
+		    	rela.setAttributeValue("ObjectType", ObjectType);
+		    	rela.setAttributeValue("contract_id", contract_id);
+		    	relaBm.saveObject(rela);
+		    	relativeid=rela.getAttribute("id").getString();
+	    	}else{
+	    		relativeid=rela.getAttribute("id").getString();
+	    	}
+	    	//初始化附件
+	    	lib=libBm.newObject();
+	    	lib.setAttributeValue("Relative_Id", relativeid);
+	    	libBm.saveObject(lib);
+	    	libraryId=lib.getAttribute("id").getString();
+	    }
+	    
+	    
+	    BizObject attr=attrBm.newObject();
+	    attr.setAttributeValue("Library_Id", libraryId);
+	    attr.setAttributeValue("FileName", sFileName);
+	    attr.setAttributeValue("InputUserId", CurUser.getUserID());
+	    attr.setAttributeValue("InputOrgId", CurUser.getOrgID());
+	    attr.setAttributeValue("InputTime",InputTime);
+	    attr.setAttributeValue("ObjectType", ObjectType);
+	    
+		//得到不带路径的文件名
+		sFileName = StringFunction.getFileName(sFileName);
+		sFileName = URLDecoder.decode(URLDecoder.decode(sFileName,"UTF-8"),"UTF-8");		
+		//定义数据库操作变量
+		SqlObject so = null;
+		String sNewSql = "";
+		String sFileSaveMode = CurConfig.getConfigure("FileSaveMode");
+		String sFileSavePath = CurConfig.getConfigure("FileSavePath");
+		String sFileNameType = CurConfig.getConfigure("FileNameType");	
+		
+		String trueTable = ((BizObjectTableMapper)attrBm).getTable(); //取得真实的表名
+		String sAttachmentNo = DBKeyHelp.getSerialNo(trueTable,"Id");
+		
+		if (!myAmarsoftUpload.getFiles().getFile(0).isMissing()){
+			try {
+				String uuid=java.util.UUID.randomUUID().toString().replaceAll("-", "");
+				String sFullPath =com.tenwa.officetempalte.util.FileOperatorUtil.getuploadFileDir(sFileSavePath) +uuid+"_"+sFileName;
+						//com.amarsoft.awe.common.attachment.FileNameHelper.getFullPath(libraryId, sAttachmentNo,sFileName, sFileSavePath, sFileNameType, application);
+				
+				myAmarsoftUpload.getFiles().getFile(0).saveAs(sFullPath);
+        					//得到带相对路径的文件名
+	       		String sFilePath = sFullPath.replace(sFileSavePath, "");
+	       		attr.setAttributeValue("FilePath",sFilePath); 
+	       		attr.setAttributeValue("FullPath",sFullPath);
+				attr.setAttributeValue("Content_Type",DataConvert.toString(myAmarsoftUpload.getFiles().getFile(0).getContentType()));
+				attr.setAttributeValue("FileSize",DataConvert.toString(String.valueOf(myAmarsoftUpload.getFiles().getFile(0).getSize())));
+				attrBm.saveObject(attr);
+				myAmarsoftUpload = null;
+			}catch(Exception e){
+				e.printStackTrace();
+		      	out.println("An error occurs : " + e.toString());
+		      	attrBm.deleteObject(attr);
+		      	myAmarsoftUpload = null;
+%>          
+      <script type="text/javascript">
+          alert("上传失败");//上传文件失败！
+          parent.AsDialog.ClosePage();
+      </script>
+<%
+     		}
+       	}
+%>
+<script type="text/javascript">
+    alert("上传成功");//上传文件成功！
+    parent.AsDialog.ClosePage("success");
+</script>
+<%@ include file="/IncludeEnd.jsp"%>
--- a/WebContent/Tenwa/Comm/DocList/showImageManage.jsp
+++ b/WebContent/Tenwa/Comm/DocList/showImageManage.jsp
@ -0,0 +1,90 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%><%
+	String compClientID = request.getParameter("CompClientID");
+	String attrid = CurPage.getParameter("attrid");
+%>
+<body style="overflow:hidden;">
+<div><a onclick='fangda()' style="text-decoration:none;" title="放大">放大</a>
+&nbsp;<a onclick='shuoxiao()' style="text-decoration:none;" title="缩小">缩小</a>
+&nbsp;<a onclick='huanyuan()' style="text-decoration:none;" title="还原">还原</a>
+&nbsp;<a onclick='turnleft()' style="text-decoration:none;" title="左转">左转</a>
+&nbsp;<a onclick='turnright()' style="text-decoration:none;" title="右转">右转</a>
+</div>
+<div id="ButtonsDiv" style="margin-left:5px; overflow:scroll;width:99.5%;height:97%;" >
+
+</div>
+</body>
+<script type="text/javascript">
+var swidth;
+var sheight;
+var current = 0;
+	window.onload=function(){
+		importRecord();
+	}
+	function importRecord(){
+		var result =  AsControl.RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","getImageWidthAndHeight","attId="+"<%=attrid%>");
+		var appImage={};
+		appImage.width=result.width;
+		appImage.height=result.height;
+		swidth=result.width;
+		sheight=result.height;
+		appImage.id="<%=attrid%>";
+		var img = createAttachmentImageDiv(appImage);
+		jQuery("#ButtonsDiv").append(img);
+	}
+	function createAttachmentImageDiv(appImage,filedict){
+		var $div = jQuery('<div/>');
+		if(appImage){
+			$div.addClass("img-box");
+			$div.attr("imageid", appImage.id);
+			var $image = jQuery("<img/>");
+			$image.attr("id","image");
+			$image.attr("height",appImage.height);
+			$image.attr("width",appImage.width);
+			$image.attr("src", sWebRootPath+"/servlet/view/image?CompClientID=<%=sCompClientID%>&attrid="+appImage.id);
+			$image.appendTo($div);
+		}
+		return $div;
+	}
+	function shuoxiao(){
+		var image=$("#image");
+		var height=image.attr("height");
+		var width=image.attr("width");
+		image.css("height",height*0.9);
+		image.css("width",width*0.9);
+		image.attr("height",height*0.9);
+		image.attr("width",width*0.9);
+	}
+	
+	function fangda(){
+		var image=$("#image");
+		var height=image.attr("height");
+		var width=image.attr("width");
+		image.css("height",height/0.9);
+		image.css("width",width/0.9);
+		image.attr("height",height/0.9);
+		image.attr("width",width/0.9);
+	}
+	function huanyuan(){
+		var image=$("#image");
+		image.css("height",sheight);
+		image.css("width",swidth);
+		image.attr("height",sheight);
+		image.attr("width",swidth);
+		current = 0;
+		image[0].style.transform = 'rotate('+current+'deg)';
+	}
+	
+	function turnleft(){
+		var imageDiv = $("#image")[0];
+		current = (current-90)%360;
+		imageDiv.style.transform = 'rotate('+current+'deg)';
+	}
+	
+	function turnright(){
+		var imageDiv = $("#image")[0];
+		current = (current+90)%360;
+		imageDiv.style.transform = 'rotate('+current+'deg)';
+	}
+</script>
+<%@ include file="/IncludeEnd.jsp"%>
--- a/WebContent/Tenwa/Core/ChannelCRMManager/ChannelUser/UserList.jsp
+++ b/WebContent/Tenwa/Core/ChannelCRMManager/ChannelUser/UserList.jsp
@ -68,10 +68,10 @@
 	function my_add(){
 		var sOrgLeval="<%=isSales%>";
 		var sCreateType="<%=sCreateType%>";
-		if(sCreateType!="manager"){//第一级都可建管理员，业务员必须要配置
+/* 		if(sCreateType!="manager"){//第一级都可建管理员，业务员必须要配置
 		     if(sOrgLeval!="Y"){alert("管理员没有配置权限,不能新增业务人员");return false;}
 		}
-		OpenPage("/Tenwa/Core/ChannelCRMManager/ChannelUser/UserInfo.jsp?OrgID=<%=sOrgID%>&isNew=true&CreateType="+sCreateType,"_self","");
+ */		OpenPage("/Tenwa/Core/ChannelCRMManager/ChannelUser/UserInfo.jsp?OrgID=<%=sOrgID%>&isNew=true&CreateType="+sCreateType,"_self","");
 	}
 	
 	function viewAndEdit(){
--- a/WebContent/Tenwa/Core/ChannelCRMManager/ChannelUser/UserMain.jsp
+++ b/WebContent/Tenwa/Core/ChannelCRMManager/ChannelUser/UserMain.jsp
@ -14,7 +14,7 @@
 	String showType="Channel";
 	if(CurUser.hasRole("099")||CurUser.hasRole("299")||CurUser.hasRole("399")){
 		 pOrgId="8";
-	}else if(CurUser.hasRole("400"))
+	}else if(CurUser.hasRole("401"))
 	{
 		//机构管理员只能看到本构和下一级的人员
 		pOrgId=CurUser.getOrgID();
--- a/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsuranceDocumentInfo.jsp
+++ b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsuranceDocumentInfo.jsp
@ -0,0 +1,93 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocumentListAction" %>
+<%
+	//获得组件参数
+	String sObjectType=CurPage.getParameter("ObjectType");//
+	String contract_id=CurPage.getParameter("contract_id");
+	
+	ASObjectModel doTemp = new ASObjectModel("LBAdjustDocumentInfo");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="2";      // 设置DW风格 1:Grid 2:Freeform
+	dwTemp.ReadOnly = "0"; // 设置是否只读 1:只读 0:可写
+	dwTemp.genHTMLObjectWindow("");
+	String[][] sButtons=null;
+	sButtons=new String[][]{
+			{"true","","Button","保存","保存所有修改","importRecord()","","","",""},
+			{"true","","Button","取消","取消","viewAndEdit_attachment()","","","","btn_icon_close"}};
+%><%@include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	$(function() {
+		$("#FILE2").attr("type","file");
+		$("#myiframe0").attr("enctype","multipart/form-data");
+		var params={};
+		params["OBJECTTYPE"]="<%=sObjectType%>";
+		params["contract_id"]="<%=contract_id%>";
+		var sparma="";
+	    for(var key in params){
+	    	sparma=sparma+"<input type=\"text\" name=\""+key+"\"  value=\""+params[key]+"\">"
+	    }
+	    $("#FILE2").append(sparma);
+	    $("#myiframe0").attr("action","<%=sWebRootPath%>/Tenwa/ChannelPortal/BusinessHanding/FundRentAdjust/LBInsuranceDocumentUpload.jsp?CompClientID=<%=CurComp.getClientID()%>");
+		$("#myiframe0").attr("method","post");
+		
+		setItemValue(0,0,"InputUserName","<%= CurUser.getUserName()%>");
+		setItemValue(0,0,"InputOrg","<%=CurUser.getOrgName()%>");
+		setItemValue(0,0,"InputTime","<%=StringFunction.getToday()%>");
+		
+	});
+	
+	function viewAndEdit_attachment(){
+		if(confirm("确认取消上传？")){
+			parent.AsDialog.ClosePage("_CANCEL_");
+		}
+	}
+	//提交
+	function importRecord(){
+		if(!iV_all('myiframe0'))return;
+		//$("#FILE").append(params);
+		var o = document.forms["myiframe0"];
+		var sFileName = o.FILE2.value;
+		var nameArr = sFileName.split("\\");
+		
+		setItemValue(0,0,"FileName",encodeURI(nameArr[nameArr.length-1]));
+		if (typeof(sFileName) == "undefined" || sFileName==""){
+			alert("请选上传的附件!");
+			return false;
+		}
+		if(/[!@'"#$%&\^*]/.test(nameArr[nameArr.length-1])){
+			alert("文件名不合法");
+			return;
+		}
+		var flag=CheckStr(nameArr[nameArr.length-1]);
+		if(flag!="true"){
+			alert("只能上传后缀名为"+flag+"的文件");
+			return ;
+		}
+		var fileSize;
+		if(typeof(ActiveXObject) == "function"){ // IE
+			var fso = new ActiveXObject("Scripting.FileSystemObject");
+			var f1 = fso.GetFile(sFileName);
+			fileSize = f1.size;
+		}else{
+			fileSize = o.FILE2.files[0].size;
+		}
+		if(fileSize > 50*1024*1024){
+			alert("文件大于50MB，不能上传！");
+			return false;
+		}
+		return o.submit();
+	}
+	function CheckStr(str){
+		var s="jpg,jpeg,png";
+		var flag="false";
+		var s2=s.split(",");
+		for(var i=0;i<s2.length;i++){
+			if(str.split(".")[1]==s2[i]){
+				return "true";
+			}
+		}
+		return s;
+    }
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
--- a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarInfo.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductCarInfo.jsp
@ -28,9 +28,12 @@
 /* 	sButtonPosition = "south"; */
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
-	var name = setItemValue(0,getRow(),"inputuserid",'<%=name%>');
-	var orgName = setItemValue(0,getRow(),"inputorgid",'<%=orgName%>');
-	<%-- var time = setItemValue(0,getRow(),"inputtime",'<%=new Date()%>'); --%>
+	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+	setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
 	function save(){
 		as_save("myiframe0","returnList()");
 	}
--- a/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvageInfo.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/CarInfo/LbProductSalvageInfo.jsp
@ -23,6 +23,12 @@
 	/* sButtonPosition = "south"; */
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+	setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserName()%>");
+	setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgName()%>");
+	setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
 	function save(){
 		as_save("myiframe0","returnList()");
 	}
@ -35,7 +41,6 @@
 			    	return;
 				}
 				sReturn = sReturn.split("@");//返回值
-				alert(sReturn);
 			    setItemValue(0,0,"ID", sReturn[0]);//设置页面上面的值
 			    setItemValue(0,0,"PRODUCT_ID", sReturn[1]);
 			    setItemValue(0,0,"SERIALNO", sReturn[2]);
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp
@ -0,0 +1,137 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2017-10-11
+        Content: 示例详情页面
+        History Log: 
+    */
+    String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+    if(sFlowUnid == null) sFlowUnid="";
+    String sTempletNo = CurPage.getParameter("TempletNo");//模板号
+    if(sTempletNo == null) sTempletNo = "LDistributorInfoSecond";
+	BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false);
+    String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString();
+    
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setDefaultValue("FLOWUNID", sFlowUnid);
+	doTemp.setDefaultValue("DISTRIBUTOR_NO", DISTRIBUTOR_NO);
+	//doTemp.setColTips("", "测试");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.ReadOnly = "1";//只读模式
+	ASDataObject ado = dwTemp.getDataObject();
+	ado.setHtmlEvent("LIMIT_APPROVAL_DATE", "onchange", "getenddate");
+	ado.setHtmlEvent("LIMIT_EFFECTIVE_DATE", "onchange", "getenddate");
+	dwTemp.genHTMLObjectWindow(sFlowUnid);
+	
+	String sButtons[][] = {
+	{"true","All","Button","保存","保存所有修改","save()","","","",""}
+	/*		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+*/	};
+	sButtonPosition = "north";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+
+function save(){
+	as_save(0,"saveproj_name()");
+}
+function saveproj_name(){
+	var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businesspply.CustomerInfoManage","saveDistributorInfo","flowunid=<%=sFlowUnid%>");	
+
+}
+	
+	function getenddate(){
+		var limit_approval_date=getItemValue(0,0,"LIMIT_APPROVAL_DATE");
+		var limit_effective_date=getItemValue(0,0,"LIMIT_EFFECTIVE_DATE");
+		var date = new Date(limit_approval_date);
+		var year=date.getFullYear();
+		var month=date.getMonth()+1;
+		var day=date.getDate();
+		if(limit_approval_date==null||limit_approval_date==""||limit_effective_date==null||limit_effective_date==""){
+			setItemValue(0,0,"LIMIT_END_DATE","");
+			return;
+		}
+		month=month+parseInt(limit_effective_date);
+		var n=parseInt(month/12);
+		if(month>12){
+		   month=month-12*n;
+		   year=year+n;
+		}
+		if(month==0){
+			month=12;
+		}
+		if (month >= 1 && month <= 9) {
+	        month = "0" + month;
+	    }
+		if (day >= 1 && day <= 9) {
+	        day = "0" + day;
+	    }
+		var end_date= year+"/"+ month +"/"+ day; 
+		setItemValue(0,0,"LIMIT_END_DATE",end_date);
+	}
+	
+	//请选择经销商名称
+	function selectcompany(){
+		AsDialog.OpenSelector("SelectCompany","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				alert(getHtmlMessage('1'));//请选择一条信息！
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");//"@"表示了向页面添加数据时的连续性
+	    	setItemValue(0,getRow(),"SUBSIDIARY_COMPANY",sReturn[0]);//向页面的框中添加数据
+			},"请选择名称");
+	}
+
+	//省市
+	function selectRegionCode(){
+		var area_code = getItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS");
+		AsDialog.PopView("/Common/ToolsA/AreaVFrame.jsp","AreaCode="+area_code,"dialogWidth=850px;dialogHeight=450px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){
+			//增加清空功能的判断
+			if( sAreaCodeInfo == '_CANCEL_'){
+				return;
+			}
+			if(sAreaCodeInfo == "NO" || sAreaCodeInfo == '_CLEAR_'){
+				setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS","");
+				setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESSNAME","");
+			}else{
+				 if(typeof(sAreaCodeInfo) != "undefined" && sAreaCodeInfo != ""){
+						sAreaCodeInfo = sAreaCodeInfo.split('@');
+						sAreaCodeValue = sAreaCodeInfo[0];//-- 行政区划代码
+						sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
+						setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS",sAreaCodeValue);
+						setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESSNAME",sAreaCodeName);				
+				}
+			}
+		},'请选择省市');
+	}
+	//验证手机号码
+/* 	function checkMobile(str) {
+	  var re = /^1\d{10}$/
+	  if (re.test(str)) {
+	    alert("正确");
+	  } else {
+	    alert("请输入有效数字");
+	  }
+	} */
+	//验证电话号码
+	function checkPhone(){
+	//var str = $("#DEALER_PHONE").val();
+	//var str = document.getElementById("DEALER_PHONE").value;
+	var str=getItemValue(0, 0, "DEALER_PHONE");
+      var re = /^0\d{2,3}-?\d{7,8}$/;
+      if(re.test(str)){
+     }else{
+        alert("请输入有效数字");
+    }
+  }
+	//验证邮箱的有效性
+/* 	function checkEmail(str){
+       var re = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/
+       if(re.test(str)){
+          alert("正确");
+      }else{
+        alert("请输入正确的邮箱号");
+    }
+  } */
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyInfo.jsp
@ -5,24 +5,30 @@
        Content: Ê¾ÀýÏêÇéÒ³Ãæ
        History Log: 
    */
+    String customerid = CurPage.getParameter("CustomerId");
 	String sPrevUrl = CurPage.getParameter("PrevUrl");
-	if(sPrevUrl == null) sPrevUrl = "";
+	if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp";

 	String sTempletNo = "CustomerBankVertifyInfo";//--Ä£°åºÅ--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	doTemp.setColTips("", "测试");
+	//doTemp.setColTips("", "²âÊÔ");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//Ö»¶ÁÄ£Ê½
-	dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo"));
+	dwTemp.genHTMLObjectWindow(customerid);
 	
 	String sButtons[][] = {
-		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+		{"true","All","Button","±£´æ","±£´æËùÓÐÐÞ¸Ä","saveMobile()","","","",""},
 		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","·µ»Ø","·µ»ØÁÐ±í","returnList()","","","",""}
 	};
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+	function saveMobile(){
+		var parm = "customerid="+getItemValue(0,getRow(0),"customerid")+",mobile="+getItemValue(0,getRow(0),"mobile");
+		var res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "saveMobile", parm);
+		reloadSelf();
+	}
 	function returnList(){
 		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
 	}
--- a/WebContent/js/jquery-ui/external/jquery/jquery.js
+++ b/WebContent/js/jquery-ui/external/jquery/jquery.js
--- a/WebContent/js/jquery-ui/images/ui-icons_444444_256x240.png
+++ b/WebContent/js/jquery-ui/images/ui-icons_444444_256x240.png
--- a/WebContent/js/jquery-ui/images/ui-icons_555555_256x240.png
+++ b/WebContent/js/jquery-ui/images/ui-icons_555555_256x240.png
--- a/WebContent/js/jquery-ui/images/ui-icons_777620_256x240.png
+++ b/WebContent/js/jquery-ui/images/ui-icons_777620_256x240.png
--- a/WebContent/js/jquery-ui/images/ui-icons_777777_256x240.png
+++ b/WebContent/js/jquery-ui/images/ui-icons_777777_256x240.png
--- a/WebContent/js/jquery-ui/images/ui-icons_cc0000_256x240.png
+++ b/WebContent/js/jquery-ui/images/ui-icons_cc0000_256x240.png
--- a/WebContent/js/jquery-ui/images/ui-icons_ffffff_256x240.png
+++ b/WebContent/js/jquery-ui/images/ui-icons_ffffff_256x240.png
--- a/WebContent/js/jquery-ui/jquery-ui.css
+++ b/WebContent/js/jquery-ui/jquery-ui.css
--- a/WebContent/js/jquery-ui/jquery-ui.js
+++ b/WebContent/js/jquery-ui/jquery-ui.js
--- a/WebContent/js/jquery-ui/jquery-ui.min.css
+++ b/WebContent/js/jquery-ui/jquery-ui.min.css
--- a/WebContent/js/jquery-ui/jquery-ui.min.js
+++ b/WebContent/js/jquery-ui/jquery-ui.min.js
--- a/WebContent/js/jquery-ui/jquery-ui.structure.css
+++ b/WebContent/js/jquery-ui/jquery-ui.structure.css
@ -0,0 +1,886 @@
+/*!
+ * jQuery UI CSS Framework 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/category/theming/
+ */
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0); /* support: IE8 */
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+	pointer-events: none;
+}
+
+
+/* Icons
+----------------------------------*/
+.ui-icon {
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -.25em;
+	position: relative;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+.ui-widget-icon-block {
+	left: 50%;
+	margin-left: -8px;
+	display: block;
+}
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin: 2px 0 0 0;
+	padding: .5em .5em .5em .7em;
+	font-size: 100%;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-menu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	display: block;
+	outline: 0;
+}
+.ui-menu .ui-menu {
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	cursor: pointer;
+	/* support: IE10, see #8844 */
+	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
+}
+.ui-menu .ui-menu-item-wrapper {
+	position: relative;
+	padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px 0;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+	margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item-wrapper {
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: .2em;
+	margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	left: auto;
+	right: 0;
+}
+.ui-button {
+	padding: .4em 1em;
+	display: inline-block;
+	position: relative;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+
+	/* Support: IE <= 11 */
+	overflow: visible;
+}
+
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2em;
+	box-sizing: border-box;
+	text-indent: -9999px;
+	white-space: nowrap;
+}
+
+/* no icon support for input elements */
+input.ui-button.ui-button-icon-only {
+	text-indent: 0;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -8px;
+	margin-left: -8px;
+}
+
+.ui-button.ui-icon-notext .ui-icon {
+	padding: 0;
+	width: 2.1em;
+	height: 2.1em;
+	text-indent: -9999px;
+	white-space: nowrap;
+
+}
+
+input.ui-button.ui-icon-notext .ui-icon {
+	width: auto;
+	height: auto;
+	text-indent: 0;
+	white-space: normal;
+	padding: .4em 1em;
+}
+
+/* workarounds */
+/* Support: Firefox 5 - 40 */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-controlgroup {
+	vertical-align: middle;
+	display: inline-block;
+}
+.ui-controlgroup > .ui-controlgroup-item {
+	float: left;
+	margin-left: 0;
+	margin-right: 0;
+}
+.ui-controlgroup > .ui-controlgroup-item:focus,
+.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
+	z-index: 9999;
+}
+.ui-controlgroup-vertical > .ui-controlgroup-item {
+	display: block;
+	float: none;
+	width: 100%;
+	margin-top: 0;
+	margin-bottom: 0;
+	text-align: left;
+}
+.ui-controlgroup-vertical .ui-controlgroup-item {
+	box-sizing: border-box;
+}
+.ui-controlgroup .ui-controlgroup-label {
+	padding: .4em 1em;
+}
+.ui-controlgroup .ui-controlgroup-label span {
+	font-size: 80%;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
+	border-left: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
+	border-top: none;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
+	border-right: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
+	border-bottom: none;
+}
+
+/* Spinner specific style fixes */
+.ui-controlgroup-vertical .ui-spinner-input {
+
+	/* Support: IE8 only, Android < 4.4 only */
+	width: 75%;
+	width: calc( 100% - 2.4em );
+}
+.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
+	border-top-style: solid;
+}
+
+.ui-checkboxradio-label .ui-icon-background {
+	box-shadow: inset 1px 1px 1px #ccc;
+	border-radius: .12em;
+	border: none;
+}
+.ui-checkboxradio-radio-label .ui-icon-background {
+	width: 16px;
+	height: 16px;
+	border-radius: 1em;
+	overflow: visible;
+	border: none;
+}
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
+	background-image: none;
+	width: 8px;
+	height: 8px;
+	border-width: 4px;
+	border-style: solid;
+}
+.ui-checkboxradio-disabled {
+	pointer-events: none;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 45%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+
+/* Icons */
+.ui-datepicker .ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+	left: .5em;
+	top: .3em;
+}
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 20px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-n {
+	height: 2px;
+	top: 0;
+}
+.ui-dialog .ui-resizable-e {
+	width: 2px;
+	right: 0;
+}
+.ui-dialog .ui-resizable-s {
+	height: 2px;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-w {
+	width: 2px;
+	left: 0;
+}
+.ui-dialog .ui-resizable-se,
+.ui-dialog .ui-resizable-sw,
+.ui-dialog .ui-resizable-ne,
+.ui-dialog .ui-resizable-nw {
+	width: 7px;
+	height: 7px;
+}
+.ui-dialog .ui-resizable-se {
+	right: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-sw {
+	left: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-ne {
+	right: 0;
+	top: 0;
+}
+.ui-dialog .ui-resizable-nw {
+	left: 0;
+	top: 0;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-draggable-handle {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
+	height: 100%;
+	filter: alpha(opacity=25); /* support: IE8 */
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-selectable {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-selectmenu-menu {
+	padding: 0;
+	margin: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	display: none;
+}
+.ui-selectmenu-menu .ui-menu {
+	overflow: auto;
+	overflow-x: hidden;
+	padding-bottom: 1px;
+}
+.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
+	font-size: 1em;
+	font-weight: bold;
+	line-height: 1.5;
+	padding: 2px 0.4em;
+	margin: 0.5em 0 0 0;
+	height: auto;
+	border: 0;
+}
+.ui-selectmenu-open {
+	display: block;
+}
+.ui-selectmenu-text {
+	display: block;
+	margin-right: 20px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-selectmenu-button.ui-button {
+	text-align: left;
+	white-space: nowrap;
+	width: 14em;
+}
+.ui-selectmenu-icon.ui-icon {
+	float: right;
+	margin-top: 0;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: default;
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+/* support: IE8 - See #6727 */
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+	filter: inherit;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-sortable-handle {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: .222em 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 2em;
+}
+.ui-spinner-button {
+	width: 1.6em;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to override default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top-style: none;
+	border-bottom-style: none;
+	border-right-style: none;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom-width: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
+	cursor: text;
+}
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
--- a/WebContent/js/jquery-ui/jquery-ui.structure.min.css
+++ b/WebContent/js/jquery-ui/jquery-ui.structure.min.css
--- a/WebContent/js/jquery-ui/jquery-ui.theme.css
+++ b/WebContent/js/jquery-ui/jquery-ui.theme.css
@ -0,0 +1,443 @@
+/*!
+ * jQuery UI CSS Framework 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/category/theming/
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Arial,Helvetica,sans-serif;
+	font-size: 1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Arial,Helvetica,sans-serif;
+	font-size: 1em;
+}
+.ui-widget.ui-widget-content {
+	border: 1px solid #c5c5c5;
+}
+.ui-widget-content {
+	border: 1px solid #dddddd;
+	background: #ffffff;
+	color: #333333;
+}
+.ui-widget-content a {
+	color: #333333;
+}
+.ui-widget-header {
+	border: 1px solid #dddddd;
+	background: #e9e9e9;
+	color: #333333;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #333333;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default,
+.ui-button,
+
+/* We use html here because we need a greater specificity to make sure disabled
+works properly when clicked or hovered */
+html .ui-button.ui-state-disabled:hover,
+html .ui-button.ui-state-disabled:active {
+	border: 1px solid #c5c5c5;
+	background: #f6f6f6;
+	font-weight: normal;
+	color: #454545;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited,
+a.ui-button,
+a:link.ui-button,
+a:visited.ui-button,
+.ui-button {
+	color: #454545;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus,
+.ui-button:hover,
+.ui-button:focus {
+	border: 1px solid #cccccc;
+	background: #ededed;
+	font-weight: normal;
+	color: #2b2b2b;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a,
+.ui-state-focus a:hover,
+.ui-state-focus a:link,
+.ui-state-focus a:visited,
+a.ui-button:hover,
+a.ui-button:focus {
+	color: #2b2b2b;
+	text-decoration: none;
+}
+
+.ui-visual-focus {
+	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+	border: 1px solid #003eff;
+	background: #007fff;
+	font-weight: normal;
+	color: #ffffff;
+}
+.ui-icon-background,
+.ui-state-active .ui-icon-background {
+	border: #003eff;
+	background-color: #ffffff;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #ffffff;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #dad55e;
+	background: #fffa90;
+	color: #777620;
+}
+.ui-state-checked {
+	border: 1px solid #dad55e;
+	background: #fffa90;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #777620;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #f1a899;
+	background: #fddfdf;
+	color: #5f3f3f;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #5f3f3f;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #5f3f3f;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70); /* support: IE8 */
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35); /* support: IE8 */
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url("images/ui-icons_444444_256x240.png");
+}
+.ui-widget-header .ui-icon {
+	background-image: url("images/ui-icons_444444_256x240.png");
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon,
+.ui-button:hover .ui-icon,
+.ui-button:focus .ui-icon {
+	background-image: url("images/ui-icons_555555_256x240.png");
+}
+.ui-state-active .ui-icon,
+.ui-button:active .ui-icon {
+	background-image: url("images/ui-icons_ffffff_256x240.png");
+}
+.ui-state-highlight .ui-icon,
+.ui-button .ui-state-highlight.ui-icon {
+	background-image: url("images/ui-icons_777620_256x240.png");
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url("images/ui-icons_cc0000_256x240.png");
+}
+.ui-button .ui-icon {
+	background-image: url("images/ui-icons_777777_256x240.png");
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-caret-1-n { background-position: 0 0; }
+.ui-icon-caret-1-ne { background-position: -16px 0; }
+.ui-icon-caret-1-e { background-position: -32px 0; }
+.ui-icon-caret-1-se { background-position: -48px 0; }
+.ui-icon-caret-1-s { background-position: -65px 0; }
+.ui-icon-caret-1-sw { background-position: -80px 0; }
+.ui-icon-caret-1-w { background-position: -96px 0; }
+.ui-icon-caret-1-nw { background-position: -112px 0; }
+.ui-icon-caret-2-n-s { background-position: -128px 0; }
+.ui-icon-caret-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -65px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -65px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 3px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 3px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 3px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 3px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa;
+	opacity: .003;
+	filter: Alpha(Opacity=.3); /* support: IE8 */
+}
+.ui-widget-shadow {
+	-webkit-box-shadow: 0px 0px 5px #666666;
+	box-shadow: 0px 0px 5px #666666;
+}
--- a/WebContent/js/jquery-ui/jquery-ui.theme.min.css
+++ b/WebContent/js/jquery-ui/jquery-ui.theme.min.css
--- a/src/com/amarsoft/app/awe/config/orguser/dwhandler/ChannelUserInfoHandler.java
+++ b/src/com/amarsoft/app/awe/config/orguser/dwhandler/ChannelUserInfoHandler.java
@ -58,24 +58,7 @@ public class ChannelUserInfoHandler extends CommonHandler {
 		tx.join(userRoleManager);
 		BizObject userRole=userRoleManager.newObject();
 		userRole.setAttributeValue("USERID",bo.getAttribute("UserID").getString()); 
-		String createType=this.asPage.getParameter("CreateType");
-		String belogOrg=bo.getAttribute("BELONGORG").toString();
-		if(belogOrg.length()==10){
-			userRole.setAttributeValue("ROLEID","402"); //二级机构管理员
-		}else if(belogOrg.length()==13){
-			userRole.setAttributeValue("ROLEID","403"); //三级机构管理员
-		}else{
-			if(createType.equals("manager")){
-				userRole.setAttributeValue("ROLEID","400"); //渠道下面的管理员
-			}else{
-				userRole.setAttributeValue("ROLEID","401"); //渠道下面的业务员	
-			}
-		}
-		/*if(createType.equals("manager")){
-			userRole.setAttributeValue("ROLEID","400"); //渠道下面的管理员
-		}else{
-			userRole.setAttributeValue("ROLEID","401"); //渠道下面的业务员	
-		}*/
+		userRole.setAttributeValue("ROLEID","401"); //默认渠道业务人员
 		userRole.setAttributeValue("GRANTOR",bo.getAttribute("INPUTUSER").getString()); 
 		userRole.setAttributeValue("BEGINTIME",bo.getAttribute("INPUTTIME").getString()); 
 		userRole.setAttributeValue("STATUS","1"); 
--- a/src/com/amarsoft/app/util/ASOrgObject.java
+++ b/src/com/amarsoft/app/util/ASOrgObject.java
@ -188,7 +188,7 @@ public class ASOrgObject implements Serializable{
 		if(belongOrgid.length()>13){
 			belongOrgid=belongOrgid.substring(0,13);
 		}	
-		belongOrgid=belongOrgid.substring(0, belongOrgid.length()-4);
+		belongOrgid=belongOrgid.substring(0, belongOrgid.length()-3);
 		String curUserId="";
 		ASResultSet rs = null;
 		//根据母公司查出这人编号
--- a/src_tenwa/com/tenwa/action/channelportal/comm/UserInfoScan.java
+++ b/src_tenwa/com/tenwa/action/channelportal/comm/UserInfoScan.java
@ -7,7 +7,6 @@ import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
 import jbo.app.tenwa.doc.LB_DOCRELATIVE;
 import jbo.com.tenwa.lease.comm.LB_CANCLE_INFO;
 import jbo.com.tenwa.lease.comm.LB_GUARANTY;
-import apx.com.amarsoft.als.base.util.NameManager;

 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
@ -16,6 +15,7 @@ import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.are.util.json.JSONEncoder;
 import com.amarsoft.are.util.json.JSONObject;
+import com.amarsoft.dict.als.manage.NameManager;
 import com.tenwa.action.channelportal.channelsubmit.ChannelSubmitAction;

 public class UserInfoScan {
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java
@ -19,8 +19,13 @@ import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;

+import com.amarsoft.app.util.ASOrgObject;
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
 import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.baseBussion.BaseBussiness;
 import com.tenwa.lease.flow.project.businessapply.CustomerCompare;
@ -31,19 +36,49 @@ public class DistributorInfoTempToFormalBusiness  extends BaseBussiness {
 	@Override
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
+		String orgid=this.saveOrgInfo(Sqlca);
 		Map<String,String>fromCondtion=new HashMap<String, String>();
 		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
-
 		BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca);		
 		Map<String,String>toCondtion=new HashMap<String, String>();
 		DistributorCompare dc=new DistributorCompare();
-		
-			fromCondtion.clear();
-			fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
-			toCondtion.clear();
-			toCondtion.put("distributor_no", dst.getAttribute("distributor_no").getString());
-	        DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, null, dc, Sqlca);
-		    String sMessage="true"; 
+		fromCondtion.clear();
+		fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
+		toCondtion.clear();
+		toCondtion.put("distributor_no", dst.getAttribute("distributor_no").getString());
+	    DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, null, dc, Sqlca);
+		String sMessage="true"; 
 		return sMessage;
 	}
+	/**
+	 * 保存渠道信息
+	 * @author  2018-06-10
+	 */
+	private String saveOrgInfo(Transaction Sqlca) throws Exception {
+		ASOrgObject orgObject= new ASOrgObject("8006");//默认为安鹏向下的渠道信息
+		Map<String,String> mapOrgInfo=orgObject.nextLevalOrgNo(Sqlca);
+		BizObjectManager manager = JBOFactory.getFactory().getManager("jbo.sys.ORG_INFO");
+		BizObject bo=null;
+		BizObjectManager PM=JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME);
+		BizObject partnerInfo=PM.createQuery(" select * from O where O.flowUnid=:flowUnid").setParameter("flowUnid", this.getAttribute("FlowUnid").toString()).getSingleResult(true);
+		if(!mapOrgInfo.isEmpty()){
+			ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString());
+			bo=manager.newObject();
+			bo.setAttributeValue("ORGID", mapOrgInfo.get("orgno"));
+			bo.setAttributeValue("SORTNO", mapOrgInfo.get("sortno"));
+			bo.setAttributeValue("TREESORTNO", mapOrgInfo.get("sortno"));
+			bo.setAttributeValue("ORGLEVEL", "9");//默认渠道
+			bo.setAttributeValue("STATUS", "1");//默认启用
+			if(partnerInfo!=null){
+				bo.setAttributeValue("RELATIVEORGID", "8006");
+				bo.setAttributeValue("BELONGORGID", "8006");
+				bo.setAttributeValue("ORGNAME",  partnerInfo.getAttribute("distributor_name").toString());
+				bo.setAttributeValue("INPUTORG", asUser.getOrgID());
+				bo.setAttributeValue("InputUser", asUser.getUserID());
+				bo.setAttributeValue("InputTime", StringFunction.getTodayNow());
+			}
+			manager.saveObject(bo);
+		}
+		return bo.getAttribute("ORGID").toString();
+	}
 }