feat: 材料调差、工程变更添加可选择审批流程和提示功能

app/public/js/change_approval.js

@@ -85,6 +85,7 @@ $(document).ready(() => {
                 $('input[name="w_code"]').val($.trim($('#w_code').val()));
 
                 $('#success-approval').find('textarea').val(sdesc.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' '));
+                if ($('#warning-text').length) $('#warning-text').remove()
                 $('#success-approval').submit();
             }
         } else {
@@ -95,7 +96,10 @@ $(document).ready(() => {
             }
             const type = $('#fail-approval').find('input[name="status"]:checked').val();
             if (type === undefined) {
-                toastr.error('请选择退回类型!');
+                // toastr.error('请选择退回类型!');
+                if (!$('#warning-text').length) {
+                    $('#change-back-content').prepend('<p id="warning-text" style="color: red; margin: 0;">请选择退回流程</p>');
+                }
                 returnflag = false;
             }
             if(returnflag) {
@@ -143,3 +147,20 @@ const postDataWithAsync = function (url, data, successCallback, errorCallBack, s
         }
     });
 };
+
+function auditCheck(i) {
+    console.log('111111111')
+    const inlineRadio1 = $('#change-back:checked').val()
+    const inlineRadio2 = $('#chagne-backnew:checked').val()
+    const opinion = $('textarea[name="sdesc"]').eq(i).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' ');
+    $('textarea[name="sdesc"]').eq(i).val(opinion);
+    if (!inlineRadio1 && !inlineRadio2) {
+        if (!$('#warning-text').length) {
+            $('#reject-process').prepend('<p id="warning-text" style="color: red; margin: 0;">请选择退回流程</p>');
+        }
+        return false;
+    } else {
+        if ($('#warning-text').length) $('#warning-text').remove()
+        return true;
+    }
+}

app/public/js/material_audit.js

@@ -163,8 +163,17 @@ function checkAuditorFrom () {
 }
 // texterea换行
 function auditCheck(i) {
-    console.log('11111111111')
+    const inlineRadio1 = $('#inlineRadio1:checked').val()
+    const inlineRadio2 = $('#inlineRadio2:checked').val()
     const opinion = $('textarea[name="opinion"]').eq(i).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' ');
     $('textarea[name="opinion"]').eq(i).val(opinion);
-    return true;
+    if (!inlineRadio1 && !inlineRadio2) {
+        if (!$('#warning-text').length) {
+            $('#reject-process').prepend('<p id="warning-text" style="color: red; margin: 0;">请选择退回流程</p>');
+        }
+        return false;
+    } else {
+        if ($('#warning-text').length) $('#warning-text').remove()
+        return true;
+    }
 }

app/view/change/info_modal.ejs

@@ -704,14 +704,16 @@
                                                         <textarea class="form-control form-control-sm" name="sdesc">不同意</textarea>
                                                         <input type="hidden" name="audit_id" value="<%= a.id %>">
                                                     </div>
-                                                    <div class="alert alert-warning">
+                                                    <div id="change-back-content"class="alert alert-warning">
                                                         <div class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="status" id="change-back" value="5" <% if (a.usite === 1) { %>checked<% } %>>
+                                                            <input class="form-check-input" type="radio" name="status" id="change-back" value="5">
+                                                            <!-- <input class="form-check-input" type="radio" name="status" id="change-back" value="5" <% if (a.usite === 1) { %>checked<% } %>> -->
                                                             <label class="form-check-label" for="change-back">退回原报 <%= auditList3[0].name %></label>
                                                         </div>
                                                         <% if (a.usite !== 1) { %>
                                                             <div class="form-check form-check-inline">
-                                                                <input class="form-check-input" type="radio" name="status" id="chagne-backnew" value="6" <% if (a.usite !== 1) { %>checked<% } %>>
+                                                                <input class="form-check-input" type="radio" name="status" id="chagne-backnew" value="6">
+                                                                <!-- <input class="form-check-input" type="radio" name="status" id="chagne-backnew" value="6" <% if (a.usite !== 1) { %>checked<% } %>> -->
                                                                 <label class="form-check-label" for="chagne-backnew">退回上一审批人 <%= auditList2[a.usite-1].name %></label>
                                                                 <input type="hidden" name="audit_last_id" value="<%= auditList2[a.usite-1].id %>">
                                                             </div>

app/view/material/audit_modal.ejs

@@ -327,15 +327,18 @@
                                         <label>审批意见<b class="text-danger">*</b></label>
                                         <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                     </div>
-                                    <div class="alert alert-warning">
+                                    <div id="reject-process" class="alert alert-warning">
+
                                         <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 %>">
                                             <label class="form-check-label" for="inlineRadio1">退回原报 <%- ctx.material.user.name %></label>
                                         </div>
                                         <% if (auditors[iA].order > 1 && auditors[iA].aid !== auditors[0].aid) { %>
                                             <% const auditorIndex = ctx.material.auditors.findIndex(function (item) { return item.aid === auditors[iA].aid }) %>
                                             <div class="form-check form-check-inline">
-                                                <input class="form-check-input" type="radio" name="checkType" id="inlineRadio2" value="<%- auditConst.status.checkNoPre %>" checked>
+                                                <!-- <input class="form-check-input" type="radio" name="checkType" id="inlineRadio2" value="<%- auditConst.status.checkNoPre %>" checked> -->
+                                                <input class="form-check-input" type="radio" name="checkType" id="inlineRadio2" value="<%- auditConst.status.checkNoPre %>" >
                                                 <label class="form-check-label" for="inlineRadio2">退回上一审批人 <%- ctx.material.auditors[auditorIndex-1].name %></label>
                                             </div>
                                         <% } %>