变更换行bug

app/view/change/information.ejs

@@ -128,19 +128,19 @@
                                 </div>
                                 <div class="form-group">
                                     <label><b class="text-danger">*&nbsp;</b>工程变更理由及内容</label>
-                                    <textarea class="form-control form-control-sm" name="content" rows="6"><%- change.content %></textarea>
+                                    <textarea class="form-control form-control-sm" name="content" rows="6"><%- ctx.helper.replaceStr(change.content, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>工程变更合同依据</label>
-                                    <textarea class="form-control form-control-sm" name="basis" rows="6"><%- change.basis %></textarea>
+                                    <textarea class="form-control form-control-sm" name="basis" rows="6"><%- ctx.helper.replaceStr(change.basis, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更工程量数量计算式</label>
-                                    <textarea class="form-control form-control-sm" name="expr" rows="2"><%- change.expr %></textarea>
+                                    <textarea class="form-control form-control-sm" name="expr" rows="2"><%- ctx.helper.replaceStr(change.expr, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>备注</label>
-                                    <textarea class="form-control form-control-sm" name="memo" rows="3"><%- change.memo %></textarea>
+                                    <textarea class="form-control form-control-sm" name="memo" rows="3"><%- ctx.helper.replaceStr(change.memo, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更类型</label>
@@ -236,19 +236,19 @@
                                 </div>
                                 <div class="form-group">
                                     <label>工程变更理由及内容</label>
-                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- change.content %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- ctx.helper.replaceStr(change.content, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>工程变更合同依据</label>
-                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- change.basis %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- ctx.helper.replaceStr(change.basis, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更工程量数量计算式</label>
-                                    <textarea class="form-control form-control-sm" rows="2" readonly><%- change.expr %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" readonly><%- ctx.helper.replaceStr(change.expr, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>备注</label>
-                                    <textarea class="form-control form-control-sm" rows="3" readonly><%- change.memo %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="3" readonly><%- ctx.helper.replaceStr(change.memo, /<br><br>/g, '\r\n') %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更类型</label>

app/view/schedule/index.ejs

@@ -36,14 +36,14 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-auto pr-0">
-                            <div class="card text-center">
-                                <div class="card-body">
-                                    <h5 class="card-title">50,000.00 <small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占计划比例">5%</small></h5>
-                                    <p class="card-text text-muted">已完成计划金额</p>
-                                </div>
-                            </div>
-                        </div>
+                        <!--<div class="col-auto pr-0">-->
+                            <!--<div class="card text-center">-->
+                                <!--<div class="card-body">-->
+                                    <!--<h5 class="card-title">50,000.00 <small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占计划比例">5%</small></h5>-->
+                                    <!--<p class="card-text text-muted">已完成计划金额</p>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
                         <div class="col-auto pr-0">
                             <div class="card text-center">
                                 <div class="card-body">