Bläddra i källkod

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

李磊 2 månader sedan
förälder
incheckning
63f359e953
1 ändrade filer med 3 tillägg och 6 borttagningar
  1. 3 6
      src/views/reportData/regionTypeBusinessReport/list.vue

+ 3 - 6
src/views/reportData/regionTypeBusinessReport/list.vue

@@ -143,12 +143,9 @@ export default {
             // 计算表格序号
             for (var i = 0; i < data.length; i++) {
               data[i].no = i + 1
-              data[i].grossMargin = data[i].grossMargin ? data[i].grossMargin + '%' : '0.00%'
-              data[i].promoRatio = data[i].promoRatio ? data[i].promoRatio + '%' : '0.00%'
-              if (data[i].category.indexOf('全品类') >= 0) {
-                data[i].grossMargin = data[i].grossMargin ? data[i].grossMargin + '%' : '--'
-                data[i].promoRatio = data[i].promoRatio ? data[i].promoRatio + '%' : '--'
-              }
+              const isqml = data[i].category.indexOf('全品类') >= 0
+              data[i].grossMargin = data[i].grossMargin ? data[i].grossMargin + '%' : (isqml ? '--' : '0.00%')
+              data[i].promoRatio = data[i].promoRatio ? data[i].promoRatio + '%' : (isqml ? '--' : '0.00%')
               if (data[i].category.indexOf('合计') >= 0) {
                 strongRow.push(i)
               }