Преглед на файлове

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

lilei преди 3 години
родител
ревизия
56e3efb043

+ 0 - 1
src/App.vue

@@ -50,7 +50,6 @@ export default {
     position: fixed;
     z-index: 100000;
     background: red;
-    width: 230px;
     text-align: center;
     color: #fff;
     font-size: 30px;

+ 19 - 0
src/api/reportData.js

@@ -64,6 +64,25 @@ export const reportBigCustomerCount = (params) => {
     method: 'post'
   })
 }
+// 连锁大客户报表-分页列表
+export const reportBigCustomerLinkageList = (params) => {
+  const url = `report/reportBigCustomer/linkageReportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 连锁大客户报表-列表合计
+export const reportBigCustomerLinkageCount = (params) => {
+  return axios({
+    url: 'report/reportBigCustomer/linkageReportCount',
+    data: params,
+    method: 'post'
+  })
+}
 // 连锁销售报表-分页列表
 export const reportSalesBillList = (params) => {
   const url = `/report/reportSalesBill/reportPage/${params.pageNo}/${params.pageSize}`

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="230px"
+    width="190px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

+ 2 - 2
src/components/global.less

@@ -133,7 +133,7 @@ body {
       transition: width 0.2s;
 
       &.ant-header-side-opened {
-        width: calc(100% - 230px);
+        width: calc(100% - 190px);
       }
 
       &.ant-header-side-closed {
@@ -151,7 +151,7 @@ body {
       right:0;
       margin: auto;
       &.ant-header-side-opened {
-        width: calc(100% - 230px);
+        width: calc(100% - 190px);
       }
       
       &.ant-header-side-closed {

+ 29 - 4
src/config/router.config.js

@@ -1407,7 +1407,7 @@ export const asyncRouterMap = [
             name: 'chainStockReport',
             component: BlankLayout,
             meta: {
-              title: '连锁库存总表(天)',
+              title: '连锁库存总表',
               icon: 'profile',
               permission: 'M_chainStockReportList'
             },
@@ -1432,7 +1432,7 @@ export const asyncRouterMap = [
             name: 'chainSalesReport',
             component: BlankLayout,
             meta: {
-              title: '连锁销售报表(天)',
+              title: '连锁销售报表',
               icon: 'profile',
               permission: 'M_chainSalesReportList'
             },
@@ -1457,7 +1457,7 @@ export const asyncRouterMap = [
             name: 'chainSalesDetailReport',
             component: BlankLayout,
             meta: {
-              title: '连锁销售明细报表(天)',
+              title: '连锁销售明细报表',
               icon: 'profile',
               permission: 'M_chainSalesDetailReportList'
             },
@@ -1507,7 +1507,7 @@ export const asyncRouterMap = [
             name: 'customerReport',
             component: BlankLayout,
             meta: {
-              title: '大客户报表(天)',
+              title: '大客户报表',
               icon: 'profile',
               permission: 'M_customerReportList'
             },
@@ -1526,6 +1526,31 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/reportData/chainCustomerReport',
+            redirect: '/reportData/chainCustomerReport/list',
+            name: 'chainCustomerReport',
+            component: BlankLayout,
+            meta: {
+              title: '连锁大客户报表',
+              icon: 'profile',
+              permission: 'M_chainCustomerReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'chainCustomerReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/chainCustomerReport/list.vue'),
+                meta: {
+                  title: '连锁大客户报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_chainCustomerReportList'
+                }
+              }
+            ]
+          },
           {
             path: '/reportData/stockIncomeReport',
             redirect: '/reportData/stockIncomeReport/list',

+ 2 - 2
src/layouts/BasicLayout.vue

@@ -130,7 +130,7 @@ export default {
         return '0'
       }
       if (this.sidebarOpened) {
-        return '230px'
+        return '190px'
       }
       return '80px'
     },
@@ -220,7 +220,7 @@ export default {
     paddingCalc () {
       let left = ''
       if (this.sidebarOpened) {
-        left = this.isDesktop() ? '230px' : '80px'
+        left = this.isDesktop() ? '190px' : '80px'
       } else {
         left = (this.isMobile() && '0') || ((this.fixSidebar && '80px') || '0')
       }

+ 0 - 1
src/permission.js

@@ -14,7 +14,6 @@ const whiteList = ['login', 'register', 'registerResult'] // no redirect whiteli
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {
-	console.log(to,'tttttttt')
 	store.commit('TOGGLE_NOW_ROUTER',to.fullPath)
   NProgress.start() // start progress bar
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))

+ 329 - 0
src/views/reportData/chainCustomerReport/list.vue

@@ -0,0 +1,329 @@
+<template>
+  <a-card size="small" :bordered="false" class="customerReportList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div class="table-page-search-wrapper">
+        <a-form-model
+          id="customerReportList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :model="queryParam"
+          :rules="rules"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          @keyup.enter.native="handleSearch" >
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="连锁店" prop="dealerSn">
+                <a-select
+                  placeholder="请选择连锁店"
+                  id="customerReportList-dealerSn"
+                  allowClear
+                  v-model="queryParam.dealerSn"
+                  :showSearch="true"
+                  option-filter-prop="children"
+                  :filter-option="filterOption">
+                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="添加时间" prop="time">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品分类">
+                <a-cascader
+                  @change="changeProductType"
+                  change-on-select
+                  v-model="productType"
+                  expand-trigger="hover"
+                  :options="productTypeList"
+                  :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
+                  id="customerReportList-productType"
+                  placeholder="请选择产品分类"
+                  allowClear />
+              </a-form-model-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="12" :sm="24">
+                <a-row>
+                  <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }">
+                    <a-col span="7">
+                      <a-form-model-item prop="provinceSn" style="margin: 0!important;">
+                        <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                          <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="citySn" style="margin: 0!important;">
+                        <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
+                          <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="countySn" style="margin: 0!important;">
+                        <a-select v-model="queryParam.countySn" allowClear placeholder="请选择区/县">
+                          <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                  </a-form-model-item>
+                </a-row>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="customerReportList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="customerReportList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+      <!-- 合计 -->
+      <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>
+        </div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.salesTargetSn"
+        :columns="columns"
+        :data="loadData"
+        :defaultLoadData="false"
+        bordered>
+      </s-table>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import { getArea } from '@/api/data'
+import { dealerProductTypeList } from '@/api/dealerProductType'
+import { reportBigCustomerLinkageList, reportBigCustomerLinkageCount, linkageGroupList } from '@/api/reportData'
+export default {
+  components: { STable, VSelect, rangeDate },
+  data () {
+    return {
+      spinning: false,
+      labelCol: { span: 8 },
+      wrapperCol: { span: 16 },
+      advanced: true, // 高级搜索 展开/关闭
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        dealerSn: undefined,
+        time: [],
+        beginDate: '',
+        endDate: '',
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '', //  产品三级分类
+        provinceSn: undefined, //  省
+        citySn: undefined, //  市
+        countySn: undefined //  区
+      },
+      productType: [],
+      rules: {
+        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
+        'time': [{ required: true, message: '请选择添加时间', trigger: 'change' }]
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false,
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '连锁门店', dataIndex: 'dealerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { 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: 'percentageUnit', align: 'center', customRender: function (text) { return text || '--' }, sorter: true }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        const params = Object.assign(parameter, this.queryParam)
+        this.spinning = true
+        delete params.time
+        if (params.beginDate) {
+          return reportBigCustomerLinkageList(params).then(res => {
+            // 总计
+            this.getCount(params)
+            const data = res.data
+            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
+            return data
+          })
+        } else {
+          const _this = this
+          return new Promise(function (resolve, reject) {
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: [],
+              count: 0
+            }
+            _this.disabled = false
+            _this.spinning = false
+            _this.$message.info('请选择添加时间')
+            resolve(data)
+          })
+        }
+      },
+      totalData: null, //  合计
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [], //  区下拉
+      productTypeList: [], //  分类下拉数据
+      linkageGroupData: []
+    }
+  },
+  methods: {
+    // 合计
+    getCount (params) {
+      reportBigCustomerLinkageCount(params).then(res => {
+        if (res.status == 200) {
+          this.totalData = res.data
+        } else {
+          this.totalData = null
+        }
+      })
+    },
+    //  创建时间  change
+    dateChange (date) {
+      this.queryParam.time = date
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
+    },
+    //  查询
+    handleSearch () {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.$refs.table.refresh(true)
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.dealerSn = undefined
+      this.$refs.rangeDate.resetDate()
+      this.queryParam.time = []
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
+      this.queryParam.provinceSn = undefined
+      this.queryParam.citySn = undefined
+      this.queryParam.countySn = undefined
+      this.productType = []
+      this.$refs.ruleForm.resetFields()
+      this.totalData = null
+      this.$refs.table.clearTable()
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    //  产品分类  列表
+    getProductType () {
+      dealerProductTypeList({}).then(res => {
+        if (res.status == 200) {
+          this.productTypeList = res.data
+        } else {
+          this.productTypeList = []
+        }
+      })
+    },
+    // 获取城市列表
+    getCityList (val) {
+      this.addrCityList = []
+      this.addrDistrictList = []
+      this.queryParam.citySn = undefined
+      this.queryParam.countySn = undefined
+      if (val) {
+        this.getArea('city', val)
+      }
+    },
+    // 获取区县列表
+    getAreaList (val) {
+      this.addrDistrictList = []
+      this.queryParam.countySn = undefined
+      if (val) {
+        this.getArea('district', val)
+      }
+    },
+    //  省/市/区
+    getArea (leve, sn) {
+      let params
+      if (leve == 'province') {
+        params = { type: '2' }
+      } else {
+        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
+      }
+      getArea(params).then(res => {
+        if (res.status == 200) {
+          if (leve == 'province') {
+            this.addrProvinceList = res.data || []
+          } else if (leve == 'city') {
+            this.addrCityList = res.data || []
+          } else if (leve == 'district') {
+            this.addrDistrictList = res.data || []
+          }
+        } else {
+          if (leve == 'province') {
+            this.addrProvinceList = []
+          } else if (leve == 'city') {
+            this.addrCityList = []
+          } else if (leve == 'district') {
+            this.addrDistrictList = []
+          }
+        }
+      })
+    },
+    // 连锁店
+    getLinkageGroup () {
+      linkageGroupList({}).then(res => {
+        if (res.status == 200) {
+          this.linkageGroupData = res.data || []
+        } else {
+          this.linkageGroupData = []
+        }
+      })
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getLinkageGroup()
+      vm.getArea('province')
+      vm.getProductType()
+    })
+  }
+}
+</script>

+ 1 - 36
src/views/reportData/customerReport/list.vue

@@ -14,20 +14,6 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="连锁店" prop="dealerSn">
-                <a-select
-                  placeholder="请选择连锁店"
-                  id="customerReportList-dealerSn"
-                  allowClear
-                  v-model="queryParam.dealerSn"
-                  :showSearch="true"
-                  option-filter-prop="children"
-                  :filter-option="filterOption">
-                  <a-select-option v-for="item in linkageGroupData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
-                </a-select>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="添加时间" prop="time">
                 <rangeDate ref="rangeDate" @change="dateChange" />
@@ -114,7 +100,7 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { getArea } from '@/api/data'
 import { dealerProductTypeList } from '@/api/dealerProductType'
-import { reportBigCustomerList, reportBigCustomerCount, linkageGroupList } from '@/api/reportData'
+import { reportBigCustomerList, reportBigCustomerCount } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate },
   data () {
@@ -125,7 +111,6 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        dealerSn: undefined,
         time: [],
         beginDate: '',
         endDate: '',
@@ -138,7 +123,6 @@ export default {
       },
       productType: [],
       rules: {
-        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择添加时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -190,7 +174,6 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       productTypeList: [], //  分类下拉数据
-      linkageGroupData: []
     }
   },
   methods: {
@@ -223,7 +206,6 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.dealerSn = undefined
       this.$refs.rangeDate.resetDate()
       this.queryParam.time = []
       this.queryParam.beginDate = ''
@@ -306,26 +288,9 @@ export default {
         }
       })
     },
-    // 连锁店
-    getLinkageGroup () {
-      linkageGroupList({}).then(res => {
-        const all = [{ dealerName: '全部', dealerSn: 'all' }]
-        if (res.status == 200) {
-          const data = res.data || []
-          if (data.length > 0) {
-            this.linkageGroupData = [...all, ...data]
-          } else {
-            this.linkageGroupData = []
-          }
-        } else {
-          this.linkageGroupData = []
-        }
-      })
-    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getLinkageGroup()
       vm.getArea('province')
       vm.getProductType()
     })

+ 16 - 17
src/views/salesManagement/salesQuery/list.vue

@@ -101,7 +101,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1400, y:tableHeight }"
+        :scroll="{ y:tableHeight }"
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
@@ -110,7 +110,7 @@
         </template>
         <!-- 急件 -->
         <template slot="oosFlag" slot-scope="text, record">
-          <a-tag :color="record.oosFlag==1?'red':'#ccc'" >{{ record.oosFlagDictValue }}</a-tag>
+          <a-tag :color="record.oosFlag==1?'red':'#ccc'" style="margin-right: 0;" >{{ record.oosFlagDictValue }}</a-tag>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -216,21 +216,20 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '来源', dataIndex: 'salesBillSourceDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'totalCategory', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'totalQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'totalAmount', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款方式', dataIndex: 'settleStyleEntity.name', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 60, align: 'center' },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
+        { title: '来源', dataIndex: 'salesBillSourceDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '店内单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'totalAmount', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款方式', dataIndex: 'settleStyleEntity.name', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: '5%', align: 'center' },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {