git-svn-id: https://192.168.57.71/svn/hbghj@108 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/access/UserModel.as

@@ -497,6 +497,12 @@ package com.jtgh.yjpt.model.access
 			if( editView.xzry !=null && editView.cd != null ){
 				editView.cd.selected = false;
 			}
+			if(editView.sfzdsp != null){
+				editView.sfzdsp.selected=false;
+			}
+			if(editView.sfyxzysq != null){
+				editView.sfyxzysq.selected=false;
+			}
 		}
 	}
 }

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/access/UserEdit.mxml

@@ -125,10 +125,10 @@
 					<ui:CheckBox id="xzry"  label="" selected="@{thisModel.thisData.xzry}" click="thisModel.xzryChange(event)" enabled="{!(mode==Constants.mode_view||Global.user.sfjyr==YesNoSelect.YES||Global.user.cd)}"/>
 				</ui:FormItem>
 				<ui:FormItem label="{resourceManager.getString('author','user.sfyxsqzy')}" visible="{!thisModel.thisData.xzry}" includeInLayout="{!thisModel.thisData.xzry}">
-					<ui:CheckBox label="" selected="@{thisModel.thisData.sqzy}" enabled="{mode!=Constants.mode_view}"/>
+					<ui:CheckBox id="sfyxzysq" label="" selected="@{thisModel.thisData.sqzy}" enabled="{mode!=Constants.mode_view}"/>
 				</ui:FormItem>
 				<ui:FormItem label="是否自动审批人员" visible="{thisModel.thisData.xzry}" includeInLayout="{thisModel.thisData.xzry}">
-					<ui:CheckBox label="" selected="@{thisModel.thisData.sfzdspry}" enabled="{mode!=Constants.mode_view}"/>
+					<ui:CheckBox id="sfzdsp" label="" selected="@{thisModel.thisData.sfzdspry}" enabled="{mode!=Constants.mode_view}"/>
 				</ui:FormItem>
 			</s:HGroup>
 			<ui:FormItem label="{resourceManager.getString('author','user.sfcd')}">

gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq-html.jrxml

@@ -2,7 +2,7 @@
 <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="zysq" language="groovy" pageWidth="595" pageHeight="855" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="6ba495ef-8263-45ad-a2fd-2d5f92c4f9fd">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="170"/>
+	<property name="ireport.y" value="376"/>
 	<parameter name="audit_user" class="java.lang.String"/>
 	<parameter name="audit_date" class="java.util.Date"/>
 	<parameter name="audit_op" class="java.lang.String"/>
@@ -273,7 +273,7 @@
 		</band>
 	</title>
 	<detail>
-		<band height="815" splitType="Immediate">
+		<band height="796" splitType="Immediate">
 			<textField isBlankWhenNull="true">
 				<reportElement x="370" y="52" width="185" height="26" uuid="8a5c3dcf-807a-48a2-8542-5c47b1f549bf"/>
 				<box leftPadding="5">
@@ -872,14 +872,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA["取消作业原因："+$F{byzd1}]]></textFieldExpression>
 			</textField>
-			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="795" width="555" height="20" uuid="c9a6be06-12c3-43af-a406-aee2f15f9c4a"/>
-				<box leftPadding="5"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="宋体" size="12" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{zysjq}]]></textFieldExpression>
-			</textField>
 			<staticText>
 				<reportElement x="0" y="26" width="90" height="26" uuid="6d75dd83-eea4-441d-90b4-edd3e337b744"/>
 				<box leftPadding="5">

gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq.jrxml

@@ -2,7 +2,7 @@
 <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="zysq" language="groovy" pageWidth="595" pageHeight="855" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="6ba495ef-8263-45ad-a2fd-2d5f92c4f9fd">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="96"/>
+	<property name="ireport.y" value="376"/>
 	<parameter name="audit_user" class="java.lang.String"/>
 	<parameter name="audit_date" class="java.util.Date"/>
 	<parameter name="audit_op" class="java.lang.String"/>
@@ -272,7 +272,7 @@
 		</band>
 	</title>
 	<detail>
-		<band height="815" splitType="Immediate">
+		<band height="795" splitType="Immediate">
 			<frame>
 				<reportElement x="0" y="290" width="555" height="40" uuid="c02bcb2c-8ed0-40c9-9135-4ff119a845c6"/>
 				<staticText>
@@ -901,14 +901,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA["取消作业原因："+$F{byzd1}]]></textFieldExpression>
 			</textField>
-			<textField pattern="yyyy-MM-dd HH:mm:ss" isBlankWhenNull="true">
-				<reportElement positionType="Float" x="0" y="795" width="555" height="20" uuid="c9a6be06-12c3-43af-a406-aee2f15f9c4a"/>
-				<box leftPadding="5"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="宋体" size="12" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{zysjq}]]></textFieldExpression>
-			</textField>
 			<staticText>
 				<reportElement x="0" y="26" width="90" height="26" uuid="6d75dd83-eea4-441d-90b4-edd3e337b744"/>
 				<box leftPadding="5">