소스 검색

修改bug

chenrui 1 년 전
부모
커밋
be6d3c5e84
3개의 변경된 파일101개의 추가작업 그리고 141개의 파일을 삭제
  1. 42 36
      src/views/reportData/salesDetails/list.vue
  2. 52 98
      src/views/reportData/salesOrderTotal/list.vue
  3. 7 7
      src/views/reportData/salesReturnDetailReport/list.vue

+ 42 - 36
src/views/reportData/salesDetails/list.vue

@@ -123,9 +123,9 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-                <a-form-item label="客服">
+                <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
@@ -196,18 +196,20 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
-import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import reportModal from '@/views/common/reportModal.vue'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import customerService from '@/views/common/customerService'
 import BizUser from '@/views/common/bizUser.js'
-import { hdExportExcel } from '@/libs/exportExcel'
+// 接口
 import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
 export default {
   name: 'SalesDetailsList',
@@ -217,55 +219,61 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false, // 导出加载状态
+      tableHeight: 0, // 表格高度
+      showExport: false, // 导出提示弹窗
+      //  查询条件
+      queryParam: {
+        // 默认时间
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        salesBillNo: '',
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
+        salesBillNo: '', // 销售单号
         dispatchBillNo: '', // 备货单号
-        productCode: '',
-        productName: '',
-        dealerName: '',
-        dealerLevel: undefined,
+        productCode: '', // 产品编码
+        productName: '', // 产品名称
+        dealerName: '', // 客户名称
+        dealerLevel: undefined, // 客户等价
         productBrandTypeSn: undefined,
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined,
-          bizUserSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined, // 分区
+          bizUserSn: undefined// 区域负责人
         },
-        dealerProvinceSn: undefined,
-        dealerCitySn: undefined,
-        dealerCountySn: undefined,
-        warehouseSn: undefined,
-        giftFLag: undefined,
-        promotionFlag: undefined,
+        dealerProvinceSn: undefined, // 省
+        dealerCitySn: undefined, // 市
+        dealerCountySn: undefined, // 区
+        warehouseSn: undefined, // 出库仓库
+        giftFLag: undefined, // 是否是促销产品  1是  0不是
+        promotionFlag: undefined, // 产品类型
         bizUserSn: undefined // 客服
       },
-      productType: [],
+      productType: [], // 产品分类
+      totalData: null, // 统计数据
       rules: {
         'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
+        // 查询列表
         return reportSalesBillDetailList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 统计查询
             this.getCount(params)
+            // 计算列表序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -275,8 +283,7 @@ export default {
           this.spinning = false
           return data
         })
-      },
-      totalData: null
+      }
     }
   },
   computed: {
@@ -338,6 +345,7 @@ export default {
     }
   },
   watch: {
+    // 展开收起
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -349,10 +357,6 @@ export default {
     }
   },
   methods: {
-    // 盘点库存日期
-    handleStock () {
-      this.$message.info('无盘点区间的起始/终止时间,请自行选择日期区间查询!')
-    },
     // 总计
     getCount (params) {
       reportSalesBillDetailCount(params).then(res => {
@@ -363,6 +367,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -374,7 +379,7 @@ export default {
         }
       })
     },
-    //  创建时间  change
+    //  下推时间  change
     dateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.time = date
@@ -384,9 +389,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
-    custChange (val) {
-      this.queryParam.dealerSn = val.key
-    },
+    //  区域  change
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -456,11 +459,13 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    // 地区  change
     areaChange (val) {
       this.queryParam.dealerProvinceSn = val[0] ? val[0] : ''
       this.queryParam.dealerCitySn = val[1] ? val[1] : ''
       this.queryParam.dealerCountySn = val[2] ? val[2] : ''
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -468,6 +473,7 @@ export default {
       })
       _this.resetSearchForm()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 215

+ 52 - 98
src/views/reportData/salesOrderTotal/list.vue

@@ -90,18 +90,12 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-                <a-form-item label="客服">
+                <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
-              <!-- <a-button
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="salesOrderTotalList-stockDate">盘点区间日期</a-button> -->
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -182,87 +176,67 @@
 </template>
 
 <script>
-import {
-  commonMixin
-} from '@/utils/mixin'
+import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
-import {
-  STable,
-  VSelect
-} from '@/components'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
+import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import customerService from '@/views/common/customerService.vue'
 import Area from '@/views/common/area.js'
-import {
-  hdExportExcel
-} from '@/libs/exportExcel'
-import {
-  userQueryList
-} from '@/api/power-user'
-import {
-  reportSalesBillList,
-  reportSalesBillCount,
-  reportSalesBillExport
-} from '@/api/reportData'
+// 接口
+import { userQueryList } from '@/api/power-user'
+import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from '@/api/reportData'
 export default {
   name: 'SalesOrderTotalList',
   mixins: [commonMixin],
-  components: {
-    STable,
-    VSelect,
-    rangeDate,
-    custList,
-    subarea,
-    reportModal,
-    Area,
-    customerService
-  },
+  components: { STable, VSelect, rangeDate, custList, subarea, reportModal, Area, customerService },
   data () {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      disabled: false, //  查询、重置按钮是否可操作
+      tableHeight: 0, // 表格高度
+      exportLoading: false, //  导出按钮加载状态
+      showExport: false, // 导出到下载中心弹窗
+      //  查询参数
+      queryParam: {
+        // 默认时间
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
-        salesBillNo: '',
-        dealerName: '',
-        dealerLevel: undefined,
-        operatorSn: undefined,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
+        salesBillNo: '', // 销售单号
+        dealerName: '', // 客户名称
+        dealerLevel: undefined, // 客户级别
+        operatorSn: undefined, // 操作员sn
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined// 分区
         },
-        dealerProvinceSn: undefined,
-        bizUserSn: undefined
-      },
-      rules: {
-        'time': [{
-          required: true,
-          message: '请选择下推时间',
-          trigger: 'change'
-        }]
+        dealerProvinceSn: undefined, // 省份
+        bizUserSn: undefined// 客服
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
+      rules: { 'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }] }, // 查询时间必选项
+
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
+        // 列表查询
         return reportSalesBillList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 统计查询
             this.getCount(params)
+            // 计算序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -273,9 +247,9 @@ export default {
           return data
         })
       },
-      totalData: null,
+      totalData: null, // 合计统计
       operatorList: [], //  操作员下拉数据
-      addrProvinceList: [], //  省下拉
+      // 列表列显示
       colsArr: [
         {
           title: '直接差价金额(明细)',
@@ -290,7 +264,7 @@ export default {
           disabled: !this.$hasPermissions('M_salesOrderTotalList_salesPrice')
         }
       ],
-      showCols: []// 需要显示
+      showCols: []// 已勾选显示的
     }
   },
   computed: {
@@ -318,8 +292,8 @@ export default {
         // { title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-
       ]
+      // 根据权限及勾选按原型图固定顺序动态显示列
       if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
         arr.push({ title: '实售金额', dataIndex: 'totalRealAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '开单金额', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -328,15 +302,7 @@ export default {
         arr.push({ title: '成本金额', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '成本金额(促)', dataIndex: 'totalGiftCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
-          arr.push({
-            title: '毛利',
-            dataIndex: 'grossProfit',
-            width: 70,
-            align: 'right',
-            customRender: function (text) {
-              return ((text || text == 0) ? _this.toThousands(text) : '--')
-            }
-          })
+          arr.push({ title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         }
       }
       if (this.$hasPermissions('M_salesOrderTotalList_provincePrice')) {
@@ -363,23 +329,13 @@ export default {
         arr.push({ title: '间接差价金额', dataIndex: 'reportRebateAmountInfo.indirectRebateAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '返利', dataIndex: 'reportRebateAmountInfo.rebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '优惠金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        // arr.push({ title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        // arr.push({ title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      arr.push({
-        title: '操作员',
-        dataIndex: 'operatorName',
-        width: 100,
-        align: 'center',
-        customRender: function (text) {
-          return text || '--'
-        },
-        ellipsis: true
-      })
+      arr.push({ title: '操作员', dataIndex: 'operatorName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       return arr
     }
   },
   watch: {
+    // 展开收起
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -391,10 +347,6 @@ export default {
     }
   },
   methods: {
-    // 盘点库存日期
-    handleStock () {
-      this.$message.info('无盘点区间的起始/终止时间,请自行选择日期区间查询!')
-    },
     // 总计
     getCount (params) {
       reportSalesBillCount(params).then(res => {
@@ -405,6 +357,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -416,7 +369,7 @@ export default {
         }
       })
     },
-    //  创建时间  change
+    //  下推时间  change
     dateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.time = date
@@ -426,14 +379,12 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
-    custChange (val) {
-      this.queryParam.dealerSn = val.key
-    },
+    // 所在区域查询
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
-    //  重置
+    //  重置列表
     resetSearchForm () {
       this.queryParam.time = [
         getDate.getCurrMonthDays().starttime,
@@ -477,12 +428,7 @@ export default {
         }
       })
     },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
-    // 操作员
+    // 操作员列表获取 无分页
     getUserList () {
       userQueryList({}).then(res => {
         if (res.status == 200) {
@@ -492,6 +438,13 @@ export default {
         }
       })
     },
+    // 操作员列名称筛选
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    // 初始化
     pageInit () {
       const _this = this
       _this.getUserList()
@@ -499,6 +452,7 @@ export default {
         _this.setTableH()
       })
     },
+    // 计算页面高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 252

+ 7 - 7
src/views/reportData/salesReturnDetailReport/list.vue

@@ -169,7 +169,7 @@
           :data="loadData"
           :pageSize="30"
           :style="{ height: tableHeight+70+'px' }"
-          :scroll="{ x: 2960, y: tableHeight - 60 }"
+          :scroll="{ x: 2960, y: tableHeight - 100 }"
           :defaultLoadData="false"
           bordered>
           <!-- 产品编码 -->
@@ -180,11 +180,11 @@
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">开单退货金额:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? toThousands(totalData.totalPrice) : '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')&&showCols.includes('priceOrig')">退货开单(折前):{{ (totalData && (totalData.totalAmountOrig || totalData.totalAmountOrig==0)) ? toThousands(totalData.totalAmountOrig) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')&&showCols.includes('priceOrig')">退货开单金额(折前):{{ (totalData && (totalData.totalAmountOrig || totalData.totalAmountOrig==0)) ? toThousands(totalData.totalAmountOrig) : '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')&&showCols.includes('realSalePriceOrig')">退货实售(折前):{{ (totalData && (totalData.totalRealAmountOrig || totalData.totalRealAmountOrig==0)) ? toThousands(totalData.totalRealAmountOrig) : '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">直接差价:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">间接差价:{{ (totalData && (totalData.indirectRebateAmount || totalData.indirectRebateAmount==0)) ? toThousands(totalData.indirectRebateAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')&&showCols.includes('realSalePriceOrig')">退货实售金额(折前):{{ (totalData && (totalData.totalRealAmountOrig || totalData.totalRealAmountOrig==0)) ? toThousands(totalData.totalRealAmountOrig) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">直接差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">间接差价金额:{{ (totalData && (totalData.indirectRebateAmount || totalData.indirectRebateAmount==0)) ? toThousands(totalData.indirectRebateAmount) : '--' }}</a-col>
               <a-col :md="4" :sm="24">仓库实收数量:{{ (totalData && (totalData.receiveQty || totalData.receiveQty==0)) ? totalData.receiveQty : '--' }}</a-col>
               <a-col :md="4" :sm="24">坏件数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
               <a-col :md="4" :sm="24">良品数量:{{ (totalData && (totalData.goodQty || totalData.goodQty==0)) ? totalData.goodQty : '--' }}</a-col>
@@ -378,11 +378,11 @@ export default {
       if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {
         arr.push({ title: '直接差价', dataIndex: 'reportRebateAmountInfo.directRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         if (this.showCols.includes('directRebatePriceOrig')) {
-          arr.push({ title: '直接差价(折前)', dataIndex: 'directRebatePriceOrig', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+          arr.push({ title: '直接差价(折前)', dataIndex: 'directRebateAmountOrig', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         }
         arr.push({ title: '间接差价', dataIndex: 'reportRebateAmountInfo.indirectRebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         if (this.showCols.includes('indirectRebatePriceOrig')) {
-          arr.push({ title: '间接差价(折前)', dataIndex: 'indirectRebatePriceOrig', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+          arr.push({ title: '间接差价(折前)', dataIndex: 'indirectRebateAmountOrig', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         }
         arr.push({ title: '直接上级差价金额', dataIndex: 'reportRebateAmountInfo.directRebateUpAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '间接上级差价金额', dataIndex: 'reportRebateAmountInfo.indirectRebateUpAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })