Browse Source

bug修复

chenrui 3 years ago
parent
commit
c91b09b0bd
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/views/reportData/customerReport/list.vue

+ 3 - 2
src/views/reportData/customerReport/list.vue

@@ -77,7 +77,7 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总交易金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</strong>;
-          总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage : '--' }}</strong>
+          总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage+'%' : '--' }}</strong>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -131,7 +131,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '客户名称', dataIndex: 'salesTargetName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, sorter: true },
         { title: '交易金额', dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') }, sorter: true },
-        { title: '毛利率', dataIndex: 'percentage', align: 'center', customRender: function (text) { return text || '--' }, sorter: true }
+        { title: '毛利率', dataIndex: 'percentageUnit', align: 'center', customRender: function (text) { return text || '--' }, sorter: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -147,6 +147,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              data.list[i].percentageUnit = data.list[i].percentage ? data.list[i].percentage + '%' : undefined
             }
             this.disabled = false
             this.spinning = false