Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
===================================================================
diff -u -r31866 -r33436
--- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 31866)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 33436)
@@ -559,8 +559,21 @@
 						name : 'remark',
 						anchor : '98.5%',
 						height : 40,
+						cls:'x-item-disabled',
 						readOnly:true
 					}]
+				},{
+					layout : 'form',
+					columnWidth : 1,
+					labelWidth :fontSize == 12 ? 100 : 150,
+					items : [{
+						xtype : 'textarea',
+						fieldLabel : '发货备注',
+						id : 'invoiceRemark',
+						name : 'invoiceRemark',
+						anchor : '98.5%',
+						height : 40
+					}]
 				}]
 			}]
 				},{
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r33364 -r33436
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 33364)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 33436)
@@ -2438,6 +2438,7 @@
 						name : 'remark',
 						anchor : '98.5%',
 						height : 40,
+						cls:'x-item-disabled',
 						readOnly:true
 					}]
 				},{
@@ -3195,13 +3196,19 @@
 				}
 		]
 	});
+	var showInvoiceAssistantSender = sstsConfig.showInvoiceAssistantSender;
+	var showInvoicePersonInCharge = sstsConfig.showInvoicePersonInCharge;
+	var height = 730;
+	if(showInvoiceAssistantSender || showInvoicePersonInCharge){
+		height += 40;
+	}
 	invoiceFormWindowTwo = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'border',
 		title : '发货单',
 		resizable: false,
 		width : windowW < 1280 ? windowW-4 : 1280,
-		height : windowH < 864 ?  windowH : 730,
+		height : windowH < 864 ?  windowH : height,
 		border : false,
 		modal : true,
 		plain : true,