Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/stage_controller.js

@@ -83,6 +83,7 @@ module.exports = app => {
             // 是否已验证手机短信
             const pa = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId);
             data.authMobile = pa.auth_mobile;
+            data.spGroupList = await ctx.service.shenpiGroup.getGroupListByStage(ctx.tender.id, shenpiConst.sp_type.stage);
             return data;
         }
 
@@ -189,7 +190,6 @@ module.exports = app => {
                 renderData.categoryData = await ctx.service.category.getAllCategory(ctx.subProject);
                 renderData.settleStatus = ctx.service.settle.settleStatus;
                 renderData.deleteFilePermission = PermissionCheck.delFile(this.ctx.session.sessionUser.permission);
-                renderData.spGroupList = await ctx.service.shenpiGroup.getGroupListByStage(ctx.tender.id, shenpiConst.sp_type.stage);
                 await this.layout('stage/index.ejs', renderData, 'stage/modal.ejs');
             } catch (err) {
                 this.log(err);
@@ -555,7 +555,7 @@ module.exports = app => {
                     const change = await this.ctx.service.change.getAllChangeHasMinus(ctx.tender.id);
                     if (change.length > 0) {
                         const cid = change.map(x => { return x.cid; });
-                        const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid } });
+                        const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid, is_valuation: 1 } });
                         const endStageChange = await this.ctx.service.stageChange.getFinalUsedData(ctx.tender.id, cid);
                         checkData.checkMinusChangeBills(change, changeBills, endStageChange);
                     }
@@ -577,7 +577,7 @@ module.exports = app => {
             const change = await this.ctx.service.change.getAllChangeHasMinus(ctx.tender.id);
             if (change.length > 0) {
                 const cid = change.map(x => { return x.cid; });
-                const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid } });
+                const changeBills = await this.ctx.service.changeAuditList.getAllDataByCondition({ where: { cid, is_valuation: 1 } });
                 const endStageChange = await this.ctx.service.stageChange.getFinalUsedData(ctx.tender.id, cid);
                 checkData.checkMinusChangeBills(change, changeBills, endStageChange);
             }

app/public/js/se_bonus.js

@@ -323,7 +323,7 @@ $(document).ready(() => {
                 }
             }
             if (other.show) result.push(other);
-            result.push(sum);
+            // result.push(sum);
             result.forEach(x => { x.tp = ZhCalc.add(x.positive_tp, x.negative_tp); });
             return result;
         }
@@ -341,7 +341,8 @@ $(document).ready(() => {
         const sum = bonusObj.sum();
         const html = [];
         for (const s of sum) {
-            html.push(`<tr><td>${s.name}</td><td class="text-right">${s.positive_tp || ''}</td><td class="text-right">${s.negative_tp || ''}</td><td class="text-right">${s.tp || ''}</td></tr>`);
+            //html.push(`<tr><td>${s.name}</td><td class="text-right">${s.positive_tp || ''}</td><td class="text-right">${s.negative_tp || ''}</td><td class="text-right">${s.tp || ''}</td></tr>`);
+            html.push(`<tr><td>${s.name}</td><td class="text-right">${s.tp || ''}</td></tr>`);
         }
         $('#sum').html(html.join(' '));
     };

app/view/stage_extra/bonus.ejs

@@ -31,7 +31,7 @@
             </div>
             <div class="c-body col-3">
                 <table class="table table-bordered" style="width: 99%">
-                    <tr><th class="text-center" width="50%">类型</th><th class="text-center">奖金</th><th class="text-center">罚金</th><th class="text-center">合计</th></tr>
+                    <tr><th class="text-center" width="50%">类型</th><th class="text-center">奖金</th></tr>
                     <tbody id="sum">
                     </tbody>
                 </table>