Browse Source

审批意见,替换换行符等

MaiXinRong 5 năm trước cách đây
mục cha
commit
4c563f7078
2 tập tin đã thay đổi với 46 bổ sung58 xóa
  1. 14 18
      app/public/js/stage.js
  2. 32 40
      app/view/stage/audit_modal.ejs

+ 14 - 18
app/public/js/stage.js

@@ -2929,27 +2929,23 @@ $(document).ready(() => {
         return false;
     });
     $('#audit-check0').submit(function (e) {
-        if (auditCheck(0)) {
-            $(this).parent().parent().modal('hide');
-            const data = {
-                opinion: $('[name=opinion]', this).val(),
-                checkType: parseInt($('[name=checkType]', this).val()),
-            };
-            dataChecker.checkAndPost(this.action, data);
-            $('#hide-all').hide();
-        }
+        $(this).parent().parent().modal('hide');
+        const data = {
+            opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
+            checkType: parseInt($('[name=checkType]', this).val()),
+        };
+        dataChecker.checkAndPost(this.action, data);
+        $('#hide-all').hide();
         return false;
     });
     $('#audit-check2').submit(function (e) {
-        if (auditCheck(2)) {
-            $(this).parent().parent().modal('hide');
-            const data = {
-                opinion: $('[name=opinion]', this).val(),
-                checkType: parseInt($('[name=checkType]', this).val()),
-            };
-            dataChecker.checkAndPost(this.action, data);
-            $('#hide-all').hide();
-        }
+        $(this).parent().parent().modal('hide');
+        const data = {
+            opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
+            checkType: parseInt($('[name=checkType]', this).val()),
+        };
+        dataChecker.checkAndPost(this.action, data);
+        $('#hide-all').hide();
         return false;
     });
 });

+ 32 - 40
app/view/stage/audit_modal.ejs

@@ -1509,56 +1509,48 @@
         return false;
     });
     $('#audit-check0').submit(function (e) {
-        if (auditCheck(0)) {
-            $(this).parent().parent().modal('hide');
-            const data = {
-                opinion: $('[name=opinion]', this).val(),
-                checkType: parseInt($('[name=checkType]', this).val()),
-            };
-            dataChecker.checkAndPost(this.action, data);
-            $('#hide-all').hide();
-        }
+        $(this).parent().parent().modal('hide');
+        const data = {
+            opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
+            checkType: parseInt($('[name=checkType]', this).val()),
+        };
+        dataChecker.checkAndPost(this.action, data);
+        $('#hide-all').hide();
         return false;
     });
     $('#audit-check2').submit(function (e) {
-        if (auditCheck(2)) {
-            $(this).parent().parent().modal('hide');
-            const data = {
-                opinion: $('[name=opinion]', this).val(),
-                checkType: parseInt($('[name=checkType]', this).val()),
-            };
-            dataChecker.checkAndPost(this.action, data);
-            $('#hide-all').hide();
-        }
+        $(this).parent().parent().modal('hide');
+        const data = {
+            opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
+            checkType: parseInt($('[name=checkType]', this).val()),
+        };
+        dataChecker.checkAndPost(this.action, data);
+        $('#hide-all').hide();
         return false;
     });
     <% } %>
     $('#audit-check1').submit(function (e) {
-        if (auditCheck(1)) {
-            $(this).parent().parent().modal('hide');
-            const data = {
-                opinion: $('[name=opinion]', this).val(),
-                checkType: parseInt($('[name=checkType]:checked', this).val()),
-            };
-            postData(this.action, data, function () {
-                window.location.reload();
-            });
-            $('#hide-all').hide();
-        }
+        $(this).parent().parent().modal('hide');
+        const data = {
+            opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
+            checkType: parseInt($('[name=checkType]:checked', this).val()),
+        };
+        postData(this.action, data, function () {
+            window.location.reload();
+        });
+        $('#hide-all').hide();
         return false;
     });
     $('#audit-check3').submit(function (e) {
-        if (auditCheck(3)) {
-            $(this).parent().parent().modal('hide');
-            const data = {
-                opinion: $('[name=opinion]', this).val(),
-                checkType: parseInt($('[name=checkType]:checked', this).val()),
-            };
-            postData(this.action, data, function () {
-                window.location.reload();
-            });
-            $('#hide-all').hide();
-        }
+        $(this).parent().parent().modal('hide');
+        const data = {
+            opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
+            checkType: parseInt($('[name=checkType]:checked', this).val()),
+        };
+        postData(this.action, data, function () {
+            window.location.reload();
+        });
+        $('#hide-all').hide();
         return false;
     });
 </script>