Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js
===================================================================
diff -u -r18368 -r18373
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js	(.../deviceMaintenanceCostomInsView.js)	(revision 18368)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js	(.../deviceMaintenanceCostomInsView.js)	(revision 18373)
@@ -53,7 +53,7 @@
 
 	var columns = [
 	    {header : "设备名称",width : 250,dataIndex : 'formDefinition.formName', renderer : modifyRecord},
-	    {header : "项目名称",width : 120,dataIndex : 'projctName'},
+	    {header : "项目名称",width : 120,dataIndex : 'projectName'},
 	    {header : "维护时间",width : 120,dataIndex : 'maintenanceTime',renderer : myDateFormatByMinute},
 	    {header : "登记时间",width : 120,dataIndex : 'createDate',renderer : myDateFormatByMinute},
 	    {header : "登记人",width : 120,dataIndex : 'createUserName'},
@@ -63,6 +63,7 @@
 	var filters = new Ext.grid.GridFilters({
 		filters : [
 			{type:'string',dataIndex:'formDefinition.formName'},
+			{type:'string',dataIndex:'projectName'},
 			{type:'string',dataIndex:'createUserName'},
 			{type:'string',dataIndex:'remark'}
 		]
@@ -71,7 +72,7 @@
 	var readerDetail = [
 	    {name : 'id'}, 
 	    {name : 'formDefinition.formName'},
-	    {name : 'projctName'},
+	    {name : 'projectName'},
 	    {name : 'maintenanceTime'},
 	    {name : 'createDate'},
 	    {name : 'createUserName'},
Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js
===================================================================
diff -u -r18368 -r18373
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js	(.../deviceMaintenanceCostomDefView.js)	(revision 18368)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js	(.../deviceMaintenanceCostomDefView.js)	(revision 18373)
@@ -555,7 +555,7 @@
 	}];
 	var formDefinitionWin = new top.Ext.Window( {
 		id : 'formDefinitionWin',
-		title : '表单定义信息',
+		title : '设备维护定义信息',
 		width : 700,
 		border : false,
 		modal : true,
@@ -573,7 +573,7 @@
 				items :[
 				    new top.Ext.grid.EditorGridPanel({
 						id : 'formDefinitionItemConfigPanel',
-						title : '表单元素列表',
+						title : '设备维护元素列表',
 						width : 685,
 						height : 400,
 						border  : true,
@@ -785,7 +785,7 @@
 	Ext.QuickTips.init();
 
 	var columns = [
-   	    {header : "表单名称",width : 250,dataIndex : 'formName', renderer : modifyRecord},
+   	    {header : "设备维护名称",width : 250,dataIndex : 'formName', renderer : modifyRecord},
    	    {header : "创建时间",width : 150,dataIndex : 'createDate'},
    	    {header : "创建人",width : 80,dataIndex : 'createUserName'},
    	    {header : "拼音码",width : 0,dataIndex : 'spelling'},
Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
===================================================================
diff -u -r18368 -r18373
--- ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml	(.../deviceMaintenanceCusReport.jrxml)	(revision 18368)
+++ ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml	(.../deviceMaintenanceCusReport.jrxml)	(revision 18373)
@@ -97,9 +97,9 @@
 		</band>
 	</title>
 	<summary>
-		<band height="97" splitType="Stretch">
+		<band height="120" splitType="Stretch">
 			<crosstab ignoreWidth="true">
-				<reportElement uuid="760d1e08-1e22-4dcc-872b-4c115269897e" x="0" y="0" width="7000" height="97"/>
+				<reportElement uuid="760d1e08-1e22-4dcc-872b-4c115269897e" style="table_TD" x="0" y="0" width="7000" height="120"/>
 				<crosstabHeaderCell>
 					<cellContents style="Crosstab Data Text">
 						<staticText>
@@ -142,7 +142,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField isStretchWithOverflow="true">
-								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="91" height="25" isPrintWhenDetailOverflows="true"/>
+								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="91" height="32" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -160,12 +160,12 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField pattern="">
-								<reportElement uuid="4e9dd109-2026-415f-bd8d-c5d6a949c819" style="table_TD" x="0" y="0" width="177" height="25"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="177" height="32" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{deviceName} == null ? "": $V{deviceName}]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{deviceName}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
@@ -179,12 +179,12 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField>
-								<reportElement uuid="5629cbcc-abb4-47fb-8696-733472b5f0d9" style="table_TD" x="0" y="0" width="55" height="25"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="55" height="32" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{registrant} == null ? "" : $V{registrant}]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{registrant}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
@@ -198,12 +198,12 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField>
-								<reportElement uuid="2ab1ad2b-9de1-4602-b3db-209ac2706932" style="table_TD" x="0" y="0" width="170" height="25"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="170" height="32" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[""+""+$V{projectName} == null ? "" : $V{projectName}]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{projectName}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
@@ -226,7 +226,7 @@
 						<cellContents/>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="questionName" height="41" headerPosition="Stretch">
+				<columnGroup name="questionName" height="42" headerPosition="Stretch">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{questionName}]]></bucketExpression>
 					</bucket>
@@ -236,7 +236,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="34e1ddb9-9d19-406a-8a3d-2218db8002cd" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="56" height="41" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
+								<reportElement uuid="34e1ddb9-9d19-406a-8a3d-2218db8002cd" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="104" height="42" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 									<paragraph tabStopWidth="40"/>
@@ -256,7 +256,7 @@
 					<crosstabColumnHeader>
 						<cellContents>
 							<textField pattern="" isBlankWhenNull="true">
-								<reportElement uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="56" height="41"/>
+								<reportElement uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="104" height="41"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true" isUnderline="false" isStrikeThrough="false"/>
 									<paragraph lineSpacing="Single"/>
@@ -272,13 +272,13 @@
 				<measure name="answerMeasure" class="java.lang.String" calculation="First">
 					<measureExpression><![CDATA[$F{answer}]]></measureExpression>
 				</measure>
-				<crosstabCell width="56" height="25">
+				<crosstabCell width="104" height="32">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="0040ed3b-81c5-4886-881d-1d8f4a7b237d" style="table_TD" x="0" y="0" width="56" height="25"/>
+							<reportElement uuid="0040ed3b-81c5-4886-881d-1d8f4a7b237d" style="table_TD" x="0" y="0" width="104" height="32"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper
===================================================================
diff -u -r18368 -r18373
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
===================================================================
diff -u -r18368 -r18373
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js	(.../deviceMaintenanceCostomInsForm.js)	(revision 18368)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js	(.../deviceMaintenanceCostomInsForm.js)	(revision 18373)
@@ -409,7 +409,7 @@
 					triggerAction : 'all',
 					name : "projectName",
 					id : "projectName",
-					anchor : '100%',
+					anchor : '95%',
 					allowBlank : false
 				}]
 			},{
@@ -493,7 +493,7 @@
 	formInstanceWin = new top.Ext.Window( {
 		id : 'formInstanceWin',
 		layout : 'fit',
-		title : '表单登记信息',
+		title : '设备维护登记信息',
 		width : 700,
 		modal : true,
 		autoHeight : true,