diff --git a/src/api/customermanagement/customerList/types.ts b/src/api/customermanagement/customerList/types.ts index 76d7b53..fd246f6 100644 --- a/src/api/customermanagement/customerList/types.ts +++ b/src/api/customermanagement/customerList/types.ts @@ -46,6 +46,7 @@ export type CustomerListRecord = { extraData?: Array channelType?: number channelIdentifying?: Array + customInformation: string } /** * 编辑表单 @@ -55,6 +56,7 @@ export interface SysEdit { clueStageName: string clueStageId: number | undefined clueLabelList: Array + customInformation: string } //详情表单 interface detailFormItem { diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts index 2b40cc0..028c3a3 100644 --- a/src/hooks/websocket.ts +++ b/src/hooks/websocket.ts @@ -18,8 +18,14 @@ const useAdminWebSocket = () => { // ws地址 const baseUri = import.meta.env.VITE_API_URL const host = window.location.host +<<<<<<< HEAD + console.log(host, 'host') + const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}` + console.log(baseUri, 'baseUri') +======= const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}` console.log(wsUri, 'wsUri') +>>>>>>> 51148e12890616d99b5cb637a2b4197ca26fbcf1 //使用useWebSocket函数创建WebSocket连接,并配置自动重连和心跳机制 useWebSocketReturn = useWebSocket(wsUri, { diff --git a/src/views/customermanagement/customerList/customerListEditModal.vue b/src/views/customermanagement/customerList/customerListEditModal.vue index 0b3933d..4cc0ee5 100644 --- a/src/views/customermanagement/customerList/customerListEditModal.vue +++ b/src/views/customermanagement/customerList/customerListEditModal.vue @@ -55,6 +55,16 @@ + + + @@ -184,7 +194,12 @@ const formModel = reactive({ clueId: undefined, clueStageName: '', clueStageId: undefined, - clueLabelList: [] + clueLabelList: [], + customInformation: '' +}) +// 表单的校验规则 +const formRule = reactive({ + customInformation: [{ required: true, message: '请输入客户资料', trigger: ['blur', 'change'] }] }) // 表单的提交请求 @@ -193,10 +208,11 @@ const formRequestMapping: FormRequestMapping = { [FormAction.UPDATE]: updateResource } -const { submitLoading, validateAndSubmit, resetFields } = useAdminForm( +const { submitLoading, validateAndSubmit, resetFields, validateInfos } = useAdminForm( formAction, formRequestMapping, - formModel + formModel, + formRule ) //表单提交处理 @@ -268,6 +284,7 @@ defineExpose({ title.value = '编辑' resourcesId.value = record.clueId formModel.clueId = record.clueId + formModel.customInformation = record.customInformation // formModel.clueLabelList label.length = 0 clueStage.length = 0 @@ -388,4 +405,17 @@ defineExpose({ max-width: 100%; } } +//客户资料textarea +.customInformationInput { + // margin-left: 10px; +} +::v-deep textarea.ant-input { + min-height: 90px; +} +//客户资料label +::v-deep .ant-form-item-required { + color: rgba(0, 0, 0, 0.85); + font-weight: 500; + font-size: 16px; +} diff --git a/vite.config.ts b/vite.config.ts index 53047d0..b74c85d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -26,10 +26,10 @@ import { antdvStyleDeps } from './src/utils/resolvers' //ts // export const serverAddress = 'http://172.18.0.228:8000' //测试 -// export const serverAddress = 'http://39.100.77.21:8000' +export const serverAddress = 'http://39.100.77.21:8000' //线上域名,现在用这个 -export const serverAddress = 'https://byffp.top' +// export const serverAddress = 'https://byffp.top' export default defineConfig({ server: {