Browse Source

Merge branch 'develop_yh55' of jianguan-web/jg-ocs-html into pre-release

李磊 2 months ago
parent
commit
cf1e09ba95
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/views/reportData/regionTypeBusinessReport/list.vue

+ 2 - 2
src/views/reportData/regionTypeBusinessReport/list.vue

@@ -144,8 +144,8 @@ export default {
             for (var i = 0; i < data.length; i++) {
               data[i].no = i + 1
               const isqml = data[i].category === '全品类'
-              data[i].grossMargin = data[i].grossMargin && data[i].amount ? data[i].grossMargin + '%' : '--'
-              data[i].promoRatio = data[i].promoRatio && data[i].amount ? data[i].promoRatio + '%' : '--'
+              data[i].grossMargin = (data[i].grossMargin || data[i].grossMargin == 0) && data[i].amount ? data[i].grossMargin.toFixed(2) + '%' : '--'
+              data[i].promoRatio = (data[i].promoRatio || data[i].promoRatio == 0) && data[i].amount ? data[i].promoRatio.toFixed(2) + '%' : '--'
               data[i].cost = data[i].cost ? data[i].cost.toFixed(2) : (isqml ? '--' : '0.00')
               data[i].amount = data[i].amount ? data[i].amount.toFixed(2) : (isqml ? '--' : '0.00')
               data[i].gross = data[i].gross ? data[i].gross.toFixed(2) : (isqml ? '--' : '0.00')