From a39c2a8e6da39ff8c22348e4b903178edc275415 Mon Sep 17 00:00:00 2001
From: wersd <1523826083@qq.com>
Date: Wed, 25 Jun 2025 21:15:59 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E5=9C=BA=E5=9C=B0=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=94=B9=E4=B8=BA=E6=8C=89=E7=85=A7=E8=B4=A3?=
=?UTF-8?q?=E4=BB=BB=E4=BA=BA=E6=90=9C=E7=B4=A2=20=E5=9C=BA=E5=9C=B0?=
=?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E5=9C=BA?=
=?UTF-8?q?=E5=9C=B0=E5=90=8D=E7=A7=B0=E5=8F=AF=E7=9B=B4=E6=8E=A5=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=20=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95=E4=B8=AD?=
=?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=AE=A2=E6=88=B7=E5=8D=95=E4=BD=8D=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E5=8F=AF=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=20?=
=?UTF-8?q?=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=A2=E6=88=B7=E8=81=94=E7=B3=BB=E4=BA=BA?=
=?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=20=E5=9C=BA=E5=9C=B0?=
=?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AF=A6=E6=83=85=E4=B8=AD=EF=BC=8C=E6=9D=83?=
=?UTF-8?q?=E9=99=90=E8=AE=BE=E7=BD=AE=E6=97=A0=E7=BC=96=E8=BE=91=E5=92=8C?=
=?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BD=86=E5=86=8D?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD=E4=BB=8D=E7=84=B6=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 2 +-
.env.local | 2 +-
.env.prod | 2 +-
src/views/crm/contract/detail/index.vue | 2 -
src/views/crm/customer/detail/index.vue | 1 -
.../crm/followup/components/FollowUpList.vue | 49 ++++++++++++++++---
.../components/FollowUpRecordForm.vue | 12 ++---
src/views/crm/stationsite/detail/index.vue | 2 +
8 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/.env.dev b/.env.dev
index e85b68c85..5a56ae651 100644
--- a/.env.dev
+++ b/.env.dev
@@ -4,7 +4,7 @@ NODE_ENV=production
VITE_DEV=true
# 请求路径
-VITE_BASE_URL='http://www.sujieguanli.top:48080'
+VITE_BASE_URL='http://www.woyaoshouchong.asia:48080'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=client
diff --git a/.env.local b/.env.local
index 90f7da7fa..aa7982fa5 100644
--- a/.env.local
+++ b/.env.local
@@ -4,7 +4,7 @@ NODE_ENV=development
VITE_DEV=true
# 请求路径
-VITE_BASE_URL='http://www.sujieguanli.top:48080'
+VITE_BASE_URL='http://www.woyaoshouchong.asia:48080'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
VITE_UPLOAD_TYPE=client
diff --git a/.env.prod b/.env.prod
index af206c36f..b62c2c3d6 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,7 +4,7 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径
-VITE_BASE_URL='http://www.sujieguanli.top:88'
+VITE_BASE_URL='http://www.sujieguanli.top'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=client
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index 2ac2b8e01..c3e6cf767 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -48,7 +48,6 @@
import { useTagsViewStore } from '@/store/modules/tagsView'
import { OperateLogVO } from '@/api/system/operatelog'
import * as ContractApi from '@/api/crm/contract'
-import ContractDetailsInfo from './ContractDetailsInfo.vue'
import ContractDetailsHeader from './ContractDetailsHeader.vue'
import ContractProductList from './ContractProductList.vue'
import { BizTypeEnum } from '@/api/crm/permission'
@@ -56,7 +55,6 @@ import { getOperateLogPage } from '@/api/crm/operateLog'
import ContractForm from '@/views/crm/contract/ContractForm.vue'
import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
import PermissionList from '@/views/crm/permission/components/PermissionList.vue'
-import FollowUpList from '@/views/crm/followup/components/FollowUpList.vue'
import ReceivableList from '@/views/crm/receivable/components/ReceivableList.vue'
import ReceivablePlanList from '@/views/crm/receivable/plan/components/ReceivablePlanList.vue'
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 7fad1badb..d2827e65b 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -25,7 +25,6 @@
>
锁定
- {{ customerId }}
-
+
+
+
+
+
+
@@ -46,11 +62,17 @@
placement="top"
>
{{ bizLabel }}人:{{ item.creatorName }}
-
- 客户名称:{{ item.customer[0].name }}
+
+ 客户名称:
+
+ {{ item.customer[0].name }}
+
-
- 场地名称:{{ item.stationSite[0].name }}
+
+ 场地名称:
+
+ {{ item.stationSite[0].name }}
+
@@ -137,6 +159,7 @@ import { FollowUpRecordApi, FollowUpRecordVO } from '@/api/crm/followup'
import FollowUpRecordForm from './FollowUpRecordForm.vue'
import { BizTypeEnum } from '@/api/crm/permission'
import * as UserApi from '@/api/system/user'
+import { defaultProps } from '@/utils/tree'
const userOptions = ref([])
@@ -161,7 +184,8 @@ const queryParams = reactive({
bizId: undefined as number | undefined,
content: '',
type: undefined,
- creator: undefined as number | undefined // 跟进人
+ creator: undefined as number | undefined, // 跟进人
+ ownerUserId: undefined as number | undefined // 责任人
})
/** 查询列表 */
@@ -219,6 +243,16 @@ const openContactDetail = (id: number) => {
const openBusinessDetail = (id: number) => {
push({ name: 'CrmBusinessDetail', params: { id } })
}
+/** 打开场地信息详情 */
+const openStationDetail = (id: number) => {
+ push({ name: 'CrmStationSiteDetail', params: { id } })
+}
+
+/** 打开客户详情 */
+const openCustomerDetail = (id: number) => {
+ push({ name: 'CrmCustomerDetail', params: { id } })
+}
+
/** 文件查看弹窗 */
const fileDialogVisible = ref(false)
@@ -240,6 +274,9 @@ const resetQuery = () => {
queryParams.content = ''
queryParams.creator = undefined
queryParams.type = undefined
+ queryParams.ownerUserId = undefined
+ queryParams.pageNo = 1
+ queryParams.pageSize = 10
handleQuery()
}
diff --git a/src/views/crm/followup/components/FollowUpRecordForm.vue b/src/views/crm/followup/components/FollowUpRecordForm.vue
index 6f8401813..26c08325f 100644
--- a/src/views/crm/followup/components/FollowUpRecordForm.vue
+++ b/src/views/crm/followup/components/FollowUpRecordForm.vue
@@ -23,7 +23,11 @@
- console.log('contactIds changed:', val)">
+
@@ -58,7 +62,6 @@ defineOptions({ name: 'FollowUpRecordForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
-const contactId = ref()
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
@@ -125,11 +128,6 @@ watch(
// 获取客户下联系人
const res = await ContactApi.getContactPageByCustomer({ customerId: val, pageSize: 100 })
contactOptions.value = res.list || []
- // 只在修改时默认选中第一个
- if (formType.value === 'update' && contactOptions.value.length > 0) {
- formData.value.contactIds = [contactOptions.value[0].id]
- contactId.value = contactOptions.value[0].id
- }
} else {
contactOptions.value = []
formData.value.contactIds = []
diff --git a/src/views/crm/stationsite/detail/index.vue b/src/views/crm/stationsite/detail/index.vue
index ad4ab0711..90cde1038 100644
--- a/src/views/crm/stationsite/detail/index.vue
+++ b/src/views/crm/stationsite/detail/index.vue
@@ -2,11 +2,13 @@
编辑
转移