From f8f1b829f79b3f4036f6bc8b229128245eb078ba Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Fri, 25 Jan 2019 17:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DocList/LbCarLicensePlateInfoTemp.jsp     | 10 +++++++++
 .../MortgageFile/LbFileArchivingInfoTemp.jsp  | 21 ++++++-------------
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml      |  7 +++++++
 .../CopyFileArchivingInfoTempToFormat.java    |  3 ++-
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
index 28fb67452..ad38d8add 100644
--- a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
+++ b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp
@@ -75,6 +75,16 @@
 
 	
 	 window.onload=function(){
+		 var is_delay = getItemValue(0,0,"is_pledge");
+			if(is_delay=="Y"){
+				setItemRequired(0,"pledge_date",true);
+				setItemReadOnly(0,0,"pledge_date",false);	
+			}else{
+				setItemReadOnly(0,0,"pledge_date",true);	
+				setItemRequired(0,"pledge_date",false);
+				setItemValue(0,0,"pledge_date","");
+			} 
+		 
 		var is_delay = getItemValue(0,0,"is_delay");
 		if(is_delay=="Y"){
 			setItemRequired(0,"delay_date",true);
diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
index 51af25012..855a6f23b 100644
--- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
+++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp
@@ -6,6 +6,8 @@
         History Log: 
     */
 	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	String contractId = CurPage.getParameter("ContractId");
+	String contractNumber = CurPage.getParameter("FlowKey");
 	if(sPrevUrl == null) sPrevUrl = "";
 	String flowunid = CurPage.getAttribute("ObjectNo");
 	String inputuserid = CurUser.getUserID();
@@ -16,6 +18,10 @@
 	String sTempletNo = "LbFileArchivingInfoTemp";//--ģ���--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setColTips("", "");
+	doTemp.setDefaultValue("CONTRACT_NUMBER", contractNumber);
+	doTemp.setDefaultValue("CONTRACT_ID", contractId);
+	doTemp.setDefaultValue("FLOWUNID", flowunid);
+	doTemp.setDefaultValue("ARCHIVING_PERSON", CurUser.getUserName());
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	dwTemp.ReadOnly = "0";//ֻ��ģʽ
@@ -28,21 +34,6 @@
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
-$(function(){
-	 setItemValue(0,getRow(),"ARCHIVING_PERSON","<%=CurUser.getUserName()%>");
-	 setItemValue(0,getRow(),"INPUTUSERID","<%=inputusername%>");
-	 setItemValue(0,getRow(),"UPDATEUSERID","<%=inputusername%>");
-	 setItemValue(0,getRow(),"INPUTORGID","<%=inputorgname%>");
-	 setItemValue(0,getRow(),"UPDATEORGID","<%=inputorgname%>");
-	 var date = new Date();
-		var updatetime = date.toJSON().substring(0,10).replace(/-/g,"/");//+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();
-		var inputtime = date.toJSON().substring(0,10).replace(/-/g,"/");//+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();
-		var inputtimes = getItemValue(0,getRow(),"INPUTTIME");
-		 if(inputtimes==null||inputtimes==""){	
-		setItemValue(0,getRow(),"INPUTTIME",inputtime);
-		} 
-		setItemValue(0,getRow(),"UPDATETIME",updatetime);
-});
 	function returnList(){
 		 AsControl.OpenView("/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingListTemp.jsp", "","_self","");
 	}
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 300dd76bb..8c53168ed 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -6,9 +6,11 @@
 			<attributes>
 				<attribute name="ID" label="标识" type="STRING" length="32"/>
 				<attribute name="CAR_ID" label="车辆编号" type="STRING" length="40"/>
+				<attribute name="orgid" label="机构编号" type="STRING" length="40"/>
 				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
 				<attribute name="PLATE_STATUS" label="上牌状态" type="STRING" length="32"/>
 				<attribute name="FRAME_NUMBER" label="车架号" type="STRING" length="32"/>
+				<attribute name="engine_number" label="发动机号" type="STRING" length="32"/>
 				<attribute name="PLATE_NUMBER" label="车牌号" type="STRING" length="50"/>
 				<attribute name="PLATETIME" label="上牌时间" type="STRING" length="50"/>
 				<attribute name="CAR_UNIT" label="上牌单位" type="STRING" length="50"/>
@@ -1587,6 +1589,11 @@
 				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
+				<attribute name="FILE_NUMBER" label="档案编号" type="STRING" length="32"/>
+				<attribute name="FILE_EFFECT_TIME" label="档案生效时间" type="STRING" length="32"/>
+				<attribute name="REMARKS" label="备注" type="STRING" length="32"/>
+				<attribute name="FILE_BORROWING_TIME" label="档案借阅时间" type="STRING" length="32"/>
+				<attribute name="MORTGAGE_COMPLETION_TIME" label="抵押完成时间" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java b/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java
index a416e52a1..86a7d4717 100644
--- a/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java
+++ b/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java
@@ -19,10 +19,11 @@ public class CopyFileArchivingInfoTempToFormat extends BaseBussiness{
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String contract_id = this.getAttribute("ContractId").toString();
-		//String flowunid = this.getAttribute("ObjectNo").toString();
+		String flowunid = this.getAttribute("ObjectNo").toString();
 		
 		Map<String,String> fromCondtion = new HashMap<String, String>();
 		fromCondtion.put("contract_id", contract_id);
+		fromCondtion.put("flowunid", flowunid);
 		
 		DataOperatorUtil.copySingleJBO("jbo.app.LB_FILE_ARCHIVING_INFO_TEMP", fromCondtion, "jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO", null, null, Sqlca);
 		return "true";