Bläddra i källkod

变更wap会签或签调整

ellisran 1 år sedan
förälder
incheckning
f30d5fefc9
3 ändrade filer med 53 tillägg och 53 borttagningar
  1. 6 2
      app/controller/wap_controller.js
  2. 2 2
      app/router.js
  3. 45 49
      app/view/wap/shenpi_change.ejs

+ 6 - 2
app/controller/wap_controller.js

@@ -16,6 +16,7 @@ const fs = require('fs');
 const path = require('path');
 const sendToWormhole = require('stream-wormhole');
 const moment = require('moment');
+const auditType = require('../const/audit').auditType;
 
 module.exports = app => {
 
@@ -368,11 +369,13 @@ module.exports = app => {
         async change(ctx) {
             try {
                 const tender = ctx.tender.data;
-                const change = await ctx.service.change.getDataByCondition({ cid: ctx.params.cid });
-                const times = change.status !== auditConst.change.status.checkNo ? change.times : change.times - 1;
+                const change = ctx.change;
+                const times = change.status !== auditConst.change.status.checkNo && change.status !== auditConst.change.status.revise ? change.times : change.times - 1;
                 const auditList = await ctx.service.changeAudit.getListOrderByTimes(change.cid, times);
                 const auditGroupList = await ctx.service.changeAudit.getListGroupByTimes(change.cid, times);
+                await ctx.service.change.loadChangeAuditViewData(ctx.change);
                 const renderData = {
+                    moment,
                     tender,
                     change,
                     auditList,
@@ -380,6 +383,7 @@ module.exports = app => {
                     auditConst: auditConst.change,
                     changeConst,
                     tpUnit: ctx.tender.info.decimal.tp,
+                    auditType,
                 };
                 await ctx.render('wap/shenpi_change.ejs', renderData);
             } catch (err) {

+ 2 - 2
app/router.js

@@ -709,7 +709,7 @@ module.exports = app => {
     app.get('/wap/list', sessionAuth, 'wapController.list');
     app.get('/wap/tender/:id', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.tender');
     app.get('/wap/tender/:id/stage/:order', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.stage');
-    app.get('/wap/tender/:id/change/:cid/info', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.change');
+    app.get('/wap/tender/:id/change/:cid/info', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, changeAuditCheck, 'wapController.change');
     app.get('/wap/tender/:id/change/plan/:cpid/info', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.changePlan');
     app.post('/wap/tender/:id/change/approval', sessionAuth, tenderCheck, uncheckTenderCheck, tenderBuildCheck, 'wapController.changeApproval');
     app.get('/wap/tender/:id/revise/:rid/info', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.revise');
@@ -717,7 +717,7 @@ module.exports = app => {
     app.get('/wap/tender/:id/advance/:order/detail', sessionAuth, tenderCheck, advanceCheck, 'wapController.advanceDetail');
     // 针对企业微信访问判断去掉wap就能直达web端
     app.get('/wap/tender/:id/measure/stage/:order', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.stage');
-    app.get('/wap/tender/:id/change/:cid/information', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.change');
+    app.get('/wap/tender/:id/change/:cid/information', sessionAuth, tenderCheck, uncheckTenderCheck, changeCheck, changeAuditCheck, 'wapController.change');
     app.get('/wap/tender/:id/change/plan/:cpid/information', sessionAuth, tenderCheck, uncheckTenderCheck, 'wapController.changePlan');
 
     // 微信

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 45 - 49
app/view/wap/shenpi_change.ejs