|
@@ -17,7 +17,7 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="商户类型">
|
|
<a-form-item label="商户类型">
|
|
- <dealerType id="merchantInfoManagementList-dealerType" v-model="queryParam.dealerType" allowClear></dealertype>
|
|
|
|
|
|
+ <dealerType id="merchantInfoManagementList-dealerType" v-model="dealerType" @change="getDealerType" allowClear></dealertype>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -85,9 +85,9 @@
|
|
<template slot="action" slot-scope="text, record">
|
|
<template slot="action" slot-scope="text, record">
|
|
<a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
|
|
<a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
|
|
<a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
|
|
<a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
|
|
- <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
|
|
|
|
- <br>
|
|
|
|
|
|
+ <!-- <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button> -->
|
|
<a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
|
|
<a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
|
|
|
|
+ <br>
|
|
<a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT'" @click="handlePriceSpread(record)">差价</a-button>
|
|
<a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT'" @click="handlePriceSpread(record)">差价</a-button>
|
|
<a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
|
|
<a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
|
|
<span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
|
|
<span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
|
|
@@ -129,9 +129,11 @@ export default {
|
|
spinning: false,
|
|
spinning: false,
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
|
|
+ dealerType: [],
|
|
queryParam: { // 查询条件
|
|
queryParam: { // 查询条件
|
|
nameLike: '', // 商户名称、别名
|
|
nameLike: '', // 商户名称、别名
|
|
- dealerType: undefined, // 商户类型
|
|
|
|
|
|
+ dealerType1: undefined, // 商户类型
|
|
|
|
+ dealerType2: undefined, // 商户类型
|
|
dealerLevel: undefined, // 商户级别
|
|
dealerLevel: undefined, // 商户级别
|
|
subareaArea: {
|
|
subareaArea: {
|
|
subareaSn: undefined, // 区域
|
|
subareaSn: undefined, // 区域
|
|
@@ -151,7 +153,7 @@ export default {
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '12%', align: 'left', ellipsis: true },
|
|
{ title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '12%', align: 'left', ellipsis: true },
|
|
{ title: '商户别名', dataIndex: 'dealerAlias', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '商户别名', dataIndex: 'dealerAlias', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
- { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '商户类型', dataIndex: 'dealerTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '联系人', dataIndex: 'contact', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '联系人', dataIndex: 'contact', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '联系电话', dataIndex: 'dealerTelephone', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '联系电话', dataIndex: 'dealerTelephone', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -174,6 +176,9 @@ export default {
|
|
this.total = data.count || 0
|
|
this.total = data.count || 0
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
|
|
+ if (data.list[i].dealerTypeName1) {
|
|
|
|
+ data.list[i].dealerTypeName = data.list[i].dealerTypeName1 + '>' + data.list[i].dealerTypeName2
|
|
|
|
+ }
|
|
}
|
|
}
|
|
this.disabled = false
|
|
this.disabled = false
|
|
}
|
|
}
|
|
@@ -193,11 +198,17 @@ export default {
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
},
|
|
},
|
|
|
|
+ getDealerType (v, o) {
|
|
|
|
+ this.queryParam.dealerType1 = v[0]
|
|
|
|
+ this.queryParam.dealerType2 = v[1]
|
|
|
|
+ },
|
|
// 重置列表
|
|
// 重置列表
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
|
|
+ this.dealerType = []
|
|
this.queryParam = {
|
|
this.queryParam = {
|
|
nameLike: '', // 商户名称、别名
|
|
nameLike: '', // 商户名称、别名
|
|
- dealerType: undefined, // 商户类型
|
|
|
|
|
|
+ dealerType1: undefined, // 商户类型
|
|
|
|
+ dealerType2: undefined, // 商户类型
|
|
dealerLevel: undefined, // 商户级别
|
|
dealerLevel: undefined, // 商户级别
|
|
subareaArea: {
|
|
subareaArea: {
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|