Explorar o código

修改计量重新审批逻辑

laiguoran %!s(int64=4) %!d(string=hai) anos
pai
achega
7b963fe9ff

+ 4 - 1
app/controller/stage_controller.js

@@ -1063,9 +1063,12 @@ module.exports = app => {
                 if (ctx.query.confirm !== undefined && ctx.query.confirm !== '确认设置终审审批') {
                     throw '请输入正确的文本信息';
                 }
-                if (ctx.query.confirm === undefined || (!ctx.query.confirm && ctx.session.sessionUser.loginStatus === 1)) {
+                if (ctx.session.sessionUser.loginStatus === 0) {
                     const code = ctx.query.code;
                     const pa = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId);
+                    if (!pa.auth_mobile) {
+                        throw '未绑定手机号';
+                    }
                     const cacheKey = 'smsCode:' + ctx.session.sessionUser.accountId;
                     const cacheCode = await app.redis.get(cacheKey);
                     // console.log(cacheCode);

+ 11 - 4
app/view/stage/audit_modal.ejs

@@ -1452,7 +1452,7 @@
             </div>
         </div>
     </div>
-    <% } else if (!authMobile) { %>
+    <% } else if (!authMobile && ctx.session.sessionUser.loginStatus === 0) { %>
         <!--终审重新审批-->
         <div class="modal fade" id="sp-down-back" data-backdrop="static">
             <div class="modal-dialog" role="document">
@@ -1480,6 +1480,7 @@
                 </div>
                 <div class="modal-body">
                     <h5>确认由「终审-<%= ctx.stage.auditors[ctx.stage.auditors.length-1].name %>」重新审批「第<%= ctx.stage.order %>期」?</h5>
+                    <% if (ctx.session.sessionUser.loginStatus === 0) { %>
                     <div class="form-group">
                         <label>重审需要验证码确认,验证码将发送至尾号<%- authMobile.slice(-4) %>的手机</label>
                         <div class="input-group input-group-sm mb-3">
@@ -1489,11 +1490,12 @@
                             </div>
                         </div>
                     </div>
+                    <% } %>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                     <!--<a href="<%- preUrl %>/audit/check/again" disabled class="btn btn-warning btn-sm">确定重审</a>-->
-                    <button disabled id="re-shenpi-btn" class="btn btn-warning btn-sm">确定重审</button>
+                    <button <% if (ctx.session.sessionUser.loginStatus === 0) { %>disabled<% } %> id="re-shenpi-btn" class="btn btn-warning btn-sm">确定重审</button>
                 </div>
             </div>
         </div>
@@ -1654,7 +1656,10 @@
 
     // 重新审批按钮
     $("#re-shenpi-btn").click(function() {
-        const code = $("input[name='code']").val();
+        const data = {
+        };
+        <% if (ctx.session.sessionUser.loginStatus === 0) { %>
+        const code = $("#sp-down-back input[name='code']").val();
         if ($(this).hasClass('disabled')) {
             return false;
         }
@@ -1663,10 +1668,12 @@
             toast('请填写正确的验证码', 'error');
             return false;
         }
+        data.code = code;
+        <% } %>
         $.ajax({
             url: '<%- preUrl %>/audit/check/again',
             type: 'get',
-            data: { code: code },
+            data: data,
             dataTye: 'json',
             success: function(response) {
                 if (response.err === 0) {

+ 1 - 1
app/view/stage/manager_modal.ejs

@@ -97,7 +97,7 @@
             </div>
         </div>
     </div>
-<% } else if (!authMobile) { %>
+<% } else if (!authMobile && ctx.session.sessionUser.loginStatus === 0) { %>
     <!--终审重新审批-->
     <div class="modal fade" id="pass" data-backdrop="static">
         <div class="modal-dialog" role="document">