Browse Source

修改bug

chenrui 1 năm trước cách đây
mục cha
commit
bf19aeee3b

+ 4 - 4
src/api/reportData.js

@@ -1266,7 +1266,7 @@ export const queryTireCount = (params) => {
     method: 'post'
   })
 }
-// 轮胎统计报表  出入库明细列表
+// 轮胎明细报表  出入库明细列表
 export const outDetailList = (params) => {
   const url = `/report/tireRptDealerDayOutStock/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -1280,10 +1280,10 @@ export const outDetailList = (params) => {
     }
   })
 }
-// 轮胎统计报表  导出
-export const excelTireOnlineExport = (params) => {
+// 轮胎明细报表  导出
+export const tireDetailListExport = (params) => {
   return axios({
-    url: '/report/tire/excelTireOnlineList',
+    url: '/report/tireRptDealerProductDay/importDetail',
     data: params,
     method: 'post',
     responseType: 'blob',

+ 0 - 18
src/libs/getDate.js

@@ -96,15 +96,6 @@ export default {
     obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
-  getCurrMonthDaysInfo () {
-    const obj = {
-      starttime: '',
-      endtime: ''
-    }
-    obj.starttime = moment(moment().month(moment().month() - 1).valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
-    return obj
-  },
   // 获取当前月的开始到当天结束时间
   getCurrLastMonthDays () {
     const obj = {
@@ -135,15 +126,6 @@ export default {
     obj.endtime = moment(moment().month(moment().month() - 3).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
-  getThreeMonthDaysInfo () {
-    const obj = {
-      starttime: '',
-      endtime: ''
-    }
-    obj.starttime = moment(moment().month(moment().month() - 3).valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 3).endOf('month').valueOf()).format('YYYY-MM-DD')
-    return obj
-  },
   // 获取近三个月的开始结束时间
   getThreeMonthCurrDays () {
     const obj = {

+ 65 - 48
src/views/reportData/tireSalesReport/detailList.vue

@@ -8,11 +8,12 @@
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
+          :rules="rules"
           :model="queryParam">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="日期">
-                <rangeDate ref="rangeDate" :showTime="false" :value="time" @change="dateChange" />
+              <a-form-model-item label="日期" prop="time">
+                <rangeDate ref="rangeDate" :showTime="false" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -62,7 +63,7 @@
               <a-button
                 style="margin-left: 5px"
                 type="primary"
-                @click="$refs.table.refresh(true)"
+                @click="handleSearch"
                 :disabled="disabled"
                 id="tireSalesDealerList-refresh">查询</a-button>
               <a-button
@@ -104,9 +105,8 @@
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :rowKey="(record) => record.no"
+          :rowKey="(record) => record.id"
           :style="{ height: tableHeight+70+'px' }"
-          rowKeyName="no"
           :columns="columns"
           :data="loadData"
           :scroll="{ x:2500,y: tableHeight-120}"
@@ -159,16 +159,15 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import outDetailModal from './outDetailModal'
-import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
 import reportModal from '@/views/common/reportModal.vue'
+import outDetailModal from './outDetailModal'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { queryTireCount, excelTireOnlineExport, tireReportDetailList, outDetailList } from '@/api/reportData'
+import { queryTireCount, tireDetailListExport, tireReportDetailList } from '@/api/reportData'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {
   name: 'TireSalesDealerList',
@@ -177,15 +176,13 @@ export default {
   data () {
     return {
       spinning: false,
+      disabled: false, //  查询、重置按钮是否可操作
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
-      time: [
-        getDate.getThreeMonthDaysInfo().starttime,
-        getDate.getCurrMonthDaysInfo().endtime
-      ],
       queryParam: { //  查询条件
-        bizBeginDate: getDate.getThreeMonthDaysInfo().starttime.replace(/-/g, ''),
-        bizEndDate: getDate.getCurrMonthDaysInfo().endtime.replace(/-/g, ''),
+        time: [],
+        bizBeginDate: '',
+        bizEndDate: '',
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
@@ -200,14 +197,19 @@ export default {
         productWord: '', // 产品编码/原厂编码
         productName: '' // 产品名称
       },
-      disabled: false, //  查询、重置按钮是否可操作
+
       exportLoading: false,
       showExport: false,
+      rules: {
+        'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
+      },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam)
+        const oldParams = Object.assign(parameter, this.queryParam)
+        const params = JSON.parse(JSON.stringify(oldParams))
+        delete params.time
         return tireReportDetailList(params).then(res => {
           let data
           if (res.status == 200) {
@@ -246,7 +248,7 @@ export default {
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '12%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域负责人', dataIndex: 'bizUserName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '区域负责人', dataIndex: 'bizUserName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -254,33 +256,53 @@ export default {
         { title: '产品尺寸', dataIndex: 'productEntity.size', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总部订货数量', dataIndex: 'sysOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '上级订货数量', dataIndex: 'upOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '跨地区订货数量', dataIndex: 'crossRegionQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '累计入库数量', dataIndex: 'putQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货数量', dataIndex: 'returnQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户现有库存数量', dataIndex: 'buyAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '客户现有库存金额', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '客户现有库存金额', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库加盟商数量', dataIndex: 'outQtyDealer', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库终端数量', dataIndex: 'outQtyTerminal', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '累计出库数量', dataIndex: 'outQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: <div>已绑质保单<div>数量</div></div>, dataIndex: 'warrantyAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      // if (this.$hasPermissions('M_tireSalesReportList_salesPrice')) {
-      //   arr.splice(11, 0, { title: '订货金额', dataIndex: 'buyPriceAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      // }
+      if (this.$hasPermissions('M_tireSalesReportList_salesPrice')) {
+        arr.splice(12, 0, { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(14, 0, { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(16, 0, { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(18, 0, { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(20, 0, { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(22, 0, { title: '客户现有库存金额', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(24, 0, { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(26, 0, { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(28, 0, { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },
   methods: {
+    // 查询
+    handleSearch () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          _this.$refs.table.refresh(true)
+        } else {
+          _this.$message.error('请选择日期')
+          return false
+        }
+      })
+    },
     custChange (val) {
       this.queryParam.dealerName = val.name
       this.queryParam.dealerSn = val.key
@@ -314,15 +336,15 @@ export default {
       this.queryParam.citySn = val[1] ? val[1] : undefined
       this.queryParam.districtSn = val[2] ? val[2] : undefined
     },
-    //  下推时间  change
+    //  日期选择  change
     dateChange (date) {
       if (date[0] && date[1]) {
-        this.time = date
+        this.queryParam.time = date
       } else {
-        this.time = []
+        this.queryParam.time = []
       }
-      this.queryParam.bizBeginDate = date[0].replace(/-/g, '') || ''
-      this.queryParam.bizEndDate = date[1].replace(/-/g, '') || ''
+      this.queryParam.bizBeginDate = date[0] ? date[0].replace(/-/g, '') : ''
+      this.queryParam.bizEndDate = date[1] ? date[1].replace(/-/g, '') : ''
     },
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
@@ -330,13 +352,10 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.time = [
-        getDate.getThreeMonthDaysInfo().starttime,
-        getDate.getCurrMonthDaysInfo().endtime
-      ]
-      this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.bizBeginDate = getDate.getThreeMonthDaysInfo().starttime.replace(/-/g, '')
-      this.queryParam.bizEndDate = getDate.getCurrMonthDaysInfo().endtime.replace(/-/g, '')
+      this.queryParam.time = []
+      this.$refs.rangeDate.resetDate()
+      this.queryParam.bizBeginDate = ''
+      this.queryParam.bizEndDate = ''
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
@@ -344,17 +363,16 @@ export default {
       this.queryParam.dealerSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.queryParam.dealerLevel = undefined
       this.queryParam.bizUserSn = undefined
       this.queryParam.productWord = undefined
       this.queryParam.productName = undefined
-      this.queryParam.dealerLevel = undefined
+      this.$refs.subarea.clearData()
+      this.$refs.dealerSubareaScopeList.resetForm()
       this.totalData = null
       this.$refs.areaList.clearData()
-      if (this.advanced) {
-        this.$refs.dealerSubareaScopeList.resetForm()
-        this.$refs.subarea.clearData()
-      }
       this.$refs.table.clearTable()
+      this.$refs.ruleForm.resetFields()
     },
     //  导出
     handleExport () {
@@ -364,7 +382,7 @@ export default {
       _this.spinning = true
       _this.showExport = true
       _this.$store.state.app.curActionPermission = 'B_tireSalesReportExport'
-      hdExportExcel(excelTireOnlineExport, params, '轮胎统计报表', function () {
+      hdExportExcel(tireDetailListExport, params, '轮胎明细报表', function () {
         _this.exportLoading = false
         _this.spinning = false
         _this.$store.state.app.curActionPermission = ''
@@ -375,7 +393,6 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
-      this.resetSearchForm()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 21 - 13
src/views/reportData/tireSalesReport/list.vue

@@ -94,7 +94,7 @@
           :defaultLoadData="false"
           bordered>
           <template slot="addressInfo" slot-scope="text, record">
-            {{ record.provinceName }}{{ '/'+record.cityName }}{{ '/'+record.districtName }}
+            {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
           </template>
           <template slot="footer">
             <a-row :gutter="15">
@@ -216,28 +216,36 @@ export default {
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部订货数量', dataIndex: 'sysOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '上级订货数量', dataIndex: 'upOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '跨地区订货数量', dataIndex: 'crossRegionQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '累计入库数量', dataIndex: 'putQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货数量', dataIndex: 'returnQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户现有库存数量', dataIndex: 'buyAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '客户现有库存金额', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '客户现有库存金额', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库加盟商数量', dataIndex: 'outQtyDealer', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库终端数量', dataIndex: 'outQtyTerminal', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '累计出库数量', dataIndex: 'outQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: <div>已绑质保单<div>数量</div></div>, dataIndex: 'warrantyAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      // if (this.$hasPermissions('M_tireSalesReportList_salesPrice')) {
-      //   arr.splice(11, 0, { title: '订货金额', dataIndex: 'buyPriceAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      // }
+      if (this.$hasPermissions('M_tireSalesReportList_salesPrice')) {
+        arr.splice(8, 0, { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(12, 0, { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(14, 0, { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(16, 0, { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(18, 0, { title: '客户现有库存金额', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(20, 0, { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(22, 0, { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(24, 0, { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },