From b11a3fa5b7fc903a4f878d15a2c42fd65702b0de Mon Sep 17 00:00:00 2001
From: zhangjun <zhangjun@DESKTOP-BF9USEF>
Date: Fri, 31 May 2019 10:00:17 +0800
Subject: [PATCH] =?UTF-8?q?jbo=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E8=A1=A8=20=E4=BF=AE=E6=94=B9=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=AD=89=E5=85=A5=E5=BA=93=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileDownloadImportList.jsp                | 11 ++-
 .../Introductionofrepairvehiclemodelslist.jsp | 86 +++----------------
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml      | 36 +++++++-
 3 files changed, 53 insertions(+), 80 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp
index d37c2ad1a..6fb9a3e87 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp
@@ -72,7 +72,7 @@
  
 	function newRecord(){
 		 var sUrl = "/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportInfo.jsp";
-		 AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
+		 AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=850px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(){
 			   reloadSelf();},"新增信息");
 	}
 	
@@ -84,7 +84,7 @@
 			alert("参数不能为空！");
 			return ;
 		 }
-		 AsDialog.PopView(sUrl,"ID="+sPara,"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){reloadSelf();},"修改信息");
+		 AsDialog.PopView(sUrl,"ID="+sPara,"resizable=yes;dialogWidth=850px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(){reloadSelf();},"修改信息");
 	}
 	
 	//excel导入
@@ -125,6 +125,13 @@
 <%/*~END~*/%>
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
 	<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()%>");
 	</script>
 <%/*~END~*/%>
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp
index 29a8bb92b..2dd43ef1d 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelslist.jsp
@@ -20,9 +20,9 @@
 <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
 <%
 	String sButtons[][] = {
-		/* {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
-		{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, */
+		//{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
 		{"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"},
 		{"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""},
 		/* {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"},
@@ -42,79 +42,6 @@
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
 <script type="text/javascript">
 /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
- 	function copyPath(){
- 		var contractNoArray=getItemValueArray(0,"CONTRACT_NO");
- 		if(typeof(contractNoArray)=="undefined"||contractNoArray==null||contractNoArray==""){alert("请选择数据");return;}
- 		var contractNos = contractNoArray.join("@");
- 		var sUrl = "/Tenwa/Core/FlowManager/CopyFileToOther.jsp";
- 		var param = "contractNos="+contractNos;
- 		AsControl.RunJsp(sUrl,param,function(result){
- 			if(result=="SUCCESS"){
- 				
- 			}
- 			alert("拷贝成功！！");
- 		});
- 		
- 		//本地测试数据
- 		//var contractNos="BQAP(AH)201904230002";
- 		/* var sparam = "contractNos="+contractNos;
- 		var result=RunJavaMethod("com.tenwa.reckon.copydata.FileCopyToOtherPath","copyFile",sparam);
- 		if(result=="SUCCESS"){
- 			alert("拷贝成功！！");
- 		}else{
- 			alert(result);
- 		} */
-	}
- 	//生成数据
- 	function createPlan(){
-		var Id = getItemValueArray(0,"ID");
-		var CONTRACT_NO = getItemValueArray(0,"CONTRACT_NO");
-		var number = 0;
-		var faile_no="";
-		if(typeof(Id)=="undefined"||Id==null||Id==""){alert("请选择数据");return;}
-		for(var i=0;i<Id.length;i++){
-			var param={};
-			var tempParam={};
-			var sparam="";
-			//模板号
-			param["templateNo"]="8c0b32eefcf349e5b5f76d898df0bbbb";
-			
-			//生成文件关联关系
-			tempParam["OBJECTTYPE"]="租金支付表导出";
-			tempParam["CONTRACT_NO"]=CONTRACT_NO[i];
-			//tempParam["contract_id"]=Id[i];
-			//生成模板固定参数
-			tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
-			tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
-			tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
-			
-			param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据
-			for(var key in param){
-				  if(sparam.length>0){sparam+=",";}
-				   sparam+=key+"="+param[key];
-			}
-		
-			var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
-			
-			if(result=="success"){
-				number++;
-			}else{
-				faile_no+=CONTRACT_NO[i]+";";
-			}
-			
-		}
-		if(Id.length==0){
-			alert("请先选择数据！！！");
-			return;
-		}else if(number==0){
-			alert("生成失败！！！");
-		}else if(number==Id.length){
-			alert("生成成功！！！");
-		}else{
-			alert("部分生成成功！！！"+faile_no+"生成失败！！！");
-		}
-		reloadSelf();
-	}
 	function newRecord(){
 		 var sUrl = "/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/Introductionofrepairvehiclemodelsinfo.jsp";
 		 AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
@@ -129,7 +56,7 @@
 			alert("参数不能为空！");
 			return ;
 		 }
-		 AsDialog.PopView(sUrl,"ID="+sPara,"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){reloadSelf();},"修改信息");
+		 AsDialog.PopView(sUrl,"ID="+sPara,"resizable=yes;dialogWidth=850px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(){reloadSelf();},"修改信息");
 	}
 	
 	//excel导入
@@ -170,6 +97,13 @@
 <%/*~END~*/%>
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
 	<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()%>");
 	</script>
 <%/*~END~*/%>
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index f88dd4f71..c7c306c5b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -5382,7 +5382,7 @@
 			</manager>
 		</class>
 		
-		<!-- 娓呴殰杞﹁溅鍨嬪鍏ヤ笅杞介〉闈bo -->
+		<!-- 鍟嗙敤杞﹁溅鍨嬪鍏ヤ笅杞介〉闈bo -->
 		<class name="li_cardata_commercial" label="娓呴殰杞﹁溅鍨嬪鍏�" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="鏍囪瘑" type="STRING" length="32"/>
@@ -5392,7 +5392,12 @@
 				<attribute name="the_guided" label="鎸囧浠�" type="STRING" length="32"/>
 				<attribute name="vehicle_type" label="杞﹁締绫诲瀷" type="STRING" length="64"/>
 				<attribute name="level" label="绾у埆" type="STRING" length="32"/>
-				<attribute name="inupttime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="INPUTUSERID" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="INPUTORGID" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="INPUTTIME" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="UPDATEUSERID" label="鏇存柊浜�" type="STRING" length="32"/>
+				<attribute name="UPDATEORGID" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="UPDATETIME" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -5410,6 +5415,12 @@
 				<attribute name="cars" label="杞︾郴" type="STRING" length="32"/>
 				<attribute name="models" label="杞﹀瀷" type="STRING" length="32"/>
 				<attribute name="the_guided" label="鎸囧浠�" type="STRING" length="32"/>
+				<attribute name="INPUTUSERID" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="INPUTORGID" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="INPUTTIME" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="UPDATEUSERID" label="鏇存柊浜�" type="STRING" length="32"/>
+				<attribute name="UPDATEORGID" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="UPDATETIME" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -5419,5 +5430,26 @@
 			</manager>
 		</class>
 		
+		<!-- 缁忛攢鍟嗚嚜鍔ㄤ唬鍋块厤缃〉闈bo -->
+		<class name="lb_automatic_compensatory" label="缁忛攢鍟嗚嚜鍔ㄤ唬鍋块厤缃�" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑" type="STRING" length="32"/>
+				<attribute name="distributor_no" label="缁忛攢鍟唅d" type="STRING" length="32"/>
+				<attribute name="days_Number" label="澶╂暟" type="STRING" length="32"/>
+				<attribute name="INPUTUSERID" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="INPUTORGID" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="INPUTTIME" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="UPDATEUSERID" label="鏇存柊浜�" type="STRING" length="32"/>
+				<attribute name="UPDATEORGID" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="UPDATETIME" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_automatic_compensatory" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		
 	</package>
 </jbo>