From 0cb51f6117f44f4df5a3622a992b914d395fe60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 10:55:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E5=92=8C=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在订单和客户管理界面中新增联系方式和公司名称字段显示
调整客户列表和订单列表的布局及字段展示
优化收款表单首次加载时的处理逻辑
---
 .../java/com/klp/crm/domain/vo/CrmOrderVo.java     |  4 ++++
 .../src/main/resources/mapper/CrmOrderMapper.xml   |  2 ++
 klp-ui/src/views/crm/components/ReceiveTable.vue   |  7 ++++++-
 klp-ui/src/views/crm/customer/index.vue            |  8 +++++---
 klp-ui/src/views/crm/order/index.vue               | 14 +++++++++-----
 5 files changed, 26 insertions(+), 9 deletions(-)

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 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!-- 客户列表区域 -->
-      <el-col :span="5" style="border-right: 1px solid #e4e7ed;">
+      <el-col :span="6" style="border-right: 1px solid #e4e7ed;">
         <div style="font-weight: 900;">客户列表</div>
         <!-- 搜索区域 -->
         <div style="display: flex; align-items: center; gap: 5px; margin-top: 10px;">
@@ -55,7 +55,9 @@
             listKey="customerId" 
             :loading="customerLoading" 
             field1="customerCode"
-            field4="companyName" 
+            field2="companyName" 
+            field4="contactPerson"
+            field5="contactWay"
             @item-click="handleItemClick"
           >
             <template slot="actions" slot-scope="{ item }">
@@ -66,7 +68,7 @@
       </el-col>
 
       <!-- 右侧内容区域 -->
-      <el-col :span="19">
+      <el-col :span="18">
         <el-tabs v-model="activeTab" type="border-card" v-if="currentCustomer && currentCustomer.customerId">
           <!-- 客户详情标签页 -->
           <el-tab-pane label="客户详情" name="detail">
diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue
index 14641861..71b71791 100644
--- a/klp-ui/src/views/crm/order/index.vue
+++ b/klp-ui/src/views/crm/order/index.vue
@@ -8,7 +8,8 @@
           <el-input style="flex: 1;" prefix-icon="el-icon-search" placeholder="输入订单编号搜索"
             v-model="queryParams.orderCode"></el-input>
           <el-button icon="el-icon-search" @click="toggleQuery"></el-button>
-          <el-button type="primary" icon="el-icon-plus" style="margin-left: 0;" @click="handleAdd" v-hasPermi="['crm:order:add']"></el-button>
+          <el-button type="primary" icon="el-icon-plus" style="margin-left: 0;" @click="handleAdd"
+            v-hasPermi="['crm:order:add']"></el-button>
         </div>
         <div v-show="showQuery"
           style="display: flex; align-items: center; gap: 5px; margin-top: 10px; flex-wrap: wrap;">
@@ -29,10 +30,11 @@
         </div>
         <div>
           <!-- 列表区域 -->
-          <KLPList :listData="orderList" listKey="orderId" :loading="orderLoading" field1="orderCode" field4="salesman"
-            @item-click="handleOrderClick">
+          <KLPList :listData="orderList" listKey="orderId" :loading="orderLoading" field1="orderCode" field2="salesman"
+            field4="companyName" field5="contactPerson"  @item-click="handleOrderClick">
             <template slot="actions" slot-scope="{ item }">
-              <el-button type="danger" size="mini" @click="handleDelete(item)" icon="el-icon-delete" v-hasPermi="['crm:order:add']"></el-button>
+              <el-button type="danger" size="mini" @click="handleDelete(item)" icon="el-icon-delete"
+                v-hasPermi="['crm:order:add']"></el-button>
             </template>
           </KLPList>
         </div>
@@ -46,8 +48,10 @@
               <!-- 订单详情内容 -->
               <el-descriptions :column="2" :border="true" title="订单基本信息" style="margin-bottom: 20px;">
                 <el-descriptions-item label="订单编号">{{ form.orderCode }}</el-descriptions-item>
-                <el-descriptions-item label="客户">{{ form.customerId }}</el-descriptions-item>
                 <el-descriptions-item label="销售员">{{ form.salesman }}</el-descriptions-item>
+                <el-descriptions-item label="客户公司">{{ form.companyName }}</el-descriptions-item>
+                <el-descriptions-item label="联系人">{{ form.contactPerson }}</el-descriptions-item>
+                <el-descriptions-item label="联系电话">{{ form.contactWay }}</el-descriptions-item>
                 <el-descriptions-item label="备注" :span="2">{{ form.remark }}</el-descriptions-item>
               </el-descriptions>