Ver código fonte

fix: 计量台账审批重复退回上一级,自动选择原报bug-补充fix

lanjianrong 5 anos atrás
pai
commit
1f9eb483d0
1 arquivos alterados com 18 adições e 7 exclusões
  1. 18 7
      app/view/stage/audit_modal.ejs

+ 18 - 7
app/view/stage/audit_modal.ejs

@@ -380,7 +380,7 @@
                                                         <label>审批意见<b class="text-danger">*</b></label>
                                                         <label>审批意见<b class="text-danger">*</b></label>
                                                         <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                                         <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                                     </div>
                                                     </div>
-                                                    <div id="reject-process" class="alert alert-warning">
+                                                    <div class="alert alert-warning reject-process">
                                                         <div class="form-check form-check-inline">
                                                         <div class="form-check form-check-inline">
                                                             <!-- <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>" <% if (auditors[iA].order === 1 || auditors[iA].aid === auditors[0].aid) { %>checked<% } %>> -->
                                                             <!-- <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>" <% if (auditors[iA].order === 1 || auditors[iA].aid === auditors[0].aid) { %>checked<% } %>> -->
                                                             <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>">
                                                             <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>">
@@ -1403,7 +1403,7 @@
                                                         <label>审批意见<b class="text-danger">*</b></label>
                                                         <label>审批意见<b class="text-danger">*</b></label>
                                                         <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                                         <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                                     </div>
                                                     </div>
-                                                    <div class="alert alert-warning">
+                                                    <div class="alert alert-warning reject-process">
                                                         <div class="form-check form-check-inline">
                                                         <div class="form-check form-check-inline">
                                                             <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>">
                                                             <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>">
                                                             <!-- <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>" <% if (auditors[iA].order === 1 || auditors[iA].aid === auditors[0].aid) { %>checked<% } %>> -->
                                                             <!-- <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>" <% if (auditors[iA].order === 1 || auditors[iA].aid === auditors[0].aid) { %>checked<% } %>> -->
@@ -1540,7 +1540,7 @@
         };
         };
         if (!parseInt($('[name=checkType]:checked', this).val())) {
         if (!parseInt($('[name=checkType]:checked', this).val())) {
             if (!$('#warning-text').length) {
             if (!$('#warning-text').length) {
-                $('#reject-process').prepend('<p id="warning-text" style="color: red; margin: 0;">请选择退回流程</p>');
+                $('.reject-process').prepend('<p id="warning-text" style="color: red; margin: 0;">请选择退回流程</p>');
             }
             }
             return false;
             return false;
         } else {
         } else {
@@ -1553,16 +1553,27 @@
 
 
     });
     });
     $('#audit-check3').submit(function (e) {
     $('#audit-check3').submit(function (e) {
-        $(this).parent().parent().modal('hide');
+        // $(this).parent().parent().modal('hide');
         const data = {
         const data = {
             opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
             opinion: $('[name=opinion]', this).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '),
             checkType: parseInt($('[name=checkType]:checked', this).val()),
             checkType: parseInt($('[name=checkType]:checked', this).val()),
         };
         };
-        postData(this.action, data, function () {
+        if (!parseInt($('[name=checkType]:checked', this).val())) {
+            if (!$('#warning-text').length) {
+                $('.reject-process').prepend('<p id="warning-text" style="color: red; margin: 0;">请选择退回流程</p>');
+            }
+            return false;
+        } else {
+            postData(this.action, data, function () {
             window.location.reload();
             window.location.reload();
         });
         });
-        $('#hide-all').hide();
-        return false;
+        }
+        return false
+        // postData(this.action, data, function () {
+        //     window.location.reload();
+        // });
+        // $('#hide-all').hide();
+        // return false;
     });
     });
     $('.modal').on('shown.bs.modal', function () {
     $('.modal').on('shown.bs.modal', function () {
         const height = $(this)[0].scrollHeight
         const height = $(this)[0].scrollHeight