|
|
@@ -24,6 +24,23 @@
|
|
|
></InputNumber>
|
|
|
</el-form-item>
|
|
|
|
|
|
+ <el-form-item v-if="showHideItem" label="入驻平台" prop="settledPlatformId">
|
|
|
+ <el-select
|
|
|
+ v-model="searchForm.settledPlatformId"
|
|
|
+ style="width: 100%"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in settledPlatformList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item v-if="showHideItem" label="创建时间" prop="dates">
|
|
|
<el-date-picker
|
|
|
style=""
|
|
|
@@ -47,7 +64,6 @@
|
|
|
<div class="jp-table top" style="">
|
|
|
<vxe-toolbar :refresh="{query: refreshList}" ref="toolbarRef" import
|
|
|
export
|
|
|
- print
|
|
|
resizable
|
|
|
custom>
|
|
|
<template #buttons>
|
|
|
@@ -116,6 +132,7 @@
|
|
|
<vxe-column min-width="100" title="从业人员(人)" field="practitionerCount" align="center"></vxe-column>
|
|
|
<vxe-column min-width="100" title="年销售额(元)" field="annualSales" align="center"></vxe-column>
|
|
|
<vxe-column min-width="100" title="网络零售额(元)" field="onlineRetailSales" align="center"></vxe-column>
|
|
|
+ <vxe-column min-width="100" title="入驻平台" field="settledPlatformStr" align="center"></vxe-column>
|
|
|
<vxe-column min-width="100" title="创建时间" field="createTime" align="center"></vxe-column>
|
|
|
|
|
|
<vxe-column title="操作" min-width="130px" fixed="right" align="center">
|
|
|
@@ -143,6 +160,7 @@
|
|
|
|
|
|
<script>
|
|
|
import merchantCompanyService from '@/api/wdt/merchantCompany/MerchantCompanyService'
|
|
|
+ import settledPlatformService from '@/api/wdt/settledPlatform/SettledPlatformService'
|
|
|
import InputNumber from '@/views/utils/InputNumber.vue'
|
|
|
import MerchantCompanyForm from './MerchantCompanyForm'
|
|
|
export default {
|
|
|
@@ -155,6 +173,7 @@
|
|
|
num: 0,
|
|
|
visable: false,
|
|
|
gridData: [],
|
|
|
+ settledPlatformList: [],
|
|
|
searchForm: {
|
|
|
companyName: '',
|
|
|
linkmanName: '',
|
|
|
@@ -164,6 +183,7 @@
|
|
|
annualSalesList: [],
|
|
|
onlineRetailSalesList: [],
|
|
|
reportNumber: '',
|
|
|
+ settledPlatformId: '',
|
|
|
sourceType: ''
|
|
|
},
|
|
|
dataList: [],
|
|
|
@@ -190,6 +210,12 @@
|
|
|
const $toolbar = this.$refs.toolbarRef;
|
|
|
$table.connect($toolbar);
|
|
|
})
|
|
|
+
|
|
|
+ Promise.all([
|
|
|
+ settledPlatformService.list({ current: 1, size: -1 }),
|
|
|
+ ]).then((result) => {
|
|
|
+ this.settledPlatformList = result[0].records;
|
|
|
+ });
|
|
|
this.refreshList()
|
|
|
},
|
|
|
activated () {
|
|
|
@@ -317,6 +343,7 @@
|
|
|
},
|
|
|
// 自定义服务端导出
|
|
|
exportMethod ({ options }) {
|
|
|
+ console.log('进入到处系统')
|
|
|
// 传给服务端的参数
|
|
|
const params = {
|
|
|
'current': this.tablePage.currentPage,
|
|
|
@@ -331,7 +358,7 @@
|
|
|
selectIds: options.mode === 'selected' ? options.map(item => item.id) : [],
|
|
|
exportFields: options.columns.map(column => column.property)
|
|
|
}
|
|
|
- return merchantCompanyService.exportFile(params).then((res) => {
|
|
|
+ return merchantCompanyService.exportExcel(params).then((res) => {
|
|
|
// 将二进制流文件写入excel表，以下为重要步骤
|
|
|
this.$utils.downloadExcel(res, options.filename)
|
|
|
}).catch(function (err) {
|
user5