1. 合同支付，新增一期，计算式拷贝规则调整

2. 期计量，上报审批相关代码还原

app/controller/stage_controller.js

@@ -1017,13 +1017,11 @@ module.exports = app => {
                 }
 
                 await ctx.service.stageAudit.start(ctx.stage.id, ctx.stage.times);
-                // const auditor = await ctx.service.stageAudit.getCurAuditor(ctx.stage.id, ctx.stage.times);
-                // ctx.body = { err: 0, msg: '', data: [] };
-                ctx.redirect(ctx.request.header.referer);
+                ctx.body = { err: 0, msg: '', data: [] };
             } catch (err) {
                 this.log(err);
                 ctx.redirect(ctx.request.header.referer);
-                // ctx.body = this.ajaxErrorBody(err, '上报失败');
+                ctx.body = this.ajaxErrorBody(err, '上报失败');
             }
         }
         /**
@@ -1040,7 +1038,7 @@ module.exports = app => {
                 if (!this.ctx.stage.curAuditor || this.ctx.stage.curAuditor.aid !== ctx.session.sessionUser.accountId) {
                     throw '您无权进行该操作';
                 }
-                const data = ctx.request.body;
+                const data = JSON.parse(ctx.request.body.data);
                 data.checkType = parseInt(data.checkType);
                 // const data = {
                 //     checkType: parseInt(ctx.request.body.checkType),
@@ -1056,20 +1054,11 @@ module.exports = app => {
                 }
 
                 await ctx.service.stageAudit.check(ctx.stage.id, data, ctx.stage.times);
-                // const stageOrder = parseInt(ctx.params.order);
-                // const stage = await ctx.service.stage.getDataByCondition({
-                //     tid: ctx.tender.id,
-                //     order: stageOrder,
-                // });
-                // const auditor = await ctx.service.stageAudit.getCurAuditor(ctx.stage.id, ctx.stage.times);
-                // ctx.body = { err: 0, msg: '', data: [] };
-                ctx.redirect(ctx.request.header.referer);
+                ctx.body = { err: 0, msg: '', data: [] };
             } catch (err) {
-                // console.log(err);
                 this.log(err);
-                // ctx.body = this.ajaxErrorBody(err, '提交失败');
-                // ctx.session.postError = err.toString();
-                ctx.redirect(ctx.request.header.referer);
+                ctx.body = this.ajaxErrorBody(err, '提交失败');
+                ctx.session.postError = err.toString();
             }
         }
         /**

app/service/stage_pay.js

@@ -75,6 +75,7 @@ module.exports = app => {
          * @returns {Promise<void>}
          */
         async addInitialStageData(stage, transaction) {
+            const basesReg = new RegExp(payConst.calcBase.map(x => {return '(' + x.code + ')'}).join('|'));
             if (!stage) {
                 throw '初始化期合同支付数据失败';
             }
@@ -101,7 +102,9 @@ module.exports = app => {
                         tid: p.tid, sid: stage.id, pid: p.id,
                         stimes: stage.times, sorder: 0,
                         name: pp.name,
-                        expr: (p.ptype === payConst.payType.normal || p.ptype === payConst.payType.wc) ? pp.expr : null,
+                        expr: (p.ptype === payConst.payType.normal || p.ptype === payConst.payType.sf)
+                            ? (basesReg.test(pp.expr) ? pp.expr : null)
+                            : (p.type === payConst.wc ? pp.expr : null),
                         pause: pp.pause,
                         pre_tp: pp.end_tp,
                         pre_used: pp.pre_used || !this.ctx.helper.checkZero(pp.tp),