浏览代码

审核比较,显示问题

MaiXinRong 5 年之前
父节点
当前提交
0ef89c634f
共有 2 个文件被更改,包括 5 次插入23 次删除
  1. 3 3
      app/const/spread.js
  2. 2 20
      app/controller/stage_controller.js

+ 3 - 3
app/const/spread.js

@@ -428,8 +428,8 @@ const stageCompare = {
             {title: '单价', colSpan: '1', rowSpan: '2', field: 'unit_price', hAlign: 2, width: 60, type: 'Number'},
         ],
         extraCols: [
-            {title: '%s|数量', colSpan: '2|1', rowSpan: '1|1', field: 'gather_qty%s', hAlign: 2, width: 60, formatter: '@'},
-            {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'gather_tp%s', hAlign: 2, width: 60, formatter: '@'},
+            {title: '%s|数量', colSpan: '2|1', rowSpan: '1|1', field: 'gather_qty%s', hAlign: 2, width: 60, type: 'Number'},
+            {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'gather_tp%s', hAlign: 2, width: 60, type: 'Number'},
         ],
         emptyRows: 3,
         headRows: 2,
@@ -444,7 +444,7 @@ const stageCompare = {
             {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 230, formatter: '@'},
         ],
         extraCols: [
-            {title: '%s', colSpan: '1', rowSpan: '1', field: 'gather_qty%s', hAlign: 2, width: 60, formatter: '@'},
+            {title: '%s', colSpan: '1', rowSpan: '1', field: 'gather_qty%s', hAlign: 2, width: 60, type: 'Number'},
         ],
         emptyRows: 3,
         headRows: 1,

+ 2 - 20
app/controller/stage_controller.js

@@ -1110,25 +1110,6 @@ module.exports = app => {
          * @returns {Promise<void>}
          */
         async compare(ctx) {
-            function getCompareSpreadSetting () {
-                function setColFormat(cols, field, formatter) {
-                    const filterCols = cols.filter(function (c) {
-                        return c.field.search(field) !== -1;
-                    });
-                    for (const col of filterCols) {
-                        col.formatter = formatter;
-                    }
-                }
-                const tpFormatter = ctx.helper.getNumberFormatter(ctx.tender.info.decimal.tp);
-                const upFormatter = ctx.helper.getNumberFormatter(2);
-                const ledger = JSON.parse(JSON.stringify(spreadConst.stageCompare.ledger));
-                setColFormat(ledger.baseCols, 'unit_price', upFormatter);
-                setColFormat(ledger.extraCols, 'total_price', tpFormatter);
-                setColFormat(ledger.extraCols, 'tp', tpFormatter);
-
-                const pos = JSON.parse(JSON.stringify(spreadConst.stageCompare.pos));
-                return [ledger, pos];
-            }
             try {
                 await this._getStageAuditViewData(ctx);
                 const renderData = await this._getDefaultRenderData(ctx);
@@ -1137,7 +1118,8 @@ module.exports = app => {
                 } else {
                     renderData.compareAuditors = ctx.stage.auditors;
                 }
-                [renderData.ledgerSpread, renderData.posSpread] = getCompareSpreadSetting();
+                renderData.ledgerSpread = JSON.parse(JSON.stringify(spreadConst.stageCompare.ledger));
+                renderData.posSpread = JSON.parse(JSON.stringify(spreadConst.stageCompare.pos));
                 renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.stage.compare);
                 await this.layout('stage/compare.ejs', renderData, 'stage/compare_modal.ejs');
             } catch (err) {