Pārlūkot izejas kodu

台账修订,修复因改版引起的功能丢失

MaiXinRong 4 gadi atpakaļ
vecāks
revīzija
a41e967c6d

+ 2 - 5
app/controller/revise_controller.js

@@ -843,13 +843,10 @@ module.exports = app => {
                 if (revise.uid !== ctx.session.sessionUser.accountId) throw '上报失败';
                 if (revise.uid !== ctx.session.sessionUser.accountId) throw '上报失败';
 
 
                 await ctx.service.reviseAudit.start(revise, revise.times);
                 await ctx.service.reviseAudit.start(revise, revise.times);
-                ctx.redirect('/tender/' + ctx.tender.id + '/revise/info');
-                // ctx.body = { err: 0, msg: '', data: {} };
+                ctx.body = { err: 0, msg: '', data: {} };
             } catch (err) {
             } catch (err) {
                 this.log(err);
                 this.log(err);
-                // ctx.body = this.ajaxErrorBody(err, '上报失败');
-                this.postError(err, '审批失败');
-                ctx.redirect('/tender/' + ctx.tender.id + '/revise/info');
+                ctx.body = this.ajaxErrorBody(err, '上报失败');
             }
             }
         }
         }
         /**
         /**

+ 2 - 10
app/view/revise/info_modal.ejs

@@ -88,7 +88,7 @@
                 </div>
                 </div>
             </div>
             </div>
             <form class="modal-footer" method="post" action="/tender/<%- ctx.tender.id %>/revise/audit/start"
             <form class="modal-footer" method="post" action="/tender/<%- ctx.tender.id %>/revise/audit/start"
-                onsubmit="return checkAuditorFrom()">
+                name="revise-start">
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                 <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
                 <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
@@ -701,7 +701,7 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 <form class="modal-footer" method="post" action="<%- preUrl %>/revise/audit/start"
                 <form class="modal-footer" method="post" action="<%- preUrl %>/revise/audit/start"
-                    onsubmit="return checkAuditorFrom()">
+                    name="revise-start">
                     <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                     <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                     <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                     <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                     <% if(revise.status === auditConst.status.checkNo && ctx.session.sessionUser.accountId === revise.uid) { %>
                     <% if(revise.status === auditConst.status.checkNo && ctx.session.sessionUser.accountId === revise.uid) { %>
@@ -963,12 +963,4 @@
                 })
                 })
             }
             }
         });
         });
-        // 检查上报情况
-        function checkAuditorFrom() {
-            if ($('#auditors li').length === 0) {
-                toast('请先选择审批人,再上报数据', 'error', 'exclamation-circle');
-                return false;
-            }
-            $('#hide-all').show();
-        }
     </script>
     </script>