Browse Source

变更,审批通过、退回Bug

MaiXinRong 6 years ago
parent
commit
31bf1f340c
2 changed files with 7 additions and 5 deletions
  1. 6 2
      app/controller/change_controller.js
  2. 1 3
      app/public/js/change_approval.js

+ 6 - 2
app/controller/change_controller.js

@@ -467,6 +467,10 @@ module.exports = app => {
         async approval(ctx) {
             try {
                 console.log(ctx.request.body);
+                const changeData = await ctx.service.change.getDataByCondition({cid: ctx.request.body.change_id});
+                if (!changeData) {
+                    throw '变更令数据错误';
+                }
                 const status = parseInt(ctx.request.body.status);
                 let result = false;
                 switch (status) {
@@ -487,10 +491,10 @@ module.exports = app => {
                 if (!result) {
                     throw '审批失败';
                 }
-                ctx.redirect('/tender/' + ctx.session.sessionUser.tenderId + '/change');
+                ctx.redirect('/tender/' + changeData.tid + '/change');
             } catch (err) {
                 console.log(err);
-                ctx.redirect('/tender/' + ctx.session.sessionUser.tenderId + '/change/' + ctx.request.body.change_id + '/info');
+                ctx.redirect(ctx.request.header.referer);
             }
         }
 

+ 1 - 3
app/public/js/change_approval.js

@@ -50,11 +50,9 @@ $(document).ready(() => {
                 toastr.error('审批意见不能为空!');
                 returnflag = false;
             }
-            if ($('#w_code').val() === '') {
+            if ($('input[name="p_code"]').val() === '') {
                 toastr.error('批复文号不能为空!');
                 returnflag = false;
-            } else {
-                $('input[name="w_code"]').val($('#w_code').val());
             }
             // 判断并提交变更清单表格数据到表单中
             const clist = [];