Ver código fonte

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

李磊 2 meses atrás
pai
commit
704067ecf9

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

@@ -96,13 +96,13 @@ const renderContent = (value, row, index) => {
   const retVal = ret == 0 ? '0.00' : ret
   if (strongRow.indexOf(index) >= 0) {
     return {
-      children: retVal,
+      children: retVal == '--' ? '' : retVal,
       attrs: {
         style: 'font-weight: bold;color:red;font-size:14px;'
       }
     }
   }
-  return retVal
+  return retVal == '--' ? '' : retVal
 }
 export default {
   name: 'RegionTypeBusinessReportList',
@@ -143,9 +143,15 @@ 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].grossMargin + '%' : (isqml ? '' : '0.00%')
-              data[i].promoRatio = data[i].promoRatio ? data[i].promoRatio + '%' : (isqml ? '' : '0.00%')
+              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].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')
+              data[i].promo = data[i].promo || data[i].promo == 0 ? data[i].promo.toFixed(2) : (isqml ? '--' : '0.00')
+              data[i].removePromoGross = data[i].removePromoGross ? data[i].removePromoGross.toFixed(2) : (isqml ? '--' : '0.00')
+
               if (data[i].category.indexOf('合计') >= 0) {
                 strongRow.push(i)
               }
@@ -175,7 +181,7 @@ export default {
       const arr = [
         { title: '类别',
           dataIndex: 'category',
-          width: '25%',
+          width: '15%',
           align: 'center',
           customRender: (text, row, index) => {
             return row.category.indexOf('合计') < 0 ? <a-button size="small" type="link" class="button-default">{text}</a-button> : (<a-button size="small" type="link" class="button-error" style="font-weight:bold;font-size:14px;">{text}</a-button>)