From 0d0f07e66da17e2994cc5ba380050bca5dc7956c Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Tue, 10 Jul 2018 11:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=E6=94=B6=E5=8F=96=E9=80=80=E5=9B=9E=E7=9A=84=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E9=A1=B5=E7=AD=BE=E7=9A=84=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerDeposit/DDepositReturn_HisList.jsp  | 37 +++++++++++++++++++
 .../DMarginChargeInfo_HisList.jsp             | 37 +++++++++++++++++++
 WebContent/WEB-INF/etc/jbo/jbo_comm.xml       |  3 ++
 3 files changed, 77 insertions(+)
 create mode 100644 WebContent/DealerDeposit/DDepositReturn_HisList.jsp
 create mode 100644 WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp

diff --git a/WebContent/DealerDeposit/DDepositReturn_HisList.jsp b/WebContent/DealerDeposit/DDepositReturn_HisList.jsp
new file mode 100644
index 000000000..f6032ba4e
--- /dev/null
+++ b/WebContent/DealerDeposit/DDepositReturn_HisList.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-07-09
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("DDepositReturn_HisList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	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",""}, */
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp
new file mode 100644
index 000000000..0847495db
--- /dev/null
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-07-09
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("DMarginChargeInfo_HisList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	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",""}, */
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "";
+		 var sPara = getItemValue(0,getRow(0),'SerialNo');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 7cda41efe..4b1a136fb 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -634,6 +634,9 @@
 				<attribute name="UPDATETIME" label="鏇存柊鏃堕棿" type="STRING" length="50"/>
 				<attribute name="LOCAL_ACCOUNT" label="鏈柟璐︽埛" type="STRING" length="100"/>
 				<attribute name="LOCAL_BANK" label="鏈柟閾惰" type="STRING" length="100"/>
+				<attribute name="ACCOUNT_INFO" label="璐︽埛淇℃伅" type="STRING" length="32"/>
+				<attribute name="ACCOUNT" label="璐︽埛鍚嶇О" type="STRING" length="32"/>
+				<attribute name="DISTRIBUTOR_ACCOUNT_TEMP" label="缁忛攢鍟嗗悕绉�" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>