|
@@ -301,7 +301,8 @@
|
|
//审核
|
|
//审核
|
|
param.setParameter("SHR",shr.text);
|
|
param.setParameter("SHR",shr.text);
|
|
param.setParameter("SHYJ",shyj.text);
|
|
param.setParameter("SHYJ",shyj.text);
|
|
- param.setParameter("SHSJ",shsj.selectedDate);
|
|
|
|
|
|
+ //param.setParameter("SHSJ",shsj.selectedDate);
|
|
|
|
+ param.setParameter("SHSJ",shsj.dateTime);
|
|
param.setParameter("SHJG",shjg.text);
|
|
param.setParameter("SHJG",shjg.text);
|
|
param.format="pdf";
|
|
param.format="pdf";
|
|
PrintUtil.doPrint(param,"_blank");
|
|
PrintUtil.doPrint(param,"_blank");
|
|
@@ -558,8 +559,9 @@
|
|
includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
|
|
includeInLayout="{zysqbp.recordStatus==2 || zysqbp.recordStatus == 8|| zysqbp.recordStatus ==4}">
|
|
<cus:QLabel text="审批人" width="120" textAlign="right"/>
|
|
<cus:QLabel text="审批人" width="120" textAlign="right"/>
|
|
<cus:QTextInput id="shr" width="200" editable="false" text="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditUsername:zysqbp.xsscTask.auditUsername}"/>
|
|
<cus:QTextInput id="shr" width="200" editable="false" text="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditUsername:zysqbp.xsscTask.auditUsername}"/>
|
|
- <cus:QLabel text="审批时间" width="120" textAlign="right"/>
|
|
|
|
- <ui:DateField id="shsj" width="200" enabled="false" selectedDate="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditTime:zysqbp.xsscTask.auditTime}"/>
|
|
|
|
|
|
+ <cus:QLabel text="审批时间" width="120" textAlign="right"/>
|
|
|
|
+ <!--<ui:DateField id="shsj" width="200" formatString="YYYY-MM-DD" enabled="false" selectedDate="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditTime:zysqbp.xsscTask.auditTime}"/>-->
|
|
|
|
+ <ui:DateTime id="shsj" width="200" hasTime="true" enabled="{enable}" dateTime="{zysqbp.xsscTask==null?zysqbp.zdspTask.auditTime:zysqbp.xsscTask.auditTime}" />
|
|
</s:HGroup>
|
|
</s:HGroup>
|
|
</s:VGroup>
|
|
</s:VGroup>
|
|
</s:BorderContainer>
|
|
</s:BorderContainer>
|