diff --git a/.env b/.env
index 6c4a546fa..cdbb61806 100644
--- a/.env
+++ b/.env
@@ -23,3 +23,6 @@ VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码
VITE_APP_DEFAULT_LOGIN_USERNAME = admin
VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123
+
+# 租户开关
+VUE_APP_TENANT_ENABLE=false
\ No newline at end of file
diff --git a/.env.dev b/.env.dev
index cf81eab22..04c9c99f2 100644
--- a/.env.dev
+++ b/.env.dev
@@ -7,7 +7,7 @@ VITE_DEV=true
VITE_BASE_URL='http://192.168.6.136:48080'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
-VITE_UPLOAD_TYPE=server
+VITE_UPLOAD_TYPE=client
# 接口地址
VITE_API_URL=/admin-api
diff --git a/.env.local b/.env.local
index ea726fd7f..1a84e6942 100644
--- a/.env.local
+++ b/.env.local
@@ -32,6 +32,3 @@ VITE_APP_CAPTCHA_ENABLE=false
# GoView域名
VITE_GOVIEW_URL='http://127.0.0.1:3000'
-
-# 租户开关
-VUE_APP_TENANT_ENABLE=false
\ No newline at end of file
diff --git a/public/bg1.jpg b/public/bg1.jpg
new file mode 100644
index 000000000..1610d59ee
Binary files /dev/null and b/public/bg1.jpg differ
diff --git a/public/bg2.jpg b/public/bg2.jpg
new file mode 100644
index 000000000..b8d54f228
Binary files /dev/null and b/public/bg2.jpg differ
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index d149d4e78..cc61596dd 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -24,6 +24,7 @@ export interface CustomerVO {
industryId: number // 所属行业
level: number // 客户等级
source: number // 客户来源
+ primaryContact: string // 主要联系人
remark: string // 备注
creator: string // 创建人
creatorName?: string // 创建人名称
diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 6d0cb571b..4d5e90106 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -5,74 +5,11 @@
v-loading="formLoading"
:model="formData"
:rules="formRules"
- label-width="100px"
+ label-width="120px"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
@@ -151,7 +107,10 @@ const formData = ref({
})
const formRules = reactive({
name: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
- ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
+ contactNextTime: [{ required: true, message: '下次联系时间不能为空', trigger: 'change' }],
+ areaId: [{ required: true, message: '地区不能为空', trigger: 'change' }],
+ detailAddress: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
+ industryId: [{ required: true, message: '客户类别不能为空', trigger: 'change' }],
})
const formRef = ref() // 表单 Ref
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 3e7301400..c73d9a551 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -26,12 +26,12 @@
@keyup.enter="handleQuery"
/>
-
+
-
-
-
-
-
-
-
-
-
-
@@ -110,62 +80,36 @@
-
+
+
+ {{ scope.row.areaName || '--' }}
+
+
+
{{ scope.row.name }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download'
import * as CustomerApi from '@/api/crm/customer'
import CustomerForm from './CustomerForm.vue'
@@ -224,6 +168,7 @@ const queryParams = reactive({
sceneType: '1', // 默认和 activeName 相等
name: '',
mobile: '',
+ areaId: undefined,
industryId: undefined,
level: undefined,
source: undefined,