From b1cf66d93aef59512699e366cc7b71c00f50e292 Mon Sep 17 00:00:00 2001
From: wersd <1523826083@qq.com>
Date: Fri, 20 Jun 2025 22:46:22 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=9C=BA=E5=9C=B0=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=82=B9=E7=A9=BA=E7=99=BD=E5=A4=84=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=B6=88=E5=A4=B1=20=E6=89=93=E5=BC=80=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BC=9A=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E6=80=BB=E8=BD=A6=E4=BD=8D=E6=95=B0=E4=B8=8D?=
 =?UTF-8?q?=E8=A6=81=E5=9C=A8=E5=9C=BA=E5=9C=B0=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=AD=E4=BD=93=E7=8E=B0=20=E5=8F=AF?=
 =?UTF-8?q?=E5=BB=BA=E5=85=85=E7=94=B5=E6=9E=AA=E6=95=B0=E6=9C=80=E4=BD=8E?=
 =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA0=20=E5=9C=A8=E5=9C=BA?=
 =?UTF-8?q?=E5=9C=B0=E4=BF=A1=E6=81=AF=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0=E5=A4=A9=E6=95=B0=EF=BC=88=E5=B7=B2?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=92=8C=E5=B7=B2=E6=94=BE=E5=BC=83=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA0=E5=A4=A9=EF=BC=89=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E5=8A=A8=E6=80=81=E6=A0=8F=E7=9B=AE=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E9=A1=B5=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=90=8E=E7=82=B9=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=20=E5=85=B3=E8=81=94=E4=B8=9A?=
 =?UTF-8?q?=E4=B8=BB=E5=92=8C=E7=89=A9=E4=B8=9A=E6=96=B9=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=A4=AA=E9=95=BF?=
 =?UTF-8?q?=E4=BA=86=20=E5=9C=BA=E5=9C=B0=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=97=A0=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/src/Dialog.vue                |  2 +-
 src/views/crm/customer/detail/index.vue             |  4 ++--
 src/views/crm/customer/index.vue                    |  4 ++--
 src/views/crm/followup/components/FollowUpList.vue  | 13 ++++---------
 src/views/crm/stationsite/StationSiteForm.vue       |  5 +++--
 .../stationsite/detail/StationSiteDetailsHeader.vue |  4 ++--
 src/views/crm/stationsite/detail/index.vue          |  2 +-
 src/views/crm/stationsite/index.vue                 |  6 ++++++
 8 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 5a62e6bb2..44782fede 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -12,7 +12,7 @@ const props = defineProps({
   width: propTypes.oneOfType([String, Number]).def('60%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
   maxHeight: propTypes.oneOfType([String, Number]).def('400px') ,
-  closeOnClickModal: propTypes.bool.def(true)
+  closeOnClickModal: propTypes.bool.def(false)
 })
 
 const getBindValue = computed(() => {
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 76b3e9a78..7fad1badb 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -34,13 +34,13 @@
   <el-col>
     <el-tabs>
       <el-tab-pane  v-if="checkPermi(['crm:follow-up-record:query'])"  label="跟进记录">
-        <FollowUpList :biz-id="customer.id" :biz-type="BizTypeEnum.CRM_CUSTOMER" />
+        <FollowUpList :biz-id="customerId" :biz-type="BizTypeEnum.CRM_CUSTOMER" />
       </el-tab-pane>
       <!-- <el-tab-pane label="基本信息">
         <CustomerDetailsInfo :customer="customer" />
       </el-tab-pane> -->
       <el-tab-pane  v-if="checkPermi(['crm:contact:query']) && customer.id != undefined" label="联系人" lazy>
-        <ContactList :biz-id="customer.id" :biz-type="BizTypeEnum.CRM_CUSTOMER" :customerId="customer.id" />
+        <ContactList :biz-id="customerId" :biz-type="BizTypeEnum.CRM_CUSTOMER" :customerId="customer.id" />
       </el-tab-pane>
       <!-- <el-tab-pane label="团队成员">
         <PermissionList
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 1e5f7f38f..de61c95f8 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -58,11 +58,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="责任人">
+      <el-form-item label="责任人"  prop="ownerUserId">
         <el-select
           v-model="queryParams.ownerUserId"
           filterable
-          remote
           clearable
           placeholder="请选择责任人"
           style="width: 150px"
@@ -257,6 +256,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  queryParams.ownerUserId = undefined
   queryFormRef.value.resetFields()
   handleQuery()
 }
diff --git a/src/views/crm/followup/components/FollowUpList.vue b/src/views/crm/followup/components/FollowUpList.vue
index 5aa2047f3..f1449f350 100644
--- a/src/views/crm/followup/components/FollowUpList.vue
+++ b/src/views/crm/followup/components/FollowUpList.vue
@@ -50,6 +50,9 @@
       <span v-if="queryParams.bizId === undefined  && Array.isArray(item.customer) && item.customer.length > 0 && item.customer[0].name" style="margin-left: 8px;">
         客户名称：{{ item.customer[0].name }}
       </span>
+      <span v-if="queryParams.bizId === undefined  && Array.isArray(item.stationSite) && item.stationSite.length > 0 && item.stationSite[0].name" style="margin-left: 8px;">
+        场地名称：{{ item.stationSite[0].name }}
+      </span>
 
       <template #timestamp>
         <div style="color:#999;font-size:13px;margin-bottom:2px;">{{ bizLabel }}时间</div>
@@ -244,18 +247,10 @@ const resetQuery = () => {
 onMounted(async () => {
   // 获得用户列表
   userOptions.value = await UserApi.getSimpleUserList()
-})
-
-watch(
-  () => props.bizId,
-  () => {
     queryParams.bizType = props.bizType
     queryParams.bizId = props.bizId
-
     getList()
-  },
-  { immediate: true }
-)
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/crm/stationsite/StationSiteForm.vue b/src/views/crm/stationsite/StationSiteForm.vue
index 59d470f04..e9bae995d 100644
--- a/src/views/crm/stationsite/StationSiteForm.vue
+++ b/src/views/crm/stationsite/StationSiteForm.vue
@@ -41,7 +41,7 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="可建充电枪数" prop="estimatedPiles" >
-          <el-input-number v-model="formData.estimatedPiles" :min="1" :max="255" :step="1"/>
+          <el-input-number v-model="formData.estimatedPiles" :min="0" :max="255" :step="1"/>
         </el-form-item>
         </el-col>
       </el-row>
@@ -168,7 +168,7 @@
       :data="filteredOwnerList"
       style="width: 100%"
       @current-change="handleOwnerSelect"
-      
+      max-height="600px"
       highlight-current-row
       ref="ownerTable"
     >
@@ -192,6 +192,7 @@
       :data="filteredManagementList"
       style="width: 100%"
       @current-change="handleManagementSelect"
+      max-height="600px"
       highlight-current-row
       ref="managementTable"
     >
diff --git a/src/views/crm/stationsite/detail/StationSiteDetailsHeader.vue b/src/views/crm/stationsite/detail/StationSiteDetailsHeader.vue
index ffd84fe12..843ae0ed3 100644
--- a/src/views/crm/stationsite/detail/StationSiteDetailsHeader.vue
+++ b/src/views/crm/stationsite/detail/StationSiteDetailsHeader.vue
@@ -28,9 +28,9 @@
       <el-descriptions-item label="可建充电枪数:">
         {{ stationSite.estimatedPiles ?? '-' }}
       </el-descriptions-item>
-      <el-descriptions-item label="总车位数:">
+      <!-- <el-descriptions-item label="总车位数:">
         {{ stationSite.parkingSpace ?? '-' }}
-      </el-descriptions-item>
+      </el-descriptions-item> -->
       <el-descriptions-item label="业主方:">
         {{ stationSite.ownerName || '-' }}
       </el-descriptions-item>
diff --git a/src/views/crm/stationsite/detail/index.vue b/src/views/crm/stationsite/detail/index.vue
index d22da0946..ad4ab0711 100644
--- a/src/views/crm/stationsite/detail/index.vue
+++ b/src/views/crm/stationsite/detail/index.vue
@@ -15,7 +15,7 @@
   <el-col>
     <el-tabs>
       <el-tab-pane  label="动态记录"> <!--v-hasPermi="['crm:station-site:update']" v-hasPermi="['crm:station-site:transfor']"  v-if="checkPermi(['crm:follow-up-record:query'])" -->
-        <FollowUpList :biz-id="stationSite.id" :biz-type="BizTypeEnum.CRM_STATION_SITE" />
+        <FollowUpList :biz-id="stationSiteId" :biz-type="BizTypeEnum.CRM_STATION_SITE" />
       </el-tab-pane>
 
       <!-- 附件标签页 -->
diff --git a/src/views/crm/stationsite/index.vue b/src/views/crm/stationsite/index.vue
index 351633113..56069e540 100644
--- a/src/views/crm/stationsite/index.vue
+++ b/src/views/crm/stationsite/index.vue
@@ -111,6 +111,11 @@
           <dict-tag :type="DICT_TYPE.CRM_STATION_SITE_STATUS" :value="scope.row.siteStatus" />
         </template>
       </el-table-column>
+      <el-table-column label="未跟进天数" align="center" prop="lastFollowTime"  width="150px">
+        <template #default="scope">
+          <span>{{ scope.row.lastFollowTime ?? '无' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="责任人" align="center" prop="ownerUserName" width="150px" />
       <el-table-column label="操作" fixed="right"  align="center" min-width="150px">
         <template #default="scope">
@@ -219,6 +224,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  queryParams.ownerUserId = undefined
   queryFormRef.value.resetFields()
   handleQuery()
 }