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

07d2ac57 · 鲁鑫 · 0b669f8f · 07d2ac57 · 07d2ac57 · 07d2ac57
Commit 07d2ac57 authored Aug 02, 2024 by 鲁鑫
3 changed files
--- a/topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
@@ -32,7 +32,10 @@
        </div>
        <div class="hg-form-row">
            <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 class="hg-form-row">
            <x:checkboxListC name="changeEffective" dictionary="changeEffective" required="true" label="生效日期" labelCol="2" fieldCol="10"/>

--- a/topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
+++ b/topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
@@ -12,10 +12,12 @@
    </style>
 </head>
 <body>
-<span class="left">
-      <img src="${bsnPng}">hh</img>
-</span>
-<div class="billTitle">宝绅内部变更申请/通知单</div>
+
+<div class="billTitle">
+    <span style="position: absolute">
+      <img src="${bsnPng}"></img>
+    </span>
+    宝绅内部变更申请/通知单</div>
 <div class="billTitle">Specification Change Form</div>
 <table cellspacing="0px" cellpadding="0px" class="tablePrint">
    <colgroup>
@@ -57,7 +59,9 @@
        <col width='100%' />
    </colgroup>
    <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>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">

--- a/topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeForm.java
+++ b/topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeForm.java
@@ -42,6 +42,12 @@ public class EpChangeForm extends FlowBillAbstractEntity {
    @Column(name = "reason_desc")
    private String reasonDesc;

+    /**
+     * 其他原因描述
+     */
+    @Column(name = "other_reason_desc")
+    private String otherReasonDesc;
+
    /**
     * 生效日期:
     * □ IMMEDIATE立即变更           □ RUNNING CHANGE 正常变更（用完后变更）  £ SEASON换季更改