Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml
===================================================================
diff -u -r12607 -r25757
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml	(.../foreignTousseApplicationReport_subreport1.jrxml)	(revision 12607)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml	(.../foreignTousseApplicationReport_subreport1.jrxml)	(revision 25757)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="borrowingReport_subreport1_subreport1" language="groovy" pageWidth="290" pageHeight="802" columnWidth="290" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0e20e121-5dde-4d64-9556-189241dd0120">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="borrowingReport_subreport1_subreport1" language="groovy" pageWidth="270" pageHeight="802" columnWidth="270" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0e20e121-5dde-4d64-9556-189241dd0120">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -49,7 +49,7 @@
 				<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="4def2d4f-35e8-4fbc-8442-6722a345d249" style="table_TD" x="200" y="0" width="90" height="35" backcolor="#CCCCCC"/>
+				<reportElement uuid="4def2d4f-35e8-4fbc-8442-6722a345d249" style="table_TD" x="200" y="0" width="70" height="35" backcolor="#CCCCCC"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js
===================================================================
diff -u -r25745 -r25757
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 25745)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 25757)
@@ -34,7 +34,7 @@
 		var endTime = $Id('endTime').value;
 		var assemblingStartTime = $Id('assemblingStartTime').value;
 		var assemblingEndTime = $Id('assemblingEndTime').value;
-		if(assemblingStartTime > assemblingEndTime !="" && assemblingEndTime != ""){
+		if(assemblingStartTime > assemblingEndTime && assemblingEndTime != ""){
 			showResult('装配开始时间不能大于装配结束时间');
 			$Id('assemblingStartTime').focus();
 			return false;
@@ -175,7 +175,7 @@
 					} ]
 				}]
 			},{
-				width : 250,
+				width : 235,
 				layout : 'form',
 				labelWidth : 100,
 				items : [{
@@ -186,7 +186,7 @@
 						id : 'assemblingStartTime',
 						name : 'assemblingStartTime',
 						editable : false,
-						format : 'Y-m-d H:i:s',
+						format : 'Y-m-d H:i',
 						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 						allowBlank : true,
 						anchor : '100%',
@@ -206,7 +206,7 @@
 					} ]
 				}]
 			},{
-				width : 250,
+				width : 235,
 				layout : 'form',
 				labelWidth : 100,
 				items : [{
@@ -217,7 +217,7 @@
 						id : 'assemblingEndTime',
 						name : 'assemblingEndTime',
 						editable : false,
-						format : 'Y-m-d H:i:s',
+						format : 'Y-m-d H:i',
 						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 						allowBlank : true,
 						anchor : '100%',
@@ -239,7 +239,7 @@
 			},{
 				width : 200,
 				layout : 'form',
-				labelWidth : 60,
+				labelWidth : 70,
 				items : [{
 				    xtype : 'combo',
 					id : 'departSearch',
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport-xjjqzyy.jasper
===================================================================
diff -u -r25743 -r25757
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jasper
===================================================================
diff -u -r13202 -r25757
Binary files differ