From 5d978c4ac8a9f9af1b8904019e6f178723884aa6 Mon Sep 17 00:00:00 2001
From: zengqiyang <492393100@qq.com>
Date: Thu, 17 Apr 2025 09:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc/.env.development                           |    2 +-
 pc/src/api/asset/inventory.js                 |    7 +-
 pc/src/api/bak/merchant/index.js              |    7 +
 pc/src/api/bak/merchant/lead.js               |  151 ++
 pc/src/api/building.js                        |    8 +
 pc/src/api/finance.js                         |   80 +
 pc/src/api/merchant.js                        |  358 +++-
 pc/src/api/project.js                         |   11 +-
 pc/src/router/modules/finance.js              |    6 +
 pc/src/utils/auth.js                          |   56 +
 pc/src/utils/request.js                       |    4 +-
 .../asset/inventory/components/AssetForm.vue  |   24 +-
 pc/src/views/finance/chargeStandard/index.vue | 1097 +++++++++++
 .../views/merchant/clue-management/index.vue  | 1742 ++++++++++++++++-
 .../views/merchant/intent-customer/index.vue  | 1583 ++++++++++++++-
 .../merchant/merchant-personnel/index.vue     |  775 ++++----
 .../views/merchant/tag-management/index.vue   |  636 +++---
 pc/src/views/project/building/index.vue       |  110 +-
 pc/src/views/project/index.vue                |   21 +-
 .../project/room/components/RoomForm.vue      |   15 +-
 pc/src/views/project/room/index.vue           |   15 +-
 pc/vue.config.js                              |   18 +-
 22 files changed, 5806 insertions(+), 920 deletions(-)
 create mode 100644 pc/src/api/bak/merchant/index.js
 create mode 100644 pc/src/api/bak/merchant/lead.js
 create mode 100644 pc/src/utils/auth.js
 create mode 100644 pc/src/views/finance/chargeStandard/index.vue

diff --git a/pc/.env.development b/pc/.env.development
index 445b3c2..6a0355f 100644
--- a/pc/.env.development
+++ b/pc/.env.development
@@ -1,4 +1,4 @@
 NODE_ENV = 'development'
 
 # 开发环境API地址
-VUE_APP_BASE_API = http://192.168.137.38:8080
\ No newline at end of file
+VUE_APP_BASE_API = http://192.168.137.3:8080/api
\ No newline at end of file
diff --git a/pc/src/api/asset/inventory.js b/pc/src/api/asset/inventory.js
index 11d5315..d868449 100644
--- a/pc/src/api/asset/inventory.js
+++ b/pc/src/api/asset/inventory.js
@@ -83,17 +83,16 @@ export function listAssetLocationTree() {
 // 获取公司列表
 export function listCompanies() {
   return request({
-    url: '/system/company/list',
+    url: '/admin/company/getAllCompanyDetails',
     method: 'get'
   })
 }
 
 // 获取用户列表
-export function listUsers(query) {
+export function listUsers() {
   return request({
-    url: '/system/user/list',
+    url: '/v1/member/list',
     method: 'get',
-    params: query
   })
 }
 
diff --git a/pc/src/api/bak/merchant/index.js b/pc/src/api/bak/merchant/index.js
new file mode 100644
index 0000000..68df39a
--- /dev/null
+++ b/pc/src/api/bak/merchant/index.js
@@ -0,0 +1,7 @@
+// 导出所有子模块
+export * from './lead'
+
+// 未来可以添加其他子模块，如：
+// export * from './team'
+// export * from './personnel'
+// 等等 
\ No newline at end of file
diff --git a/pc/src/api/bak/merchant/lead.js b/pc/src/api/bak/merchant/lead.js
new file mode 100644
index 0000000..67f447c
--- /dev/null
+++ b/pc/src/api/bak/merchant/lead.js
@@ -0,0 +1,151 @@
+import request from '@/utils/request'
+
+// 线索状态API
+export function getLeadStatusList() {
+  return request({
+    url: '/bizLead/status/list',
+    method: 'get'
+  })
+}
+
+export function getLeadStatusDetail(id) {
+  return request({
+    url: `/bizLead/status/${id}`,
+    method: 'get'
+  })
+}
+
+export function addLeadStatus(data) {
+  return request({
+    url: '/bizLead/status',
+    method: 'post',
+    data
+  })
+}
+
+export function updateLeadStatus(data) {
+  return request({
+    url: '/bizLead/status',
+    method: 'put',
+    data
+  })
+}
+
+export function deleteLeadStatus(id, userId) {
+  return request({
+    url: `/bizLead/status/${id}`,
+    method: 'delete',
+    params: { userId }
+  })
+}
+
+export function checkLeadStatusName(statusName) {
+  return request({
+    url: '/bizLead/status/checkName',
+    method: 'get',
+    params: { statusName }
+  })
+}
+
+// 线索管理API
+export function getLeadList(params) {
+  return request({
+    url: '/bizLead/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getMyLeadList(params) {
+  return request({
+    url: '/bizLead/myLeads',
+    method: 'get',
+    params
+  })
+}
+
+export function getAllLeadList(params) {
+  return request({
+    url: '/bizLead/allLeads',
+    method: 'get',
+    params
+  })
+}
+
+export function getPublicLeadList(params) {
+  return request({
+    url: '/bizLead/publicLeads',
+    method: 'get',
+    params
+  })
+}
+
+export function getLeadDetail(id) {
+  return request({
+    url: `/bizLead/${id}`,
+    method: 'get'
+  })
+}
+
+export function addLead(data) {
+  return request({
+    url: '/bizLead',
+    method: 'post',
+    data
+  })
+}
+
+export function updateLead(data) {
+  return request({
+    url: '/bizLead',
+    method: 'put',
+    data
+  })
+}
+
+export function changeLeadStatus(id, statusId, userId) {
+  return request({
+    url: `/bizLead/${id}/status`,
+    method: 'put',
+    params: { statusId, userId }
+  })
+}
+
+export function changeLeadPersonnel(id, personnelId, userId) {
+  return request({
+    url: `/bizLead/${id}/personnel`,
+    method: 'put',
+    params: { personnelId, userId }
+  })
+}
+
+export function checkLeadPhone(phone) {
+  return request({
+    url: '/bizLead/checkPhone',
+    method: 'get',
+    params: { phone }
+  })
+}
+
+export function convertLeadToIntention(id, userId) {
+  return request({
+    url: `/bizLead/${id}/convert`,
+    method: 'post',
+    params: { userId }
+  })
+}
+
+export function deleteLead(id, userId) {
+  return request({
+    url: `/bizLead/${id}`,
+    method: 'delete',
+    params: { userId }
+  })
+}
+
+export function getLeadFollowHistory(leadId) {
+  return request({
+    url: `/bizLead/${leadId}/followHistory`,
+    method: 'get'
+  })
+} 
\ No newline at end of file
diff --git a/pc/src/api/building.js b/pc/src/api/building.js
index a8d86be..73f6970 100644
--- a/pc/src/api/building.js
+++ b/pc/src/api/building.js
@@ -129,4 +129,12 @@ export function getFloorListByBuilding(buildingId) {
     url: `/room/floor/building/${buildingId}`,
     method: 'get'
   })
+} 
+
+// 收支账号管理
+export function getAllAccounts() {
+  return request({
+    url: `/admin/account/getAllAccounts`,
+    method: 'get'
+  })
 } 
\ No newline at end of file
diff --git a/pc/src/api/finance.js b/pc/src/api/finance.js
index 3a17024..877f7ec 100644
--- a/pc/src/api/finance.js
+++ b/pc/src/api/finance.js
@@ -257,4 +257,84 @@ export function getBuildingList(projectId) {
     url: `/business/building/list/${projectId}`,
     method: 'get'
   })
+}
+
+/* 收费标准相关接口 */
+
+// 分页查询收费标准列表
+export function getChargingStandardPage(query) {
+  return request({
+    url: '/finance/charging-standard/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据ID查询收费标准详情
+export function getChargingStandardById(id) {
+  return request({
+    url: `/finance/charging-standard/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增收费标准
+export function addChargingStandard(data) {
+  return request({
+    url: '/finance/charging-standard',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改收费标准
+export function updateChargingStandard(data) {
+  return request({
+    url: '/finance/charging-standard',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除收费标准
+export function deleteChargingStandard(id) {
+  return request({
+    url: `/finance/charging-standard/${id}`,
+    method: 'delete'
+  })
+}
+
+// 更新收费标准状态（立即失效）
+export function updateChargingStandardStatus(id) {
+  return request({
+    url: `/finance/charging-standard/${id}/updateStatus`,
+    method: 'put'
+  })
+}
+
+// 检查收费标准名称是否存在
+export function checkChargingStandardName(standardName, id) {
+  return request({
+    url: '/finance/charging-standard/check-name',
+    method: 'get',
+    params: { standardName, id }
+  })
+}
+
+// 根据状态查询收费标准列表
+export function getChargingStandardListByStatus(status) {
+  return request({
+    url: '/finance/charging-standard/list-by-status',
+    method: 'get',
+    params: { status }
+  })
+}
+
+// 获取费用类型树
+export function getFeeTypeTree(params) {
+  return request({
+    url: '/feeForeign/categories',
+    method: 'get',
+    params
+  })
 } 
\ No newline at end of file
diff --git a/pc/src/api/merchant.js b/pc/src/api/merchant.js
index b42ca97..bcc6bcd 100644
--- a/pc/src/api/merchant.js
+++ b/pc/src/api/merchant.js
@@ -3,15 +3,29 @@ import request from '@/utils/request'
 // 招商团队相关API
 export function getMerchantTeamList(params) {
   return request({
-    url: '/business/team/list',
+    url: '/bizTeam/list',
     method: 'get',
     params
   })
 }
 
+export function getMerchantTeamDetail(id) {
+  return request({
+    url: `/bizTeam/${id}`,
+    method: 'get'
+  })
+}
+// 根据项目ID获取招商团队信息
+export function getMerchantTeamByProjectId(projectId) {
+  return request({
+    url: `/bizTeam/project/${projectId}`,
+    method: 'get'
+  })
+}
+
 export function addMerchantTeam(data) {
   return request({
-    url: '/business/team',
+    url: '/bizTeam',
     method: 'post',
     data
   })
@@ -19,25 +33,41 @@ export function addMerchantTeam(data) {
 
 export function updateMerchantTeam(data) {
   return request({
-    url: '/business/team',
+    url: '/bizTeam',
     method: 'put',
     data
   })
 }
 
-export function deleteMerchantTeam(id) {
+export function deleteMerchantTeam(id, userId) {
   return request({
-    url: `/business/team/${id}`,
-    method: 'delete'
+    url: `/bizTeam/${id}`,
+    method: 'delete',
+    params: { userId }
+  })
+}
+
+export function checkTeamName(params) {
+  return request({
+    url: '/bizTeam/checkName',
+    method: 'get',
+    params
+  })
+}
+
+export function getProjectsList() {
+  return request({
+    url: '/bizTeam/projects',
+    method: 'get'
   })
 }
 
 // 招商人员相关API
-export function getMerchantPersonnelList(params) {
+export function getMerchantPersonnelList(data) {
   return request({
-    url: '/business/personnel/list',
-    method: 'get',
-    params
+    url: '/bizPersonnel/queryAllPersonnel',
+    method: 'post',
+    data
   })
 }
 
@@ -57,16 +87,33 @@ export function getPersonnelDetail(id) {
 
 export function addMerchantPersonnel(data) {
   return request({
-    url: '/business/personnel',
+    url: '/bizPersonnel',
     method: 'post',
     data
   })
 }
 
-export function removeMerchantPersonnel(id) {
+export function batchAddMerchantPersonnel(data) {
   return request({
-    url: `/business/personnel/${id}`,
-    method: 'delete'
+    url: '/bizPersonnel/batch',
+    method: 'post',
+    data
+  })
+}
+
+export function removeMerchantPersonnel(id, userId) {
+  return request({
+    url: `/bizPersonnel/${id}`,
+    method: 'delete',
+    params: { userId }
+  })
+}
+
+export function checkMemberExists(params) {
+  return request({
+    url: '/bizPersonnel/checkMember',
+    method: 'get',
+    params
   })
 }
 
@@ -252,4 +299,285 @@ export function checkTagName(params) {
     method: 'get',
     params
   })
-} 
\ No newline at end of file
+}
+
+// 线索状态API
+export function getLeadStatusList() {
+  return request({
+    url: '/bizLead/status/list',
+    method: 'get'
+  })
+}
+
+export function getLeadStatusDetail(id) {
+  return request({
+    url: `/bizLead/status/${id}`,
+    method: 'get'
+  })
+}
+
+export function addLeadStatus(data) {
+  return request({
+    url: '/bizLead/status',
+    method: 'post',
+    data
+  })
+}
+
+export function updateLeadStatus(data) {
+  return request({
+    url: '/bizLead/status',
+    method: 'put',
+    data
+  })
+}
+
+export function deleteLeadStatus(id, userId) {
+  return request({
+    url: `/bizLead/status/${id}`,
+    method: 'delete',
+    params: { userId }
+  })
+}
+
+export function checkLeadStatusName(statusName) {
+  return request({
+    url: '/bizLead/status/checkName',
+    method: 'get',
+    params: { statusName }
+  })
+}
+
+// 线索管理API
+export function getLeadList(params) {
+  return request({
+    url: '/bizLead/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getMyLeadList(params) {
+  return request({
+    url: '/bizLead/myLeads',
+    method: 'get',
+    params
+  })
+}
+
+export function getAllLeadList(params) {
+  return request({
+    url: '/bizLead/allLeads',
+    method: 'get',
+    params
+  })
+}
+
+export function getPublicLeadList(params) {
+  return request({
+    url: '/bizLead/publicLeads',
+    method: 'get',
+    params
+  })
+}
+
+export function getLeadDetail(id) {
+  return request({
+    url: `/bizLead/${id}`,
+    method: 'get'
+  })
+}
+
+export function addLead(data) {
+  return request({
+    url: '/bizLead',
+    method: 'post',
+    data
+  })
+}
+
+export function updateLead(data) {
+  return request({
+    url: '/bizLead',
+    method: 'put',
+    data
+  })
+}
+
+export function changeLeadStatus(id, statusId, userId) {
+  return request({
+    url: `/bizLead/${id}/status`,
+    method: 'put',
+    params: { statusId, userId }
+  })
+}
+
+export function changeLeadPersonnel(id, personnelId, userId) {
+  return request({
+    url: `/bizLead/${id}/personnel`,
+    method: 'put',
+    params: { personnelId, userId }
+  })
+}
+
+export function checkLeadPhone(phone) {
+  return request({
+    url: '/bizLead/checkPhone',
+    method: 'get',
+    params: { phone }
+  })
+}
+
+export function convertLeadToIntention(id, userId) {
+  return request({
+    url: `/bizLead/${id}/convert`,
+    method: 'post',
+    params: { userId }
+  })
+}
+
+export function deleteLead(id, userId) {
+  return request({
+    url: `/bizLead/${id}`,
+    method: 'delete',
+    params: { userId }
+  })
+}
+
+export function getLeadFollowHistory(leadId) {
+  return request({
+    url: `/bizLead/${leadId}/followHistory`,
+    method: 'get'
+  })
+}
+
+// 意向客户相关API
+export function getCustomerDetail(id) {
+  return request({
+    url: `/bizCustomer/${id}`,
+    method: 'get'
+  })
+}
+
+export function createCustomer(data) {
+  return request({
+    url: '/bizCustomer',
+    method: 'post',
+    data
+  })
+}
+
+export function updateCustomer(data) {
+  return request({
+    url: '/bizCustomer',
+    method: 'put',
+    data
+  })
+}
+
+export function deleteCustomer(id) {
+  return request({
+    url: `/bizCustomer/${id}`,
+    method: 'delete'
+  })
+}
+
+export function changeCustomerPersonnel(id, personnelId) {
+  return request({
+    url: `/bizCustomer/personnel/${id}/${personnelId}`,
+    method: 'put'
+  })
+}
+
+export function changeCustomerStatus(id, statusId) {
+  return request({
+    url: `/bizCustomer/status/${id}/${statusId}`,
+    method: 'put'
+  })
+}
+
+export function checkCustomerPhone(params) {
+  return request({
+    url: '/bizCustomer/checkPhone',
+    method: 'get',
+    params
+  })
+}
+
+export function getMyCustomerList(data) {
+  return request({
+    url: '/bizCustomer/myCustomer',
+    method: 'post',
+    data
+  })
+}
+
+export function getAllCustomerList(data) {
+  return request({
+    url: '/bizCustomer/allCustomer',
+    method: 'post',
+    data
+  })
+}
+
+export function getPublicCustomerList(data) {
+  return request({
+    url: '/bizCustomer/publicCustomer',
+    method: 'post',
+    data
+  })
+}
+
+export function followCustomer(data) {
+  return request({
+    url: '/bizCustomer/follow',
+    method: 'post',
+    data
+  })
+}
+
+export function getCustomerFollowHistory(customerId) {
+  return request({
+    url: `/bizCustomer/followHistory/${customerId}`,
+    method: 'get'
+  })
+}
+
+export function assignCustomer(id, params) {
+  return request({
+    url: `/bizCustomer/${id}/assign`,
+    method: 'post',
+    params
+  })
+}
+
+export function returnCustomerToPublic(id, userId) {
+  return request({
+    url: `/bizCustomer/returnToPublic/${id}`,
+    method: 'post',
+    params: { userId }
+  })
+}
+
+export function getCustomerTagGroups() {
+  return request({
+    url: '/bizCustomer/tags/groups',
+    method: 'get'
+  })
+}
+
+export function saveCustomerTags(data) {
+  return request({
+    url: '/bizCustomer/tags',
+    method: 'post',
+    data
+  })
+}
+
+// 获取客户状态列表
+export function getCustomerStatusList() {
+  return request({
+    url: '/bizCustomer/status/list',
+    method: 'get'
+  })
+}
diff --git a/pc/src/api/project.js b/pc/src/api/project.js
index 37ba84d..b84c48e 100644
--- a/pc/src/api/project.js
+++ b/pc/src/api/project.js
@@ -58,4 +58,13 @@ export function getAllProjectStatistics() {
     url: '/room/project/statistics',
     method: 'get'
   })
-} 
\ No newline at end of file
+} 
+
+// 获取标签列表
+export function getTagByType(data) {
+  return request({
+    url: '/admin/tag/getTagsByType',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/pc/src/router/modules/finance.js b/pc/src/router/modules/finance.js
index e0769ee..7b569d3 100644
--- a/pc/src/router/modules/finance.js
+++ b/pc/src/router/modules/finance.js
@@ -18,6 +18,12 @@ export default {
       component: () => import('@/views/finance/receiptSetting/index.vue'),
       name: 'ReceiptSetting',
       meta: { title: '收据设置', icon: 'el-icon-document' }
+    },
+    {
+      path: 'chargeStandard',
+      component: () => import('@/views/finance/chargeStandard/index.vue'),
+      name: 'ChargeStandard',
+      meta: { title: '收费标准', icon: 'el-icon-price-tag' }
     }
   ]
 } 
\ No newline at end of file
diff --git a/pc/src/utils/auth.js b/pc/src/utils/auth.js
new file mode 100644
index 0000000..92f056a
--- /dev/null
+++ b/pc/src/utils/auth.js
@@ -0,0 +1,56 @@
+/**
+ * 用户鉴权相关工具方法
+ */
+
+/**
+ * 获取当前登录用户ID
+ * @returns {string} 用户ID
+ */
+export function getUserId() {
+  // 从本地存储中获取用户信息
+  const userInfo = localStorage.getItem('userInfo')
+  if (userInfo) {
+    try {
+      const user = JSON.parse(userInfo)
+      return user.id || user.userId || ''
+    } catch (e) {
+      console.error('解析用户信息失败', e)
+      return ''
+    }
+  }
+  return ''
+}
+
+/**
+ * 获取用户信息
+ * @returns {Object} 用户信息对象
+ */
+export function getUserInfo() {
+  const userInfo = localStorage.getItem('userInfo')
+  if (userInfo) {
+    try {
+      return JSON.parse(userInfo)
+    } catch (e) {
+      console.error('解析用户信息失败', e)
+      return {}
+    }
+  }
+  return {}
+}
+
+/**
+ * 保存用户信息到本地存储
+ * @param {Object} userInfo 用户信息对象
+ */
+export function setUserInfo(userInfo) {
+  if (userInfo) {
+    localStorage.setItem('userInfo', JSON.stringify(userInfo))
+  }
+}
+
+/**
+ * 清除用户信息
+ */
+export function clearUserInfo() {
+  localStorage.removeItem('userInfo')
+} 
\ No newline at end of file
diff --git a/pc/src/utils/request.js b/pc/src/utils/request.js
index 29134d3..654f76d 100644
--- a/pc/src/utils/request.js
+++ b/pc/src/utils/request.js
@@ -4,8 +4,8 @@ import { API_SUCCESS_CODE } from './constants'
 
 // 创建axios实例
 const service = axios.create({
-  // baseURL: '/', // 修改为相对路径，使用代理
-  baseURL: process.env.VUE_APP_BASE_API, // 使用环境变量中的接口地址
+  baseURL: '/', // 修改为相对路径，使用代理
+  // baseURL: process.env.VUE_APP_BASE_API, // 使用环境变量中的接口地址
 
   timeout: 10000 // 请求超时时间
 })
diff --git a/pc/src/views/asset/inventory/components/AssetForm.vue b/pc/src/views/asset/inventory/components/AssetForm.vue
index aadddb9..2e56abb 100644
--- a/pc/src/views/asset/inventory/components/AssetForm.vue
+++ b/pc/src/views/asset/inventory/components/AssetForm.vue
@@ -39,7 +39,7 @@
                   <el-option
                     v-for="item in adminOptions"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.memberName"
                     :value="item.id"
                   />
                 </el-select>
@@ -51,7 +51,7 @@
                   <el-option
                     v-for="item in companyOptions"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.companyName"
                     :value="item.id"
                   />
                 </el-select>
@@ -226,7 +226,7 @@
 import { getAsset, addAsset, updateAsset, listCompanies, listUsers, uploadAssetImage, checkAssetCode } from '@/api/asset/inventory'
 import { getClassificationTree } from '@/api/asset/classification'
 import { getLocationTree } from '@/api/asset/location'
-
+import { API_SUCCESS_CODE } from '@/utils/constants'
 
 export default {
   name: 'AssetForm',
@@ -350,7 +350,7 @@ export default {
     getAssetDetail() {
       this.loading = true
       getAsset(this.assetId).then(response => {
-        if (response.code === '000000') {
+        if (response.code === API_SUCCESS_CODE) {
           this.form = response.data || {}
           
           // 如果有管理员，添加到选项中
@@ -371,7 +371,7 @@ export default {
     /** 获取资产分类树形选项 */
     getClassificationOptions() {
       getClassificationTree({ status: '1' }).then(response => {
-        if (response.code === '000000') {
+        if (response.code === API_SUCCESS_CODE) {
           this.classificationOptions = this.processClassificationTree(response.data || [])
         }
       })
@@ -404,7 +404,7 @@ export default {
     /** 获取位置树选项 */
     getLocationOptions() {
       getLocationTree().then(response => {
-        if (response.code === '000000') {
+        if (response.code === API_SUCCESS_CODE) {
           this.locationOptions = this.processLocationTree(response.data || [])
         }
       })
@@ -436,7 +436,7 @@ export default {
     /** 获取公司选项 */
     getCompanyOptions() {
       listCompanies().then(response => {
-        if (response.code === '000000') {
+        if (response.code === API_SUCCESS_CODE) {
           this.companyOptions = response.data || []
         }
       }).catch(() => {
@@ -448,9 +448,9 @@ export default {
     /** 远程搜索管理员 */
     remoteSearchAdmin(query) {
       this.adminLoading = true
-      listUsers({ name: query }).then(response => {
+      listUsers().then(response => {
         this.adminLoading = false
-        if (response.code === '000000') {
+        if (response.code === API_SUCCESS_CODE) {
           this.adminOptions = response.data || []
         }
       }).catch(() => {
@@ -471,7 +471,7 @@ export default {
           // 检查资产编码是否已存在
           if (!this.isEdit) {
             checkAssetCode(this.form.code).then(response => {
-              if (response.code === '000000') {
+              if (response.code === API_SUCCESS_CODE) {
                 if (!response.data) {
                   this.$message.error('资产编码已存在，请更换其他编码')
                   this.loading = false
@@ -496,7 +496,7 @@ export default {
     saveAsset(formData) {
       const method = this.isEdit ? updateAsset : addAsset
       method(formData).then(response => {
-        if (response.code === '000000') {
+        if (response.code === API_SUCCESS_CODE) {
           this.$message.success(this.isEdit ? '修改成功' : '新增成功')
           this.$emit('refresh')
           this.$emit('close')
@@ -530,7 +530,7 @@ export default {
     
     /** 图片上传成功回调 */
     handleImageSuccess(response) {
-      if (response.code === '000000') {
+      if (response.code === API_SUCCESS_CODE) {
         this.form.imageUrl = response.data.url
       } else {
         this.$message.error(response.msg || '上传图片失败')
diff --git a/pc/src/views/finance/chargeStandard/index.vue b/pc/src/views/finance/chargeStandard/index.vue
new file mode 100644
index 0000000..487f0cb
--- /dev/null
+++ b/pc/src/views/finance/chargeStandard/index.vue
@@ -0,0 +1,1097 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true" class="search-form">
+      <el-form-item label="标准名称" prop="standardName">
+        <el-input v-model="queryParams.standardName" placeholder="请输入标准名称" clearable style="width: 240px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 200px">
+          <el-option label="待生效" value="0" />
+          <el-option label="生效中" value="1" />
+          <el-option label="已失效" value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作按钮区域 -->
+    <el-row :gutter="10" class="mb12">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+      </el-col>
+    </el-row>
+
+    <!-- 表格区域 -->
+    <el-table v-loading="loading" :data="standardList" border>
+      <el-table-column label="标准名称" prop="standardName" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-link type="primary" @click="handleDetail(scope.row)">{{ scope.row.standardName }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="收费模式" prop="chargeMode" width="120" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.chargeMode === '1' ? '周期性费用' : '一次性费用' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="单价" prop="price" width="100" align="center" />
+      <el-table-column label="单价单位" prop="priceU" width="150" align="center">
+        <template slot-scope="scope">
+          {{ formatPriceUnit(scope.row.priceU, scope.row.chargeMode) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="生效时间" prop="effectiveDate" width="120" align="center" />
+      <el-table-column label="失效时间" prop="expiryDate" width="120" align="center" />
+      <el-table-column label="状态" prop="status" width="100" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="getStatusType(scope.row.status)">{{ getStatusName(scope.row.status) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属项目" prop="projectName" min-width="150" show-overflow-tooltip />
+      <el-table-column label="创建时间" prop="createTime" width="160" align="center" />
+      <el-table-column label="绑定对象" prop="bindingObjectType" width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.bindingObjectType === '1' ? '房间' : '车位' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="绑定列表" width="150" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" icon="el-icon-link" :disabled="scope.row.status !== '1'"
+            @click="handleBindData(scope.row)">绑定数据源+生成账单</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="150" align="center">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.status === '0' || scope.row.status === '1'" size="mini" type="text"
+            icon="el-icon-time" @click="handleDisable(scope.row)">立即失效</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页区域 -->
+    <div class="pagination-container" v-show="total > 0">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 50]" :page-size="queryParams.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <!-- 收费标准详情对话框 -->
+    <el-dialog title="收费标准详情" :visible.sync="detailOpen" width="800px" append-to-body>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="标准名称">{{ detailForm.standardName }}</el-descriptions-item>
+        <el-descriptions-item label="绑定对象">
+          {{ detailForm.bindingObjectType === '1' ? '房间' : '车位' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="所属项目">{{ detailForm.projectName }}</el-descriptions-item>
+        <el-descriptions-item label="收费公司">{{ detailForm.companyName }}</el-descriptions-item>
+        <el-descriptions-item label="收费账户">{{ detailForm.accountName }}</el-descriptions-item>
+        <el-descriptions-item label="开户银行">{{ detailForm.bankName }}</el-descriptions-item>
+        <el-descriptions-item label="银行账号">{{ detailForm.bankAccountNumber }}</el-descriptions-item>
+        <el-descriptions-item label="收费模式">
+          {{ detailForm.chargeMode === '1' ? '周期性费用' : '一次性费用' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="费用类型">{{ detailForm.feeTypeName }}</el-descriptions-item>
+        <el-descriptions-item label="标准生效时间">{{ detailForm.effectiveDate }}</el-descriptions-item>
+        <el-descriptions-item label="标准失效时间">{{ detailForm.expiryDate }}</el-descriptions-item>
+        <el-descriptions-item label="单价">{{ detailForm.price }}</el-descriptions-item>
+        <el-descriptions-item label="单价单位">
+          {{ formatPriceUnit(detailForm.priceU, detailForm.chargeMode) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="含税规则">
+          {{ detailForm.taxInclusiveRule === '1' ? '含税' : '不含税' }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.dayPriceConversionRule" label="天单价换算规则">
+          {{ detailForm.dayPriceConversionRule === '1' ? '按自然月换算' : '按年换算' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="计算单价保留小数点">{{ detailForm.decimalPrecisionPrice }}</el-descriptions-item>
+        <el-descriptions-item label="计算精度">{{ detailForm.calculationPrecision }}</el-descriptions-item>
+        <el-descriptions-item label="计算精度方式">
+          {{ detailForm.calculationPrecisionMethod === '1' ? '每步计算结果按计算精度保留' : '最终计算结果按照计算精度保留' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="应收金额精度">{{ detailForm.receivableAmountPrecision }}</el-descriptions-item>
+        <el-descriptions-item label="计算顺序">
+          {{ detailForm.calculationOrder === '1' ? '单价*面积*时间' : '单价*时间*面积' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item v-if="detailForm.chargeMode === '1'" label="付款时间规则">
+          {{ formatPaymentTimeRule(detailForm) }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.chargeMode === '1'" label="计费类型">
+          {{ detailForm.billingType === '1' ? '按月计费' : '按实际天数计费' }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.chargeMode === '1'" label="年天数">
+          {{ detailForm.chrgingUnitVal }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.chargeMode === '1'" label="付款周期">
+          {{ detailForm.remitCycleVal }}个月一付
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.chargeMode === '1'" label="账单划分方式">
+          {{ formatBillDivisionMethod(detailForm.billDivisionMethod) }}
+        </el-descriptions-item>
+
+        <el-descriptions-item v-if="detailForm.lateFeeStartDays" label="滞纳金起算天数">
+          {{ detailForm.lateFeeStartDays }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.ovdueFeeRate" label="滞纳金收取比例">
+          {{ formatPercentage(detailForm.ovdueFeeRate) }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detailForm.lateFeeUpperLimit" label="滞纳金收取上限">
+          {{ formatPercentage(detailForm.lateFeeUpperLimit) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="状态">
+          <el-tag :type="getStatusType(detailForm.status)">{{ getStatusName(detailForm.status) }}</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{ detailForm.createTime }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+
+    <!-- 新增收费标准对话框 -->
+    <el-dialog title="新增收费标准" :visible.sync="addOpen" width="60%" append-to-body>
+      <el-form ref="addForm" :model="form" :rules="rules" label-width="140px" class="standard-form">
+        <!-- 收费设置 -->
+        <el-divider content-position="left">收费设置</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="绑定对象" prop="bindingObjectType">
+              <el-select v-model="form.bindingObjectType" placeholder="请选择绑定对象" style="width: 240px" disabled>
+                <el-option label="房间" value="1" />
+                <el-option label="车位" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="projectId">
+              <el-select v-model="form.projectId" placeholder="请选择项目" style="width: 240px" filterable
+                @change="handleProjectChange">
+                <el-option v-for="item in projectOptions" :key="item.id" :label="item.projectName" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="收费公司" prop="companyId">
+              <el-select v-model="form.companyId" placeholder="请选择收费公司" style="width: 240px" filterable>
+                <el-option v-for="item in companyOptions" :key="item.id" :label="item.companyName" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收费模式" prop="chargeMode">
+              <el-select v-model="form.chargeMode" placeholder="请选择收费模式" style="width: 240px"
+                @change="handleChargeModeChange">
+                <el-option label="周期性费用" value="1" />
+                <el-option label="一次性费用" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          
+          <el-col :span="12">
+            <el-form-item label="费用类型" prop="feeTypeId">
+              <el-cascader v-model="form.feeTypeId" :options="feeTypeOptions" :props="{
+                label: 'label',
+                value: 'id',
+                children: 'children',
+                expandTrigger: 'hover',
+                emitPath: false
+              }" clearable filterable @change="changeFeeType" placeholder="请选择费用类型" style="width: 240px">
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收费账户" prop="accountId">
+              <el-select v-model="form.accountId" placeholder="请选择收费账户" style="width: 240px" filterable
+                @change="handleAccountChange">
+                <el-option v-for="item in accountOptions" :key="item.id" :label="item.accountName" :value="item.id">
+                  <div style="display: flex; justify-content: space-between;">
+                    <span>{{ item.accountName }}</span>
+                    <span style="color: #8492a6; font-size: 13px">{{ item.companyName }}</span>
+                  </div>
+                  <div style="font-size: 12px; color: #909399">{{ item.bankAccountNumber }}</div>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+        <el-row :gutter="20" v-if="form.accountId">
+          <el-col :span="12">
+            <el-form-item label="收款公司">
+              <el-input v-model="selectedAccount.companyName" disabled placeholder="收款公司" style="width: 240px" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户银行">
+              <el-input v-model="selectedAccount.bankName" disabled placeholder="开户银行" style="width: 240px" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" v-if="form.accountId">
+          <el-col :span="12">
+            <el-form-item label="银行账号">
+              <el-input v-model="selectedAccount.bankAccountNumber" disabled placeholder="银行账号" style="width: 240px" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!-- 预留空间保持布局整齐 -->
+          </el-col>
+        </el-row>
+
+        <!-- 基本信息 -->
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="标准名称" prop="standardName">
+              <el-input v-model="form.standardName" placeholder="请输入标准名称" @blur="checkStandardName"
+                style="width: 240px; text-align: left;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标准生效时间" prop="effectiveDate">
+              <el-date-picker v-model="form.effectiveDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
+                style="width: 240px">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="标准失效时间" prop="expiryDate">
+              <el-date-picker v-model="form.expiryDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
+                style="width: 240px">
+              </el-date-picker>
+              <el-button type="text" @click="setForeverEffective">永久生效</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单价" prop="price">
+              <el-input v-model="form.price" placeholder="请输入单价" style="width: 240px">
+                <el-select slot="append" v-model="form.priceU" style="width: 120px">
+                  <el-option v-for="item in priceUnitOptions" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="含税规则" prop="taxInclusiveRule">
+              <el-select v-model="form.taxInclusiveRule" placeholder="请选择含税规则" style="width: 240px">
+                <el-option label="含税" value="1" />
+                <el-option label="不含税" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- 天单价换算规则（条件渲染） -->
+          <el-col :span="12" v-if="showDayPriceRule">
+            <el-form-item label="天单价换算规则" prop="dayPriceConversionRule">
+              <el-select v-model="form.dayPriceConversionRule" placeholder="请选择天单价换算规则" style="width: 240px">
+                <el-option label="按自然月换算" value="1" />
+                <el-option label="按年换算" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+
+          <el-col :span="12">
+            <el-form-item label="计算单价保留小数点" prop="decimalPrecisionPrice">
+              <el-input-number v-model="form.decimalPrecisionPrice" :min="0" :max="10" :precision="0"
+                style="width: 240px" class="text-left" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计算精度" prop="calculationPrecision">
+              <el-select v-model="form.calculationPrecision" placeholder="请选择计算精度" style="width: 240px">
+                <el-option label="0" :value="0" />
+                <el-option label="1" :value="1" />
+                <el-option label="2" :value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="计算精度方式" prop="calculationPrecisionMethod">
+              <el-select v-model="form.calculationPrecisionMethod" placeholder="请选择计算精度方式" style="width: 240px">
+                <el-option label="每步计算结果按计算精度保留" value="1" />
+                <el-option label="最终计算结果按照计算精度保留" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="应收金额精度" prop="receivableAmountPrecision">
+              <el-select v-model="form.receivableAmountPrecision" placeholder="请选择应收金额精度" style="width: 240px">
+                <el-option label="0" :value="0" />
+                <el-option label="1" :value="1" />
+                <el-option label="2" :value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="计算顺序" prop="calculationOrder">
+              <el-select v-model="form.calculationOrder" placeholder="请选择计算顺序" style="width: 240px">
+                <el-option label="单价*面积*时间" value="1" />
+                <el-option label="单价*时间*面积" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 周期性费用特有字段 -->
+        <template v-if="form.chargeMode === '1'">
+          <el-divider content-position="left">付款信息</el-divider>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="付款时间规则" prop="paymentTimeRuleType" class="payment-rule">
+                <div class="payment-rule-container">
+                  <el-select v-model="form.paymentTimeRuleType" placeholder="按开始延后" style="width: 120px">
+                    <el-option label="按开始延后" value="1" />
+                    <el-option label="按结束延后" value="2" />
+                    <el-option label="按开始提前" value="3" />
+                    <el-option label="按结束提前" value="4" />
+                    <el-option label="指定日期" value="5" />
+                  </el-select>
+                  <el-input v-model="form.delayPaymDaynum" placeholder="请输入" style="width: 80px"
+                    v-if="form.paymentTimeRuleType !== '5'" />
+                  <el-select v-model="form.dateCalculationMethod" placeholder="自然日" style="width: 100px"
+                    v-if="form.paymentTimeRuleType !== '5'">
+                    <el-option label="自然日" value="1" />
+                    <el-option label="工作日" value="2" disabled />
+                  </el-select>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="账单拆分周期" prop="remitCycleVal">
+                <el-input-number v-model="form.remitCycleVal" :min="1" :precision="0" style="width: 240px"
+                  class="text-left" />
+                <span class="unit-label">月一付</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="计费类型" prop="billingType">
+                <el-select v-model="form.billingType" placeholder="请选择计费类型" style="width: 240px">
+                  <el-option label="按月计费" value="1" />
+                  <el-option label="按实际天数计费" value="2" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="年天数" prop="chrgingUnitVal">
+                <el-input-number v-model="form.chrgingUnitVal" :min="1" :precision="0" style="width: 240px"
+                  class="text-left" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="账单划分方式" prop="billDivisionMethod">
+                <el-select v-model="form.billDivisionMethod" placeholder="请选择账单划分方式" style="width: 240px">
+                  <el-option label="按起始日划分" value="1" />
+                  <el-option label="按自然月划分（首月非整自然月划入第一期）" value="2" />
+                  <el-option label="按自然月划分（首月非整自然月算一个月）" value="3" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
+
+        <!-- 滞纳金设置 -->
+        <el-divider content-position="left">滞纳金设置</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="起算天数" prop="lateFeeStartDays">
+              <el-input-number v-model="form.lateFeeStartDays" :min="0" :precision="0" style="width: 240px"
+                class="text-left" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="滞纳金收取比例" prop="ovdueFeeRate">
+              <el-input-number v-model="form.ovdueFeeRate" :min="0" :max="1" :precision="4" :step="0.001"
+                style="width: 240px" class="text-left" />
+              <span class="percentage-text">%</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="滞纳金收取上限" prop="lateFeeUpperLimit">
+              <el-input-number v-model="form.lateFeeUpperLimit" :min="0" :max="1" :precision="2" :step="0.01"
+                style="width: 240px" class="text-left" />
+              <span class="percentage-text">%</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelAdd">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  getChargingStandardPage,
+  getChargingStandardById,
+  deleteChargingStandard,
+  updateChargingStandardStatus,
+  addChargingStandard,
+  checkChargingStandardName,
+  getFeeTypeTree
+} from '@/api/finance'
+import { getAllAccounts } from '@/api/building'
+import { API_SUCCESS_CODE } from '@/utils/constants'
+
+export default {
+  name: 'ChargeStandard',
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      // 收费标准列表
+      standardList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        standardName: undefined,
+        status: undefined
+      },
+      // 详情对话框
+      detailOpen: false,
+      detailForm: {
+        id: undefined
+      },
+      // 新增对话框
+      addOpen: false,
+      form: {
+        bindingObjectType: '1', // 默认房间
+        projectId: undefined,
+        companyId: undefined,
+        accountId: undefined, // 添加账户ID字段
+        chargeMode: '1', // 默认周期性费用
+        feeTypeId: undefined,
+        standardName: undefined,
+        effectiveDate: undefined,
+        expiryDate: undefined,
+        price: undefined,
+        priceU: '1',
+        taxInclusiveRule: '1', // 默认含税
+        dayPriceConversionRule: '1', // 默认按自然月换算
+        decimalPrecisionPrice: 2,
+        calculationPrecision: 2,
+        calculationPrecisionMethod: '1', // 默认每步计算结果按计算精度保留
+        receivableAmountPrecision: 2,
+        calculationOrder: '1', // 默认单价*面积*时间
+        paymentTimeRuleType: '1', // 默认按开始延后
+        delayPaymDaynum: 0,
+        dateCalculationMethod: '1', // 默认自然日
+        billingType: '1', // 默认按月计费
+        chrgingUnitVal: 365, // 默认年天数
+        remitCycleVal: 1, // 默认1个月一付
+        billDivisionMethod: '1', // 默认按起始日划分
+        lateFeeStartDays: 0,
+        ovdueFeeRate: 0,
+        lateFeeUpperLimit: 0
+      },
+      // 表单校验规则
+      rules: {
+        projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
+        companyId: [{ required: true, message: '请选择收费公司', trigger: 'change' }],
+        accountId: [{ required: true, message: '请选择收费账户', trigger: 'change' }], // 添加账户校验规则
+        feeTypeId: [{ required: true, message: '请选择费用类型', trigger: 'change' }],
+        standardName: [{ required: true, message: '请输入标准名称', trigger: 'blur' }],
+        effectiveDate: [{ required: true, message: '请选择标准生效时间', trigger: 'change' }],
+        expiryDate: [{ required: true, message: '请选择标准失效时间', trigger: 'change' }],
+        price: [{ required: true, message: '请输入单价', trigger: 'blur' }],
+        priceU: [{ required: true, message: '请选择单价单位', trigger: 'change' }],
+        paymentTimeRuleType: [{ required: true, message: '请选择付款时间计算方式', trigger: 'change' }],
+        delayPaymDaynum: [{ required: true, message: '请输入付款天数', trigger: 'blur' }],
+        dateCalculationMethod: [{ required: true, message: '请选择日期计算方式', trigger: 'change' }],
+        billingType: [{ required: true, message: '请选择计费类型', trigger: 'change' }],
+        chrgingUnitVal: [{ required: true, message: '请输入年天数', trigger: 'blur' }],
+        remitCycleVal: [{ required: true, message: '请输入付款周期', trigger: 'blur' }],
+        billDivisionMethod: [{ required: true, message: '请选择账单划分方式', trigger: 'change' }]
+      },
+      // 项目选项
+      projectOptions: [
+        { id: 'P001', projectName: '智慧园区示范项目' },
+        { id: 'P002', projectName: '创新园区项目' }
+      ],
+      // 公司选项
+      companyOptions: [
+        { id: 'C001', companyName: '智慧园区物业公司' },
+        { id: 'C002', companyName: '创新物业管理有限公司' }
+      ],
+      // 账户选项
+      accountOptions: [],
+      // 选中的账户信息
+      selectedAccount: {
+        companyName: '',
+        bankName: '',
+        bankAccountNumber: ''
+      },
+      // 费用类型选项（级联选择器的数据）
+      feeTypeOptions: [],
+      // 价格单位选项（根据收费模式动态变化）
+      priceUnitOptions: []
+    }
+  },
+  created() {
+    this.getList()
+    // 初始化价格单位选项
+    this.handleChargeModeChange(this.form.chargeMode)
+    // 获取费用类型树
+    this.getFeeTypes()
+    // 获取账户选项
+    this.getAccountOptions()
+  },
+  computed: {
+    // 是否显示天单价换算规则
+    showDayPriceRule() {
+      if (this.form.chargeMode !== '1') return false
+      return ['3', '4', '7', '8'].includes(this.form.priceU)
+    }
+  },
+  methods: {
+    changeFeeType(val) {
+      console.log('选择的费用类型ID:', val);
+      // 查找匹配的费用类型
+      if (val) {
+        let selectedFeeType = null;
+        // 在所有分类中查找
+        for (const category of this.feeTypeOptions) {
+          // 先检查是否选中的是分类
+          if (category.id === val) {
+            selectedFeeType = {
+              id: category.id,
+              name: category.label,
+              type: '分类'
+            };
+            break;
+          }
+          // 检查子节点
+          if (category.children && category.children.length > 0) {
+            const found = category.children.find(item => item.id === val);
+            if (found) {
+              selectedFeeType = {
+                id: found.id,
+                name: found.label,
+                categoryName: category.label,
+                type: '费用类型'
+              };
+              break;
+            }
+          }
+        }
+
+        if (selectedFeeType) {
+          console.log('找到的费用类型:', selectedFeeType);
+        } else {
+          console.warn('未找到ID对应的费用类型:', val);
+        }
+      }
+    },
+    /** 查询收费标准列表 */
+    getList() {
+      this.loading = true
+      getChargingStandardPage(this.queryParams).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.standardList = response.data.list || []
+          this.total = response.data.total
+        } else {
+          this.$message.error(response.message || '获取收费标准列表失败')
+          this.standardList = []
+          this.total = 0
+        }
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    /** 获取账户选项 */
+    getAccountOptions() {
+      getAllAccounts().then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          this.accountOptions = res.data
+        } else {
+          // 出错时使用默认数据
+          this.accountOptions = [
+            { id: 1, accountName: '示例账户1', companyName: '示例收款公司1', bankName: '中国建设银行', bankAccountNumber: '6214000012345678' },
+            { id: 2, accountName: '示例账户2', companyName: '示例收款公司2', bankName: '中国工商银行', bankAccountNumber: '6217000087654321' }
+          ]
+        }
+      }).catch(() => {
+        // 出错时使用默认数据
+        this.accountOptions = [
+          { id: 1, accountName: '示例账户1', companyName: '示例收款公司1', bankName: '中国建设银行', bankAccountNumber: '6214000012345678' },
+          { id: 2, accountName: '示例账户2', companyName: '示例收款公司2', bankName: '中国工商银行', bankAccountNumber: '6217000087654321' }
+        ]
+      })
+    },
+    /** 账户选择处理 */
+    handleAccountChange() {
+      // 获取选中的账户信息
+      const selectedAccount = this.accountOptions.find(item => item.id === this.form.accountId)
+      if (selectedAccount) {
+        this.selectedAccount = {
+          companyName: selectedAccount.companyName,
+          bankName: selectedAccount.bankName,
+          bankAccountNumber: selectedAccount.bankAccountNumber
+        }
+      } else {
+        this.selectedAccount = {
+          companyName: '',
+          bankName: '',
+          bankAccountNumber: ''
+        }
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        standardName: undefined,
+        status: undefined
+      }
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.addOpen = true
+      // 重置表单数据
+      this.resetForm()
+    },
+    /** 重置表单数据 */
+    resetForm() {
+      if (this.$refs.addForm) {
+        this.$refs.addForm.resetFields()
+      }
+      this.form = {
+        bindingObjectType: '1', // 默认房间
+        projectId: undefined,
+        companyId: undefined,
+        accountId: undefined, // 重置账户ID
+        chargeMode: '1', // 默认周期性费用
+        feeTypeId: undefined,
+        standardName: undefined,
+        effectiveDate: undefined,
+        expiryDate: undefined,
+        price: undefined,
+        priceU: '1',
+        taxInclusiveRule: '1', // 默认含税
+        dayPriceConversionRule: '1', // 默认按自然月换算
+        decimalPrecisionPrice: 2,
+        calculationPrecision: 2,
+        calculationPrecisionMethod: '1', // 默认每步计算结果按计算精度保留
+        receivableAmountPrecision: 2,
+        calculationOrder: '1', // 默认单价*面积*时间
+        paymentTimeRuleType: '1', // 默认按开始延后
+        delayPaymDaynum: 0,
+        dateCalculationMethod: '1', // 默认自然日
+        billingType: '1', // 默认按月计费
+        chrgingUnitVal: 365, // 默认年天数
+        remitCycleVal: 1, // 默认1个月一付
+        billDivisionMethod: '1', // 默认按起始日划分
+        lateFeeStartDays: 0,
+        ovdueFeeRate: 0,
+        lateFeeUpperLimit: 0
+      }
+      // 重置选中的账户信息
+      this.selectedAccount = {
+        companyName: '',
+        bankName: '',
+        bankAccountNumber: ''
+      }
+      // 更新单价单位选项
+      this.handleChargeModeChange(this.form.chargeMode)
+    },
+    /** 关闭新增对话框 */
+    cancelAdd() {
+      this.addOpen = false
+      this.resetForm()
+    },
+    /** 收费模式变更处理 */
+    handleChargeModeChange(val) {
+      // 根据收费模式更新单价单位选项
+      if (val === '1') {
+        // 周期性费用
+        this.priceUnitOptions = [
+          { value: '1', label: '元' },
+          { value: '2', label: '元/天' },
+          { value: '3', label: '元/月' },
+          { value: '4', label: '元/年' },
+          { value: '5', label: '元/㎡' },
+          { value: '6', label: '元/(㎡*天)' },
+          { value: '7', label: '元/(㎡*月)' },
+          { value: '8', label: '元/(㎡*年)' }
+        ]
+      } else {
+        // 一次性费用
+        this.priceUnitOptions = [
+          { value: '1', label: '元' },
+          { value: '2', label: '元/㎡' }
+        ]
+      }
+      // 清空已选择的单价单位
+      this.form.priceU = '1'
+    },
+    /** 项目变更处理 */
+    handleProjectChange(val) {
+      // 这里可以根据项目获取相关数据
+      console.log('项目变更:', val)
+    },
+    /** 设置永久生效 */
+    setForeverEffective() {
+      this.form.expiryDate = '2099-12-31'
+    },
+    /** 检查标准名称是否存在 */
+    checkStandardName() {
+      if (!this.form.standardName) return
+
+      checkChargingStandardName(this.form.standardName).then(response => {
+        if (response.code === API_SUCCESS_CODE && response.data) {
+          this.$message.warning('该标准名称已存在，请修改')
+          this.form.standardName = ''
+        }
+      })
+    },
+    /** 提交新增表单 */
+    submitForm() {
+      this.$refs.addForm.validate(valid => {
+        if (!valid) {
+          return this.$message.warning('请完善表单信息')
+        }
+
+        const loading = this.$loading({
+          lock: true,
+          text: '提交中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        // 转换数字类型的字段
+        const formData = { ...this.form }
+        const numericFields = [
+          'decimalPrecisionPrice', 'calculationPrecision', 'receivableAmountPrecision',
+          'delayPaymDaynum', 'chrgingUnitVal', 'remitCycleVal', 'lateFeeStartDays'
+        ]
+
+        numericFields.forEach(field => {
+          if (formData[field] !== undefined) {
+            formData[field] = Number(formData[field])
+          }
+        })
+
+        // 转换价格为数值
+        if (formData.price !== undefined) {
+          formData.price = parseFloat(formData.price)
+        }
+
+        // 提交API请求
+        addChargingStandard(formData).then(response => {
+          loading.close()
+          if (response.code === API_SUCCESS_CODE) {
+            this.$message.success('新增收费标准成功')
+            this.addOpen = false
+            this.getList()
+          } else {
+            this.$message.error(response.message || '新增收费标准失败')
+          }
+        }).catch(() => {
+          loading.close()
+        })
+      })
+    },
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.detailOpen = true
+      this.detailForm = { ...row }
+      if (!row.id) return
+
+      getChargingStandardById(row.id).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.detailForm = response.data
+        }
+      })
+    },
+    /** 绑定数据源按钮操作 */
+    handleBindData(row) {
+      this.$router.push({
+        path: '/finance/chargeStandard/bindData',
+        query: { id: row.id }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$confirm(`确定要删除收费标准 ${row.standardName} 吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteChargingStandard(row.id).then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.$message.success('删除成功')
+            this.getList()
+          } else {
+            this.$message.error(response.message || '删除失败')
+          }
+        })
+      }).catch(() => { })
+    },
+    /** 立即失效按钮操作 */
+    handleDisable(row) {
+      this.$confirm(`确定要将收费标准 ${row.standardName} 立即失效吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateChargingStandardStatus(row.id).then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.$message.success('操作成功')
+            this.getList()
+          } else {
+            this.$message.error(response.message || '操作失败')
+          }
+        })
+      }).catch(() => { })
+    },
+    /** 处理分页大小改变 */
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val
+      this.getList()
+    },
+    /** 处理页码改变 */
+    handleCurrentChange(val) {
+      this.queryParams.pageNum = val
+      this.getList()
+    },
+    /** 格式化单价单位 */
+    formatPriceUnit(priceU, chargeMode) {
+      const oneTimeUnits = {
+        '1': '元',
+        '2': '元/㎡'
+      }
+
+      const periodicUnits = {
+        '1': '元',
+        '2': '元/天',
+        '3': '元/月',
+        '4': '元/年',
+        '5': '元/㎡',
+        '6': '元/(㎡*天)',
+        '7': '元/(㎡*月)',
+        '8': '元/(㎡*年)'
+      }
+
+      return chargeMode === '1' ? periodicUnits[priceU] : oneTimeUnits[priceU]
+    },
+    /** 格式化付款时间规则 */
+    formatPaymentTimeRule(data) {
+      if (!data.paymentTimeRuleType) return ''
+
+      const typeMap = {
+        '1': '按开始延后',
+        '2': '按结束延后',
+        '3': '按开始提前',
+        '4': '按结束提前',
+        '5': '指定日期'
+      }
+
+      const methodMap = {
+        '1': '自然日',
+        '2': '工作日'
+      }
+
+      let result = typeMap[data.paymentTimeRuleType]
+      if (['1', '2', '3', '4'].includes(data.paymentTimeRuleType)) {
+        result += ` ${data.delayPaymDaynum} 个${methodMap[data.dateCalculationMethod]}`
+      }
+
+      return result
+    },
+    /** 获取费用类型树 */
+    getFeeTypes() {
+      getFeeTypeTree({ level: 2 }).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          console.log('原始费用类型数据:', response.data)
+
+          // 数据预处理
+          const processedData = this.processTreeData(response.data)
+          this.feeTypeOptions = processedData
+
+          console.log('处理后的费用类型数据:', this.feeTypeOptions)
+        } else {
+          console.error('获取费用类型失败:', response.message)
+        }
+      }).catch(error => {
+        console.error('获取费用类型异常:', error)
+      })
+    },
+    /** 处理树形数据 */
+    processTreeData(data) {
+      if (!data || !Array.isArray(data) || data.length === 0) {
+        console.warn('无费用类型数据')
+        return []
+      }
+
+      return data.map(category => {
+        // 确保id字段存在
+        const categoryId = category.id || Math.random().toString(36).substr(2, 9)
+
+        // 处理子节点
+        let children = []
+        if (category.financeFeeTypes && Array.isArray(category.financeFeeTypes)) {
+          children = category.financeFeeTypes.map(feeType => {
+            return {
+              id: feeType.id || Math.random().toString(36).substr(2, 9),
+              label: feeType.feeTypeName || '未命名费用',
+              categoryId: categoryId,
+              // 存储原始数据以便后续使用
+              feeTypeName: feeType.feeTypeName || '未命名费用',
+              // 确保没有更多的子节点
+              children: null
+            }
+          })
+        }
+
+        return {
+          id: categoryId,
+          label: category.categoryName || '未命名分类',
+          categoryName: category.categoryName || '未命名分类',
+          children: children.length > 0 ? children : null
+        }
+      }).filter(item => item.children && item.children.length > 0)
+    },
+    /** 获取状态类型 */
+    getStatusType(status) {
+      const statusMap = {
+        '0': 'info',
+        '1': 'success',
+        '2': 'danger'
+      }
+      return statusMap[status] || 'info'
+    },
+    /** 获取状态名称 */
+    getStatusName(status) {
+      const statusMap = {
+        '0': '待生效',
+        '1': '生效中',
+        '2': '已失效'
+      }
+      return statusMap[status] || '未知状态'
+    },
+    /** 格式化账单划分方式 */
+    formatBillDivisionMethod(method) {
+      const methodMap = {
+        '1': '按起始日划分',
+        '2': '按自然月划分（首月非整自然月划入第一期）',
+        '3': '按自然月划分（首月非整自然月算一个月）'
+      }
+      return methodMap[method] || '未知账单划分方式'
+    },
+    /** 格式化百分比 */
+    formatPercentage(value) {
+      return (value * 100).toFixed(2) + '%'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 20px;
+
+  .search-form {
+    margin-bottom: 20px;
+  }
+
+  .mb12 {
+    margin-bottom: 12px;
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    text-align: right;
+  }
+
+  .el-divider {
+    margin: 24px 0;
+  }
+
+  .percentage-text {
+    margin-left: 5px;
+  }
+
+  .standard-form {
+
+    .el-input,
+    .el-select,
+    .el-cascader,
+    .el-date-picker,
+    .el-input-number {
+      text-align: left !important;
+
+      ::v-deep .el-input__inner {
+        text-align: left;
+      }
+    }
+
+    .payment-rule {
+      margin-bottom: 10px;
+
+      .payment-rule-container {
+        display: flex;
+        align-items: center;
+      }
+    }
+
+    .payment-time {
+      margin-bottom: 22px;
+    }
+
+    .unit-label {
+      margin-left: 5px;
+    }
+
+    .text-left {
+      ::v-deep .el-input__inner {
+        text-align: left;
+      }
+    }
+  }
+}
+
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>
\ No newline at end of file
diff --git a/pc/src/views/merchant/clue-management/index.vue b/pc/src/views/merchant/clue-management/index.vue
index ff17d85..a0c836d 100644
--- a/pc/src/views/merchant/clue-management/index.vue
+++ b/pc/src/views/merchant/clue-management/index.vue
@@ -1,23 +1,1536 @@
 <template>
   <div class="clue-management-container">
-    <h1>线索管理页面</h1>
-    <p>这里是线索管理的内容，根据需求继续完善</p>
+    <!-- 导航标签 -->
+    <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tab-pane label="我的线索" name="my"></el-tab-pane>
+      <el-tab-pane label="全部线索" name="all"></el-tab-pane>
+      <el-tab-pane label="线索公海" name="public"></el-tab-pane>
+      <el-tab-pane label="跟进状态" name="status"></el-tab-pane>
+    </el-tabs>
+
+
+
+    <!-- 搜索条件区域 -->
+    <div v-if="activeTab !== 'status'" class="filter-container">
+      <el-form :inline="true" :model="queryParams" ref="queryForm" class="search-form">
+        <el-form-item label="客户名称">
+          <el-input v-model="queryParams.customerName" placeholder="搜索客户名称" clearable style="width: 200px;"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="客户电话">
+          <el-input v-model="queryParams.customerPhone" placeholder="搜索客户电话" clearable style="width: 200px;"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="公司名称">
+          <el-input v-model="queryParams.companyName" placeholder="搜索公司名称" clearable style="width: 200px;"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="意向项目">
+          <el-cascader v-model="queryParams.projectId" :options="projectOptions" placeholder="请选择意向项目" clearable
+            style="width: 200px;" :props="{ expandTrigger: 'hover', emitPath: false }"></el-cascader>
+        </el-form-item>
+        <el-form-item label="来源">
+          <el-select v-model="queryParams.source" placeholder="请选择来源" clearable style="width: 200px;">
+            <el-option v-for="item in sourceOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="线索来源" v-if="activeTab !== 'public'">
+          <el-select v-model="queryParams.leadSource" placeholder="请选择线索来源" clearable style="width: 200px;">
+            <el-option v-for="item in clueSourceOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="线索状态">
+          <el-select v-model="queryParams.statusId" placeholder="请选择线索状态" clearable style="width: 200px;">
+            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="更新日期">
+          <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" value-format="yyyy-MM-dd" style="width: 240px;"></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="action-buttons">
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增线索</el-button>
+        <!-- <template v-if="activeTab === 'all'">
+          <el-button type="success" icon="el-icon-upload2">导入线索</el-button>
+          <el-button type="info" icon="el-icon-download">导出线索</el-button>
+        </template>
+<template v-if="activeTab === 'public'">
+          <el-button type="success" icon="el-icon-s-promotion">批量指定分配</el-button>
+        </template> -->
+      </div>
+    </div>
+
+    <!-- 跟进状态管理页面 -->
+    <div v-if="activeTab === 'status'" class="status-management">
+      <div class="status-header">
+        <div class="title">跟进状态列表</div>
+        <!-- <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAddStatus">新增状态</el-button> -->
+      </div>
+      <el-table :data="leadList" border style="width: 100%">
+        <el-table-column type="index" label="排序" width="80" align="center"></el-table-column>
+        <el-table-column prop="statusName" label="跟进状态" width="180"></el-table-column>
+        <el-table-column prop="description" label="阶段描述"></el-table-column>
+        <!-- <el-table-column label="操作" width="150" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="!scope.row.isSystem" type="text" @click="handleEditStatus(scope.row)">编辑</el-button>
+            <el-button v-if="!scope.row.isSystem" type="text" class="delete-btn"
+              @click="handleDeleteStatus(scope.row)">删除</el-button>
+          </template>
+        </el-table-column> -->
+      </el-table>
+    </div>
+
+    <!-- 表格展示区域 - 仅在非状态管理时显示 -->
+    <div v-else>
+      <el-table v-loading="loading" :data="leadList" border stripe :key="activeTab">
+        <el-table-column type="selection" width="55" align="center" v-if="activeTab === 'public'"></el-table-column>
+        <el-table-column prop="customerName" label="客户名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="customerPhone" label="客户电话" width="120" />
+        <el-table-column prop="companyName" label="公司" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="statusName" label="线索状态" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="getFollowStatusType(scope.row.statusId.toString())">
+              {{ scope.row.statusName }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="leadSourceDesc" label="线索来源" width="100" />
+        <el-table-column prop="companyName" label="所属渠道公司" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="lastModTime" label="更新时间" width="160" />
+        <el-table-column prop="projectName" label="意向项目" min-width="150" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.projectName || getProjectNameById(scope.row.projectId) || '--' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="需求面积段" width="120">
+          <template slot-scope="scope">
+            {{ formatAreaRange(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="personnelName" label="跟进人员" min-width="150" show-overflow-tooltip
+          v-if="activeTab === 'all'" />
+        <el-table-column label="操作" width="150" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="activeTab !== 'public'" type="text" size="small"
+              @click="handleFollow(scope.row)">跟进</el-button>
+            <el-button v-if="activeTab === 'public'" type="text" size="small"
+              @click="handleAssign(scope.row)">指定分配</el-button>
+            <el-button type="text" size="small" @click="handleViewDetail(scope.row)">详情</el-button>
+            <el-button type="text" v-if="activeTab === 'my' || activeTab === 'all'" size="small" class="delete-btn"
+              @click="returnToPublic(scope.row)">退回公海</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+    </div>
+    <!-- 分页区域 -->
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 50]" :page-size="queryParams.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <!-- 新增线索对话框 -->
+    <el-dialog title="新增线索" :visible.sync="addDialogVisible" width="700px" append-to-body
+      @close="$refs.addForm && $refs.addForm.resetFields()">
+      <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px">
+        <el-divider content-position="left">基础信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="意向项目" prop="projectId">
+              <el-cascader v-model="addForm.projectId" :options="projectOptions" @change="getTeamOptions"
+                placeholder="请选择意向项目" clearable style="width: 100%;"
+                :props="{ expandTrigger: 'hover', emitPath: false }"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="addForm.customerName" placeholder="请输入客户名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户手机号" prop="customerPhone">
+              <el-input v-model="addForm.customerPhone" placeholder="请输入客户手机号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司" prop="companyName">
+              <el-input v-model="addForm.companyName" placeholder="请输入公司" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户详情" prop="customerDetails">
+              <el-input v-model="addForm.customerDetails" placeholder="请输入客户详情" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户级别" prop="customerLevel">
+              <el-input v-model="addForm.customerLevel" placeholder="请输入客户级别" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="行业" prop="industry">
+              <el-select v-model="addForm.industry" placeholder="请选择行业" clearable style="width: 100%;">
+                <el-option v-for="item in industryOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="年龄" prop="age">
+              <el-input-number v-model="addForm.age" :min="0" :max="150" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="来源" prop="source">
+              <el-select v-model="addForm.source" placeholder="请选择来源" clearable style="width: 100%;">
+                <el-option v-for="item in sourceOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="addForm.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">需求信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="需求面积">
+              <div class="area-range">
+                <el-input-number v-model="addForm.areaMin" :min="0" placeholder="最小值" style="width: 110px;"
+                  controls-position="right" />
+                <span class="area-unit">m²</span>
+                <span style="margin: 0 10px;" class="area-separator">-</span>
+                <el-input-number v-model="addForm.areaMax" :min="0" placeholder="最大值" style="width: 110px;"
+                  controls-position="right" />
+                <span class="area-unit">m²</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户预算" prop="budget">
+              <el-input-number v-model="addForm.budget" :min="0" :step="1000" style="width: 100%;" :controls="false">
+                <template slot="append">元</template>
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">跟进人员</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="跟进方式" prop="followType">
+              <el-radio-group v-model="addForm.followType" @change="handleFollowTypeChange">
+                <el-radio label="1">指定人员</el-radio>
+                <el-radio label="2">加入公海</el-radio>
+                <el-radio label="3">分配给创建人</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" v-if="addForm.followType === '1'">
+          <el-col :span="24">
+            <el-form-item label="跟进人员" prop="personnelId">
+              <el-cascader v-model="addForm.personnelId" :options="cascaderTeamOptions" placeholder="请选择跟进人员" clearable
+                filterable :props="{
+                  expandTrigger: 'hover',
+                  lazy: true,
+                  lazyLoad: lazyLoadTeamPersonnel,
+                  value: 'value',
+                  label: 'label',
+                  emitPath: false
+                }" style="width: 100%;"></el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitAddForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 跟进线索对话框 -->
+    <el-dialog title="跟进线索" :visible.sync="followDialogVisible" width="900px" append-to-body>
+      <el-tabs v-model="followActiveTab">
+        <el-tab-pane label="跟进线索" name="follow">
+          <el-form ref="followForm" :model="followForm" :rules="followRules" label-width="120px">
+            <el-form-item label="变更线索状态" prop="statusId">
+              <el-select v-model="followForm.statusId" placeholder="请选择跟进状态" style="width: 100%;">
+                <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="跟进内容" prop="followContent">
+              <el-input type="textarea" v-model="followForm.followContent" placeholder="请输入跟进内容" :rows="3" />
+            </el-form-item>
+            <el-form-item v-if="followForm.statusId !== '4'" label="下次跟进时间" prop="nextFollowTime">
+              <el-date-picker v-model="followForm.nextFollowTime" type="datetime" placeholder="请选择下次跟进时间"
+                value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%;"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="跟进图片" prop="image">
+              <el-upload :action="uploadUrl" :file-list="fileList" :limit="1" :on-exceed="handleExceed"
+                :on-success="handleUploadSuccess" :on-error="handleUploadError" :before-upload="beforeUpload"
+                list-type="picture-card">
+                <i class="el-icon-plus"></i>
+              </el-upload>
+              <div class="el-upload__tip">只能上传jpg/png文件，且不超过5MB</div>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+
+        <el-tab-pane label="线索信息" name="info">
+          <el-form ref="leadInfoForm" :model="currentLead" label-width="100px">
+            <el-form-item label="意向项目">
+              <el-cascader v-model="currentLead.projectId" :options="projectOptions" placeholder="请选择意向项目" clearable
+                style="width: 100%;" :props="{ expandTrigger: 'hover', emitPath: false }"></el-cascader>
+            </el-form-item>
+            <el-form-item label="客户名称">
+              <el-input v-model="currentLead.customerName" />
+            </el-form-item>
+            <el-form-item label="客户手机号">
+              <el-input v-model="currentLead.customerPhone" />
+            </el-form-item>
+            <el-form-item label="公司">
+              <el-input v-model="currentLead.companyName" />
+            </el-form-item>
+            <el-form-item label="需求面积">
+              <el-row :gutter="10">
+                <el-col :span="5">
+                  <el-input-number v-model="currentLead.areaMin" placeholder="最小面积" :min="0" style="width: 100%;" />
+                </el-col>
+                <el-col :span="2" style="text-align: center;">-</el-col>
+                <el-col :span="5">
+                  <el-input-number v-model="currentLead.areaMax" placeholder="最大面积" :min="0" style="width: 100%;" />
+                </el-col>
+              </el-row>
+            </el-form-item>
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="currentLead.remark" :rows="3" />
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        
+        <el-tab-pane label="跟进历史" name="history">
+          <div v-if="!currentLead.followHistory || currentLead.followHistory.length === 0" class="no-data">暂无跟进记录</div>
+          <div v-else class="history-timeline">
+            <el-timeline>
+              <el-timeline-item v-for="(item, index) in currentLead.followHistory" :key="index"
+                :timestamp="item.createTime" :type="getFollowStatusType(item.statusId)">
+                <div class="timeline-content">
+                  <div class="status">
+                    <el-tag :type="getFollowStatusType(item.statusId)">{{ getFollowStatusLabel(item.statusId) }}</el-tag>
+                  </div>
+                  <div class="content">{{ item.followContent }}</div>
+                  <div class="footer">
+                    <span>跟进人: {{ item.followUserName }}</span>
+                  </div>
+                  <div v-if="item.imageUrl" class="image">
+                    <el-image :src="item.imageUrl" :preview-src-list="[item.imageUrl]"
+                      style="width: 100px; height: 100px;"></el-image>
+                  </div>
+                </div>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="followDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitFollowForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 线索详情对话框 -->
+    <el-dialog title="线索详情" :visible.sync="detailDialogVisible" width="800px" append-to-body>
+      <el-tabs value="basic">
+        <el-tab-pane label="基本信息" name="basic">
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="报备时间">{{ currentLead.createTime || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="意向项目">{{ currentLead.projectName || getProjectNameById(currentLead.projectId) || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="楼宇名称">{{ currentLead.buildingName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户名称">{{ currentLead.customerName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户手机号">{{ currentLead.customerPhone || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户所属公司">{{ currentLead.companyName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="需求面积段">{{ formatAreaRange(currentLead) || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="备注">{{ currentLead.remark || '--' }}</el-descriptions-item>
+          </el-descriptions>
+        </el-tab-pane>
+        <el-tab-pane label="跟进信息" name="follow">
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="招商专员">{{ currentLead.personnelName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="招商经理">{{ currentLead.teamName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="分配方式">{{ currentLead.assignmentTypeDesc || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="线索状态">{{ currentLead.statusName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="最后跟进时间">{{ currentLead.lastFollowTime || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="下次跟进时间">{{ currentLead.nextFollowTime || '--' }}</el-descriptions-item>
+          </el-descriptions>
+        </el-tab-pane>
+        <el-tab-pane label="其他信息" name="other">
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="行业">{{ currentLead.industry || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="年龄">{{ currentLead.age || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户预算">{{ currentLead.budget || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户详情">{{ currentLead.customerDetails || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户级别">{{ currentLead.customerLevel || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户级别描述">{{ currentLead.customerLevelDesc || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="线索来源">{{ currentLead.leadSource || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="线索来源描述">{{ currentLead.leadSourceDesc || '--' }}</el-descriptions-item>
+          </el-descriptions>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+    <!-- 指定分配对话框 -->
+    <el-dialog title="指定分配" :visible.sync="assignDialogVisible" width="500px" append-to-body>
+      <el-form ref="assignForm" :model="assignForm" label-width="100px">
+        <el-form-item label="客户信息">
+          <div>{{ currentLead.customerName }} {{ currentLead.customerPhone }}</div>
+        </el-form-item>
+        <el-form-item label="选择跟进人员" prop="personnelId">
+          <el-cascader v-model="assignForm.personnelId" :options="cascaderTeamOptions" placeholder="请选择跟进人员" clearable
+            filterable :props="{
+              expandTrigger: 'hover',
+              lazy: true,
+              lazyLoad: lazyLoadTeamPersonnel,
+              value: 'value',
+              label: 'label',
+              emitPath: false
+            }" style="width: 100%;"></el-cascader>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="assignDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitAssignForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 状态表单对话框 -->
+    <el-dialog :title="statusForm.id ? '编辑状态' : '新增状态'" :visible.sync="statusFormDialogVisible" width="500px"
+      append-to-body>
+      <el-form ref="statusForm" :model="statusForm" :rules="statusRules" label-width="100px">
+        <el-form-item label="状态名称" prop="statusName">
+          <el-input v-model="statusForm.statusName" placeholder="请输入状态名称" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="statusForm.sort" :min="0" :max="100" style="width: 100%;" />
+        </el-form-item>
+        <el-form-item label="阶段描述" prop="description">
+          <el-input v-model="statusForm.description" placeholder="请输入阶段描述" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="statusFormDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitStatusForm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { API_SUCCESS_CODE } from '@/utils/constants'
+import {
+  getProjectsList,
+  getMerchantTeamList,
+  getMerchantTeamByProjectId,
+  getMerchantPersonnelList,
+  // 线索状态API
+  getLeadStatusList,
+  getLeadStatusDetail,
+  addLeadStatus,
+  updateLeadStatus,
+  deleteLeadStatus,
+  checkLeadStatusName,
+  // 线索管理API
+  getLeadList,
+  getMyLeadList,
+  getAllLeadList,
+  getPublicLeadList,
+  getLeadDetail,
+  addLead,
+  updateLead,
+  changeLeadStatus,
+  changeLeadPersonnel,
+  checkLeadPhone,
+  convertLeadToIntention,
+  deleteLead,
+  getLeadFollowHistory
+} from '@/api/merchant'
+
+import { getTagByType } from '@/api/project'
+
 export default {
   name: 'ClueManagement',
   data() {
     return {
-      
+      // 激活的标签页
+      activeTab: 'my',
+      // 跟进弹窗标签页
+      followActiveTab: 'follow',
+      // 遮罩层
+      loading: false,
+      // 统计数据
+      totalCount: 0,
+      todayNewCount: 0,
+      monthNewCount: 0,
+      invalidCount: 0,
+      convertRate: 0,
+      // 线索列表
+      leadList: [],
+      // 标签分组数据
+      tagGroups: [],
+      // 总条数
+      total: 0,
+      // 项目选项
+      projectOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        customerName: undefined,
+        customerPhone: undefined,
+        companyName: undefined,
+        projectId: undefined,
+        source: undefined,
+        leadSource: undefined,
+        statusId: undefined,
+        beginTime: undefined,
+        endTime: undefined
+      },
+      // 来源选项
+      sourceOptions: [
+        { value: '1', label: '自上' },
+        { value: '2', label: '公司资源' },
+        { value: '3', label: '自拓' },
+        { value: '4', label: '个人转介' },
+        { value: '5', label: '老带新' },
+        { value: '6', label: '渠道' },
+        { value: '7', label: '其他' }
+      ],
+      // 线索来源选项
+      clueSourceOptions: [
+        { value: '1', label: '自建' },
+        { value: '2', label: '导入' }
+      ],
+      // 跟进状态选项
+      statusOptions: [
+        { value: '1', label: '未联系', isSystem: true, sort: 1, description: '内置线索状态' },
+        { value: '2', label: '初步沟通', isSystem: true, sort: 1, description: '内置线索状态' },
+        { value: '3', label: '无效线索', isSystem: true, sort: null, description: '内置线索状态' },
+        { value: '4', label: '转意向客户', isSystem: true, sort: null, description: '内置线索状态' }
+      ],
+      // 状态列表（用于状态管理页面）
+      statusList: [],
+      // 当前选中的线索
+      currentLead: {
+        followHistory: [] // 默认为空数组
+      },
+
+      // 对话框显示控制
+      addDialogVisible: false,
+      followDialogVisible: false,
+      detailDialogVisible: false,
+      assignDialogVisible: false,
+      statusDialogVisible: false,
+      statusFormDialogVisible: false,
+
+      // 新增线索表单
+      addForm: {
+        // 基础信息
+        projectId: undefined,
+        buildingId: undefined,
+        customerName: '',
+        customerPhone: '',
+        companyName: '',
+        customerLevel: '',
+        industry: '',
+        source: '',
+        remark: '',
+        // 需求信息
+        areaMin: undefined,
+        areaMax: undefined,
+        budget: undefined,
+        // 跟进人员
+        followType: '1', // 1-指定人员 2-加入公海 3-分配给创建人
+        teamId: undefined,
+        personnelId: undefined,
+        customerDetails: '',
+        leadSource: 'zi',
+        statusId: undefined
+      },
+      // 新增表单校验规则
+      addRules: {
+        projectId: [{ required: true, message: '请选择意向项目', trigger: 'change' }],
+        customerName: [
+          { required: true, message: '客户名称不能为空', trigger: 'blur' },
+          { min: 2, max: 50, message: '客户名称长度必须在2-50个字符之间', trigger: 'blur' }
+        ],
+        customerPhone: [
+          { required: true, message: '客户手机号不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        ],
+        customerDetails: [
+          { required: true, message: '客户详情不能为空', trigger: 'blur' }
+        ],
+        customerLevel: [
+          { required: true, message: '客户级别不能为空', trigger: 'blur' }
+        ]
+      },
+
+      // 跟进表单
+      followForm: {
+        id: undefined,
+        statusId: '',
+        followContent: '',
+        nextFollowTime: '',
+        image: null,
+      },
+      // 跟进表单校验规则
+      followRules: {
+        statusId: [
+          { required: true, message: '请选择跟进状态', trigger: 'change' }
+        ]
+      },
+
+      // 指定分配表单
+      assignForm: {
+        id: undefined,
+        teamId: undefined,
+        personnelId: undefined
+      },
+
+      // 状态表单
+      statusForm: {
+        id: undefined,
+        statusName: '',
+        sortOrder: undefined,
+        isInitial: false,
+        isFinal: false,
+        isSuccess: false,
+        statusColor: '#409EFF',
+        remark: '',
+        createUserId: undefined,
+        lastModUserId: undefined
+      },
+      // 状态表单校验规则
+      statusRules: {
+        statusName: [
+          { required: true, message: '请输入状态名称', trigger: 'blur' }
+        ],
+        sortOrder: [
+          { required: true, message: '请输入排序值', trigger: 'blur' }
+        ],
+        statusColor: [
+          { required: true, message: '请选择状态颜色', trigger: 'change' }
+        ]
+      },
+
+      // 招商团队选项
+      teamOptions: [],
+      // 级联选择器的团队选项
+      cascaderTeamOptions: [],
+      // 招商人员选项
+      personnelOptions: [],
+      // 行业选项
+      industryOptions: [],
+      // 上传接口地址
+      uploadUrl: '/api/common/upload',
+      // 上传文件列表
+      fileList: []
+    }
+  },
+  computed: {
+    // 计算属性：根据日期范围设置查询参数
+    queryDateParams() {
+      if (this.dateRange && this.dateRange.length === 2) {
+        this.queryParams.beginTime = this.dateRange[0]
+        this.queryParams.endTime = this.dateRange[1]
+      } else {
+        this.queryParams.beginTime = undefined
+        this.queryParams.endTime = undefined
+      }
+      return this.queryParams
+    },
+
+    // 计算属性：获取当前线索的面积区间文本表示
+    areaRangeText() {
+      return this.currentLead ? this.formatAreaRange(this.currentLead) : '--';
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val) {
+        this.queryParams.beginTime = val[0]
+        this.queryParams.endTime = val[1]
+      } else {
+        this.queryParams.beginTime = undefined
+        this.queryParams.endTime = undefined
+      }
     }
   },
   created() {
-    
+    this.getProjectOptions()
+    this.getTagOptions()
+    this.getStatistics()
+    this.getList()
   },
   methods: {
-    
+
+    /** 获取标签选项 */
+    getTagOptions() {
+      getTagByType({ tagType: '行业标签', tagName: '行业标签' }).then(res => {
+        this.industryOptions = res.data
+      }).catch(() => {
+        this.industryOptions = [
+          { id: '1', tagName: '标签1' },
+          { id: '2', tagName: '标签2' }
+        ]
+      })
+    },
+
+    // 获取统计数据
+    getStatistics() {
+      // 模拟数据
+      this.totalCount = 12
+      this.todayNewCount = 2
+      this.monthNewCount = 5
+      this.invalidCount = 1
+      this.convertRate = 50
+    },
+
+    // 获取跟进状态列表
+    getStatusList() {
+      this.loading = true
+      getLeadList()
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.statusList = response.data.list || []
+            // 将状态列表同步到状态选项中
+            this.statusOptions = this.statusList.map(item => ({
+              value: item.id.toString(),
+              label: item.statusName,
+              isSystem: item.isInitial || item.isFinal,
+              sort: item.sortOrder,
+              description: item.remark,
+              color: item.statusColor
+            }))
+          } else {
+            this.$message.error(response.msg || '获取状态列表失败')
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          console.error('获取状态列表失败', error)
+          this.$message.error('系统错误，获取状态列表失败')
+          this.loading = false
+        })
+    },
+
+    // 获取项目选项
+    getProjectOptions() {
+      // 使用bizTeam/projects接口获取项目列表
+      getProjectsList().then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          // 转换数据结构为级联选择器格式
+          this.projectOptions = res.data.map(item => ({
+            value: item.projectId || item.id,
+            label: item.projectName || item.name
+          }))
+        } else {
+          this.$message.error(res.msg || '获取项目列表失败')
+          this.projectOptions = []
+        }
+      }).catch(error => {
+        console.error('获取项目列表失败', error)
+        this.$message.error('系统错误，获取项目列表失败')
+        this.projectOptions = []
+      })
+    },
+
+    // 获取招商团队选项
+    getTeamOptions() {
+      // 使用bizTeam/list接口获取团队列表
+      getMerchantTeamByProjectId(this.addForm.projectId).then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          this.teamOptions = res.data.map(team => ({
+            id: team.id,
+            value: team.id,
+            teamName: team.teamName,
+            label: team.teamName,
+            personnelList: []
+          }))
+
+          // 只构建团队层级，不预加载人员数据
+          this.cascaderTeamOptions = res.data.map(team => ({
+            value: team.id,
+            label: team.teamName,
+            leaf: false,  // 表示有子节点，但需要懒加载
+          }))
+        } else {
+          this.$message.error(res.msg || '获取团队列表失败')
+          this.teamOptions = []
+          this.cascaderTeamOptions = []
+        }
+      }).catch(error => {
+        console.error('获取团队列表失败', error)
+        // this.$message.error('系统错误，获取团队列表失败')
+        this.teamOptions = []
+        this.cascaderTeamOptions = []
+      })
+    },
+
+    // 懒加载招商团队人员
+    lazyLoadTeamPersonnel(node, resolve) {
+      // 根节点时不做操作
+      if (node.level === 0) {
+        return resolve([])
+      }
+
+      // 已经是叶子节点，不需要继续加载
+      if (node.level > 0) {
+        const teamId = node.value
+
+        const params = {
+          pageNum: 1,
+          pageSize: 100,
+          teamId: teamId
+        }
+
+        getMerchantPersonnelList(params).then(res => {
+          if (res.code === API_SUCCESS_CODE) {
+            // 将人员数据转换为叶子节点
+            const personnel = (res.data.data || []).map(item => ({
+              value: item.id,
+              label: `${item.memberName || '未知'} (${item.phone || '无电话'})`,
+              leaf: true  // 标记为叶子节点
+            }))
+
+            resolve(personnel)
+          } else {
+            this.$message.error(res.msg || '获取团队人员失败')
+            resolve([])
+          }
+        }).catch(error => {
+          console.error('获取团队人员失败', error)
+          this.$message.error('系统错误，获取团队人员失败')
+          resolve([])
+        })
+      } else {
+        resolve([])
+      }
+    },
+
+    // 处理跟进方式变更
+    handleFollowTypeChange(value) {
+      if (value === '1') { // 指定人员
+        // 重置人员选择
+        this.addForm.personnelId = undefined
+      }
+    },
+
+    // 获取线索列表
+    getList() {
+      this.loading = true
+      let params = { ...this.queryParams }
+
+      // 移除日期范围，单独设置
+      delete params.beginTime;
+      delete params.endTime;
+
+      // 处理日期范围
+      if (this.dateRange && this.dateRange.length === 2) {
+        params.beginTime = this.dateRange[0]
+        params.endTime = this.dateRange[1]
+      }
+
+      // 根据当前标签页选择对应的API
+      let apiMethod;
+      if (this.activeTab === 'my') {
+        // 默认给我的线索加一个userid
+        params.userId = 110
+
+        apiMethod = getMyLeadList;
+      } else if (this.activeTab === 'all') {
+        apiMethod = getAllLeadList;
+      } else if (this.activeTab === 'public') {
+        apiMethod = getPublicLeadList;
+      } else {
+        apiMethod = getLeadList; // 默认使用原来的API
+      }
+
+      apiMethod(params)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.leadList = response.data.list || []
+            this.total = response.data.total || 0
+          } else {
+            this.$message.error(response.msg || '获取线索列表失败')
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          console.error('获取线索列表失败', error)
+          this.$message.error('系统错误，获取线索列表失败')
+          this.loading = false
+        })
+    },
+
+    // 标签页点击事件
+    handleTabClick() {
+      // 清空列表数据，避免切换时数据错乱
+      this.leadList = []
+      // 重置分页参数
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      
+      // 如果切换到状态管理标签页
+      if (this.activeTab === 'status') {
+        this.getStatusList()
+      } else {
+        this.getList()
+      }
+    },
+
+    // 查询按钮
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置按钮
+    resetQuery() {
+      this.$refs.queryForm.resetFields()
+      this.dateRange = []
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        customerName: undefined,
+        customerPhone: undefined,
+        companyName: undefined,
+        projectId: undefined,
+        source: undefined,
+        leadSource: undefined,
+        statusId: undefined,
+        beginTime: undefined,
+        endTime: undefined
+      }
+      this.getList()
+    },
+
+    // 分页大小改变
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val
+      this.getList()
+    },
+
+    // 分页页码改变
+    handleCurrentChange(val) {
+      this.queryParams.pageNum = val
+      this.getList()
+    },
+
+    // 新增线索
+    handleAdd() {
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+      const initialStatus = this.statusOptions.find(item => item.isInitial)
+
+      this.addForm = {
+        customerName: '',
+        customerPhone: '',
+        companyName: '',
+        customerLevel: '',
+        industry: '',
+        source: '',
+        projectId: undefined,
+        areaMin: undefined,
+        areaMax: undefined,
+        budget: undefined,
+        customerDetails: '',
+        remark: '',
+        followType: '1', // 1-指定人员 2-加入公海 3-分配给创建人
+        teamId: undefined,
+        personnelId: undefined,
+        statusId: initialStatus ? initialStatus.value : undefined,
+        leadSource: 'zi', // zi-自建
+        createUserId: userId
+      }
+      this.addDialogVisible = true
+    },
+
+    // 编辑线索
+    handleEdit(row) {
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+
+      getLeadDetail(row.id)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            const data = response.data
+            this.addForm = {
+              id: data.id,
+              customerName: data.customerName || '',
+              customerPhone: data.customerPhone || '',
+              companyName: data.companyName || '',
+              customerLevel: data.customerLevel || '',
+              industry: data.industry || '',
+              source: data.source || '',
+              projectId: data.projectId || undefined,
+              areaMin: data.areaMin || undefined,
+              areaMax: data.areaMax || undefined,
+              budget: data.budget || undefined,
+              customerDetails: data.customerDetails || '',
+              remark: data.remark || '',
+              assignmentType: data.assignmentType || '加入公海',
+              teamId: data.teamId || undefined,
+              personnelId: data.personnelId || undefined,
+              statusId: data.statusId ? data.statusId.toString() : undefined,
+              lastModUserId: userId
+            }
+            this.addDialogVisible = true
+          } else {
+            this.$message.error(response.msg || '获取线索详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取线索详情失败', error)
+          this.$message.error('系统错误，获取线索详情失败')
+        })
+    },
+
+    // 查看线索详情
+    handleViewDetail(row) {
+      getLeadDetail(row.id)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.currentLead = response.data;
+            // 确保followHistory字段有默认值
+            if (!this.currentLead.followHistory) {
+              this.currentLead.followHistory = [];
+            }
+            this.detailDialogVisible = true;
+          } else {
+            this.$message.error(response.msg || '获取线索详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取线索详情失败', error)
+          this.$message.error('系统错误，获取线索详情失败')
+        })
+    },
+
+    // 跟进线索
+    handleFollow(row) {
+      getLeadDetail(row.id)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.currentLead = response.data;
+            // 确保followHistory字段有默认值
+            if (!this.currentLead.followHistory) {
+              this.currentLead.followHistory = [];
+            }
+            this.followForm = {
+              id: row.id,
+              statusId: this.currentLead.statusId ? this.currentLead.statusId.toString() : '',
+              followContent: this.currentLead.followContent,
+              nextFollowTime: this.currentLead.nextFollowTime,
+              image: null
+            }
+            this.followActiveTab = 'follow';
+            this.followDialogVisible = true;
+          } else {
+            this.$message.error(response.msg || '获取线索详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取线索详情失败', error)
+          this.$message.error('系统错误，获取线索详情失败')
+        })
+    },
+
+    // 下拉菜单命令处理
+    handleCommand(command, row) {
+      if (command === 'returnToPublic') {
+        this.returnToPublic(row)
+      }
+    },
+
+    // 退回公海
+    returnToPublic(row) {
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+
+      this.$confirm(`确认将线索 ${row.customerName} 退回公海吗？`, '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true
+        // API中没有直接退回公海的接口，使用修改跟进人员为空来实现
+        changeLeadPersonnel(row.id, 0, userId)
+          .then(response => {
+            if (response.code === API_SUCCESS_CODE) {
+              this.$message.success('已将线索退回公海')
+              this.getList()
+            } else {
+              this.$message.error(response.msg || '退回公海失败')
+            }
+            this.loading = false
+          })
+          .catch(error => {
+            console.error('退回公海失败', error)
+            this.$message.error('系统错误，退回公海失败')
+            this.loading = false
+          })
+      }).catch(() => { })
+    },
+
+    // 新增状态
+    handleAddStatus() {
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+
+      this.statusForm = {
+        id: undefined,
+        statusName: '',
+        sortOrder: this.statusList.length > 0 ? Math.max(...this.statusList.map(item => item.sortOrder)) + 1 : 1,
+        isInitial: false,
+        isFinal: false,
+        isSuccess: false,
+        statusColor: '#409EFF',
+        remark: '',
+        createUserId: userId
+      }
+      this.statusFormDialogVisible = true
+    },
+
+    // 编辑状态
+    handleEditStatus(row) {
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+
+      getLeadStatusDetail(row.id)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.statusForm = {
+              ...response.data,
+              lastModUserId: userId
+            }
+            this.statusFormDialogVisible = true
+          } else {
+            this.$message.error(response.msg || '获取状态详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取状态详情失败', error)
+          this.$message.error('系统错误，获取状态详情失败')
+        })
+    },
+
+    // 删除状态
+    handleDeleteStatus(row) {
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+
+      this.$confirm(`确认删除状态 ${row.statusName} 吗？`, '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true
+        deleteLeadStatus(row.id, userId)
+          .then(response => {
+            if (response.code === API_SUCCESS_CODE) {
+              this.$message.success('删除成功')
+              this.getStatusList()
+            } else {
+              this.$message.error(response.msg || '删除状态失败')
+            }
+            this.loading = false
+          })
+          .catch(error => {
+            console.error('删除状态失败', error)
+            this.$message.error('系统错误，删除状态失败')
+            this.loading = false
+          })
+      }).catch(() => { })
+    },
+
+    // 提交状态表单
+    submitStatusForm() {
+      this.$refs.statusForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+          const method = this.statusForm.id ? updateLeadStatus : addLeadStatus
+
+          method(this.statusForm)
+            .then(response => {
+              if (response.code === API_SUCCESS_CODE) {
+                this.$message.success(this.statusForm.id ? '更新状态成功' : '新增状态成功')
+                this.statusFormDialogVisible = false
+                this.getStatusList()
+              } else {
+                this.$message.error(response.msg || (this.statusForm.id ? '更新状态失败' : '新增状态失败'))
+              }
+              this.loading = false
+            })
+            .catch(error => {
+              console.error(this.statusForm.id ? '更新状态失败' : '新增状态失败', error)
+              this.$message.error(`系统错误，${this.statusForm.id ? '更新' : '新增'}状态失败`)
+              this.loading = false
+            })
+        }
+      })
+    },
+
+    // 检查状态名称是否重复
+    checkStatusNameExist(rule, value, callback) {
+      if (value && (!this.statusForm.id || this.statusForm.statusName !== value)) {
+        checkLeadStatusName(value)
+          .then(response => {
+            if (response.code === API_SUCCESS_CODE) {
+              if (response.data) {
+                callback(new Error('状态名称已存在'))
+              } else {
+                callback()
+              }
+            } else {
+              callback()
+            }
+          })
+          .catch(() => {
+            callback()
+          })
+      } else {
+        callback()
+      }
+    },
+
+    // 格式化面积区间
+    formatAreaRange(row) {
+      if (!row.areaMin && !row.areaMax) return '--';
+      if (row.areaMin && !row.areaMax) return `${row.areaMin}m²以上`;
+      if (!row.areaMin && row.areaMax) return `${row.areaMax}m²以下`;
+      return `${row.areaMin}-${row.areaMax}m²`;
+    },
+
+    // 获取跟进状态标签类型
+    getFollowStatusType(status) {
+      const statusItem = this.statusOptions.find(item => item.value === status)
+      if (statusItem) {
+        // 基于颜色返回对应类型
+        const color = statusItem.color || '#409EFF'
+        switch (color) {
+          case '#409EFF': return 'primary'
+          case '#67C23A': return 'success'
+          case '#E6A23C': return 'warning'
+          case '#F56C6C': return 'danger'
+          default: return 'info'
+        }
+      }
+      return 'info'
+    },
+
+    // 获取跟进状态显示文本
+    getFollowStatusLabel(status) {
+      const found = this.statusOptions.find(item => item.value == status)
+      return found ? found.label : '未知状态'
+    },
+
+    // 提交跟进表单
+    submitFollowForm() {
+      this.$refs.followForm.validate(valid => {
+        if (valid) {
+          // 获取当前用户ID
+          const userId = this.$store.getters.userId || 110
+
+          // 检查是否需要转化为意向客户
+          if (this.followForm.statusId === '4') { // 假设"4"是转化为意向客户的状态ID
+            this.$confirm('确认将该线索转化为意向客户吗？', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.loading = true
+              convertLeadToIntention(this.followForm.id, userId)
+                .then(response => {
+                  if (response.code === API_SUCCESS_CODE) {
+                    this.$message.success('成功将线索转化为意向客户')
+                    this.followDialogVisible = false
+                    this.getList()
+                  } else {
+                    this.$message.error(response.msg || '转化为意向客户失败')
+                  }
+                  this.loading = false
+                })
+                .catch(error => {
+                  console.error('转化为意向客户失败', error)
+                  this.$message.error('系统错误，转化为意向客户失败')
+                  this.loading = false
+                })
+            }).catch(() => { })
+          } else {
+            // 普通状态变更
+            this.loading = true
+            // 更新线索状态
+            changeLeadStatus(this.followForm.id, this.followForm.statusId, userId)
+              .then(response => {
+                if (response.code === API_SUCCESS_CODE) {
+                  this.$message.success('线索状态更新成功')
+
+                  // 同时更新线索信息
+                  const updateData = {
+                    ...this.followForm,
+                    userId,
+                    id: this.currentLead.id,
+                    customerName: this.currentLead.customerName,
+                    customerPhone: this.currentLead.customerPhone,
+                    companyName: this.currentLead.companyName,
+                    projectId: this.currentLead.projectId,
+                    areaMin: this.currentLead.areaMin,
+                    areaMax: this.currentLead.areaMax,
+                    remark: this.currentLead.remark,
+                    lastModUserId: userId
+                  }
+
+                  updateLead(updateData)
+                    .then(() => {
+                      this.followDialogVisible = false
+                      this.getList()
+                    })
+                    .catch(error => {
+                      console.error('更新线索信息失败', error)
+                      this.$message.error('状态已更新，但线索信息更新失败')
+                      this.followDialogVisible = false
+                      this.getList()
+                    })
+                } else {
+                  this.$message.error(response.msg || '更新线索状态失败')
+                  this.loading = false
+                }
+              })
+              .catch(error => {
+                console.error('更新线索状态失败', error)
+                this.$message.error('系统错误，更新线索状态失败')
+                this.loading = false
+              })
+          }
+        }
+      })
+    },
+
+    // 提交新增/编辑线索表单
+    submitAddForm() {
+      this.$refs.addForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+
+          // 构造请求数据
+          const data = { ...this.addForm }
+
+          // 处理跟进方式
+          if (this.addForm.followType === '1') {
+            data.assignmentType = '指定人员'
+          } else if (this.addForm.followType === '2') {
+            data.assignmentType = '加入公海'
+          } else if (this.addForm.followType === '3') {
+            data.assignmentType = '分配给创建人'
+            data.createUserId = this.$store.getters.userId || 110
+          }
+
+          // 删除表单中不需要传递给接口的字段
+          delete data.followType;
+
+          // 获取当前用户ID
+          if (!data.createUserId) {
+            data.createUserId = this.$store.getters.userId || 1;
+          }
+
+          // 新增或更新
+          const method = data.id ? updateLead : addLead
+          data.userId = this.$store.getters.userId || 100
+          method(data)
+            .then(response => {
+              if (response.code === API_SUCCESS_CODE) {
+                this.$message.success(data.id ? '更新线索成功' : '新增线索成功')
+                this.addDialogVisible = false
+                this.getList()
+              } else {
+                this.$message.error(response.msg || (data.id ? '更新线索失败' : '新增线索失败'))
+              }
+              this.loading = false
+            })
+            .catch(error => {
+              console.error(data.id ? '更新线索失败' : '新增线索失败', error)
+              this.$message.error(`系统错误，${data.id ? '更新' : '新增'}线索失败`)
+              this.loading = false
+            })
+        }
+      })
+    },
+
+    // 指定分配线索
+    handleAssign(row) {
+      this.currentLead = row
+      this.assignForm = {
+        id: row.id,
+        teamId: undefined,
+        personnelId: undefined
+      }
+      this.assignDialogVisible = true
+      // 使用bizTeam/list接口获取团队列表
+      getMerchantTeamByProjectId(row.projectId).then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          this.teamOptions = res.data.map(team => ({
+            id: team.id,
+            value: team.id,
+            teamName: team.teamName,
+            label: team.teamName,
+            personnelList: []
+          }))
+
+          // 只构建团队层级，不预加载人员数据
+          this.cascaderTeamOptions = res.data.map(team => ({
+            value: team.id,
+            label: team.teamName,
+            leaf: false,  // 表示有子节点，但需要懒加载
+          }))
+        } else {
+          this.$message.error(res.msg || '获取团队列表失败')
+          this.teamOptions = []
+          this.cascaderTeamOptions = []
+        }
+      })
+    },
+
+    // 提交分配表单
+    submitAssignForm() {
+      if (!this.assignForm.personnelId) {
+        this.$message.warning('请选择跟进人员')
+        return
+      }
+
+      // 获取当前用户ID
+      const userId = this.$store.getters.userId || 1
+
+      this.loading = true
+      changeLeadPersonnel(this.assignForm.id, this.assignForm.personnelId, userId)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.$message.success('分配成功')
+            this.assignDialogVisible = false
+            this.getList()
+          } else {
+            this.$message.error(response.msg || '分配失败')
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          console.error('分配失败', error)
+          this.$message.error('系统错误，分配失败')
+          this.loading = false
+        })
+    },
+
+    // 检查手机号是否存在
+    checkPhoneExist(rule, value, callback) {
+      if (value && (!this.addForm.id || this.addForm.customerPhone !== value)) {
+        checkLeadPhone(value)
+          .then(response => {
+            if (response.code === API_SUCCESS_CODE) {
+              if (response.data) {
+                callback(new Error('该手机号已存在'))
+              } else {
+                callback()
+              }
+            } else {
+              callback()
+            }
+          })
+          .catch(() => {
+            callback()
+          })
+      } else {
+        callback()
+      }
+    },
+
+    // 文件上传前检查
+    beforeUpload(file) {
+      const isImage = file.type.startsWith('image/')
+      const isLt5M = file.size / 1024 / 1024 < 5
+
+      if (!isImage) {
+        this.$message.error('只能上传图片文件!')
+      }
+      if (!isLt5M) {
+        this.$message.error('图片大小不能超过 5MB!')
+      }
+
+      return isImage && isLt5M
+    },
+
+    // 超出上传数量限制
+    handleExceed() {
+      this.$message.warning('最多只能上传1张图片')
+    },
+
+    // 上传成功回调
+    handleUploadSuccess(response, file, fileList) {
+      if (response.code === API_SUCCESS_CODE) {
+        this.followForm.image = response.data.url
+        this.$message.success('图片上传成功')
+      } else {
+        this.$message.error(response.msg || '图片上传失败')
+        // 移除上传失败的文件
+        this.fileList = []
+      }
+    },
+
+    // 上传失败回调
+    handleUploadError() {
+      this.$message.error('图片上传失败')
+      // 移除上传失败的文件
+      this.fileList = []
+    },
+
+    // 根据团队ID获取人员列表
+    getPersonnelByTeamId(teamId) {
+      if (!teamId) return []
+      const selectedTeam = this.teamOptions.find(team =>
+        team.id === teamId || team.value === teamId
+      )
+      return selectedTeam && selectedTeam.personnelList ? selectedTeam.personnelList : []
+    },
+
+    // 根据项目ID获取项目名称
+    getProjectNameById(projectId) {
+      if (!projectId || !this.projectOptions || this.projectOptions.length === 0) {
+        return '';
+      }
+      const project = this.projectOptions.find(item => item.value === projectId);
+      return project ? project.label : '';
+    },
   }
 }
 </script>
@@ -25,5 +1538,222 @@ export default {
 <style lang="scss" scoped>
 .clue-management-container {
   padding: 20px;
+
+  .statistics-container {
+    display: flex;
+    justify-content: space-between;
+    margin: 20px 0;
+    background-color: #f9f9f9;
+    padding: 20px;
+    border-radius: 4px;
+
+    .statistics-item {
+      text-align: center;
+      padding: 0 20px;
+
+      .number {
+        font-size: 24px;
+        font-weight: bold;
+        color: #409EFF;
+        margin-bottom: 5px;
+      }
+
+      .text {
+        font-size: 14px;
+        color: #606266;
+      }
+    }
+  }
+
+  .filter-container {
+    margin-bottom: 20px;
+    background-color: #fff;
+    padding: 20px;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+    .search-form {
+      margin-bottom: 10px;
+    }
+
+    .action-buttons {
+      display: flex;
+      justify-content: flex-end;
+      gap: 10px;
+    }
+  }
+
+  .status-management {
+    padding: 20px;
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+    .status-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 20px;
+
+      .title {
+        font-size: 18px;
+        font-weight: bold;
+      }
+    }
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    text-align: right;
+  }
+
+  .delete-btn {
+    color: #F56C6C;
+  }
+
+  .el-dropdown-link {
+    cursor: pointer;
+    color: #409EFF;
+  }
+
+  .area-range {
+    display: flex;
+    align-items: center;
+
+    .area-unit {
+      margin: 0 5px;
+    }
+
+    .area-separator {
+      margin: 0 10px;
+    }
+  }
+
+  .follow-panel,
+  .lead-info-panel {
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    margin-bottom: 20px;
+    padding: 20px;
+
+    .follow-header,
+    .info-header,
+    .history-header {
+      font-size: 16px;
+      font-weight: bold;
+      margin-bottom: 20px;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #EBEEF5;
+    }
+  }
+
+  .follow-history-panel {
+    margin-top: 20px;
+
+    .no-data {
+      text-align: center;
+      color: #909399;
+      padding: 20px 0;
+    }
+
+    .history-timeline {
+      max-height: 300px;
+      overflow-y: auto;
+      padding: 0 10px;
+    }
+  }
+
+  .timeline-content {
+    padding: 10px;
+    background: #F5F7FA;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .status {
+      margin-bottom: 10px;
+    }
+
+    .content {
+      margin: 10px 0;
+      color: #303133;
+      line-height: 1.5;
+    }
+
+    .footer {
+      display: flex;
+      justify-content: space-between;
+      color: #909399;
+      font-size: 12px;
+    }
+
+    .image {
+      margin-top: 10px;
+    }
+  }
+
+  .history-list {
+    max-height: 400px;
+    overflow-y: auto;
+    padding: 10px;
+  }
+
+  .personnel-select-wrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    max-height: 300px;
+    overflow-y: auto;
+    border: 1px solid #EBEEF5;
+    border-radius: 4px;
+    padding: 10px;
+
+    .personnel-team {
+      .team-name {
+        font-weight: bold;
+        margin-bottom: 8px;
+        color: #303133;
+        padding-bottom: 5px;
+        border-bottom: 1px solid #EBEEF5;
+      }
+
+      .personnel-list {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 10px;
+        margin-bottom: 5px;
+      }
+
+      .personnel-item {
+        padding: 8px 15px;
+        border: 1px solid #DCDFE6;
+        border-radius: 4px;
+        cursor: pointer;
+        transition: all 0.3s;
+        background-color: #f5f7fa;
+
+        &:hover {
+          border-color: #409EFF;
+          color: #409EFF;
+        }
+
+        &.active {
+          background-color: #ecf5ff;
+          border-color: #409EFF;
+          color: #409EFF;
+        }
+      }
+
+      .empty-tip {
+        color: #909399;
+        font-size: 12px;
+        padding: 5px;
+      }
+    }
+  }
 }
-</style> 
\ No newline at end of file
+
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>
\ No newline at end of file
diff --git a/pc/src/views/merchant/intent-customer/index.vue b/pc/src/views/merchant/intent-customer/index.vue
index 53b525d..b7900b6 100644
--- a/pc/src/views/merchant/intent-customer/index.vue
+++ b/pc/src/views/merchant/intent-customer/index.vue
@@ -1,23 +1,1522 @@
 <template>
   <div class="intent-customer-container">
-    <h1>意向客户页面</h1>
-    <p>这里是意向客户的内容，根据需求继续完善</p>
+    <!-- 导航标签 -->
+    <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tab-pane label="我的客户" name="my"></el-tab-pane>
+      <el-tab-pane label="全部客户" name="all"></el-tab-pane>
+      <el-tab-pane label="客户公海" name="public"></el-tab-pane>
+      <el-tab-pane label="客户状态" name="status"></el-tab-pane>
+    </el-tabs>
+
+    <!-- 搜索条件区域 -->
+    <div v-if="activeTab !== 'status'" class="filter-container">
+      <el-form :inline="true" :model="queryParams" ref="queryForm" class="search-form">
+        <el-form-item label="客户名称">
+          <el-input v-model="queryParams.customerName" placeholder="搜索客户名称" clearable style="width: 200px;"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="客户电话">
+          <el-input v-model="queryParams.customerPhone" placeholder="搜索客户电话" clearable style="width: 200px;"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="公司名称">
+          <el-input v-model="queryParams.companyName" placeholder="搜索公司名称" clearable style="width: 200px;"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="意向项目">
+          <el-cascader v-model="queryParams.projectId" :options="projectOptions" placeholder="请选择意向项目" clearable
+            style="width: 200px;" :props="{ expandTrigger: 'hover', emitPath: false }"></el-cascader>
+        </el-form-item>
+        <el-form-item label="客户状态" v-if="activeTab !== 'public'">
+          <el-select v-model="queryParams.statusId" placeholder="请选择客户状态" clearable style="width: 200px;">
+            <el-option v-for="item in statusOptions" :key="item.id" :label="item.statusName" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签">
+          <el-select v-model="queryParams.tagIds" multiple placeholder="请选择标签" clearable style="width: 240px;"
+            collapse-tags>
+            <el-option-group v-for="group in tagGroups" :key="group.id" :label="group.groupName">
+              <el-option v-for="tag in group.tags" :key="tag.id" :label="tag.tagName" :value="tag.id" />
+            </el-option-group>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="更新日期">
+          <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" value-format="yyyy-MM-dd" style="width: 240px;"></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="action-buttons">
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增意向客户</el-button>
+      </div>
+    </div>
+
+    <!-- 客户状态管理页面 -->
+    <div v-if="activeTab === 'status'" class="status-management">
+      <div class="status-header">
+        <div class="title">客户状态列表</div>
+      </div>
+      <el-table :data="statusList" border style="width: 100%">
+        <el-table-column type="index" label="排序" width="80" align="center"></el-table-column>
+        <el-table-column prop="statusName" label="跟进状态" width="180"></el-table-column>
+        <el-table-column prop="description" label="阶段描述"></el-table-column>
+        <el-table-column prop="isInitial" label="初始状态" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isInitial ? 'success' : 'info'">
+              {{ scope.row.isInitial ? '是' : '否' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isFinal" label="结束状态" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isFinal ? 'success' : 'info'">
+              {{ scope.row.isFinal ? '是' : '否' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 表格展示区域 - 我的客户和全部客户 -->
+    <div v-else-if="activeTab === 'my' || activeTab === 'all'">
+      <el-table v-loading="loading" :data="customerList" border stripe :key="activeTab">
+        <el-table-column prop="customerName" label="客户名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="customerPhone" label="客户电话" width="120" />
+        <el-table-column prop="companyName" label="公司" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="successRate" label="成交率" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.successRate }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="industry" label="行业" width="100" />
+        <el-table-column prop="statusName" label="客户状态" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="getStatusType(scope.row.statusId)">
+              {{ scope.row.statusName }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerType" label="客户类型" width="100" />
+        <el-table-column prop="lastUpdateTime" label="更新时间" width="160" />
+        <el-table-column prop="budget" label="客户预算" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.budget ? `${scope.row.budget}元` : '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="意向项目" min-width="150" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ getProjectNameById(scope.row.projectId) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="需求面积" width="120">
+          <template slot-scope="scope">
+            {{ formatAreaRange(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="expectedSignDate" label="预计签约时间" width="110" />
+        <el-table-column label="标签" min-width="150">
+          <template slot-scope="scope">
+            <el-tag v-for="tag in scope.row.tags" :key="tag.id" size="mini"
+              style="margin-right: 5px; margin-bottom: 5px;">
+              {{ tag.tagName }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleFollow(scope.row)">跟进</el-button>
+            <el-button type="text" size="small" @click="handleViewDetail(scope.row)">详情</el-button>
+            <el-button v-if="activeTab === 'my' || activeTab === 'all'" type="text" size="small" class="delete-btn"
+              @click="returnToPublic(scope.row)">退回公海</el-button>
+            <el-button v-if="activeTab === 'my'" type="text" size="small" @click="handleTag(scope.row)">打标签</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 表格展示区域 - 客户公海 -->
+    <div v-else-if="activeTab === 'public'">
+      <el-table v-loading="loading" :data="customerList" border stripe>
+        <el-table-column prop="customerName" label="客户名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="customerPhone" label="客户电话" width="120" />
+        <el-table-column prop="companyName" label="公司" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="successRate" label="成交率" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.successRate }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="industry" label="行业" width="100" />
+        <el-table-column prop="customerType" label="客户类型" width="100" />
+        <el-table-column prop="lastUpdateTime" label="更新时间" width="160" />
+        <el-table-column prop="budget" label="客户预算" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.budget ? `${scope.row.budget}元` : '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="意向项目" min-width="150" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ getProjectNameById(scope.row.projectId) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="需求面积" width="120">
+          <template slot-scope="scope">
+            {{ formatAreaRange(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="expectedSignDate" label="预计签约时间" width="110" />
+        <el-table-column prop="remark" label="备注" min-width="150" show-overflow-tooltip />
+        <el-table-column label="操作" width="150" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleAssign(scope.row)">指定分配</el-button>
+            <el-button type="text" size="small" @click="handleViewDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 分页区域 -->
+    <div class="pagination-container" v-if="activeTab !== 'status'">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 50]" :page-size="queryParams.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <!-- 新增意向客户对话框 -->
+    <el-dialog title="新增意向客户" :visible.sync="addDialogVisible" width="700px" append-to-body
+      @close="$refs.addForm && $refs.addForm.resetFields()">
+      <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px">
+        <el-divider content-position="left">基础信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户类型" prop="customerType">
+              <el-select v-model="addForm.customerType" placeholder="请选择客户类型" style="width: 100%;">
+                <el-option label="办公" value="办公"></el-option>
+                <el-option label="商业" value="商业"></el-option>
+                <el-option label="公寓" value="公寓"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="意向项目" prop="projectId">
+              <el-cascader v-model="addForm.projectId" :options="projectOptions" @change="getTeamOptions"
+                placeholder="请选择意向项目" clearable style="width: 100%;"
+                :props="{ expandTrigger: 'hover', emitPath: false }"></el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="addForm.customerName" placeholder="请输入客户名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户手机号" prop="customerPhone">
+              <el-input v-model="addForm.customerPhone" placeholder="请输入客户手机号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="公司" prop="companyName">
+              <el-input v-model="addForm.companyName" placeholder="请输入公司" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="行业" prop="industry">
+              <el-select v-model="addForm.industry" placeholder="请选择行业" clearable style="width: 100%;">
+                <el-option v-for="item in industryOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="addForm.remark" type="textarea" :rows="3" placeholder="请输入备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">需求信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="需求面积">
+              <div class="area-range">
+                <el-input-number v-model="addForm.areaMin" :min="0" placeholder="最小值" style="width: 110px;"
+                  controls-position="right" />
+                <span class="area-unit">m²</span>
+                <span style="margin: 0 10px;" class="area-separator">-</span>
+                <el-input-number v-model="addForm.areaMax" :min="0" placeholder="最大值" style="width: 110px;"
+                  controls-position="right" />
+                <span class="area-unit">m²</span>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="客户预算" prop="budget">
+              <el-input-number v-model="addForm.budget" :min="0" :step="1000" style="width: 100%;" :controls="false">
+                <template slot="append">元</template>
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="预计签约时间" prop="expectedSignDate">
+              <el-date-picker v-model="addForm.expectedSignDate" type="date" placeholder="选择日期" style="width: 100%;"
+                value-format="yyyy-MM-dd"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider content-position="left">跟进人员</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="跟进方式" prop="followType">
+              <el-radio-group v-model="addForm.followType" @change="handleFollowTypeChange">
+                <el-radio label="1">指定人员</el-radio>
+                <el-radio label="2">加入公海</el-radio>
+                <el-radio label="3">分配给创建人</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" v-if="addForm.followType === '1'">
+          <el-col :span="24">
+            <el-form-item label="跟进人员" prop="followPersonnel">
+              <el-cascader v-model="addForm.followPersonnel" :options="cascaderTeamOptions" placeholder="请选择跟进人员"
+                style="width: 100%;" :props="{
+                  expandTrigger: 'hover',
+                  lazy: true,
+                  lazyLoad: lazyLoadTeamPersonnel,
+                  value: 'value',
+                  label: 'label',
+                  emitPath: false
+                }"></el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitAddForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 客户跟进对话框 -->
+    <el-dialog title="客户跟进" :visible.sync="followDialogVisible" width="800px" append-to-body>
+      <el-tabs v-model="followActiveTab">
+        <el-tab-pane label="跟进客户" name="follow">
+          <el-form ref="followForm" :model="followForm" :rules="followRules" label-width="120px">
+            <el-form-item label="变更客户状态" prop="statusId">
+              <el-select v-model="followForm.statusId" placeholder="请选择客户状态" style="width: 100%;"
+                @change="handleStatusChange">
+                <el-option v-for="item in statusOptions" :key="item.id" :label="item.statusName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="跟进内容" prop="followContent" v-if="followForm.statusId !== '4'">
+              <el-input v-model="followForm.followContent" type="textarea" :rows="3" placeholder="请输入跟进内容" />
+            </el-form-item>
+            <el-form-item label="下次跟进时间" prop="nextFollowTime" v-if="followForm.statusId !== '4'">
+              <el-date-picker v-model="followForm.nextFollowTime" type="datetime" placeholder="选择日期时间"
+                style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="{ start: '08:00', step: '00:15', end: '18:00' }"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="跟进图片" prop="followImage">
+              <el-upload action="#" list-type="picture-card" :limit="1" :file-list="followForm.imageList"
+                :http-request="uploadImage" :before-upload="beforeImageUpload">
+                <i class="el-icon-plus"></i>
+              </el-upload>
+            </el-form-item>
+            <!-- 成交时绑定合同 -->
+            <el-form-item label="绑定合同" prop="contractIds" v-if="followForm.statusId === '4'">
+              <el-select v-model="followForm.contractIds" multiple placeholder="请选择合同" style="width: 100%;" filterable
+                remote :remote-method="searchContracts" :loading="contractLoading">
+                <el-option v-for="item in contractOptions" :key="item.id"
+                  :label="`${item.contractNo} - ${item.customerName}`" :value="item.id">
+                  <span style="float: left">{{ item.contractNo }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customerName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+
+        <el-tab-pane label="客户信息" name="info">
+          <el-form ref="customerInfoForm" :model="customerInfo" label-width="120px">
+            <el-form-item label="意向项目" prop="projectId">
+              <el-cascader v-model="customerInfo.projectId" :options="projectOptions" placeholder="请选择意向项目" clearable
+                style="width: 100%;" :props="{ expandTrigger: 'hover', emitPath: false }"></el-cascader>
+            </el-form-item>
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="customerInfo.customerName" placeholder="请输入客户名称" />
+            </el-form-item>
+            <el-form-item label="客户手机号" prop="customerPhone">
+              <el-input v-model="customerInfo.customerPhone" placeholder="请输入客户手机号" />
+            </el-form-item>
+            <el-form-item label="公司" prop="companyName">
+              <el-input v-model="customerInfo.companyName" placeholder="请输入公司" />
+            </el-form-item>
+            <el-form-item label="预计签约时间" prop="expectedSignDate">
+              <el-date-picker v-model="customerInfo.expectedSignDate" type="date" placeholder="选择日期"
+                style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="需求面积">
+              <div class="area-range">
+                <el-input-number v-model="customerInfo.areaMin" :min="0" placeholder="最小值" style="width: 100px;"
+                  controls-position="right" />
+                <span class="area-unit">m²</span>
+                <span style="margin: 0 10px;" class="area-separator">-</span>
+                <el-input-number v-model="customerInfo.areaMax" :min="0" placeholder="最大值" style="width: 100px;"
+                  controls-position="right" />
+                <span class="area-unit">m²</span>
+              </div>
+            </el-form-item>
+            <el-form-item label="客户预算" prop="budget">
+              <el-input-number v-model="customerInfo.budget" :min="0" :step="1000" style="width: 100%;"
+                :controls="false">
+                <template slot="append">元</template>
+              </el-input-number>
+            </el-form-item>
+            <el-form-item label="成交率" prop="successRate">
+              <el-slider v-model="customerInfo.successRate" :min="1" :max="100"
+                :format-tooltip="formatDealRate"></el-slider>
+            </el-form-item>
+            <el-form-item label="标签" prop="tagIds">
+              <el-select v-model="customerInfo.tagIds" multiple placeholder="请选择标签" clearable style="width: 100%;"
+                collapse-tags>
+                <el-option-group v-for="group in tagGroups" :key="group.id" :label="group.groupName">
+                  <el-option v-for="tag in group.tags" :key="tag.id" :label="tag.tagName" :value="tag.id" />
+                </el-option-group>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="customerInfo.remark" type="textarea" :rows="3" placeholder="请输入备注信息" />
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+
+        <el-tab-pane label="跟进历史" name="history">
+          <el-timeline>
+            <el-timeline-item v-for="(history, index) in followHistoryList" :key="index" :timestamp="history.followTime"
+              :type="getTimelineItemType(history.statusId)">
+              <div class="timeline-content">
+                <div class="status">状态: {{ history.statusName }}</div>
+                <div class="follow-person" v-if="history.personnelName">跟进人: {{ history.personnelName }} ({{
+                  history.personnelPhone }})</div>
+                <div class="content" v-if="history.followContent">内容: {{ history.followContent }}</div>
+                <div class="image" v-if="history.imageUrl">
+                  <el-image :src="history.imageUrl" style="width: 80px; height: 80px"
+                    :preview-src-list="[history.imageUrl]"></el-image>
+                </div>
+                <div class="contract" v-if="history.contractNo">合同编号: {{ history.contractNo }}</div>
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+          <div v-if="!followHistoryList || followHistoryList.length === 0" class="no-data">暂无跟进历史</div>
+        </el-tab-pane>
+      </el-tabs>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="followDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitFollowForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 指定分配对话框 -->
+    <el-dialog title="指定分配" :visible.sync="assignDialogVisible" width="500px" append-to-body>
+      <el-form ref="assignForm" :model="assignForm" :rules="assignRules" label-width="100px">
+        <el-form-item label="客户名称">
+          <span>{{ currentCustomer.customerName }}</span>
+        </el-form-item>
+        <el-form-item label="分配成员" prop="assignTo">
+          <el-cascader v-model="assignForm.assignTo" :options="cascaderTeamOptions" placeholder="请选择分配成员" style="width: 100%;"
+            :props="{ 
+              expandTrigger: 'hover', 
+              lazy: true, 
+              lazyLoad: lazyLoadTeamPersonnel,
+              value: 'value',
+              label: 'label',
+              emitPath: false
+            }"></el-cascader>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="assignDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitAssignForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 客户详情对话框 -->
+    <el-dialog title="客户详情" :visible.sync="detailDialogVisible" width="800px" append-to-body>
+      <el-tabs v-model="detailActiveTab">
+        <el-tab-pane label="基本信息" name="basic">
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="线索创建时间">{{ customerDetail.createTime || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="转意向客户时间">{{ customerDetail.convertTime || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="意向项目">{{ getProjectNameById(customerDetail.projectId) }}</el-descriptions-item>
+            <el-descriptions-item label="楼宇名称">{{ customerDetail.buildingName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户名称">{{ customerDetail.customerName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户手机号">{{ customerDetail.customerPhone || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户所属公司">{{ customerDetail.companyName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="行业">{{ customerDetail.industry || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="预计签约时间">{{ customerDetail.expectedSignDate || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="需求面积段">{{ formatAreaRange(customerDetail) || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="客户预算">{{ customerDetail.budget ? `${customerDetail.budget}元` : '--'
+            }}</el-descriptions-item>
+            <el-descriptions-item label="成交率">{{ customerDetail.successRate ? `${customerDetail.successRate}%` : '--'
+            }}</el-descriptions-item>
+            <el-descriptions-item label="标签" :span="2">
+              <el-tag v-for="tag in customerDetail.tags" :key="tag.id" size="mini"
+                style="margin-right: 5px; margin-bottom: 5px;">
+                {{ tag.tagName }}
+              </el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注" :span="2">{{ customerDetail.remark || '--' }}</el-descriptions-item>
+          </el-descriptions>
+        </el-tab-pane>
+        <el-tab-pane label="跟进信息" name="follow">
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="招商专员">{{ customerDetail.personnelName || '--' }}</el-descriptions-item>
+            <el-descriptions-item label="招商经理">{{ customerDetail.managerName || '--' }}</el-descriptions-item>
+          </el-descriptions>
+        </el-tab-pane>
+        <el-tab-pane label="合同信息" name="contract">
+          <div v-if="customerDetail.contracts && customerDetail.contracts.length > 0">
+            <el-table :data="customerDetail.contracts" border>
+              <el-table-column prop="contractNo" label="合同编号" />
+              <el-table-column prop="customerName" label="客户名称" />
+              <el-table-column prop="signDate" label="签约日期" />
+            </el-table>
+          </div>
+          <div v-else class="no-data">暂无合同信息</div>
+        </el-tab-pane>
+        <el-tab-pane label="跟进历史" name="history">
+          <el-timeline>
+            <el-timeline-item v-for="(history, index) in customerDetail.followHistory" :key="index"
+              :timestamp="history.followTime" :type="getTimelineItemType(history.statusId)">
+              <div class="timeline-content">
+                <div class="status">状态: {{ history.statusName }}</div>
+                <div class="follow-person" v-if="history.personnelName">跟进人: {{ history.personnelName }} ({{
+                  history.personnelPhone }})</div>
+                <div class="content" v-if="history.followContent">内容: {{ history.followContent }}</div>
+                <div class="image" v-if="history.imageUrl">
+                  <el-image :src="history.imageUrl" style="width: 80px; height: 80px"
+                    :preview-src-list="[history.imageUrl]"></el-image>
+                </div>
+                <div class="contract" v-if="history.contractNo">合同编号: {{ history.contractNo }}</div>
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+          <div v-if="!customerDetail.followHistory || customerDetail.followHistory.length === 0" class="no-data">暂无跟进历史
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="线索跟进历史" name="clueHistory">
+          <el-timeline>
+            <el-timeline-item v-for="(history, index) in customerDetail.clueFollowHistory" :key="index"
+              :timestamp="history.followTime" :type="getTimelineItemType(history.statusId)">
+              <div class="timeline-content">
+                <div class="status">状态: {{ history.statusName }}</div>
+                <div class="follow-person" v-if="history.personnelName">跟进人: {{ history.personnelName }} ({{
+                  history.personnelPhone }})</div>
+                <div class="content" v-if="history.followContent">内容: {{ history.followContent }}</div>
+                <div class="image" v-if="history.imageUrl">
+                  <el-image :src="history.imageUrl" style="width: 80px; height: 80px"
+                    :preview-src-list="[history.imageUrl]"></el-image>
+                </div>
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+          <div v-if="!customerDetail.clueFollowHistory || customerDetail.clueFollowHistory.length === 0"
+            class="no-data">
+            暂无线索跟进历史</div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+    <!-- 打标签对话框 -->
+    <el-dialog title="打标签" :visible.sync="tagDialogVisible" width="500px" append-to-body>
+      <el-form ref="tagForm" :model="tagForm" label-width="80px">
+        <el-form-item label="客户名称">
+          <span>{{ currentCustomer.customerName }}</span>
+        </el-form-item>
+        <el-form-item label="标签" prop="tagIds">
+          <el-select v-model="tagForm.tagIds" multiple placeholder="请选择标签" clearable style="width: 100%;" collapse-tags>
+            <el-option-group v-for="group in tagGroups" :key="group.id" :label="group.groupName">
+              <el-option v-for="tag in group.tags" :key="tag.id" :label="tag.tagName" :value="tag.id" />
+            </el-option-group>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="tagDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitTagForm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { getIntentCustomerCount, getAllTagGroups, getTagListByGroupId } from '@/api/merchant'
+import { getProjectsList } from '@/api/merchant'
+import { getMerchantTeamByProjectId, getMerchantPersonnelList } from '@/api/merchant'
+import {
+  getMyCustomerList,
+  getAllCustomerList,
+  getPublicCustomerList,
+  getCustomerDetail,
+  createCustomer,
+  updateCustomer,
+  followCustomer,
+  getCustomerFollowHistory,
+  assignCustomer,
+  returnCustomerToPublic,
+  getCustomerTagGroups,
+  saveCustomerTags,
+  checkCustomerPhone,
+  getCustomerStatusList
+} from '@/api/merchant'
+import { getUserId } from '@/utils/auth'
+import { API_SUCCESS_CODE } from '@/utils/constants'
+
 export default {
   name: 'IntentCustomer',
   data() {
+    const validatePhone = (rule, value, callback) => {
+      if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error('请输入正确的手机号码'))
+      } else {
+        callback()
+      }
+    }
     return {
-      
+      // 遮罩层
+      loading: false,
+      contractLoading: false,
+      // 激活的标签页
+      activeTab: 'my',
+      // 客户列表
+      customerList: [],
+      // 标签分组数据
+      tagGroups: [],
+      // 总条数
+      total: 0,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        customerName: undefined,
+        customerPhone: undefined,
+        companyName: undefined,
+        projectId: undefined,
+        statusId: undefined,
+        tagIds: [],
+        startDate: undefined,
+        endDate: undefined
+      },
+      // 客户状态选项
+      statusOptions: [],
+      // 项目选项
+      projectOptions: [],
+      // 团队选项
+      teamOptions: [],
+      // 级联选择器团队选项
+      cascaderTeamOptions: [],
+      // 行业选项
+      industryOptions: [
+        { value: '互联网', label: '互联网' },
+        { value: '金融', label: '金融' },
+        { value: '教育', label: '教育' },
+        { value: '医疗', label: '医疗' },
+        { value: '制造业', label: '制造业' },
+        { value: '贸易', label: '贸易' },
+        { value: '服务业', label: '服务业' },
+        { value: '其他', label: '其他' }
+      ],
+      // 客户状态列表
+      statusList: [],
+      // 当前选中的客户
+      currentCustomer: {},
+      // 新增对话框可见性
+      addDialogVisible: false,
+      // 跟进对话框可见性
+      followDialogVisible: false,
+      // 指定分配对话框可见性
+      assignDialogVisible: false,
+      // 详情对话框可见性
+      detailDialogVisible: false,
+      // 打标签对话框可见性
+      tagDialogVisible: false,
+      // 详情对话框激活标签
+      detailActiveTab: 'basic',
+      // 跟进历史列表
+      followHistoryList: [],
+      // 合同选项
+      contractOptions: [],
+      // 新增表单
+      addForm: {
+        customerType: undefined,
+        projectId: undefined,
+        customerName: undefined,
+        customerPhone: undefined,
+        companyName: undefined,
+        industry: undefined,
+        remark: undefined,
+        areaMin: undefined,
+        areaMax: undefined,
+        budget: undefined,
+        expectedSignDate: undefined,
+        followType: '2', // 默认加入公海
+        followPersonnel: undefined
+      },
+      // 跟进表单
+      followForm: {
+        id: undefined,
+        statusId: undefined,
+        content: undefined,
+        nextFollowTime: undefined,
+        imageList: [],
+        imageUrl: undefined,
+        contractIds: []
+      },
+      // 客户信息表单
+      customerInfo: {
+        id: undefined,
+        projectId: undefined,
+        customerName: undefined,
+        customerPhone: undefined,
+        companyName: undefined,
+        expectedSignDate: undefined,
+        areaMin: undefined,
+        areaMax: undefined,
+        budget: undefined,
+        successRate: 50,
+        tagIds: [],
+        remark: undefined
+      },
+      // 指定分配表单
+      assignForm: {
+        id: undefined,
+        assignTo: undefined
+      },
+      // 打标签表单
+      tagForm: {
+        id: undefined,
+        tagIds: []
+      },
+      // 客户详情数据
+      customerDetail: {},
+      // 新增表单校验规则
+      addRules: {
+        customerType: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
+        projectId: [{ required: true, message: '请选择意向项目', trigger: 'change' }],
+        customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
+        customerPhone: [
+          { required: true, message: '请输入客户手机号', trigger: 'blur' },
+          { validator: validatePhone, trigger: 'blur' }
+        ],
+        followPersonnel: [
+          {
+            required: true, message: '请选择跟进人员', trigger: 'change',
+            validator: (rule, value, callback) => {
+              if (this.addForm.followType === '1' && !value) {
+                callback(new Error('请选择跟进人员'))
+              } else {
+                callback()
+              }
+            }
+          }
+        ]
+      },
+      // 跟进表单校验规则
+      followRules: {
+        statusId: [{ required: true, message: '请选择客户状态', trigger: 'change' }],
+        contractIds: [
+          {
+            required: true, message: '请选择合同', trigger: 'change',
+            validator: (rule, value, callback) => {
+              if (this.followForm.statusId === '4' && (!value || value.length === 0)) {
+                callback(new Error('请选择合同'))
+              } else {
+                callback()
+              }
+            }
+          }
+        ]
+      },
+      // 指定分配表单校验规则
+      assignRules: {
+        assignTo: [{ required: true, message: '请选择分配成员', trigger: 'change' }]
+      },
+      // 跟进对话框激活标签
+      followActiveTab: 'follow'
     }
   },
   created() {
-    
+    this.getCustomerList()
+    this.getProjectOptions()
+    this.getStatusOptions()
+    this.getTagGroups()
   },
   methods: {
-    
+    // 获取意向客户列表
+    getCustomerList() {
+      this.loading = true
+
+      // 准备查询参数
+      const params = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        customerName: this.queryParams.customerName,
+        customerPhone: this.queryParams.customerPhone,
+        companyName: this.queryParams.companyName,
+        projectId: this.queryParams.projectId,
+        statusId: this.queryParams.statusId,
+        tagIds: this.queryParams.tagIds,
+        beginTime: this.queryParams.startDate,
+        endTime: this.queryParams.endDate
+      }
+
+      // 根据标签页选择对应的API
+      let apiMethod;
+      if (this.activeTab === 'my') {
+        apiMethod = getMyCustomerList
+        params.followUserId = 201
+      } else if (this.activeTab === 'all') {
+        apiMethod = getAllCustomerList
+      } else if (this.activeTab === 'public') {
+        apiMethod = getPublicCustomerList
+      }
+
+      // 调用API
+      apiMethod(params)
+        .then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.customerList = response.data.list || []
+            this.total = response.data.total || 0
+          } else {
+            this.$message.error(response.msg || '获取意向客户列表失败')
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          console.error('获取意向客户列表失败', error)
+          this.$message.error('系统错误，获取意向客户列表失败')
+          this.loading = false
+        })
+    },
+
+    // 获取客户状态选项
+    getStatusOptions() {
+      // 使用API获取状态列表
+      getCustomerStatusList().then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.statusOptions = response.data || []
+          this.statusList = this.statusOptions
+        } else {
+          this.$message.error(response.msg || '获取客户状态列表失败')
+          this.statusOptions = []
+          this.statusList = []
+        }
+      }).catch(error => {
+        console.error('获取客户状态列表失败', error)
+        this.$message.error('系统错误，获取客户状态列表失败')
+        // 使用模拟数据作为备选
+        this.statusOptions = [
+          { id: '1', statusName: '接触', description: '初次接触阶段', isInitial: true, isFinal: false },
+          { id: '2', statusName: '带看', description: '带客户看房阶段', isInitial: false, isFinal: false },
+          { id: '3', statusName: '沟通', description: '深入沟通阶段', isInitial: false, isFinal: false },
+          { id: '4', statusName: '流失', description: '客户流失阶段', isInitial: false, isFinal: true },
+          { id: '5', statusName: '成交', description: '客户成交阶段', isInitial: false, isFinal: true },
+        ]
+        this.statusList = this.statusOptions
+      })
+    },
+
+    // 获取标签分组和标签
+    getTagGroups() {
+      getCustomerTagGroups().then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.tagGroups = response.data || []
+        } else {
+          this.$message.error(response.msg || '获取标签分组失败')
+          this.tagGroups = []
+        }
+      }).catch(error => {
+        console.error('获取标签分组失败', error)
+        this.$message.error('系统错误，获取标签分组失败')
+        // 使用模拟数据
+        this.tagGroups = [
+          {
+            id: 1,
+            groupName: '客户价值',
+            tags: [
+              { id: 1, tagName: '高价值' },
+              { id: 2, tagName: '中价值' },
+              { id: 3, tagName: '低价值' }
+            ]
+          },
+          {
+            id: 2,
+            groupName: '客户需求',
+            tags: [
+              { id: 4, tagName: '急需' },
+              { id: 5, tagName: '稳定客户' },
+              { id: 6, tagName: '潜在客户' }
+            ]
+          }
+        ]
+      })
+    },
+
+    // 提交新增表单
+    submitAddForm() {
+      this.$refs.addForm.validate(valid => {
+        if (valid) {
+          // 检查手机号是否已存在
+          checkCustomerPhone({ phone: this.addForm.customerPhone }).then(phoneRes => {
+            if (phoneRes.code === API_SUCCESS_CODE && phoneRes.data) {
+              this.$confirm('该手机号已存在，是否继续创建?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.createNewCustomer()
+              }).catch(() => {
+                // 用户取消操作
+              })
+            } else {
+              // 手机号不存在，直接创建
+              this.createNewCustomer()
+            }
+          }).catch(error => {
+            console.error('检查手机号失败', error)
+            // 出错时也允许继续创建
+            this.createNewCustomer()
+          })
+        } else {
+          this.$message.error('表单校验失败，请检查填写的信息')
+          return false
+        }
+      })
+    },
+
+    // 创建新客户
+    createNewCustomer() {
+      const userId = getUserId() || '110'
+      // 准备提交的数据
+      const formData = {
+        customerType: this.addForm.customerType,
+        projectId: this.addForm.projectId,
+        customerName: this.addForm.customerName,
+        customerPhone: this.addForm.customerPhone,
+        companyName: this.addForm.companyName,
+        industry: this.addForm.industry,
+        remark: this.addForm.remark,
+        areaMin: this.addForm.areaMin,
+        areaMax: this.addForm.areaMax,
+        budget: this.addForm.budget,
+        expectedSignDate: this.addForm.expectedSignDate,
+        assignmentType: this.addForm.followType == 1 ? '指定人员' : this.addForm.followType == 2 ? '加入公海' : '分配给创建人',
+      }
+      if (this.addForm.followType === '3') {
+        formData.createUserId = userId
+      }
+
+      // 如果是指定人员跟进，添加相关字段
+      if (this.addForm.followType === '1' && this.addForm.followPersonnel) {
+        formData.personnelId = this.addForm.followPersonnel
+      }
+
+      // 调用创建API
+      createCustomer(formData).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.$message.success('新增意向客户成功')
+          this.addDialogVisible = false
+          this.getCustomerList()
+        } else {
+          this.$message.error(response.msg || '新增意向客户失败')
+        }
+      }).catch(error => {
+        console.error('新增意向客户失败', error)
+        this.$message.error('系统错误，新增意向客户失败')
+      })
+    },
+
+    // 获取跟进历史
+    getFollowHistory(id) {
+      getCustomerFollowHistory(id).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.followHistoryList = response.data || []
+        } else {
+          this.$message.error(response.msg || '获取跟进历史失败')
+          this.followHistoryList = []
+        }
+      }).catch(error => {
+        console.error('获取跟进历史失败', error)
+        this.$message.error('系统错误，获取跟进历史失败')
+        this.followHistoryList = []
+      })
+    },
+
+    // 跟进按钮
+    handleFollow(row) {
+      this.currentCustomer = row
+      this.followForm = {
+        id: row.id,
+        statusId: row.statusId,
+        content: undefined,
+        nextFollowTime: undefined,
+        imageList: [],
+        imageUrl: undefined,
+        contractIds: []
+      }
+
+      // 获取客户详情，包含跟进历史
+      getCustomerDetail(row.id).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          const detail = response.data
+          this.customerInfo = {
+            id: detail.id,
+            projectId: detail.projectId,
+            customerName: detail.customerName,
+            customerPhone: detail.customerPhone,
+            companyName: detail.companyName,
+            expectedSignDate: detail.expectedSignDate,
+            areaMin: detail.areaMin,
+            areaMax: detail.areaMax,
+            budget: detail.budget,
+            successRate: detail.successRate || 50,
+            tagIds: detail.tags ? detail.tags.map(tag => tag.id) : [],
+            remark: detail.remark
+          }
+          this.followHistoryList = detail.followHistory || []
+          this.followDialogVisible = true
+        } else {
+          this.$message.error(response.msg || '获取客户详情失败')
+        }
+      }).catch(error => {
+        console.error('获取客户详情失败', error)
+        this.$message.error('系统错误，获取客户详情失败')
+      })
+    },
+
+    // 提交跟进表单
+    submitFollowForm() {
+      // 优先校验跟进表单
+      this.$refs.followForm.validate(valid => {
+        if (valid) {
+          // 如果跟进表单验证通过，再校验客户信息表单
+          this.$refs.customerInfoForm.validate(infoValid => {
+            if (infoValid) {
+              // 组装所有数据
+              const submitData = {
+                // 客户基本信息
+                customerId: this.customerInfo.id,
+                projectId: this.customerInfo.projectId,
+                customerName: this.customerInfo.customerName,
+                customerPhone: this.customerInfo.customerPhone,
+                companyName: this.customerInfo.companyName,
+                expectedSignDate: this.customerInfo.expectedSignDate,
+                areaMin: this.customerInfo.areaMin,
+                areaMax: this.customerInfo.areaMax,
+                budget: this.customerInfo.budget,
+                successRate: this.customerInfo.successRate,
+                remark: this.customerInfo.remark,
+                // 跟进信息
+                statusId: this.followForm.statusId,
+                followContent: this.followForm.followContent,
+                nextFollowTime: this.followForm.nextFollowTime,
+                followImage: this.followForm.imageUrl,
+                contractNos: this.followForm.contractIds || [],
+                // 标签信息
+                tagIds: this.customerInfo.tagIds,
+                followUserId:201
+              }
+
+              // 调用更新API
+              followCustomer(submitData).then(response => {
+                if (response.code === API_SUCCESS_CODE) {
+                  this.$message.success('客户跟进成功')
+                  this.followDialogVisible = false
+                  this.getCustomerList()
+                } else {
+                  this.$message.error(response.msg || '客户跟进失败')
+                }
+              }).catch(error => {
+                console.error('客户跟进失败', error)
+                this.$message.error('系统错误，客户跟进失败')
+              })
+            } else {
+              // 如果客户信息表单未通过验证，切换到客户信息标签页
+              this.followActiveTab = 'info'
+              this.$message.error('客户信息表单验证失败，请检查输入')
+            }
+          })
+        } else {
+          // 如果跟进表单未通过验证，切换到跟进客户标签页
+          this.followActiveTab = 'follow'
+          this.$message.error('跟进表单验证失败，请检查输入')
+        }
+      })
+    },
+
+    // 提交指定分配表单
+    submitAssignForm() {
+      this.$refs.assignForm.validate(valid => {
+        if (valid) {
+          const userId = getUserId() || '1'
+          const teamId = this.assignForm.assignTo.toString().split(',')[0] // 如果是数组，取第一个作为团队ID
+          const personnelId = this.assignForm.assignTo
+
+          assignCustomer(this.assignForm.id, {
+            teamId: teamId,
+            personnelId: personnelId,
+            userId: userId
+          }).then(response => {
+            if (response.code === API_SUCCESS_CODE) {
+              this.$message.success('指定分配成功')
+              this.assignDialogVisible = false
+              this.getCustomerList()
+            } else {
+              this.$message.error(response.msg || '指定分配失败')
+            }
+          }).catch(error => {
+            console.error('指定分配失败', error)
+            this.$message.error('系统错误，指定分配失败')
+          })
+        }
+      })
+    },
+
+    // 提交打标签表单
+    submitTagForm() {
+      saveCustomerTags({
+        customerId: this.tagForm.id,
+        tagIds: this.tagForm.tagIds
+      }).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.$message.success('标签更新成功')
+          this.tagDialogVisible = false
+          this.getCustomerList()
+        } else {
+          this.$message.error(response.msg || '标签更新失败')
+        }
+      }).catch(error => {
+        console.error('标签更新失败', error)
+        this.$message.error('系统错误，标签更新失败')
+      })
+    },
+
+    // 格式化面积范围
+    formatAreaRange(row) {
+      if (!row) return '--'
+      if (row.areaMin && row.areaMax) {
+        return `${row.areaMin}-${row.areaMax}m²`
+      } else if (row.areaMin) {
+        return `≥${row.areaMin}m²`
+      } else if (row.areaMax) {
+        return `≤${row.areaMax}m²`
+      } else {
+        return '--'
+      }
+    },
+    // 格式化成交率
+    formatDealRate(val) {
+      return val + '%'
+    },
+    // 获取状态类型
+    getStatusType(statusId) {
+      switch (statusId) {
+        case '1': return 'info'
+        case '2': return 'warning'
+        case '3': return 'primary'
+        case '4': return 'success'
+        case '5': return 'danger'
+        default: return 'info'
+      }
+    },
+    // 获取时间线项目类型
+    getTimelineItemType(statusId) {
+      switch (statusId) {
+        case '1': return 'info'
+        case '2': return 'warning'
+        case '3': return 'primary'
+        case '4': return 'success'
+        case '5': return 'danger'
+        default: return ''
+      }
+    },
+    // 打开标签弹窗
+    handleTag(row) {
+      this.currentCustomer = row;
+      this.tagForm = {
+        id: row.id,
+        tagIds: row.tags ? row.tags.map(tag => tag.id) : []
+      };
+      this.tagDialogVisible = true;
+    },
+    // 标签页切换
+    handleTabClick() {
+      this.resetQuery()
+      this.getCustomerList()
+    },
+    // 查询按钮
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      if (this.dateRange && this.dateRange.length === 2) {
+        this.queryParams.startDate = this.dateRange[0]
+        this.queryParams.endDate = this.dateRange[1]
+      } else {
+        this.queryParams.startDate = undefined
+        this.queryParams.endDate = undefined
+      }
+      this.getCustomerList()
+    },
+    // 重置按钮
+    resetQuery() {
+      this.$refs.queryForm.resetFields()
+      this.dateRange = []
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        customerName: undefined,
+        customerPhone: undefined,
+        companyName: undefined,
+        projectId: undefined,
+        statusId: undefined,
+        tagIds: [],
+        startDate: undefined,
+        endDate: undefined
+      }
+      this.handleQuery()
+    },
+    // 分页大小改变
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val
+      this.getCustomerList()
+    },
+    // 分页页码改变
+    handleCurrentChange(val) {
+      this.queryParams.pageNum = val
+      this.getCustomerList()
+    },
+    // 新增按钮
+    handleAdd() {
+      this.addDialogVisible = true
+    },
+    // 跟进类型变更
+    handleFollowTypeChange(value) {
+      if (value !== '1') {
+        this.addForm.followPersonnel = undefined
+      }
+    },
+    // 客户状态变更
+    handleStatusChange(value) {
+      if (value === '4') {
+        // 成交状态，清空不需要的内容
+        this.followForm.followContent = undefined
+        this.followForm.nextFollowTime = undefined
+        // 获取可绑定的合同
+        this.searchContracts('')
+      } else {
+        this.followForm.contractIds = []
+      }
+    },
+    // 搜索合同
+    searchContracts(query) {
+      this.contractLoading = true
+      // 模拟合同搜索
+      setTimeout(() => {
+        this.contractOptions = [
+          {
+            id: 1,
+            contractNo: 'HT2023001',
+            customerName: '张三',
+            signDate: '2023-06-20'
+          },
+          {
+            id: 2,
+            contractNo: 'HT2023002',
+            customerName: '李四',
+            signDate: '2023-07-15'
+          }
+        ]
+        this.contractLoading = false
+      }, 500)
+    },
+    // 图片上传前校验
+    beforeImageUpload(file) {
+      const isImage = file.type.indexOf('image/') === 0
+      const isLt5M = file.size / 1024 / 1024 < 5
+
+      if (!isImage) {
+        this.$message.error('只能上传图片文件!')
+      }
+      if (!isLt5M) {
+        this.$message.error('图片大小不能超过 5MB!')
+      }
+      return isImage && isLt5M
+    },
+    // 自定义图片上传
+    uploadImage(options) {
+      // 模拟上传
+      const file = options.file
+      const reader = new FileReader()
+      reader.readAsDataURL(file)
+      reader.onload = () => {
+        this.followForm.imageUrl = reader.result
+        this.followForm.imageList = [{
+          name: file.name,
+          url: reader.result
+        }]
+        options.onSuccess()
+      }
+    },
+    // 获取团队选项
+    getTeamOptions() {
+      // 使用bizTeam/project/:projectId接口获取团队列表
+      getMerchantTeamByProjectId(this.addForm.projectId).then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          this.teamOptions = res.data.map(team => ({
+            id: team.id,
+            value: team.id,
+            teamName: team.teamName,
+            label: team.teamName,
+            personnelList: []
+          }))
+
+          // 只构建团队层级，不预加载人员数据
+          this.cascaderTeamOptions = res.data.map(team => ({
+            value: team.id,
+            label: team.teamName,
+            leaf: false,  // 表示有子节点，但需要懒加载
+          }))
+        } else {
+          this.$message.error(res.msg || '获取团队列表失败')
+          this.teamOptions = []
+          this.cascaderTeamOptions = []
+        }
+      }).catch(error => {
+        console.error('获取团队列表失败', error)
+        // 使用模拟数据
+        this.teamOptions = [
+          {
+            value: 1,
+            label: '招商一部',
+            children: [
+              { value: 101, label: '王经理 (13812345678)' },
+              { value: 102, label: '张经理 (13823456789)' }
+            ]
+          },
+          {
+            value: 2,
+            label: '招商二部',
+            children: [
+              { value: 201, label: '赵经理 (13987654321)' },
+              { value: 202, label: '钱经理 (13976543210)' }
+            ]
+          }
+        ]
+
+        this.cascaderTeamOptions = [
+          {
+            value: 1,
+            label: '招商一部',
+            leaf: false
+          },
+          {
+            value: 2,
+            label: '招商二部',
+            leaf: false
+          }
+        ]
+      })
+    },
+    // 获取项目选项
+    getProjectOptions() {
+      // 使用与线索管理相同的接口获取项目列表
+      getProjectsList().then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          // 转换数据结构为级联选择器格式
+          this.projectOptions = res.data.map(item => ({
+            value: item.projectId || item.id,
+            label: item.projectName || item.name
+          }))
+        } else {
+          this.$message.error(res.msg || '获取项目列表失败')
+          this.projectOptions = []
+        }
+      }).catch(error => {
+        console.error('获取项目列表失败', error)
+        // 如果API调用失败，使用模拟数据
+        this.projectOptions = [
+          {
+            value: 1,
+            label: '某商业广场',
+            children: [
+              { value: 101, label: 'A座' },
+              { value: 102, label: 'B座' }
+            ]
+          },
+          {
+            value: 2,
+            label: '某办公大厦',
+            children: [
+              { value: 201, label: '1号楼' },
+              { value: 202, label: '2号楼' }
+            ]
+          }
+        ]
+      })
+    },
+    // 懒加载招商团队人员
+    lazyLoadTeamPersonnel(node, resolve) {
+      // 根节点时不做操作
+      if (node.level === 0) {
+        return resolve([])
+      }
+
+      // 已经是叶子节点，不需要继续加载
+      if (node.level > 0) {
+        const teamId = node.value
+
+        const params = {
+          pageNum: 1,
+          pageSize: 100,
+          teamId: teamId
+        }
+
+        getMerchantPersonnelList(params).then(res => {
+          if (res.code === API_SUCCESS_CODE) {
+            // 将人员数据转换为叶子节点
+            const personnel = (res.data.data || []).map(item => ({
+              value: item.id,
+              label: `${item.memberName || '未知'} (${item.phone || '无电话'})`,
+              leaf: true  // 标记为叶子节点
+            }))
+
+            resolve(personnel)
+          } else {
+            this.$message.error(res.msg || '获取团队人员失败')
+            resolve([])
+          }
+        }).catch(error => {
+          console.error('获取团队人员失败', error)
+          this.$message.error('系统错误，获取团队人员失败')
+          resolve([])
+        })
+      } else {
+        resolve([])
+      }
+    },
+    // 指定分配按钮
+    handleAssign(row) {
+      this.currentCustomer = row
+      this.assignForm = {
+        id: row.id,
+        assignTo: undefined
+      }
+      this.assignDialogVisible = true
+
+      // 获取团队和人员数据
+      getMerchantTeamByProjectId(row.projectId).then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          // 只构建团队层级，不预加载人员数据
+          this.cascaderTeamOptions = res.data.map(team => ({
+            value: team.id,
+            label: team.teamName,
+            leaf: false  // 表示有子节点，但需要懒加载
+          }))
+        } else {
+          this.$message.error(res.msg || '获取团队列表失败')
+          this.cascaderTeamOptions = []
+        }
+      }).catch(error => {
+        console.error('获取团队列表失败', error)
+        // 使用模拟数据
+        this.cascaderTeamOptions = [
+          {
+            value: 1,
+            label: '招商一部',
+            leaf: false
+          },
+          {
+            value: 2,
+            label: '招商二部',
+            leaf: false
+          }
+        ]
+      })
+    },
+    // 添加获取项目名称的方法
+    getProjectNameById(projectId) {
+      if (!projectId) return '--'
+
+      // 扁平化处理projectOptions，获取所有项目选项
+      const findProjectName = (options) => {
+        for (const option of options) {
+          if (option.value === projectId) {
+            return option.label
+          }
+          if (option.children && option.children.length > 0) {
+            const name = findProjectName(option.children)
+            if (name) return name
+          }
+        }
+        return null
+      }
+
+      const projectName = findProjectName(this.projectOptions)
+      return projectName || '--'
+    },
+    // 详情按钮
+    handleViewDetail(row) {
+      this.currentCustomer = row
+      getCustomerDetail(row.id).then(response => {
+        if (response.code === API_SUCCESS_CODE) {
+          this.customerDetail = response.data
+          this.detailDialogVisible = true
+        } else {
+          this.$message.error(response.msg || '获取客户详情失败')
+        }
+      }).catch(error => {
+        console.error('获取客户详情失败', error)
+        this.$message.error('系统错误，获取客户详情失败')
+      })
+    },
+    // 退回公海按钮
+    returnToPublic(row) {
+      const userId = this.$store.getters.userId || 201
+
+      this.currentCustomer = row
+
+      this.$confirm(`确认将客户 ${row.customerName} 退回公海吗？`, '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        returnCustomerToPublic(row.id, userId).then(response => {
+          if (response.code === API_SUCCESS_CODE) {
+            this.$message.success('客户退回公海成功')
+            this.getCustomerList()
+          } else {
+            this.$message.error(response.msg || '客户退回公海失败')
+          }
+        }).catch(error => {
+        })
+        console.error('客户退回公海失败', error)
+        this.$message.error('系统错误，客户退回公海失败')
+      })
+    },
   }
 }
 </script>
@@ -25,5 +1524,77 @@ export default {
 <style lang="scss" scoped>
 .intent-customer-container {
   padding: 20px;
+
+  .filter-container {
+    margin-bottom: 20px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .search-form {
+      flex: 1;
+    }
+
+    .action-buttons {
+      margin-left: 10px;
+    }
+  }
+
+  .status-management {
+    .status-header {
+      margin-bottom: 15px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .title {
+        font-size: 16px;
+        font-weight: bold;
+      }
+    }
+  }
+
+  .timeline-content {
+    padding: 10px;
+    background-color: #F8F8F8;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .status,
+    .follow-person,
+    .content,
+    .contract {
+      margin-bottom: 5px;
+    }
+
+    .image {
+      margin: 10px 0;
+    }
+  }
+
+  .area-range {
+    display: flex;
+    align-items: center;
+
+    .area-unit {
+      margin-left: 5px;
+    }
+  }
+
+  .no-data {
+    color: #909399;
+    font-size: 14px;
+    text-align: center;
+    padding: 20px 0;
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    text-align: right;
+  }
+
+  .delete-btn {
+    color: #F56C6C;
+  }
 }
-</style> 
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/pc/src/views/merchant/merchant-personnel/index.vue b/pc/src/views/merchant/merchant-personnel/index.vue
index 5935e24..0dd6442 100644
--- a/pc/src/views/merchant/merchant-personnel/index.vue
+++ b/pc/src/views/merchant/merchant-personnel/index.vue
@@ -26,10 +26,14 @@
 
         <!-- 列表区域 -->
         <el-table v-loading="loading" :data="personnelList" row-key="id" border>
-          <el-table-column prop="memberName" label="招商人名称" />
+          <el-table-column label="招商人名称">
+            <template slot-scope="scope">
+              {{ scope.row.memberName }}
+              <el-tag v-if="scope.row.managerFlag === '1'" size="mini" type="primary">招商经理</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="phone" label="招商人电话" />
           <el-table-column prop="teamName" label="所属团队" />
-          <el-table-column prop="managerFlagDesc" label="是否经理" align="center" />
           <el-table-column prop="clueCount" label="线索数量" align="center" />
           <el-table-column prop="intentionCustomerCount" label="意向客户数量" align="center" />
           <el-table-column prop="contractCount" label="合同数量" align="center" />
@@ -58,7 +62,12 @@
             class="filter-item" />
           <el-select v-model="teamQueryParams.projectId" placeholder="请选择项目" clearable style="width: 200px;"
             class="filter-item">
-            <el-option v-for="item in projectOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option 
+              v-for="item in projectOptions" 
+              :key="item.projectId || item.id" 
+              :label="item.projectName || item.name" 
+              :value="item.projectId || item.id" 
+            />
           </el-select>
           <el-button type="primary" icon="el-icon-search" @click="handleTeamSearch">搜索</el-button>
           <el-button @click="resetTeamQuery">重置</el-button>
@@ -68,9 +77,13 @@
         <!-- 团队列表 -->
         <el-table v-loading="teamLoading" :data="teamTableList" border>
           <el-table-column prop="teamName" label="团队名称" />
-          <el-table-column prop="managerName" label="招商经理" />
-          <el-table-column prop="memberCount" label="团队数量" align="center" />
-          <el-table-column prop="projects" label="绑定项目" />
+          <el-table-column prop="memberName" label="招商经理" />
+          <el-table-column prop="teamSize" label="团队数量" align="center" />
+          <el-table-column label="绑定项目">
+            <template slot-scope="scope">
+              {{ formatProjectNames(scope.row.projectIds) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" label="创建时间" />
           <el-table-column label="操作" align="center" width="150">
             <template slot-scope="scope">
@@ -95,6 +108,7 @@
       :visible.sync="teamDialogVisible" 
       width="500px" 
       append-to-body
+      @open="handleOpenTeamDialog"
       @closed="handleCloseTeamDialog"
     >
       <el-form :model="teamForm" :rules="teamRules" ref="teamFormRef" label-width="100px">
@@ -104,12 +118,17 @@
         <el-form-item label="招商经理" prop="managerId">
           <el-button @click="openManagerDialog">选择</el-button>
           <span class="selected-manager" v-if="teamForm.managerName">
-            {{ teamForm.managerName }} {{ teamForm.managerPhone ? `(${teamForm.managerPhone})` : '' }}
+            {{ teamForm.managerName }} <span v-if="teamForm.managerPhone">({{ teamForm.managerPhone }})</span>
           </span>
         </el-form-item>
         <el-form-item label="绑定项目" prop="projectIds">
           <el-select v-model="teamForm.projectIds" multiple placeholder="请选择项目" style="width: 100%;">
-            <el-option v-for="item in projectOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option 
+              v-for="item in projectOptions" 
+              :key="item.projectId || item.id" 
+              :label="item.projectName || item.name" 
+              :value="item.projectId || item.id" 
+            />
           </el-select>
         </el-form-item>
       </el-form>
@@ -191,7 +210,7 @@
                     @click="handleSelectMember(item)"
                   >
                     <span>{{item.memberName}}</span>
-                    <span class="member-dept">{{item.deptName}}</span>
+                    <span class="member-dept">{{item.teamName}}</span>
                   </div>
                 </div>
               </div>
@@ -262,18 +281,17 @@ import {
   addMerchantTeam,
   updateMerchantTeam,
   deleteMerchantTeam,
+  checkTeamName,
+  getProjectsList,
   getMerchantPersonnelList,
-  getPersonnelByTeamId,
-  getPersonnelDetail,
   addMerchantPersonnel,
+  batchAddMerchantPersonnel,
   removeMerchantPersonnel,
-  getDepartmentTree,
-  getDepartmentMemberTree,
+  checkMemberExists,
   getManagerList,
   getMemberList,
   getMembersByDeptId,
-  getMemberDetail,
-  getProjectList
+  getDepartmentTree
 } from '@/api/merchant'
 import MemberSelector from '@/components/MemberSelector'
 
@@ -322,7 +340,9 @@ export default {
         managerId: '',
         managerName: '',
         managerPhone: '',
-        projectIds: []
+        projectIds: [],
+        createUserId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       },
       teamRules: {
         teamName: [{ required: true, message: '请输入团队名称', trigger: 'blur' }],
@@ -347,7 +367,8 @@ export default {
       personnelForm: {
         teamId: undefined,
         memberIds: [],
-        memberNames: []
+        createUserId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       },
       personnelRules: {
         teamId: [{ required: true, message: '请选择团队', trigger: 'change' }],
@@ -396,23 +417,12 @@ export default {
     }
   },
   created() {
-    this.getTeamList()
-    this.getPersonnelList()
-    this.getProjects()
+    this.loadProjects()
     this.initMockData() // 初始化模拟数据
   },
   methods: {
     // 初始化模拟数据
     initMockData() {
-      // 模拟项目数据
-      this.projectOptions = [
-        { id: '1', name: '高新科技园区' },
-        { id: '2', name: '软件产业园' },
-        { id: '3', name: '文创产业园' },
-        { id: '4', name: '生物医药园区' },
-        { id: '5', name: '智能制造基地' }
-      ]
-
       // 模拟部门数据
       this.departmentList = [
         {
@@ -459,115 +469,74 @@ export default {
     },
 
     // 获取项目列表
-    async getProjects() {
-      try {
-        const res = await getProjectList()
-        if (res && res.code === '0000000000000000') {
-        this.projectOptions = res.data
+    loadProjects() {
+      getProjectsList().then(res => {
+        if (res.code === '0000000000000000') {
+          this.projectOptions = res.data
+          
+          // 项目列表加载完成后加载团队和人员列表
+          this.getTeamList()
+          this.getPersonnelList()
+        } else {
+          // 如果加载失败，仍然尝试加载团队和人员列表
+          this.getTeamList()
+          this.getPersonnelList()
         }
-      } catch (error) {
-        console.error('获取项目列表失败', error)
-        // 使用模拟数据
-      }
+      }).catch(() => {
+        // 发生错误时仍然尝试加载团队和人员列表
+        this.getTeamList()
+        this.getPersonnelList()
+      })
     },
 
     // 获取团队列表
-    async getTeamList() {
+    getTeamList() {
       this.teamLoading = true
-      try {
-        const res = await getMerchantTeamList(this.teamQueryParams)
-        if (res && res.code === '0000000000000000') {
-          // 确保团队数据包含完整的项目信息
-          this.teamTableList = (res.data.data || []).map(team => {
-            // 如果返回的数据中没有projectIds，但有projects字符串，则构建projectIds
-            if ((!team.projects || team.projects.length === 0) && team.projects) {
-              // 尝试构建projectIds
-              const projectNames = team.projects.split('，');
-              const projects = [];
-              projectNames.forEach(name => {
-                const project = this.projectOptions.find(p => p.name === name.trim());
-                if (project) {
-                  projects.push(project.id);
-                }
-              });
-              return { ...team, projects };
-            }
-            return team;
-          });
+      getMerchantTeamList(this.teamQueryParams).then(res => {
+        if (res.code === '0000000000000000') {
+          this.teamTableList = res.data.list
+          this.teamTotal = res.data.total
           
-          this.teamTotal = res.data.total || 0
-        // 更新团队选项
-        this.teamOptions = this.teamTableList.map(item => ({
-          id: item.id,
-          teamName: item.teamName
-        }))
+          // 更新团队选项
+          this.teamOptions = res.data.list.map(item => ({
+            id: item.id,
+            teamName: item.teamName
+          }))
         }
-      } catch (error) {
-        console.error('获取团队列表失败', error)
-        // 模拟一些数据
-        this.teamTableList = [
-          {
-            id: '1',
-            teamName: '园区招商团队A',
-            managerName: '张三',
-            memberCount: 5,
-            projects: '高新科技园区，软件产业园',
-            createTime: '2023-05-15'
-          },
-          {
-            id: '2',
-            teamName: '园区招商团队B',
-            managerName: '李四',
-            memberCount: 8,
-            projects: '文创产业园，智能制造基地',
-            createTime: '2023-06-20'
-          }
-        ]
-        this.teamTotal = 2
-        this.teamOptions = this.teamTableList.map(item => ({
-          id: item.id,
-          teamName: item.teamName
-        }))
-      } finally {
         this.teamLoading = false
-      }
+      }).catch(() => {
+        this.teamLoading = false
+      })
     },
 
     // 获取人员列表
-    async getPersonnelList() {
+    getPersonnelList() {
       this.loading = true
-      try {
-        // 将查询参数名称从name改为memberName
-        const params = {
-          ...this.queryParams,
-          memberName: this.queryParams.memberName
-        }
-        delete params.name
-
-        const res = await getMerchantPersonnelList(params)
-        if (res && res.code === '0000000000000000') {
+      getMerchantPersonnelList(this.queryParams).then(res => {
+        if (res.code === '0000000000000000') {
+          // 确保数据中有managerFlag字段
           this.personnelList = res.data.data || []
+          this.personnelList.forEach(item => {
+            // 如果返回数据中没有managerFlag字段但有managerFlagDesc，则尝试推断
+            if (item.managerFlagDesc && !item.managerFlag) {
+              item.managerFlag = item.managerFlagDesc === '是' ? '1' : '0'
+            }
+          })
           this.total = res.data.total || 0
         } else {
-          this.$message.error(res.message || '获取人员列表失败')
           this.personnelList = []
           this.total = 0
         }
-      } catch (error) {
-        console.error('获取人员列表失败', error)
-        this.$message.error('获取人员列表失败')
+        this.loading = false
+      }).catch(() => {
         this.personnelList = []
         this.total = 0
-      } finally {
         this.loading = false
-      }
+      })
     },
 
     // 添加团队
     handleAddTeam() {
-      // 首先关闭可能打开的弹窗
-      this.teamDialogVisible = false
-      
       // 重置临时选择的招商经理数据
       this.tempSelectedMember = null
       this.tempSelectedMemberId = null
@@ -575,66 +544,57 @@ export default {
       
       // 设置对话框标题和表单数据
       this.teamDialogTitle = '新增招商团队'
+      
+      // 先重置表单数据
       this.teamForm = {
         id: undefined,
         teamName: '',
         managerId: '',
         managerName: '',
         managerPhone: '',
-        projectIds: []
+        projectIds: [],
+        createUserId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       }
       
-      // 确保在打开新增团队弹窗时重置表单验证状态
-      this.$nextTick(() => {
-        // 打开弹窗
+      // 然后打开弹窗
       this.teamDialogVisible = true
-        
-        // 重置表单
-        if (this.$refs.teamFormRef) {
-          this.$refs.teamFormRef.resetFields()
-          this.$refs.teamFormRef.clearValidate()
-        }
-      })
     },
 
     // 编辑团队
     handleEditTeam(row) {
-      // 首先关闭可能打开的弹窗
-      this.teamDialogVisible = false
-      
       // 设置对话框标题
       this.teamDialogTitle = '编辑招商团队'
-      console.log(row);
       
+      // 输出调试信息，查看原始数据
+      console.log('编辑团队原始数据:', row)
       
-      // 设置表单数据
+      // 先设置表单数据
       this.teamForm = {
         id: row.id,
         teamName: row.teamName,
-        managerId: row.managerId,
-        managerName: row.managerName,
-        managerPhone: row.managerPhone || '',
-        projectIds: row.projects || []
-      }
-      this.selectedMember = {
-        id: row.managerId,
-        name: row.managerName,
-        phone: row.managerPhone || ''
+        managerId: row.memberId, // 使用memberId字段
+        managerName: row.memberName, // 使用memberName字段
+        managerPhone: row.phone || '', // 使用phone字段
+        projectIds: [],
+        createUserId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       }
       
-      // 解析绑定项目字段，如果projectIds为空但有projects字段，则尝试从projects中提取项目ID
-      if (!this.teamForm.projectIds || this.teamForm.projectIds.length === 0) {
-        if (row.projects) {
-          // 尝试从projects字符串中提取项目ID
-          const projectNames = row.projects.split('，');
-          const projectIds = [];
-          projectNames.forEach(name => {
-            const project = this.projectOptions.find(p => p.name === name.trim());
-            if (project) {
-              projectIds.push(project.id);
-            }
-          });
-          this.teamForm.projectIds = projectIds;
+      // 设置选中的经理
+      this.selectedMember = {
+        id: row.memberId, // 使用memberId字段
+        name: row.memberName, // 使用memberName字段
+        phone: row.phone || ''
+      }
+      
+      // 解析绑定项目字段
+      if (row.projectIds) {
+        // 如果返回的是字符串，转为数组
+        if (typeof row.projectIds === 'string') {
+          this.teamForm.projectIds = row.projectIds.split(',');
+        } else if (Array.isArray(row.projectIds)) {
+          this.teamForm.projectIds = [...row.projectIds];
         }
       }
       
@@ -651,37 +611,24 @@ export default {
         this.tempSelectedMember = null
       }
       
-      // 确保触发表单校验更新
-      this.$nextTick(() => {
-        // 打开弹窗
+      // 然后打开弹窗
       this.teamDialogVisible = true
-        
-        if (this.$refs.teamFormRef) {
-          // 清除表单校验状态
-          this.$refs.teamFormRef.clearValidate();
-          // 手动触发验证以确保状态更新
-          if (this.teamForm.managerId) {
-            this.$refs.teamFormRef.validateField('managerId');
-          }
-        }
-      });
     },
 
     // 开启招商经理选择对话框
     openManagerDialog() {
-      console.log('开启招商经理选择对话框，当前teamForm:', this.teamForm);
-      
       // 先重置所有成员的选中状态
       this.resetMembersCheckStatus()
       
+      // 设置单选模式
+      this.selectionMode = 'single'
+      
       // 如果已选择经理，找到对应的成员对象
       if (this.teamForm.managerId && this.teamForm.managerName) {
         // 在allMembers中查找对应成员
         const manager = this.allMembers.find(m => m.id === this.teamForm.managerId);
         
         if (manager) {
-          console.log('找到对应成员:', manager);
-          
           // 设置单选模式下的选中值
           this.tempSelectedMemberId = manager.id;
           
@@ -696,9 +643,6 @@ export default {
           // 确保成员的checked属性设置正确（对单选模式的radio按钮）
           manager.checked = true;
           
-          // 立即更新选中状态，确保UI更新
-          this.$set(manager, 'checked', true);
-          
           // 展开包含该成员的部门
           this.expandManagerDepartment(manager.deptId);
           
@@ -710,7 +654,6 @@ export default {
             department: this.getDepartmentNameById(manager.deptId)
           }];
         } else {
-          console.log('未找到对应成员，使用表单数据');
           // 如果在allMembers中找不到，则使用表单中的信息
           this.tempSelectedMemberId = this.teamForm.managerId;
           this.tempSelectedMember = {
@@ -723,7 +666,6 @@ export default {
           this.tempSelectedMembers = [this.tempSelectedMember];
         }
       } else {
-        console.log('没有选择经理');
         this.tempSelectedMemberId = null;
         this.tempSelectedMember = null;
         this.tempSelectedMembers = [];
@@ -732,11 +674,10 @@ export default {
       // 展开部门
       this.expandDepartments();
       
-      // 设置选择模式和其他参数
+      // 设置其他参数并打开对话框
       this.memberDialogVisible = true;
       this.memberType = 'member';
       this.memberSearchKeyword = '';
-      this.selectionMode = 'single'; // 单选模式
     },
     
     // 展开部门
@@ -976,107 +917,153 @@ export default {
 
     // 提交团队表单
     submitTeamForm() {
-      this.$refs.teamFormRef.validate(async valid => {
+      this.$refs.teamFormRef.validate(valid => {
         if (valid) {
-          try {
-            const submitData = {
-              ...this.teamForm,
-              // 保证三个数据都传给后端
-              managerId: this.teamForm.managerId,
-              managerName: this.teamForm.managerName,
-              managerPhone: this.teamForm.managerPhone
+          const method = this.teamForm.id ? updateMerchantTeam : addMerchantTeam
+          const message = this.teamForm.id ? '更新成功' : '新增成功'
+          
+          // 克隆表单数据
+          const formData = { ...this.teamForm }
+          
+          // 重命名字段以匹配后端要求
+          formData.memberId = formData.managerId
+          formData.memberName = formData.managerName
+          formData.phone = formData.managerPhone // 设置电话字段
+          
+          // 确保有电话信息
+          console.log('提交的表单数据:', formData);
+          
+          // 处理项目ID格式
+          if (Array.isArray(formData.projectIds)) {
+            formData.projectIds = formData.projectIds.join(',')
+          }
+          
+          method(formData).then(res => {
+            if (res.code === '0000000000000000') {
+              this.$message.success(message)
+              this.teamDialogVisible = false
+              this.getTeamList()
             }
+          })
+        }
+      })
+    },
 
-            if (this.teamForm.id) {
-              // 编辑
-              const res = await updateMerchantTeam(submitData)
-              if (res && res.code === '0000000000000000') {
-              this.$message.success('编辑成功')
-              } else {
-                this.$message.error(res.message || '编辑失败')
-                return
-              }
-            } else {
-              // 新增
-              const res = await addMerchantTeam(submitData)
-              if (res && res.code === '0000000000000000') {
-              this.$message.success('新增成功')
-              } else {
-                this.$message.error(res.message || '新增失败')
-                return
-            }
-            }
-            this.handleCloseTeamDialog()
-            this.getTeamList()
-            // 更新人员列表
-            this.getPersonnelList()
-          } catch (error) {
-            console.error('提交失败', error)
-            this.$message.error('操作失败')
+    // 检查团队名称是否存在
+    checkTeamNameExists(rule, value, callback) {
+      if (!value) {
+        callback(new Error('团队名称不能为空'))
+        return
+      }
+      
+      const params = {
+        teamName: value
+      }
+      
+      if (this.teamForm.id) {
+        params.excludeId = this.teamForm.id
+      }
+      
+      checkTeamName(params).then(res => {
+        if (res.code === '0000000000000000') {
+          if (res.data) {
+            callback(new Error('团队名称已存在'))
+          } else {
+            callback()
           }
         }
       })
     },
 
+    // 删除团队
+    handleDeleteTeam(row) {
+      this.$confirm('确认删除该团队?', '警告', {
+        type: 'warning'
+      }).then(() => {
+        deleteMerchantTeam(row.id, this.$store.getters.userId).then(res => {
+          if (res.code === '0000000000000000') {
+            this.$message.success('删除成功')
+            this.getTeamList()
+          }
+        })
+      }).catch(() => {})
+    },
+
     // 提交人员表单
     submitPersonnelForm() {
-      if (this.selectedMembers.length === 0) {
-        this.$message.warning('请选择人员')
-        return
-      }
-
-      this.$refs.personnelFormRef.validate(async valid => {
+      this.$refs.personnelFormRef.validate(valid => {
         if (valid) {
-          try {
-            // 批量添加人员
-            let successCount = 0
-            let failCount = 0
-            
-            for (const member of this.selectedMembers) {
-              const data = {
-                teamId: this.personnelForm.teamId,
-                memberId: member.id,
-                memberName: member.name,
-                phone: member.phone || ''
+          if (this.selectedMembers.length === 0) {
+            this.$message.warning('请选择招商人员')
+            return
+          }
+          
+          // 构建提交数据
+          const personnelList = this.selectedMembers.map(member => ({
+            teamId: this.personnelForm.teamId,
+            memberId: member.id,
+            memberName: member.name,
+            memberPhone: member.phone || '',
+            isManager: '0',
+            createUserId: this.personnelForm.createUserId,
+            tenantId: this.personnelForm.tenantId
+          }))
+          
+          if (personnelList.length === 1) {
+            // 单个添加
+            addMerchantPersonnel(personnelList[0]).then(res => {
+              if (res.code === '0000000000000000') {
+                this.$message.success('添加成功')
+                this.personnelDialogVisible = false
+                this.getPersonnelList()
               }
-              
-              try {
-                const res = await addMerchantPersonnel(data)
-                if (res && res.code === '0000000000000000') {
-                  successCount++
-                } else {
-                  failCount++
-                }
-              } catch (error) {
-                console.error('添加人员失败', error)
-                failCount++
+            })
+          } else {
+            // 批量添加
+            batchAddMerchantPersonnel(personnelList).then(res => {
+              if (res.code === '0000000000000000') {
+                this.$message.success('批量添加成功')
+                this.personnelDialogVisible = false
+                this.getPersonnelList()
               }
-            }
-            
-            if (successCount > 0) {
-              this.$message.success(`成功添加${successCount}名人员`)
-              this.handleClosePersonnelDialog()
-            this.getPersonnelList()
-              this.getTeamList()
-            }
-            
-            if (failCount > 0) {
-              this.$message.warning(`${failCount}名人员添加失败`)
-            }
-          } catch (error) {
-            console.error('提交失败', error)
-            this.$message.error('操作失败')
+            })
           }
         }
       })
     },
     
-    // 移除已选择的人员
-    removeMember(member) {
-      const index = this.selectedMembers.findIndex(item => item.id === member.id)
-      if (index !== -1) {
-        this.selectedMembers.splice(index, 1)
-      }
+    // 检查成员是否已存在
+    checkPersonnelExists(memberId, teamId) {
+      return new Promise((resolve) => {
+        const params = {
+          teamId,
+          memberId
+        }
+        
+        checkMemberExists(params).then(res => {
+          if (res.code === '0000000000000000') {
+            resolve(res.data)
+          } else {
+            resolve(false)
+          }
+        }).catch(() => {
+          resolve(false)
+        })
+      })
+    },
+    
+    // 移除招商人员
+    handleRemovePersonnel(row) {
+      this.$confirm('确认移除该人员?', '警告', {
+        type: 'warning'
+      }).then(() => {
+        removeMerchantPersonnel(row.id, this.$store.getters.userId).then(res => {
+          if (res.code === '0000000000000000') {
+            this.$message.success('移除成功')
+            this.getPersonnelList()
+          }
+        })
+      }).catch(() => {})
     },
 
     // 处理成员选择器确认
@@ -1084,9 +1071,24 @@ export default {
       if (this.selectionMode === 'single') {
         // 单选模式（招商经理）
         // 设置团队表单中的经理信息
-        this.teamForm.managerId = result.id
-        this.teamForm.managerName = result.name
-        this.teamForm.managerPhone = result.phone || ''
+        if (!result) return;
+        
+        console.log('选择的招商经理:', result);
+        
+        // 设置团队表单中的经理数据
+        this.teamForm.managerId = result.id;
+        this.teamForm.managerName = result.name;
+        this.teamForm.managerPhone = result.phone || '';
+        
+        // 确保成员选择器关闭
+        this.memberDialogVisible = false;
+        
+        // 手动触发验证经理字段
+        this.$nextTick(() => {
+          if (this.$refs.teamFormRef) {
+            this.$refs.teamFormRef.validateField('managerId');
+          }
+        });
       } else {
         // 多选模式（招商人员）
         // 更新已选招商人员列表
@@ -1094,7 +1096,9 @@ export default {
         
         // 更新表单数据
         this.personnelForm.memberIds = this.selectedMembers.map(member => member.id)
-        this.personnelForm.memberNames = this.selectedMembers.map(member => member.name)
+        
+        // 确保成员选择器关闭
+        this.memberDialogVisible = false;
       }
     },
 
@@ -1178,182 +1182,42 @@ export default {
       this.getTeamList()
     },
 
-    // 删除团队
-    handleDeleteTeam(row) {
-      this.deleteDialogVisible = true
-      this.deleteTeamId = row.id
-    },
-
-    // 确认删除团队
-    confirmDelete() {
-      if (!this.deleteTeamId) return
+    // 打开团队对话框时初始化
+    handleOpenTeamDialog() {
+      console.log('对话框打开，当前表单状态:', this.teamForm);
       
-      deleteMerchantTeam(this.deleteTeamId).then(res => {
-        if (res && res.code === '0000000000000000') {
-          this.$message.success('删除成功')
-          this.getTeamList()
-        } else {
-          this.$message.error(res.message || '删除失败')
-        }
-        this.deleteDialogVisible = false
-      }).catch(error => {
-        console.error('删除团队失败', error)
-        this.$message.error('删除失败')
-        this.deleteDialogVisible = false
-      })
-    },
-
-    // 移除人员
-    handleRemovePersonnel(row) {
-      this.removeDialogVisible = true
-      this.removePersonnelId = row.id
-    },
-
-    // 确认移除人员
-    confirmRemove() {
-      if (!this.removePersonnelId) return
-      
-      removeMerchantPersonnel(this.removePersonnelId).then(res => {
-        if (res && res.code === '0000000000000000') {
-        this.$message.success('移除成功')
-        this.getPersonnelList()
-          this.getTeamList()
-        } else {
-          this.$message.error(res.message || '移除失败')
-        }
-        this.removeDialogVisible = false
-      }).catch(error => {
-        console.error('移除人员失败', error)
-        this.$message.error('移除失败')
-        this.removeDialogVisible = false
-      })
-    },
-
-    // 搜索成员
-    searchMember() {
-      if (!this.memberSearchKeyword) {
-        return
-      }
-      
-      this.memberLoading = true
-      // 调用搜索成员接口
-      getMemberList({keyword: this.memberSearchKeyword}).then(res => {
-        if (res && res.code === '0000000000000000') {
-          this.memberList = res.data
-      } else {
-          this.memberList = []
-        }
-      }).catch(error => {
-        console.error('搜索成员失败', error)
-        this.memberList = []
-      }).finally(() => {
-        this.memberLoading = false
-      })
-    },
-
-    // 处理节点点击事件
-    handleNodeClick(node) {
-      if (node.type === 'member') {
-        // 选择成员
-        const selectedMember = {
-          id: node.id,
-          name: node.label,
-          deptId: node.deptId,
-          deptName: node.deptName
-        }
-        this.handleSelectMember(selectedMember)
-      } else if (node.type === 'dept') {
-        // 选择部门（用于按部门选择模式）
-        if (this.memberSelectMode === 'all') {
-          this.getMembersByDept(node.id)
-        }
-      }
-    },
-
-    // 根据部门ID获取成员
-    getMembersByDept(deptId) {
-      if (!deptId) return
-      
-      this.memberLoading = true
-      getMembersByDeptId(deptId).then(res => {
-        if (res && res.code === '0000000000000000') {
-          const members = res.data
-          // 如果按部门选择，可以一次选择多个成员
-          members.forEach(member => {
-            const exists = this.tempSelectedMembers.some(m => m.id === member.id)
-            if (!exists) {
-              this.tempSelectedMembers.push({
-                id: member.id,
-                name: member.name,
-                deptName: member.deptName
-              })
+      // 编辑模式下触发经理字段验证
+      if (this.teamForm.id) {
+        this.$nextTick(() => {
+          if (this.$refs.teamFormRef) {
+            this.$refs.teamFormRef.clearValidate();
+            if (this.teamForm.managerId) {
+              this.$refs.teamFormRef.validateField('managerId');
             }
-          })
-        }
-      }).catch(error => {
-        console.error('获取部门成员失败', error)
-      }).finally(() => {
-        this.memberLoading = false
-      })
-    },
-
-    // 选择成员
-    handleSelectMember(member) {
-        if (this.currentSelectType === 'manager') {
-        // 招商经理选择（单选）
-          this.tempSelectedMembers = [{
-          id: member.id,
-          name: member.name,
-          deptName: member.deptName
-          }]
-        } else {
-        // 招商人员选择（多选）
-        const exists = this.tempSelectedMembers.some(m => m.id === member.id)
-          if (!exists) {
-            this.tempSelectedMembers.push({
-            id: member.id,
-            name: member.name,
-            deptName: member.deptName
-            })
-        }
-      }
-    },
-
-    // 移除临时选择的成员
-    removeTempMember(member) {
-      const index = this.tempSelectedMembers.findIndex(item => item.id === member.id)
-      if (index !== -1) {
-        this.tempSelectedMembers.splice(index, 1)
-      }
-    },
-
-    // 确认成员选择
-    confirmMemberSelect() {
-      if (this.currentSelectType === 'manager') {
-        // 招商经理选择
-        if (this.tempSelectedMembers.length === 0) {
-          this.$message.warning('请选择招商经理')
-          return
-        }
-        
-        const manager = this.tempSelectedMembers[0]
-        this.teamForm.managerId = manager.id
-        this.teamForm.managerName = manager.name
-      } else {
-        // 招商人员选择
-        if (this.tempSelectedMembers.length === 0) {
-          this.$message.warning('请选择招商人员')
-          return
-        }
-        
-        this.selectedMembers = [...this.tempSelectedMembers]
-        
-        // 更新表单数据
-        this.personnelForm.memberIds = this.selectedMembers.map(member => member.id)
-        this.personnelForm.memberNames = this.selectedMembers.map(member => member.name)
+          }
+        });
+        return;
       }
       
-      this.memberSelectVisible = false
+      // 如果是新增模式，确保表单被重置
+      this.$nextTick(() => {
+        if (this.$refs.teamFormRef) {
+          this.$refs.teamFormRef.resetFields();
+          this.$refs.teamFormRef.clearValidate();
+          
+          // 确保表单值被正确初始化为默认值
+          this.$set(this, 'teamForm', {
+            id: undefined,
+            teamName: '',
+            managerId: '',
+            managerName: '',
+            managerPhone: '',
+            projectIds: [],
+            createUserId: this.$store.getters.userId,
+            tenantId: this.$store.getters.tenantId
+          });
+        }
+      });
     },
 
     // 关闭团队弹窗时重置表单
@@ -1372,14 +1236,16 @@ export default {
           this.$refs.teamFormRef.clearValidate();
           
           // 重置表单数据，确保下次打开时不会有残留
-          this.teamForm = {
+          this.$set(this, 'teamForm', {
             id: undefined,
             teamName: '',
             managerId: '',
             managerName: '',
             managerPhone: '',
-            projectIds: []
-          };
+            projectIds: [],
+            createUserId: this.$store.getters.userId,
+            tenantId: this.$store.getters.tenantId
+          });
         }
       });
     },
@@ -1397,7 +1263,8 @@ export default {
       this.personnelForm = {
         teamId: undefined,
         memberIds: [],
-        memberNames: []
+        createUserId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       }
       
       // 确保在打开新增人员弹窗时重置表单验证状态
@@ -1430,12 +1297,33 @@ export default {
           this.personnelForm = {
             teamId: undefined,
             memberIds: [],
-            memberNames: []
+            createUserId: this.$store.getters.userId,
+            tenantId: this.$store.getters.tenantId
           }
         }
       })
     },
 
+    // 格式化项目IDs为项目名称
+    formatProjectNames(projectIds) {
+      if (!projectIds) return '-';
+      
+      // 如果是字符串，转为数组
+      const projectIdArray = typeof projectIds === 'string' 
+        ? projectIds.split(',') 
+        : projectIds;
+      
+      if (!projectIdArray.length) return '-';
+      
+      // 匹配项目名称
+      const projectNames = projectIdArray.map(id => {
+        const project = this.projectOptions.find(p => p.projectId && p.projectId.toString() === id.toString());
+        return project ? project.projectName : id;
+      });
+      
+      return projectNames.join('，');
+    },
+
     // 以下是保留的原有方法
     // ...
   }
@@ -1471,6 +1359,15 @@ export default {
       margin-bottom: 5px;
     }
   }
+  
+  // 招商经理标签样式
+  .el-tag--mini {
+    margin-left: 5px;
+    padding: 0 5px;
+    height: 20px;
+    line-height: 19px;
+    font-size: 12px;
+  }
 
   .member-select-container {
     .member-select-header {
diff --git a/pc/src/views/merchant/tag-management/index.vue b/pc/src/views/merchant/tag-management/index.vue
index 1c551ba..f190844 100644
--- a/pc/src/views/merchant/tag-management/index.vue
+++ b/pc/src/views/merchant/tag-management/index.vue
@@ -20,8 +20,8 @@
               placeholder="请输入分组名称" 
               clearable 
               size="small"
-              @keyup.enter.native="handleGroupSearch">
-              <el-button slot="append" icon="el-icon-search" @click="handleGroupSearch"></el-button>
+              >
+              
             </el-input>
           </div>
           <div class="group-menu">
@@ -179,7 +179,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="标签名称" prop="names">
+        <el-form-item v-if="tagDialogType === 'add'" label="标签名称" prop="names">
           <el-select
             v-model="tagForm.names"
             multiple
@@ -191,6 +191,9 @@
           </el-select>
           <div class="el-form-item-tip">按回车键可输入多个标签名称</div>
         </el-form-item>
+        <el-form-item v-else label="标签名称" prop="tagName">
+          <el-input v-model="tagForm.tagName" placeholder="请输入标签名称" style="width: 100%"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="tagDialogVisible = false">取 消</el-button>
@@ -201,19 +204,19 @@
 </template>
 
 <script>
-import { 
+import {
   getTagGroupList,
   getAllTagGroups,
   getTagGroupDetail,
-  addTagGroup, 
-  updateTagGroup, 
+  addTagGroup,
+  updateTagGroup,
   deleteTagGroup,
   checkTagGroupName,
   getTagList,
-  getTagListByGroupId, 
+  getTagListByGroupId,
   getTagDetail,
-  addTag, 
-  updateTag, 
+  addTag,
+  updateTag,
   deleteTag,
   checkTagName
 } from '@/api/merchant'
@@ -221,128 +224,158 @@ import {
 export default {
   name: 'TagManagement',
   data() {
-    // 校验分组名称是否重复
+    // 校验分组名称
     const validateGroupName = (rule, value, callback) => {
       if (!value) {
         callback(new Error('请输入分组名称'))
         return
       }
       
-      // 编辑时不需要校验自身名称
-      if (this.groupDialogType === 'edit' && this.groupForm.originalName === value) {
-        callback()
-        return
-      }
-      
       const params = {
         groupName: value
       }
       
-      if (this.groupDialogType === 'edit') {
+      if (this.groupForm.id) {
         params.id = this.groupForm.id
       }
       
       checkTagGroupName(params).then(res => {
-        if (res.success && res.data) {
-          callback()
+        if (res.code === '0000000000000000') {
+          if (res.data) {
+            callback(new Error('分组名称已存在'))
+          } else {
+            callback()
+          }
         } else {
-          callback(new Error('分组名称已存在'))
+          callback(new Error('验证失败，请重试'))
         }
       }).catch(() => {
-        callback(new Error('校验分组名称失败'))
+        callback(new Error('验证失败，请重试'))
       })
     }
     
-    // 校验标签名称是否重复
+    // 校验标签名称
     const validateTagName = (rule, value, callback) => {
       if (!value || value.length === 0) {
-        callback(new Error('请输入至少一个标签名称'))
+        callback(new Error('请输入标签名称'))
         return
       }
       
-      // 多标签情况下，暂不支持前端检查
-      if (value.length > 1 || this.tagDialogType === 'add') {
-        callback()
-        return
+      // 批量添加标签时，只检查第一个标签名称
+      const firstTagName = value[0]
+      const params = {
+        groupId: this.tagForm.groupId,
+        tagName: firstTagName
       }
       
-      // 编辑时不需要校验自身名称
-      if (this.tagDialogType === 'edit' && this.tagForm.originalName === value[0]) {
-        callback()
+      if (this.tagForm.id) {
+        params.id = this.tagForm.id
+      }
+      
+      checkTagName(params).then(res => {
+        if (res.code === '0000000000000000') {
+          if (res.data) {
+            callback(new Error(`标签名称"${firstTagName}"已存在`))
+          } else {
+            callback()
+          }
+        } else {
+          callback(new Error('验证失败，请重试'))
+        }
+      }).catch(() => {
+        callback(new Error('验证失败，请重试'))
+      })
+    }
+    
+    // 校验单个标签名称
+    const validateSingleTagName = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入标签名称'))
         return
       }
       
       const params = {
         groupId: this.tagForm.groupId,
-        tagName: value[0]
+        tagName: value
       }
       
-      if (this.tagDialogType === 'edit') {
+      if (this.tagForm.id) {
         params.id = this.tagForm.id
       }
       
       checkTagName(params).then(res => {
-        if (res.success && res.data) {
-          callback()
+        if (res.code === '0000000000000000') {
+          if (res.data) {
+            callback(new Error(`标签名称"${value}"已存在`))
+          } else {
+            callback()
+          }
         } else {
-          callback(new Error('标签名称在该分组下已存在'))
+          callback(new Error('验证失败，请重试'))
         }
       }).catch(() => {
-        callback(new Error('校验标签名称失败'))
+        callback(new Error('验证失败，请重试'))
       })
     }
     
     return {
-      // 分组相关数据
+      // 分组相关
       groupList: [],
       groupSearchInput: '',
       activeGroupId: '',
       activeGroup: null,
+      
+      // 标签相关
+      tagList: [],
+      tagQueryParams: {
+        groupId: '',
+        tagName: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0,
+      tableLoading: false,
+      
+      // 分组弹窗
       groupDialogVisible: false,
-      groupDialogType: 'add', // add或edit
+      groupDialogType: 'add', // add 或 edit
       groupForm: {
-        id: '',
+        id: undefined,
         groupName: '',
         tagNames: [],
-        originalName: '' // 用于校验
+        operatorId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       },
       groupRules: {
         groupName: [
           { required: true, message: '请输入分组名称', trigger: 'blur' },
-          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' },
           { validator: validateGroupName, trigger: 'blur' }
-        ],
-        tagNames: [
-          { required: true, message: '请输入至少一个标签名称', trigger: 'change' }
         ]
       },
       
-      // 标签相关数据
-      tagList: [],
-      tableLoading: false,
-      total: 0,
-      tagQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        tagName: undefined,
-        groupId: null
-      },
+      // 标签弹窗
       tagDialogVisible: false,
-      tagDialogType: 'add', // add或edit
+      tagDialogType: 'add', // add 或 edit
       tagForm: {
-        id: '',
+        id: undefined,
         groupId: '',
-        tagName: '',
         names: [],
-        originalName: '' // 用于校验
+        tagName: '',
+        tagColor: '#1890FF',
+        operatorId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       },
       tagRules: {
         groupId: [
           { required: true, message: '请选择分组', trigger: 'change' }
         ],
         names: [
-          { required: true, message: '请输入至少一个标签名称', trigger: 'change' },
-          { validator: validateTagName, trigger: 'blur' }
+          { required: true, message: '请输入标签名称', trigger: 'change' },
+          { validator: validateTagName, trigger: 'change' }
+        ],
+        tagName: [
+          { required: true, message: '请输入标签名称', trigger: 'blur' },
+          { validator: validateSingleTagName, trigger: 'blur' }
         ]
       }
     }
@@ -357,353 +390,252 @@ export default {
         group.groupName.toLowerCase().includes(this.groupSearchInput.toLowerCase())
       )
     },
+    
     // 分页后的标签列表
     paginationTagList() {
-      let list = this.tagList
-      if (this.tagQueryParams.tagName) {
-        list = list.filter(tag => 
-          tag.tagName.toLowerCase().includes(this.tagQueryParams.tagName.toLowerCase())
-        )
-      }
-      this.total = list.length
-      const start = (this.tagQueryParams.pageNum - 1) * this.tagQueryParams.pageSize
-      const end = start + this.tagQueryParams.pageSize
-      return list.slice(start, end)
+      return this.tagList
     }
   },
-  created() {
-    this.fetchGroupList()
-  },
   methods: {
-    // 分组相关方法
-    async fetchGroupList() {
-      try {
-        const res = await getAllTagGroups()
-        if (res.success) {
-          this.groupList = res.data || []
+    // 加载分组列表
+    loadGroupList() {
+      getAllTagGroups().then(res => {
+        if (res.code === '0000000000000000') {
+          this.groupList = res.data
+          
+          // 如果存在分组，默认选中第一个
           if (this.groupList.length > 0 && !this.activeGroupId) {
-            this.activeGroupId = this.groupList[0].id.toString()
-            this.activeGroup = this.groupList[0]
-            this.tagQueryParams.groupId = parseInt(this.activeGroupId)
-            this.fetchTagList(this.activeGroupId)
-          }
-        } else {
-          this.$message.error(res.message || '获取分组列表失败')
-        }
-      } catch (error) {
-        console.error('获取分组列表失败', error)
-        this.$message.error('获取分组列表失败')
-      }
-    },
-    // 分组搜索
-    handleGroupSearch() {
-      // 分组搜索功能已通过计算属性filteredGroupList实现
-    },
-    handleGroupSelect(index) {
-      this.activeGroupId = index
-      this.activeGroup = this.groupList.find(group => group.id.toString() === index)
-      this.tagQueryParams.groupId = parseInt(index)
-      this.tagQueryParams.pageNum = 1
-      this.fetchTagList(index)
-    },
-    handleAddGroup() {
-      this.groupDialogType = 'add'
-      this.groupForm = {
-        id: '',
-        groupName: '',
-        tagNames: [],
-        originalName: ''
-      }
-      this.groupDialogVisible = true
-    },
-    handleEditGroup(group) {
-      this.groupDialogType = 'edit'
-      this.groupForm = {
-        id: group.id,
-        groupName: group.groupName,
-        tagNames: [],
-        originalName: group.groupName
-      }
-      this.groupDialogVisible = true
-    },
-    handleDeleteGroup(group) {
-      this.$confirm('此操作将永久删除该分组, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 判断分组下是否有标签
-        if (group.tagCount > 0) {
-          return this.$message.warning('该分组下存在标签，不能删除')
-        }
-        
-        deleteTagGroup(group.id).then(res => {
-          if (res.success) {
-            this.$message.success('删除成功')
-            this.fetchGroupList()
-            if (this.activeGroupId === group.id.toString()) {
-              this.tagList = []
-              this.total = 0
-            }
-          } else {
-            this.$message.error(res.message || '删除失败')
-          }
-        }).catch(() => {
-          this.$message.error('删除失败')
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
-      })
-    },
-    submitGroupForm() {
-      this.$refs.groupForm.validate(async (valid) => {
-        if (valid) {
-          try {
-            const data = {
-              groupName: this.groupForm.groupName
-            }
-            
-            if (this.groupDialogType === 'add') {
-              const res = await addTagGroup(data)
-              if (res.success) {
-                this.$message.success('新增成功')
-                // 如果有标签名称，添加标签
-                if (this.groupForm.tagNames && this.groupForm.tagNames.length > 0) {
-                  // 获取新建的分组信息
-                  await this.fetchGroupList()
-                  const newGroup = this.groupList.find(g => g.groupName === this.groupForm.groupName)
-                  if (newGroup) {
-                    // 为新分组添加标签
-                    for (const tagName of this.groupForm.tagNames) {
-                      await addTag({
-                        groupId: newGroup.id,
-                        tagName: tagName
-                      })
-                    }
-                  }
-                }
-              } else {
-                this.$message.error(res.message || '新增分组失败')
-              }
-            } else {
-              data.id = this.groupForm.id
-              const res = await updateTagGroup(data)
-              if (res.success) {
-                this.$message.success('更新成功')
-              } else {
-                this.$message.error(res.message || '更新分组失败')
-              }
-            }
-            this.groupDialogVisible = false
-            await this.fetchGroupList()
-          } catch (error) {
-            console.error(this.groupDialogType === 'add' ? '新增分组失败' : '更新分组失败', error)
-            this.$message.error(this.groupDialogType === 'add' ? '新增分组失败' : '更新分组失败')
+            this.handleGroupSelect(this.groupList[0].id.toString())
           }
         }
       })
     },
     
-    // 标签相关方法
-    async fetchTagList(groupId) {
-      if (!groupId) return
+    // 加载标签列表
+    loadTagList() {
+      if (!this.activeGroupId) {
+        this.tagList = []
+        this.total = 0
+        return
+      }
       
       this.tableLoading = true
-      try {
-        const res = await getTagListByGroupId(groupId)
-        if (res.success) {
-          this.tagList = res.data || []
-          this.total = this.tagList.length
-          this.tagQueryParams.pageNum = 1
+      this.tagQueryParams.groupId = this.activeGroupId
+      
+      getTagList(this.tagQueryParams).then(res => {
+        if (res.code === '0000000000000000') {
+          this.tagList = res.data.data
+          this.total = res.data.total
         } else {
-          this.$message.error(res.message || '获取标签列表失败')
           this.tagList = []
           this.total = 0
         }
-      } catch (error) {
-        console.error('获取标签列表失败', error)
-        this.$message.error('获取标签列表失败')
+        this.tableLoading = false
+      }).catch(() => {
         this.tagList = []
         this.total = 0
-      } finally {
         this.tableLoading = false
-      }
+      })
     },
-    // 标签查询
+    
+    // 处理分组搜索
+    handleGroupSearch() {
+      // 通过计算属性过滤
+    },
+    
+    // 处理标签查询
     handleTagQuery() {
-      // 如果需要服务端查询
-      if (this.tagQueryParams.tagName) {
-        this.fetchTagsByParams()
-      } else {
-        this.fetchTagList(this.activeGroupId)
-      }
-    },
-    // 服务端查询标签
-    async fetchTagsByParams() {
-      this.tableLoading = true
-      try {
-        const params = {
-          ...this.tagQueryParams,
-          pageNum: 1,
-          pageSize: 1000 // 暂时取大量数据本地分页
-        }
-        
-        const res = await getTagList(params)
-        if (res.success) {
-          this.tagList = res.data.list || []
-          this.total = res.data.total || 0
-        } else {
-          this.$message.error(res.message || '查询标签失败')
-          this.tagList = []
-          this.total = 0
-        }
-      } catch (error) {
-        console.error('查询标签失败', error)
-        this.$message.error('查询标签失败')
-        this.tagList = []
-        this.total = 0
-      } finally {
-        this.tableLoading = false
-      }
+      this.tagQueryParams.pageNum = 1
+      this.loadTagList()
     },
+    
     // 重置标签查询
     resetTagQuery() {
-      this.tagQueryParams.tagName = undefined
+      this.tagQueryParams.tagName = ''
       this.tagQueryParams.pageNum = 1
-      this.fetchTagList(this.activeGroupId)
+      this.loadTagList()
     },
+    
+    // 处理分组选择
+    handleGroupSelect(groupId) {
+      this.activeGroupId = Number(groupId)
+      this.activeGroup = this.groupList.find(item => item.id.toString() === groupId)
+      
+      // 重置标签查询参数
+      this.tagQueryParams.tagName = ''
+      this.tagQueryParams.pageNum = 1
+      
+      // 加载该分组下的标签
+      this.loadTagList()
+    },
+    
+    // 处理分页大小变化
+    handleSizeChange(val) {
+      this.tagQueryParams.pageSize = val
+      this.loadTagList()
+    },
+    
+    // 处理当前页变化
+    handleCurrentChange(val) {
+      this.tagQueryParams.pageNum = val
+      this.loadTagList()
+    },
+    
+    // 打开新增分组弹窗
+    handleAddGroup() {
+      this.groupDialogType = 'add'
+      this.groupForm = {
+        id: undefined,
+        groupName: '',
+        tagNames: [],
+        operatorId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
+      }
+      this.groupDialogVisible = true
+    },
+    
+    // 打开编辑分组弹窗
+    handleEditGroup(group) {
+      this.groupDialogType = 'edit'
+      this.groupForm = {
+        id: group.id,
+        groupName: group.groupName,
+        operatorId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
+      }
+      this.groupDialogVisible = true
+    },
+    
+    // 提交分组表单
+    submitGroupForm() {
+      this.$refs.groupForm.validate(valid => {
+        if (valid) {
+          const method = this.groupForm.id ? updateTagGroup : addTagGroup
+          const message = this.groupForm.id ? '更新成功' : '新增成功'
+          
+          method(this.groupForm).then(res => {
+            if (res.code === '0000000000000000') {
+              this.$message.success(message)
+              this.groupDialogVisible = false
+              this.loadGroupList()
+            }
+          })
+        }
+      })
+    },
+    
+    // 删除分组
+    handleDeleteGroup(group) {
+      this.$confirm(`确认删除分组"${group.groupName}"吗？该操作将删除该分组下所有标签`, '警告', {
+        type: 'warning'
+      }).then(() => {
+        deleteTagGroup(group.id).then(res => {
+          if (res.code === '0000000000000000') {
+            this.$message.success('删除成功')
+            
+            // 如果删除的是当前激活的分组，重置激活状态
+            if (this.activeGroupId === group.id.toString()) {
+              this.activeGroupId = ''
+              this.activeGroup = null
+              this.tagList = []
+              this.total = 0
+            }
+            
+            this.loadGroupList()
+          }
+        })
+      }).catch(() => {})
+    },
+    
+    // 打开新增标签弹窗
     handleAddTag() {
       this.tagDialogType = 'add'
       this.tagForm = {
-        id: '',
+        id: undefined,
         groupId: this.activeGroupId,
-        tagName: '',
         names: [],
-        originalName: ''
+        tagColor: '#1890FF',
+        operatorId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       }
       this.tagDialogVisible = true
     },
+    
+    // 打开编辑标签弹窗
     handleEditTag(tag) {
       this.tagDialogType = 'edit'
       this.tagForm = {
         id: tag.id,
         groupId: tag.groupId,
         tagName: tag.tagName,
-        names: [tag.tagName],
-        originalName: tag.tagName
+        tagColor: tag.tagColor || '#1890FF',
+        operatorId: this.$store.getters.userId,
+        tenantId: this.$store.getters.tenantId
       }
       this.tagDialogVisible = true
     },
-    handleDeleteTag(tag) {
-      // 判断标签是否有关联的意向客户
-      if (tag.intentionCustomerCount > 0) {
-        return this.$message.warning('该标签已绑定意向客户，不能删除')
-      }
-      
-      this.$confirm('此操作将永久删除该标签, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteTag(tag.id).then(res => {
-          if (res.success) {
-            this.$message.success('删除成功')
-            this.fetchTagList(this.activeGroupId)
-          } else {
-            this.$message.error(res.message || '删除失败')
-          }
-        }).catch(() => {
-          this.$message.error('删除失败')
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
-      })
-    },
+    
+    // 提交标签表单
     submitTagForm() {
-      this.$refs.tagForm.validate(async (valid) => {
+      this.$refs.tagForm.validate(valid => {
         if (valid) {
-          try {
-            if (this.tagDialogType === 'add') {
-              // 多标签添加
-              if (this.tagForm.names.length > 1) {
-                let success = 0
-                let fail = 0
-                
-                for (const name of this.tagForm.names) {
-                  try {
-                    const res = await addTag({
-                      groupId: this.tagForm.groupId,
-                      tagName: name
-                    })
-                    
-                    if (res.success) {
-                      success++
-                    } else {
-                      fail++
-                    }
-                  } catch (error) {
-                    fail++
-                  }
-                }
-                
-                if (success > 0) {
-                  this.$message.success(`成功添加${success}个标签`)
-                }
-                
-                if (fail > 0) {
-                  this.$message.warning(`${fail}个标签添加失败`)
-                }
-              } else {
-                // 单标签添加
-                const res = await addTag({
-                  groupId: this.tagForm.groupId,
-                  tagName: this.tagForm.names[0]
-                })
-                
-                if (res.success) {
-                  this.$message.success('新增成功')
-                } else {
-                  this.$message.error(res.message || '新增标签失败')
-                }
-              }
-            } else {
-              // 编辑标签
-              const res = await updateTag({
-                id: this.tagForm.id,
-                groupId: this.tagForm.groupId,
-                tagName: this.tagForm.names[0]
-              })
-              
-              if (res.success) {
+          if (this.tagDialogType === 'edit') {
+            // 编辑标签
+            const data = {
+              id: this.tagForm.id,
+              groupId: this.tagForm.groupId,
+              tagName: this.tagForm.tagName,
+              tagColor: this.tagForm.tagColor,
+              operatorId: this.tagForm.operatorId,
+              tenantId: this.tagForm.tenantId
+            }
+            
+            updateTag(data).then(res => {
+              if (res.code === '0000000000000000') {
                 this.$message.success('更新成功')
-              } else {
-                this.$message.error(res.message || '更新标签失败')
+                this.tagDialogVisible = false
+                this.loadTagList()
               }
-            }
+            })
+          } else {
+            // 批量添加标签
+            const promises = this.tagForm.names.map(name => {
+              const data = {
+                groupId: this.tagForm.groupId,
+                tagName: name,
+                tagColor: this.tagForm.tagColor,
+                operatorId: this.tagForm.operatorId,
+                tenantId: this.tagForm.tenantId
+              }
+              return addTag(data)
+            })
             
-            this.tagDialogVisible = false
-            await this.fetchTagList(this.tagForm.groupId)
-            
-            // 如果切换了分组，需要更新当前选中的分组
-            if (this.activeGroupId !== this.tagForm.groupId) {
-              this.activeGroupId = this.tagForm.groupId
-              this.activeGroup = this.groupList.find(group => group.id.toString() === this.tagForm.groupId)
-            }
-          } catch (error) {
-            console.error(this.tagDialogType === 'add' ? '新增标签失败' : '更新标签失败', error)
-            this.$message.error(this.tagDialogType === 'add' ? '新增标签失败' : '更新标签失败')
+            Promise.all(promises).then(() => {
+              this.$message.success('新增成功')
+              this.tagDialogVisible = false
+              this.loadTagList()
+            })
           }
         }
       })
     },
     
-    // 分页相关方法
-    handleSizeChange(val) {
-      this.tagQueryParams.pageSize = val
-    },
-    handleCurrentChange(val) {
-      this.tagQueryParams.pageNum = val
+    // 删除标签
+    handleDeleteTag(tag) {
+      this.$confirm(`确认删除标签"${tag.tagName}"吗？`, '警告', {
+        type: 'warning'
+      }).then(() => {
+        deleteTag(tag.id).then(res => {
+          if (res.code === '0000000000000000') {
+            this.$message.success('删除成功')
+            this.loadTagList()
+          }
+        })
+      }).catch(() => {})
     }
+  },
+  created() {
+    this.loadGroupList()
   }
 }
 </script>
diff --git a/pc/src/views/project/building/index.vue b/pc/src/views/project/building/index.vue
index a5afb11..88fd531 100644
--- a/pc/src/views/project/building/index.vue
+++ b/pc/src/views/project/building/index.vue
@@ -296,9 +296,9 @@
                       :value="item.id">
                       <div style="display: flex; justify-content: space-between;">
                         <span>{{ item.accountName }}</span>
-                        <span style="color: #8492a6; font-size: 13px">{{ item.company }}</span>
+                        <span style="color: #8492a6; font-size: 13px">{{ item.companyName }}</span>
                       </div>
-                      <div style="font-size: 12px; color: #909399">{{ item.bankAccount }}</div>
+                      <div style="font-size: 12px; color: #909399">{{ item.bankAccountNumber }}</div>
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -311,12 +311,12 @@
             <el-row :gutter="20" v-if="form.accountId">
               <el-col :span="12">
                 <el-form-item label="收款公司">
-                  <el-input v-model="selectedAccount.company" disabled placeholder="收款公司" />
+                  <el-input v-model="selectedAccount.companyName" disabled placeholder="收款公司" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="开户银行">
-                  <el-input v-model="selectedAccount.bank" disabled placeholder="开户银行" />
+                  <el-input v-model="selectedAccount.bankName" disabled placeholder="开户银行" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -324,7 +324,7 @@
             <el-row :gutter="20" v-if="form.accountId">
               <el-col :span="12">
                 <el-form-item label="银行账号">
-                  <el-input v-model="selectedAccount.bankAccount" disabled placeholder="银行账号" />
+                  <el-input v-model="selectedAccount.bankAccountNumber" disabled placeholder="银行账号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -340,13 +340,12 @@
               <el-col :span="12">
                 <el-form-item label="楼宇标签" prop="buildingTags">
                   <el-select v-model="form.buildingTags" multiple placeholder="请选择楼宇标签">
-                    <el-option label="AAA级写字楼" value="AAA级写字楼" />
-                    <el-option label="甲级写字楼" value="甲级写字楼" />
-                    <el-option label="乙级写字楼" value="乙级写字楼" />
-                    <el-option label="商住两用" value="商住两用" />
-                    <el-option label="商业综合体" value="商业综合体" />
-                    <el-option label="创意园区" value="创意园区" />
-                    <el-option label="科技园区" value="科技园区" />
+                    <el-option 
+                      v-for="item in tagOptions" 
+                      :key="item.id" 
+                      :label="item.tagName" 
+                      :value="item.id" 
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -552,12 +551,12 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="收款公司">
-                  <el-input v-model="detail.company" disabled />
+                  <el-input v-model="detail.companyName" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="开户银行">
-                  <el-input v-model="detail.bank" disabled />
+                  <el-input v-model="detail.bankName" disabled />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -565,7 +564,7 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="银行账号">
-                  <el-input v-model="detail.bankAccount" disabled />
+                  <el-input v-model="detail.bankAccountNumber" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -663,8 +662,10 @@
 
 <script>
 import { getBuildingList, getBuildingDetail, addBuilding, updateBuilding, deleteBuilding, getBuildingStatistics } from '@/api/building'
-import { getFloorList, addFloor, updateFloor, deleteFloor, getFloorListByBuilding } from '@/api/building'
-import { getProjectList } from '@/api/project'
+import { getFloorList, addFloor, updateFloor, deleteFloor, getFloorListByBuilding,getAllAccounts } from '@/api/building'
+import { getProjectList,getTagByType } from '@/api/project'
+import { getAccountList } from '@/api/finance'
+import { API_SUCCESS_CODE } from '@/utils/constants'
 
 export default {
   name: 'BuildingList',
@@ -733,11 +734,12 @@ export default {
       projectOptions: [],
       // 账户选项
       accountOptions: [],
+      tagOptions: [], // 楼宇标签选项
       // 选中的账户信息
       selectedAccount: {
-        company: '',
-        bank: '',
-        bankAccount: ''
+        companyName: '',
+        bankName: '',
+        bankAccountNumber: ''
       },
       // 表单校验
       rules: {
@@ -911,6 +913,7 @@ export default {
     this.getList()
     this.getProjectOptions()
     this.getAccountOptions()
+    this.getTagOptions() // 获取楼宇标签选项
     this.fetchStatistics()
   },
   methods: {
@@ -929,7 +932,7 @@ export default {
       }
       
       getBuildingList(params).then(res => {
-        if (res.code === '000000') {
+        if (res.code === API_SUCCESS_CODE) {
           // 处理后端返回的数据，确保字段名映射正确
           const listData = res.data.rows || res.data.list || []
           this.buildingList = listData.map(item => {
@@ -960,7 +963,7 @@ export default {
     getProjectOptions() {
       // 调用项目列表接口获取项目选项
       getProjectList({ pageSize: 100 }).then(res => {
-        if (res.code === '000000') {
+        if (res.code === API_SUCCESS_CODE) {
           this.projectOptions = res.data.list.map(item => {
             return { id: item.id, name: item.projectName }
           })
@@ -969,23 +972,16 @@ export default {
     },
     /** 获取账户选项 */
     getAccountOptions() {
-      // TODO: 调用后端接口获取账户列表
-      this.accountOptions = [
-        { 
-          id: 1, 
-          accountName: '示例账户1', 
-          company: '示例收款公司1',
-          bank: '中国建设银行',
-          bankAccount: '6214000012345678'
-        },
-        { 
-          id: 2, 
-          accountName: '示例账户2', 
-          company: '示例收款公司2',
-          bank: '中国工商银行',
-          bankAccount: '6217000087654321'
+      getAllAccounts().then(res => {
+        if (res.code === API_SUCCESS_CODE) {
+          this.accountOptions = res.data
         }
-      ]
+      }).catch(() => {
+        this.accountOptions = [
+          { id: 1, accountName: '示例账户1', company: '示例收款公司1', bankName: '中国建设银行', bankAccountNumber: '6214000012345678' },
+          { id: 2, accountName: '示例账户2', company: '示例收款公司2', bankName: '中国工商银行', bankAccountNumber: '6217000087654321' }
+        ]
+      })
     },
     /** 查询楼层列表 */
     getFloorList(buildingId) {
@@ -996,7 +992,7 @@ export default {
       
       this.floorLoading = true
       getFloorListByBuilding(buildingId).then(res => {
-        if (res.code === '000000') {
+        if (res.code === API_SUCCESS_CODE) {
           this.floorList = res.data
         } else {
           this.$message.error(res.msg || '获取楼层列表失败')
@@ -1058,7 +1054,7 @@ export default {
       this.dialogTitle = '编辑楼宇'
       const id = row.id
       getBuildingDetail(id).then(res => {
-        if (res.code === '000000') {
+        if (res.code === API_SUCCESS_CODE) {
           // 保存原始楼宇名称用于验证
           this.originalBuildingName = res.data.buildingName
           // 将API返回的数据转换为数值类型
@@ -1179,7 +1175,7 @@ export default {
         type: 'warning'
       }).then(() => {
         deleteFloor(row.id).then(res => {
-          if (res.code === '000000') {
+          if (res.code === API_SUCCESS_CODE) {
             this.$message.success('删除成功')
             this.getFloorList(this.currentBuilding.id)
           } else {
@@ -1202,7 +1198,7 @@ export default {
         type: 'warning'
       }).then(() => {
         deleteBuilding(row.id).then(res => {
-          if (res.code === '000000') {
+          if (res.code === API_SUCCESS_CODE) {
             this.$message.success('删除成功')
             this.getList()
           } else {
@@ -1215,6 +1211,9 @@ export default {
     },
     /** 对话框打开时的处理 */
     onDialogOpen() {
+      if (this.tagOptions.length === 0) {
+        this.getTagOptions()
+      }
       // 等待DOM更新后重置验证
       this.$nextTick(() => {
         if (this.$refs.form) {
@@ -1265,7 +1264,7 @@ export default {
           
           action(formData).then(res => {
             console.log("API响应:", res)
-            if (res.code === '000000') {
+            if (res.code === API_SUCCESS_CODE) {
               this.$message.success(successMsg)
               this.dialogVisible = false
               this.getList()
@@ -1297,7 +1296,7 @@ export default {
             const action = isEdit ? updateFloor : addFloor
             
             action(this.floorForm).then(res => {
-              if (res.code === '000000') {
+              if (res.code === API_SUCCESS_CODE) {
                 this.$message.success(isEdit ? '编辑成功' : '新增成功')
                 this.floorFormVisible = false
                 this.getFloorList(this.currentBuilding.id)
@@ -1334,7 +1333,7 @@ export default {
           pageNum: 1
         })
         
-        if (res.code === '000000') {
+        if (res.code === API_SUCCESS_CODE) {
           // 计算总统计数据
           const totalStats = {
             buildingCount: res.data.total || 0,
@@ -1379,12 +1378,12 @@ export default {
     /** 详情按钮操作 */
     handleDetail(row) {
       getBuildingDetail(row.id).then(res => {
-        if (res.code === '000000') {
+        if (res.code === API_SUCCESS_CODE) {
           const buildingData = res.data
           
           // 获取楼宇统计信息
           getBuildingStatistics(row.id).then(statsRes => {
-            if (statsRes.code === '000000') {
+            if (statsRes.code === API_SUCCESS_CODE) {
               // 合并基本信息和统计信息
               const detailData = {
                 ...buildingData,
@@ -1593,9 +1592,9 @@ export default {
       const selectedAccount = this.accountOptions.find(item => item.id === this.form.accountId)
       if (selectedAccount) {
         this.selectedAccount = {
-          company: selectedAccount.company,
-          bank: selectedAccount.bank,
-          bankAccount: selectedAccount.bankAccount
+          companyName: selectedAccount.companyName,
+          bankName: selectedAccount.bankName,
+          bankAccountNumber: selectedAccount.bankAccountNumber
         }
       }
     },
@@ -1666,6 +1665,17 @@ export default {
         buildingImage: '',
         facilities: []
       }
+    },
+    // 获取楼宇标签选项
+    getTagOptions() {
+      getTagByType({ tagType: "楼宇标签", tagName: "楼宇标签" }).then(res => {
+        this.tagOptions = res.data
+      }).catch(() => {
+        this.tagOptions = [
+          { id: '1', tagName: '标签1' },
+          { id: '2', tagName: '标签2' }
+        ]
+      })
     }
   }
 }
diff --git a/pc/src/views/project/index.vue b/pc/src/views/project/index.vue
index ce50770..e66e3bf 100644
--- a/pc/src/views/project/index.vue
+++ b/pc/src/views/project/index.vue
@@ -146,9 +146,9 @@
           <el-select v-model="form.projectTags" multiple placeholder="请选择项目标签">
             <el-option
               v-for="tag in tagOptions"
-              :key="tag.value"
-              :label="tag.label"
-              :value="tag.value">
+              :key="tag.id"
+              :label="tag.tagName"
+              :value="tag.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -222,7 +222,7 @@
 </template>
 
 <script>
-import { getProjectList, getProjectDetail, addProject, updateProject, deleteProject, getAllProjectStatistics } from '@/api/project'
+import { getProjectList, getProjectDetail, addProject, updateProject, deleteProject, getAllProjectStatistics, getTagByType } from '@/api/project'
 
 export default {
   name: 'ProjectList',
@@ -309,11 +309,14 @@ export default {
     },
     /** 获取标签选项 */
     getTagOptions() {
-      // TODO: 调用后端接口获取标签列表
-      this.tagOptions = [
-        { value: '1', label: '标签1' },
-        { value: '2', label: '标签2' }
-      ]
+      getTagByType({ tagType: '项目标签',tagName: '项目标签' }).then(res => {
+        this.tagOptions = res.data
+      }).catch(() => {
+        this.tagOptions = [
+          { id: '1', tagName: '标签1' },
+          { id: '2', tagName: '标签2' }
+        ]
+      })
     },
     /** 搜索按钮操作 */
     handleQuery() {
diff --git a/pc/src/views/project/room/components/RoomForm.vue b/pc/src/views/project/room/components/RoomForm.vue
index 798d01d..84dcf1d 100644
--- a/pc/src/views/project/room/components/RoomForm.vue
+++ b/pc/src/views/project/room/components/RoomForm.vue
@@ -343,7 +343,7 @@
 
 <script>
 import { getRoom, addRoom, updateRoom, listProjects, listBuildings, listFloors, listRoomTags, listOwners } from '@/api/room'
-import { getProjectList } from '@/api/project'
+import { getProjectList,getTagByType } from '@/api/project'
 import { getBuildingList, getFloorList,getFloorListByBuilding} from '@/api/building'
 export default {
   name: 'RoomForm',
@@ -589,12 +589,13 @@ export default {
 
     /** 获取房源标签选项 */
     getTagOptions() {
-      listRoomTags().then(response => {
-        if (response.code === '000000') {
-          this.tagOptions = response.data
-        } else {
-          this.$message.error(response.msg || '获取房源标签失败')
-        }
+      getTagByType({ tagType: "房源标签", tagName: "房源标签" }).then(res => {
+        this.tagOptions = res.data
+      }).catch(() => {
+        this.tagOptions = [
+          { id: '1', tagName: '标签1' },
+          { id: '2', tagName: '标签2' }
+        ]
       })
     },
 
diff --git a/pc/src/views/project/room/index.vue b/pc/src/views/project/room/index.vue
index df27182..8596b92 100644
--- a/pc/src/views/project/room/index.vue
+++ b/pc/src/views/project/room/index.vue
@@ -206,7 +206,7 @@
 
 <script>
 import { listRoom, exportRoom, downloadTemplate, importRoom, listRoomTags, listProjects, listBuildings, listFloors, delRoom } from '@/api/room'
-import { getProjectList } from '@/api/project'
+import { getProjectList,getTagByType } from '@/api/project'
 import { getBuildingList,getFloorList,getFloorListByBuilding } from '@/api/building'
 
 import DetailView from './components/DetailView'
@@ -389,12 +389,13 @@ export default {
     
     /** 获取房源标签选项 */
     getTagOptions() {
-      listRoomTags().then(response => {
-        if (response.code === '000000') {
-          this.tagOptions = response.data || []
-        } else {
-          this.$message.error(response.msg || '获取房源标签失败')
-        }
+      getTagByType({ tagType: "房源标签", tagName: "房源标签" }).then(res => {
+        this.tagOptions = res.data
+      }).catch(() => {
+        this.tagOptions = [
+          { id: '1', tagName: '标签1' },
+          { id: '2', tagName: '标签2' }
+        ]
       })
     },
     
diff --git a/pc/vue.config.js b/pc/vue.config.js
index 74ffd64..359c310 100644
--- a/pc/vue.config.js
+++ b/pc/vue.config.js
@@ -10,14 +10,14 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    // proxy: {
-    //   '/': {
-    //     target: 'http://192.168.137.3:8080/api',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       '^/api': '/api'
-    //     }
-    //   }
-    // }
+    proxy: {
+      '/': {
+        target: 'http://192.168.137.214:8082/api',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/api': '/api'
+        }
+      }
+    }
   }
 } 
\ No newline at end of file