浏览代码

多期比较,显示签约清单数据

MaiXinRong 2 年之前
父节点
当前提交
dd28d260cd
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      app/controller/measure_controller.js
  2. 1 0
      app/public/js/measure_compare.js

+ 1 - 0
app/controller/measure_controller.js

@@ -247,6 +247,7 @@ module.exports = app => {
                     result.main = {};
                     result.main.ledger = await ctx.service.ledger.getData(ctx.tender.id);
                     result.main.pos = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
+                    result.main.deal = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
                 }
                 if (data.stages) {
                     for (const order of data.stages) {

+ 1 - 0
app/public/js/measure_compare.js

@@ -246,6 +246,7 @@ $(document).ready(() => {
         gclGatherModel.loadGatherField(checkField, checkField);
         gclGatherModel.loadLedgerData(result.main.ledger);
         gclGatherModel.loadPosData(result.main.pos);
+        gclGatherModel.loadDealBillsData(result.main.deal);
         gclGatherData = gclGatherModel.gatherGclData();
         SpreadJsObj.loadSheetData(gclSheet, SpreadJsObj.DataType.Data, gclGatherData);
         loadLeafXmjData(0);