bugs

gulpfile.js

@@ -99,8 +99,8 @@ let compleGljOptions = {
     htmlDest: 'web/building_saas/complementary_glj_lib/html',
     htmlName: 'tools-gongliaoji.html',
     injectList: [
-        'web/dest/scripts/compleGlj.all.min' + version + '.js',
-        'web/dest/css/compleGlj.all.min' + version + '.css',
+        'web/dest/scripts/compleGlj.all.min.' + version + '.js',
+        'web/dest/css/compleGlj.all.min.' + version + '.css',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -115,8 +115,8 @@ let compleRation_rationOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'dinge.html',
     injectList: [
-        'web/dest/scripts/compleRation_ration.all.min' + version + '.js',
-        'web/dest/css/compleRation_ration.all.min' + version + '.css',
+        'web/dest/scripts/compleRation_ration.all.min.' + version + '.js',
+        'web/dest/css/compleRation_ration.all.min.' + version + '.css',
         'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
@@ -132,8 +132,8 @@ let compleRation_gljOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'gongliao.html',
     injectList: [
-        'web/dest/scripts/compleRation_glj.all.min' + version + '.js',
-        'web/dest/scripts/compleRation_glj.all.min' + version + '.css',
+        'web/dest/scripts/compleRation_glj.all.min.' + version + '.js',
+        'web/dest/scripts/compleRation_glj.all.min.' + version + '.css',
         'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
@@ -149,8 +149,8 @@ let compleRation_coeOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'fuzhu.html',
     injectList: [
-        'web/dest/scripts/compleRation_coe.all.min' + version + '.js',
-        'web/dest/scripts/compleRation_coe.all.min' + version + '.css',
+        'web/dest/scripts/compleRation_coe.all.min.' + version + '.js',
+        'web/dest/scripts/compleRation_coe.all.min.' + version + '.css',
         'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
@@ -166,8 +166,8 @@ let compleRation_instOptions = {
     htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'anzhuang.html',
     injectList: [
-        'web/dest/scripts/compleRation_inst.all.min' + version + '.js',
-        'web/dest/scripts/compleRation_inst.all.min' + version + '.css',
+        'web/dest/scripts/compleRation_inst.all.min.' + version + '.js',
+        'web/dest/scripts/compleRation_inst.all.min.' + version + '.css',
         'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
@@ -387,4 +387,6 @@ gulp.task('unit_price',gulp.series('unitPrice_inject', function (){
   return htmlmin(unitPriceOptions);
 }));
 
-gulp.task('build',gulp.series('common','header','login','pm','main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst','unit_price'));
+//gulp.task('build', gulp.series('common', 'header', 'login', 'pm', 'main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst', 'unit_price'));
+
+gulp.task('build',gulp.series('common','header', 'compleGlj'));

public/web/gljUtil.js

@@ -330,9 +330,10 @@ let gljUtil = {
             tem_marketPrice = ext[tem.id].marketPrice;
           };
 
-          let temP = scMathUtil.roundForObj(
-            scMathUtil.roundForObj(tem_marketPrice * priceCoe, price_decimal) *
-            scMathUtil.roundForObj(ratio.consumption, quantity_decimal), process_decimal);
+
+          let temP = scMathUtil.roundForObj(tem_marketPrice * priceCoe, price_decimal) * scMathUtil.roundForObj(ratio.consumption, quantity_decimal);
+          temP = scMathUtil.roundForObj(temP, decimalObj.process);//取两次防止中间过程使用两位导致 4舍5入后少0.01的情况
+          temP = scMathUtil.roundForObj(temP,process_decimal);
           p = scMathUtil.roundForObj(temP + p, process_decimal);
         }
       }