Ver código fonte

feat: 材料调差-清单筛选出有值的数据进行渲染

lanjianrong 5 anos atrás
pai
commit
38fa81aa2e

+ 1 - 0
app/controller/material_controller.js

@@ -304,6 +304,7 @@ module.exports = app => {
                 renderData.pos = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
                 // 获取所选期数据并合并相加同类清单项
                 renderData.curLedgerData = await ctx.service.stageBills.getStagesData(ctx.tender.id, ctx.material.stage_id);
+                console.log('curLedgerData:', renderData.curLedgerData);
                 renderData.curPosData = await ctx.service.stagePos.getStagesData(ctx.tender.id, ctx.material.stage_id);
                 await this.layout('material/list.ejs', renderData, 'material/list_modal.ejs');
             } catch (err) {

+ 6 - 2
app/public/js/material_list.js

@@ -125,8 +125,11 @@ $(document).ready(() => {
     // 解析清单汇总数据
     gclGatherModel.loadLedgerData(ledger, curLedgerData);
     gclGatherModel.loadPosData(pos, curPosData);
-    let gclGatherData = gclGatherModel.gatherGclData();
-    console.log(gclGatherData);
+    let gclGatherData = gclGatherModel.gatherGclData().filter(item => {
+        return item.qc_qty || item.contract_qty
+    });
+    // let gclGatherData = gclGatherModel.gatherGclData()
+    // console.log(gclGatherData);
     // 获取项目节数据
     function loadLeafXmjData(iGclRow) {
         const gcl = gclGatherData[iGclRow];
@@ -247,6 +250,7 @@ $(document).ready(() => {
         SpreadJsObj.reLoadSheetData(leafXmjSpread.getActiveSheet());
     }
 
+    // SpreadJsObj.locateTreeNode(ledgerSpread.getActiveSheet(), )
     loadLeafXmjData(0);
     loadMaterialData(0, 0);
     const sheet = materialSpread.getActiveSheet();