Skip to content

T
topsun-bpm
Commit 07d2ac57 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

ECN变更增加变更原因-其他原因描述字段；打印样式调整

parent 0b669f8f
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 6 deletions
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
View file @ 07d2ac57
...@@ -32,7 +32,10 @@ ...@@ -32,7 +32,10 @@
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:checkboxListC name="reasonForChange" dictionary="reasonForChange" required="true" label="变更原因" labelCol="2" fieldCol="6"/> <x:checkboxListC name="reasonForChange" dictionary="reasonForChange" required="true" label="变更原因" labelCol="2" fieldCol="6"/>
<x:inputC name="reasonDesc" required="false" label="原因描述" labelCol="2" fieldCol="2"/> <x:inputC name="otherReasonDesc" required="false" label="其他原因描述" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:textareaC name="reasonDesc" required="false" label="原因描述" rows="3" labelCol="2" fieldCol="10"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<x:checkboxListC name="changeEffective" dictionary="changeEffective" required="true" label="生效日期" labelCol="2" fieldCol="10"/> <x:checkboxListC name="changeEffective" dictionary="changeEffective" required="true" label="生效日期" labelCol="2" fieldCol="10"/>
......
topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
View file @ 07d2ac57
...@@ -12,10 +12,12 @@ ...@@ -12,10 +12,12 @@
</style> </style>
</head> </head>
<body> <body>
<span class="left">
<img src="${bsnPng}">hh</img> <div class="billTitle">
</span> <span style="position: absolute">
<div class="billTitle">宝绅内部变更申请/通知单</div> <img src="${bsnPng}"></img>
</span>
宝绅内部变更申请/通知单</div>
<div class="billTitle">Specification Change Form</div> <div class="billTitle">Specification Change Form</div>
<table cellspacing="0px" cellpadding="0px" class="tablePrint"> <table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup> <colgroup>
...@@ -57,7 +59,9 @@ ...@@ -57,7 +59,9 @@
<col width='100%' /> <col width='100%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="left">${reasonForChange?default("")?html}</td> <td class="left">${reasonForChange?default("")?html}
<span style="text-decoration: underline">${otherReasonDesc?default("")?html}</span>
</td>
</tr> </tr>
</table> </table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
......
topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeForm.java
View file @ 07d2ac57
...@@ -42,6 +42,12 @@ public class EpChangeForm extends FlowBillAbstractEntity { ...@@ -42,6 +42,12 @@ public class EpChangeForm extends FlowBillAbstractEntity {
@Column(name = "reason_desc") @Column(name = "reason_desc")
private String reasonDesc; private String reasonDesc;
/**
* 其他原因描述
*/
@Column(name = "other_reason_desc")
private String otherReasonDesc;
/** /**
* 生效日期: * 生效日期:
* □ IMMEDIATE立即变更 □ RUNNING CHANGE 正常变更（用完后变更） £ SEASON换季更改 * □ IMMEDIATE立即变更 □ RUNNING CHANGE 正常变更（用完后变更） £ SEASON换季更改
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment