Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r31892 -r32179
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 31892)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 32179)
@@ -2544,34 +2544,148 @@
 		fields : [ 'tousseGroupName','id' ],
 		url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do'
 	});
-	
+
+	var serialNumberHidden = false;
+	var statusHidden = false;
+	var isPrintHidden = false;
+	var invoiceSerialNumberSetBarcodeHidden = true;
+	var departHidden = false;
+	var sendTimeHidden = false;
+	var applicationTimeHidden = false;
+	var recyclingTimeHidden = false;
+	var printTimeHidden = false;
+	var senderHidden = false;
+	var assistantSenderHidden = false;
+	var personInChargeHidden = false;
+	var invoicePlanTypeHidden = false;
+	var remarkHidden = false;
+	var hospitalNumberHidden = false;
+	var receiptorHidden = false;
+	var receiptingTimeHidden = false;
+	var signStatusHidden = false;
+	var settleAccountsDepartHidden = false;
+	var warehouseNameHidden = false;
+	var totalPriceHidden = false;
+
+	var searchDisableIndexes = ['recyclingApplicationType'];
+
+	if(sstsConfig.hiddenColumnsOfInvoiceListView){
+		if(sstsConfig.hiddenColumnsOfInvoiceListView.length > 0){
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('流水号') > -1){
+				serialNumberHidden = true;
+				searchDisableIndexes.push('serialNumber');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('状态') > -1){
+				statusHidden = true;
+				searchDisableIndexes.push('status');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('已打印') > -1){
+				isPrintHidden = true;
+				searchDisableIndexes.push('isPrint');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('发货单号集合码') > -1){
+				invoiceSerialNumberSetBarcodeHidden = true;
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('申请科室') > -1){
+				departHidden = true;
+				searchDisableIndexes.push('depart');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('发货时间') > -1){
+				sendTimeHidden = true;
+				searchDisableIndexes.push('sendTime');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('申请时间') > -1){
+				applicationTimeHidden = true;
+				searchDisableIndexes.push('applicationTime');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('回收时间') > -1){
+				recyclingTimeHidden = true;
+				searchDisableIndexes.push('recyclingTime');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('打印时间') > -1){
+				printTimeHidden = true;
+				searchDisableIndexes.push('printTime');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('发货员') > -1){
+				senderHidden = true;
+				searchDisableIndexes.push('sender');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('核对员') > -1){
+				assistantSenderHidden = true;
+				searchDisableIndexes.push('assistantSender');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('责任人') > -1){
+				personInChargeHidden = true;
+				searchDisableIndexes.push('personInCharge');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('类型') > -1){
+				invoicePlanTypeHidden = true;
+				searchDisableIndexes.push('invoicePlanType');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('备注') > -1){
+				remarkHidden = true;
+				searchDisableIndexes.push('remark');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('住院号') > -1){
+				hospitalNumberHidden = true;
+				searchDisableIndexes.push('hospitalNumber');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('签收人') > -1){
+				receiptorHidden = true;
+				searchDisableIndexes.push('receiptor');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('签收时间') > -1){
+				receiptingTimeHidden = true;
+				searchDisableIndexes.push('receiptingTime');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('签收状态') > -1){
+				signStatusHidden = true;
+				searchDisableIndexes.push('signStatus');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('结算科室') > -1){
+				settleAccountsDepartHidden = true;
+				searchDisableIndexes.push('settleAccountsDepart');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('仓库') > -1){
+				warehouseNameHidden = true;
+				searchDisableIndexes.push('warehouseName');
+			}
+			if(sstsConfig.hiddenColumnsOfInvoiceListView.indexOf('总价') > -1){
+				totalPriceHidden = true;
+				searchDisableIndexes.push('totalPrice');
+			}
+		}
+	}
+
+	if(sstsConfig.enableInvoiceSerialNumberCollectionCodeFunction){
+		invoiceSerialNumberSetBarcodeHidden = false;
+	}
+
 	var columns = [
-	    {header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction},
-	    {header : "状态",width : 70,dataIndex : 'status',renderer : renderColor},
-		{header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor},
-		{header : "发货单号集合码",width : 140,renderer : renderSerialNumbers,hidden:!sstsConfig.enableInvoiceSerialNumberCollectionCodeFunction},
-		{header : "申请科室",width : 120,dataIndex : 'depart'},
-		{header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute},
-		{header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute},
-		{header : "回收时间",width : 120,dataIndex : 'recyclingTime',renderer : myDateFormatByMinute},
-		{header : "打印时间",width : 120,dataIndex : 'printTime',renderer : myDateFormatByMinute},
+		{header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction,hidden:serialNumberHidden},
+		{header : "状态",width : 70,dataIndex : 'status',renderer : renderColor,hidden:statusHidden},
+		{header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor,hidden:isPrintHidden},
+		{header : "发货单号集合码",width : 140,renderer : renderSerialNumbers,hidden:invoiceSerialNumberSetBarcodeHidden},
+		{header : "申请科室",width : 120,dataIndex : 'depart',hidden:departHidden},
+		{header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute,hidden:sendTimeHidden},
+		{header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute,hidden:applicationTimeHidden},
+		{header : "回收时间",width : 120,dataIndex : 'recyclingTime',renderer : myDateFormatByMinute,hidden:recyclingTimeHidden},
+		{header : "打印时间",width : 120,dataIndex : 'printTime',renderer : myDateFormatByMinute,hidden:printTimeHidden},
 
-		{header : "发货员",width : 70,dataIndex : 'sender'},
-		{header : "核对员",width : 70,dataIndex : 'assistantSender'},
-	    {header : "责任人",width : 70,dataIndex : 'personInCharge'},
-	    {header : "拼音码",width : 100,dataIndex : 'spelling',hidden:true}, 
-	    {header : "五笔码",width : 100,dataIndex : 'wbCode',hidden:true},
-	    
-	    {header : "类型",width : 110,dataIndex : 'invoicePlanType',sortable:false},
-	    {id : 'remark',header : "备注",width : 110,dataIndex : 'remark'},
-	    
-	    {header : "住院号",width : 70,dataIndex : 'hospitalNumber'},
-	    {header : "签收人",width : 70,dataIndex : 'receiptor'},
-	    {header : "签收时间",width : 120,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute},
-		{header : "签收状态",width : 100,dataIndex : 'signStatus'},
-	    {header : "结算科室",width : 100,dataIndex : 'settleAccountsDepart'},
-	    {header : "仓库",width : 100,dataIndex : 'warehouseName',id : 'warehouseName'},
-	    {header : "总价",width : 70,dataIndex : 'totalPrice',align : 'right',renderer : formartPrice}
+		{header : "发货员",width : 70,dataIndex : 'sender',hidden:senderHidden},
+		{header : "核对员",width : 70,dataIndex : 'assistantSender',hidden:assistantSenderHidden},
+		{header : "责任人",width : 70,dataIndex : 'personInCharge',hidden:personInChargeHidden},
+		
+		{header : "类型",width : 110,dataIndex : 'invoicePlanType',sortable:false,hidden:invoicePlanTypeHidden},
+		{id : 'remark',header : "备注",width : 110,dataIndex : 'remark',hidden:remarkHidden},
+		
+		{header : "住院号",width : 70,dataIndex : 'hospitalNumber',hidden:hospitalNumberHidden},
+		{header : "签收人",width : 70,dataIndex : 'receiptor',hidden:receiptorHidden},
+		{header : "签收时间",width : 120,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute,hidden:receiptingTimeHidden},
+		{header : "签收状态",width : 100,dataIndex : 'signStatus',hidden:signStatusHidden},
+		{header : "结算科室",width : 100,dataIndex : 'settleAccountsDepart',hidden:settleAccountsDepartHidden},
+		{header : "仓库",width : 100,dataIndex : 'warehouseName',id : 'warehouseName',hidden:warehouseNameHidden},
+		{header : "总价",width : 70,dataIndex : 'totalPrice',align : 'right',renderer : formartPrice,hidden:totalPriceHidden}
 	];
 
 	var readerDetail = [
@@ -2977,7 +3091,7 @@
 		defaultSortField : 'sendTime',
 		defaultSortDirection : 'DESC',
 		isCheckboxSelectionModel : true,
-		searchDisableIndexes : [ 'recyclingApplicationType' ],
+		searchDisableIndexes : searchDisableIndexes,
 		rememberSelected : false,
 		isShowSearchField : true,
 		columns : columns,