From 3de90439100044ea7139626bb4b80fcb6ce37957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 25 Oct 2017 00:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/financial/financial_base.js      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/main/webapp/js/pages/financial/financial_base.js b/src/main/webapp/js/pages/financial/financial_base.js
index 988413dc..5b8da8d4 100644
--- a/src/main/webapp/js/pages/financial/financial_base.js
+++ b/src/main/webapp/js/pages/financial/financial_base.js
@@ -201,6 +201,23 @@
 	
 	//初始化表格数据
 	function initTableData(){
+		var organNameTitle = "";
+		var organNameHidden = false;
+		if(listType === "收入" || listType === "支出") {
+			organNameTitle = "往来单位";
+		}
+		else if(listType === "收款") {
+			organNameTitle = "付款单位";
+		}
+		else if(listType === "付款") {
+			organNameTitle = "收款单位";
+		}
+		else if(listType === "收预付款") {
+			organNameTitle = "付款会员";
+		}
+		if(listType === "转账") {
+			organNameHidden = true;
+		}
 		$('#tableData').datagrid({
 			//width:700,
 			height:heightInfo,
@@ -238,7 +255,9 @@
 					}
 				},
 				{ field: 'OrganId',width:5, hidden:true},
+				{ title: organNameTitle,field: 'OrganName',width:140,hidden:organNameHidden},
 				{ title: '单据编号',field: 'BillNo',width:140},
+				{ title: '经手人',field: 'HandsPersonName',width:80},
 				{ title: '单据时间 ',field: 'BillTime',width:140},
 				{ title: '合计',field: 'TotalPrice',width:80},
 				{ title: '备注',field: 'Remark',width:100}