Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jasper
===================================================================
diff -u -r33626 -r33775
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml
===================================================================
diff -u -r33626 -r33775
--- ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml	(.../supplyRoomQualityQuota.jrxml)	(revision 33626)
+++ ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml	(.../supplyRoomQualityQuota.jrxml)	(revision 33775)
@@ -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="supplyRoomQualityQuota" language="groovy" pageWidth="1000" pageHeight="842" columnWidth="1000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2988db68-ce04-4e05-a625-a4cee77166ab">
+<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="supplyRoomQualityQuota" language="groovy" pageWidth="1000" pageHeight="842" columnWidth="1000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="2988db68-ce04-4e05-a625-a4cee77166ab">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -41,7 +41,7 @@
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="efbde1c9-384b-48ad-a2cc-879adb594797" style="Crosstab Data Text" mode="Opaque" x="40" y="0" width="140" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
+							<reportElement uuid="efbde1c9-384b-48ad-a2cc-879adb594797" style="Crosstab Data Text" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="80" height="30" forecolor="#000000" backcolor="#F0F8FF"/>
 							<box>
 								<pen lineWidth="0.5"/>
 								<topPen lineWidth="0.5"/>
@@ -50,28 +50,14 @@
 								<rightPen lineWidth="0.5"/>
 							</box>
 							<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-								<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+								<font fontName="SansSerif" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 								<paragraph lineSpacing="Single"/>
 							</textElement>
-							<text><![CDATA[指标名称]]></text>
+							<text><![CDATA[日期]]></text>
 						</staticText>
-						<staticText>
-							<reportElement uuid="854617c6-1208-4bfd-af48-2bdb4184ce81" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="40" height="30" isRemoveLineWhenBlank="true" backcolor="#F0F8FF"/>
-							<box>
-								<pen lineWidth="0.5"/>
-								<topPen lineWidth="0.5"/>
-								<leftPen lineWidth="0.5"/>
-								<bottomPen lineWidth="0.5"/>
-								<rightPen lineWidth="0.5"/>
-							</box>
-							<textElement verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<text><![CDATA[序号]]></text>
-						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
-				<rowGroup name="rowSerialNumber" width="40">
+				<rowGroup name="rowSerialNumber" width="0">
 					<bucket class="java.lang.Integer">
 						<bucketExpression><![CDATA[$F{rowSerialNumber}]]></bucketExpression>
 					</bucket>
@@ -80,20 +66,13 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField>
-								<reportElement uuid="5bc65bf5-8251-4738-aa05-622a73ce132b" style="Crosstab Data Text" x="0" y="0" width="40" height="25"/>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{rowSerialNumber}+1]]></textFieldExpression>
-							</textField>
 						</cellContents>
 					</crosstabRowHeader>
 					<crosstabTotalRowHeader>
 						<cellContents/>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<rowGroup name="rowName" width="140">
+				<rowGroup name="rowName" width="80">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{rowName}]]></bucketExpression>
 					</bucket>
@@ -103,7 +82,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField isStretchWithOverflow="true">
-								<reportElement uuid="8d82180a-7b3c-45de-a0e6-10cf18b0c312" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="140" height="25"/>
+								<reportElement uuid="8d82180a-7b3c-45de-a0e6-10cf18b0c312" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="80" height="25"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12" isBold="false"/>
 								</textElement>
@@ -139,8 +118,15 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField>
-								<reportElement uuid="5e9a6665-127a-4211-92e8-d8768566770a" style="Crosstab Data Text" x="0" y="0" width="56" height="30"/>
+							<textField isStretchWithOverflow="true">
+								<reportElement uuid="5e9a6665-127a-4211-92e8-d8768566770a" style="Crosstab Data Text" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="30"/>
+								<box>
+									<pen lineWidth="0.5"/>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.5"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
 								<textElement verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
@@ -155,13 +141,13 @@
 				<measure name="valueMeasure" class="java.lang.String">
 					<measureExpression><![CDATA[$F{value}]]></measureExpression>
 				</measure>
-				<crosstabCell width="56" height="25">
+				<crosstabCell width="90" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="5378e2d5-2d92-49a1-a140-c360c59fad0f" style="Crosstab Data Text" x="0" y="0" width="56" height="25"/>
+							<reportElement uuid="5378e2d5-2d92-49a1-a140-c360c59fad0f" style="Crosstab Data Text" x="0" y="0" width="90" height="25"/>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>