|
@@ -22,7 +22,7 @@
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="是否卫星仓客户">
|
|
|
+ <a-form-item label="是否为下级">
|
|
|
<v-select code="FLAG" id="customerManagementList-satelliteFlag" v-model="queryParam.satelliteFlag" allowClear placeholder="请选择"></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -104,6 +104,13 @@
|
|
|
class="button-success"
|
|
|
@click="handleDetail(record)"
|
|
|
id="customerManagementList-detail-btn">详情</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ v-if="$hasPermissions('B_customer_customerInfo_edit')"
|
|
|
+ type="link"
|
|
|
+ class="button-primary"
|
|
|
+ @click="handleEdit(record)"
|
|
|
+ id="customerManagementList-edit-btn">合并</a-button>
|
|
|
<span v-if="!$hasPermissions('B_customer_customerInfo_edit') && !$hasPermissions('B_customer_customerInfo_detail')">--</span>
|
|
|
</template>
|
|
|
<template slot="enableAction" slot-scope="text, record">
|
|
@@ -154,7 +161,7 @@ export default {
|
|
|
{ title: '联系手机', dataIndex: 'contactMobile', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '最后销售时间', dataIndex: 'lastSaleTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '是否卫星仓', dataIndex: 'satelliteFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '是否为下级', dataIndex: 'satelliteFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
|
],
|