调差bug

app/controller/material_controller.js

@@ -234,7 +234,17 @@ module.exports = app => {
                 searchsql.mid = midList;
             }
             // 取所有工料表
-            return await ctx.service.materialBills.getAllDataByCondition({ where: searchsql });
+            const materialBillsData = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql });
+            // 取对应期的截取上期的调差金额和应耗数量
+            if (ctx.material.highOrder !== ctx.material.order) {
+                for (const [mindex, mb] of materialBillsData.entries()) {
+                    const result = await ctx.service.materialBillsHistory.getByMbId(ctx.material.id, ctx.material.order, mb.id);
+                    _.forEach(result, function(value, key) {
+                        materialBillsData[mindex][key] = result ? result[key] : null;
+                    });
+                }
+            }
+            return materialBillsData;
         }
 
         /**
@@ -257,7 +267,7 @@ module.exports = app => {
                         mb_id: mbd.id,
                     };
                     for (const m of material_month) {
-                        const one_mm = _.find(materialMonthList, { mb_id: mbd.id, yearmonth: m });
+                        const one_mm = _.find(materialMonthList, { mb_id: mbd.mb_id, yearmonth: m });
                         one_mb[m] = one_mm.msg_tp;
                     }
                     monthsList.push(one_mb);
@@ -276,30 +286,6 @@ module.exports = app => {
                 await this._getMaterialAuditViewData(ctx);
                 const renderData = await this._getDefaultRenderData(ctx);
                 renderData.materialBillsData = await this._getMaterialBillsData(ctx);
-                // 取对应期的截取上期的调差金额和应耗数量
-                if (ctx.material.highOrder !== ctx.material.order) {
-                    for (const [mindex, mb] of renderData.materialBillsData.entries()) {
-                        const result = await ctx.service.materialBillsHistory.getByMbId(ctx.material.id, ctx.material.order, mb.id);
-                        _.forEach(result, function(value, key) {
-                            renderData.materialBillsData[mindex][key] = result ? result[key] : null;
-                        });
-                        // if (result) {
-                        //     renderData.materialBillsData[mindex].quantity = result.quantity;
-                        //     renderData.materialBillsData[mindex].expr = result.expr;
-                        //     renderData.materialBillsData[mindex].msg_tp = result.msg_tp;
-                        //     renderData.materialBillsData[mindex].msg_times = result.msg_times;
-                        //     renderData.materialBillsData[mindex].msg_spread = result.msg_spread;
-                        //     renderData.materialBillsData[mindex].m_up_risk = result.m_up_risk;
-                        //     renderData.materialBillsData[mindex].m_down_risk = result.m_down_risk;
-                        //     renderData.materialBillsData[mindex].m_spread = result.m_spread;
-                        //     renderData.materialBillsData[mindex].pre_tp = result.pre_tp;
-                        // } else {
-                        //     this._.forEach(renderData.materialBillsData[mindex], function(value, key) {
-                        //         renderData.materialBillsData[mindex][key] = null;
-                        //     });
-                        // }
-                    }
-                }
                 // 取所有已被调用的工料清单表
                 renderData.materialListData = await ctx.service.materialList.getAllDataByCondition({ tid: ctx.tender.id, mid: ctx.material.id });
                 // 基数

app/view/material/info.ejs

@@ -63,15 +63,15 @@
             <div class="c-body col-4">
                 <div class="tab-content" style="width: 100%">
                     <div id="qianyue" class="tab-pane active">
+                        <% if ((material.status === auditConst.status.uncheck || material.status === auditConst.status.checkNo) && ctx.session.sessionUser.accountId === material.user_id) {%>
                         <div class="sjs-bar-1">
-                            <% if ((material.status === auditConst.status.uncheck || material.status === auditConst.status.checkNo) && ctx.session.sessionUser.accountId === material.user_id) {%>
                             <div class="pb-1">
                                 <a href="#add-month" data-toggle="modal" data-target="#add-month" class="btn btn-sm btn-primary">创建月信息价</a>
                                 <a href="#remove-month" data-toggle="modal" data-target="#remove-month" class="btn btn-sm btn-outline-danger">移除月信息价</a>
                             </div>
-                            <% } %>
                         </div>
-                        <div id="material-month-spread">
+                        <% } %>
+                        <div class="sjs-height-1" id="material-month-spread">
                         </div>
                     </div>
                 </div>