修复调差bug

app/controller/material_controller.js

@@ -367,6 +367,15 @@ module.exports = app => {
                 }
                 searchsql.t_type = materialConst.t_type[0].value;
                 renderData.materialBillsData = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql });
+                // 取对应期的截取上期的调差金额和应耗数量
+                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;
+                        });
+                    }
+                }
                 // 取所有已被调用的工料清单表
                 renderData.materialListData = await ctx.service.materialList.getMaterialData(ctx.tender.id, ctx.material.id);
                 renderData.materialNotJoinListData = await ctx.service.materialListNotjoin.getAllDataByCondition({ where: { tid: ctx.tender.id, mid: ctx.material.id } });

app/public/js/material_list.js

@@ -21,7 +21,7 @@ function findNotJoinLeafXmj(x, type = '') {
 
 function getMpSpreadByMBData(id) {
     const info = materialBillsData.find(function (item) {
-        return item.id === parseInt(id);
+        return item.mb_id === parseInt(id);
     });
     return info.m_spread;
 }