lilei 1 hari lalu
induk
melakukan
fe91c02849
1 mengubah file dengan 14 tambahan dan 4 penghapusan
  1. 14 4
      src/views/reportData/promotionSalesRealTimeReport/list.vue

+ 14 - 4
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -291,13 +291,23 @@ export default {
         }
         return obj
       }
+      const rowspanMix2 = function (value, row, index) {
+        const obj = {
+          children: (value || value == 0) ? _this.toThousands(value) : '--',
+          attrs: {}
+        }
+        if (row.rowspan1 != undefined) {
+          obj.attrs.rowSpan = row.rowspan1
+        }
+        return obj
+      }
       return [
         {
           title: '销售单号',
           dataIndex: 'salesBillNo',
           width: '120px',
           align: 'center',
-          customRender: (value, row, index) => rowspanMix(value, row, index)
+          customRender: rowspanMix
         },
         {
           title: '区域',
@@ -399,21 +409,21 @@ export default {
           dataIndex: 'totalRealAmountSum',
           width: '100px',
           align: 'right',
-          customRender: rowspanMix1
+          customRender: rowspanMix2
         },
         {
           title: '开单金额',
           dataIndex: 'totalAmountSum',
           width: '100px',
           align: 'right',
-          customRender: rowspanMix1
+          customRender: rowspanMix2
         },
         {
           title: '成本金额',
           dataIndex: 'totalRealCostSum',
           width: '100px',
           align: 'right',
-          customRender: rowspanMix1
+          customRender: rowspanMix2
         },
         {
           title: '规则数量(非促)',