|
@@ -19,7 +19,7 @@
|
|
|
<a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="客户传真:">{{ detailData&&detailData.fax || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="配送方式:">{{ detailData&&detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="是否为下级:">{{ detailData&&detailData.dealerFlagDictValue || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="客户关系:">{{ detailData&&detailData.relationTypeDictValue || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="价格类型:">{{ detailData&&detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="收款方式:">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="客户类型:">{{ detailData&&detailData.customerTypeName || '--' }}</a-descriptions-item>
|
|
@@ -28,14 +28,14 @@
|
|
|
<div style="padding:10px 0;border-bottom: 1px solid #eee;margin: 10px 0;">被合并的客户记录</div>
|
|
|
<div>
|
|
|
<s-table
|
|
|
- class="sTable"
|
|
|
- ref="table"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :defaultLoadData="false"
|
|
|
- bordered>
|
|
|
+ class="sTable"
|
|
|
+ ref="table"
|
|
|
+ size="small"
|
|
|
+ :rowKey="(record) => record.id"
|
|
|
+ :columns="columns"
|
|
|
+ :data="loadData"
|
|
|
+ :defaultLoadData="false"
|
|
|
+ bordered>
|
|
|
</s-table>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -80,13 +80,13 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
{ title: '合并时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '被合并客户名称', dataIndex: 'customerNameSource', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '合并后客户名称', dataIndex: 'customerNameTarget', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '合并后客户名称', dataIndex: 'customerNameTarget', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- return custMergeLogList(Object.assign(parameter, {customerSnMain:this.detailData.customerSn})).then(res => {
|
|
|
+ return custMergeLogList(Object.assign(parameter, { customerSnMain: this.detailData.customerSn })).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -99,7 +99,7 @@ export default {
|
|
|
this.spinning = false
|
|
|
return data
|
|
|
})
|
|
|
- },
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
methods: {
|