diff --git a/src/views/Conversations/Online/Components/EmailBind.jsx b/src/views/Conversations/Online/Components/EmailBind.jsx index a2c782a..f6c999d 100644 --- a/src/views/Conversations/Online/Components/EmailBind.jsx +++ b/src/views/Conversations/Online/Components/EmailBind.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { App, Modal, Button, Table, Form, Row, Col, Input } from 'antd' +import { App, Modal, Button, Table, Form, Row, Col, Input, Checkbox } from 'antd' import { ApiOutlined } from '@ant-design/icons' import { isEmpty, cloneDeep } from '@/utils/commons' import { fetchJSON } from '@/utils/request' @@ -33,7 +33,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB const copyObject = cloneDeep(values) delete copyObject.type const allEmpty = Object.values(copyObject).every((val) => { - return val === null || val === '' || val === undefined + return val === null || String(val).trim() === '' || val === undefined }) if (allEmpty) { notification.warning({ @@ -45,12 +45,13 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB return false } // values.opisn = loginUserId - values.sourcetype = values.sourcetype || '227001' + values.sourcetype = values.is_biz ? '227002' : '227001' + delete values.is_biz setLoading(false) setSearchLoading(true) setSearchResult([]) const result = await fetchHTOrderList(values) - setSearchResult(result) + setSearchResult(result.map(ele => ({...ele, sourcetype: values.sourcetype}))) setSearchLoading(false) } @@ -133,7 +134,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB key: 'action', width: 150, render: (_, record) => ( - ), @@ -158,7 +159,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB destroyOnHidden> {/* */}
- - - + -