MaiXinRong 2 years ago
parent
commit
5ce27b5122
3 changed files with 5 additions and 2 deletions
  1. 3 1
      app/public/js/gcl_gather.js
  2. 1 1
      app/public/js/stage_gather.js
  3. 1 0
      app/view/stage/gather.ejs

+ 3 - 1
app/public/js/gcl_gather.js

@@ -39,6 +39,7 @@ const gclGatherModel = (function () {
 
     const gclList = [], leafXmjs = [];
     const mergeChar = ';';
+    let tpDecimal = 0;
 
     /**
      * 将所有数据加载至树结构
@@ -70,8 +71,9 @@ const gclGatherModel = (function () {
         deal = dealBills;
     }
 
-    function loadChangeBillsData(data) {
+    function loadChangeBillsData(data, decimal) {
         change = data;
+        tpDecimal = decimal;
     }
 
     function gatherfields(obj, src, fields) {

+ 1 - 1
app/public/js/stage_gather.js

@@ -129,7 +129,7 @@ $(document).ready(function () {
         gclGatherModel.loadLedgerData(result.ledgerData);
         gclGatherModel.loadPosData(result.posData);
         gclGatherModel.loadDealBillsData(result.dealBills);
-        gclGatherModel.loadChangeBillsData(result.changeBills);
+        gclGatherModel.loadChangeBillsData(result.changeBills, tenderDecimal.tp);
         gclGatherData = gclGatherModel.gatherGclData();
         gclGatherModel.checkDiffer(gclGatherData);
         checkOverRange(gclGatherData);

+ 1 - 0
app/view/stage/gather.ejs

@@ -104,4 +104,5 @@
     const chapter = JSON.parse('<%- JSON.stringify(ctx.tender.info.chapter) %>');
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const hintOver = <%- hintOver %>;
+    const tenderDecimal = JSON.parse(unescape('<%- escape(JSON.stringify(ctx.tender.info.decimal)) %>'));
 </script>