Browse Source

glj计算,中间过程取6位

zhongzewei 7 years ago
parent
commit
c3040a1c69
2 changed files with 8 additions and 1 deletions
  1. 2 1
      web/maintain/std_glj_lib/js/gljComponent.js
  2. 6 0
      web/users/views/tool/index.html

+ 2 - 1
web/maintain/std_glj_lib/js/gljComponent.js

@@ -4,6 +4,7 @@
 
 let gljComponentOprObj = {
     workBook: null,
+    processDecimal: -6,
     setting: {
         owner: "gljComponent",
         header:[
@@ -507,7 +508,7 @@ let gljComponentOprObj = {
             let roundBasePrc = scMathUtil.roundTo(parseFloat(component[i].basePrice), -2);
             let roundConsumeAmt = scMathUtil.roundTo(parseFloat(component[i].consumeAmt), -3);
             //gljBasePrc = scMathUtil.roundTo(scMathUtil.roundTo(roundBasePrc * parseFloat(component[i].consumeAmt), -2) + gljBasePrc, -2); 旧算法
-            gljBasePrc = roundBasePrc * roundConsumeAmt + gljBasePrc;
+            gljBasePrc = scMathUtil.roundTo(scMathUtil.roundTo(roundBasePrc * roundConsumeAmt, me.processDecimal) + gljBasePrc, me.processDecimal);
         }
         return scMathUtil.roundTo(gljBasePrc, -2);
     }

+ 6 - 0
web/users/views/tool/index.html

@@ -32,6 +32,12 @@
             </div>
             <div class="col-xs-6 mb-30 ">
                 <div class="c-body">
+                    <h2>清单指引编辑器
+                        <a href="/billsGuidance/main" class="btn btn-primary pull-right">进入</a></h2>
+                </div>
+            </div>
+            <div class="col-xs-6 mb-30 ">
+                <div class="c-body">
                     <h2>清除项目残留数据
                         <a href="javascript:void(0);" id="clearJunkBtn" class="btn btn-primary pull-right">清除</a></h2>
                 </div>