更新换行规则

app/public/js/change_information_set.js

@@ -731,6 +731,12 @@ $(document).ready(() => {
             toastr.error('工程名称不能为空！');
             return;
         }
+        // 换行更改并提交
+        changeInfo.content = changeInfo.content.replace(/<br><br>/g, '\r\n');
+        changeInfo.basis = changeInfo.basis.replace(/<br><br>/g, '\r\n');
+        changeInfo.expr = changeInfo.expr.replace(/<br><br>/g, '\r\n');
+        changeInfo.memo = changeInfo.memo.replace(/<br><br>/g, '\r\n');
+        // 后改为br
         // 更新至服务器
         postData(window.location.pathname + '/save', { type:'info', updateData: changeInfo }, function (result) {
             $('.reduction-code').attr('data-code', $('input[name="code"]').val());
@@ -738,6 +744,10 @@ $(document).ready(() => {
             $('#show-save-btn').hide();
             $('#sp-btn').show();
             $('.title-main').removeClass('bg-warning');
+            changeInfo.content = changeInfo.content.replace(/[\r\n]/g, '<br>');
+            changeInfo.basis = changeInfo.basis.replace(/[\r\n]/g, '<br>');
+            changeInfo.expr = changeInfo.expr.replace(/[\r\n]/g, '<br>');
+            changeInfo.memo = changeInfo.memo.replace(/[\r\n]/g, '<br>');
             back_changeInfo = Object.assign({}, changeInfo);
         });
         return false;

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"><%- ctx.helper.replaceStr(change.content, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" name="content" rows="6"><%- change.content %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>工程变更合同依据</label>
-                                    <textarea class="form-control form-control-sm" name="basis" rows="6"><%- ctx.helper.replaceStr(change.basis, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" name="basis" rows="6"><%- change.basis %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更工程量数量计算式</label>
-                                    <textarea class="form-control form-control-sm" name="expr" rows="2"><%- ctx.helper.replaceStr(change.expr, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" name="expr" rows="2"><%- change.expr %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>备注</label>
-                                    <textarea class="form-control form-control-sm" name="memo" rows="3"><%- ctx.helper.replaceStr(change.memo, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" name="memo" rows="3"><%- change.memo %></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><%- ctx.helper.replaceStr(change.content, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- change.content %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>工程变更合同依据</label>
-                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- ctx.helper.replaceStr(change.basis, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="6" readonly><%- change.basis %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更工程量数量计算式</label>
-                                    <textarea class="form-control form-control-sm" rows="2" readonly><%- ctx.helper.replaceStr(change.expr, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" readonly><%- change.expr %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>备注</label>
-                                    <textarea class="form-control form-control-sm" rows="3" readonly><%- ctx.helper.replaceStr(change.memo, /<br><br>/g, '\r\n') %></textarea>
+                                    <textarea class="form-control form-control-sm" rows="3" readonly><%- change.memo %></textarea>
                                 </div>
                                 <div class="form-group">
                                     <label>变更类型</label>