Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r32186 -r33275
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 32186)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 33275)
@@ -37,6 +37,7 @@
 	    {name : 'diposable'},
 	    {name : 'price'},
 	    {name : 'fluctuationPrice'},
+		{name : 'invoicePlanSerialNumber'},
 	    {name : 'storage'},
 	    {name : 'batchNumber'},
 	    {name : 'sterilizerName'},
@@ -164,6 +165,7 @@
     {name : 'diposable'},
     {name : 'price'},
     {name : 'fluctuationPrice'},
+	{name : 'invoicePlanSerialNumber'},
     {name : 'storage'},
     {name : 'batchNumber'},
     {name : 'tousseType'},
@@ -613,6 +615,7 @@
 				}
 			})
 		},
+		{header : "申请单号",dataIndex : 'invoicePlanSerialNumber',width : 50,menuDisabled : true},
 		{header : "发货类型",dataIndex : 'type',width : 40,menuDisabled : true}
 	]);
 
@@ -2667,6 +2670,9 @@
 		{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 : 'invoicePlanSerialNumber',hidden:departHidden,renderer : function(v, p, record){
+			return record.json.invoicePlan.serialNumber;
+		}},
 		{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},
@@ -2715,6 +2721,7 @@
 	    {name : 'receiptingTime'},
 		{name : 'signStatus'},
 	    {name : 'personInCharge'},
+		{name : 'invoicePlanSerialNumber'},
 	    {name : 'warehouseName'},
 	    {name : 'applicant'},
 	    {name : 'personInChargeCode'},