diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java index 13463f31..e56ea33e 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java @@ -116,6 +116,10 @@ public class CrmOrderVo extends BaseEntity { // @ExcelProperty(value = "地址") private String address; + private String contactWay; + + private String companyName; + //创建人 private String createByName; //更新人 diff --git a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml index 88dea3e1..d8421338 100644 --- a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml +++ b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml @@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" co.update_time AS updateTime, cu.customer_code AS customerCode, cu.contact_person AS contactPerson, + cu.contact_way AS contactWay, + cu.company_name AS companyName, cu.address AS address FROM crm_order co LEFT JOIN crm_customer cu ON co.customer_id = cu.customer_id diff --git a/klp-ui/src/views/crm/components/ReceiveTable.vue b/klp-ui/src/views/crm/components/ReceiveTable.vue index 68f793f9..77eb27a1 100644 --- a/klp-ui/src/views/crm/components/ReceiveTable.vue +++ b/klp-ui/src/views/crm/components/ReceiveTable.vue @@ -247,7 +247,8 @@ export default { // 收款表单参数 receiveForm: {}, // 是否显示收款弹出层 - receiveOpen: false + receiveOpen: false, + isFirst: true, }; }, methods: { @@ -258,6 +259,10 @@ export default { this.receivableList = response.rows; this.total = response.total; this.loading = false; + if (this.isFirst) { + this.isFirst = false; + return; + } updateOrder({ orderId: this.orderId, unpaidAmount: this.unreceivedAmount, diff --git a/klp-ui/src/views/crm/customer/index.vue b/klp-ui/src/views/crm/customer/index.vue index 1f00e3fc..bccf8c7b 100644 --- a/klp-ui/src/views/crm/customer/index.vue +++ b/klp-ui/src/views/crm/customer/index.vue @@ -2,7 +2,7 @@
- +
客户列表
@@ -55,7 +55,9 @@ listKey="customerId" :loading="customerLoading" field1="customerCode" - field4="companyName" + field2="companyName" + field4="contactPerson" + field5="contactWay" @item-click="handleItemClick" >