diff --git a/src/api/customermanagement/customerList/types.ts b/src/api/customermanagement/customerList/types.ts index 7a5378c..67a5b1a 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 ff5e7a5..16e5198 100644 --- a/src/hooks/websocket.ts +++ b/src/hooks/websocket.ts @@ -19,7 +19,7 @@ const useAdminWebSocket = () => { const baseUri = import.meta.env.VITE_API_URL const host = window.location.host console.log(host, 'host') - const wsUri = `ws://${host}${baseUri}/ws?access_token=${accessToken}` + const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}` console.log(baseUri, 'baseUri') //使用useWebSocket函数创建WebSocket连接,并配置自动重连和心跳机制 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; +}