diff --git a/src/components/BelongPeople/BelongPeople.tsx b/src/components/BelongPeople/BelongPeople.tsx index 0340039..0d37278 100644 --- a/src/components/BelongPeople/BelongPeople.tsx +++ b/src/components/BelongPeople/BelongPeople.tsx @@ -6,7 +6,7 @@ import { FolderAddOutlined } from '@ant-design/icons'; import { useEffect, useState } from "react"; // import { get, put, post, del, downloadUrl } from "../../../util/AjaxUtils.ts"; import { - get, put, post, del,getRealNameUrl + get, put, post, del, getRealNameUrl // downloadUrl } from "../../util/AjaxUtils.ts"; import { Button, Form, Input } from 'antd'; @@ -102,8 +102,10 @@ export default function BelongPeople(props: propsInfo) { // 表格第几行数据 // const [clom, setClom] = useState('') // 著作人搜索 - const belongPeopleSearch: SearchProps['onSearch'] = (value, _e, info) => ( - console.log(info?.source, value), + const belongPeopleSearch: SearchProps['onSearch'] = (value) => ( + // console.log(info?.source, value), + // console.log('',value), + setKeyWords(value), getSearchProjOwnerList(value, type) ); @@ -470,29 +472,43 @@ export default function BelongPeople(props: propsInfo) { authorType: 'ORGANIZATION', }) - }} type="primary" icon={} style={{ width: "160px", height: '43px', fontSize: '14px' }}> + }} type="primary" icon={} style={{}}> 创建所属者
- + { + // console.log('打印',e.target.value); + if (e.target.value == '') { + getSearchProjOwnerList('', type) + } + + }} onSearch={belongPeopleSearch} style={{ width: '300px', }} allowClear />
{ // console.log(`selected ${value}`); // alert(`selected ${value}`) // lyp - setType(value) - getSearchProjOwnerList(keywords, value) + if (value) { + setType(value) + getSearchProjOwnerList(keywords, value) + } else { + setType('') + getSearchProjOwnerList(keywords, '') + } }} options={[ - { value: '', label: '全部类型' }, + // { value: '', label: '全部类型' }, { value: 'PERSONAL', label: '自然人' }, { value: 'ORGANIZATION', label: '企业/组织' }, ]} - defaultValue="" + placeholder="请选择所属人类型" + // defaultValue="" />
{/*
@@ -990,11 +1005,17 @@ export default function ProjEditStep2(props: any) { steIsContantOpen(true) setContactTitle('创建联系人') - }} type="primary" icon={} style={{ width: "160px", height: '43px', fontSize: '14px' }}> + }} type="primary" icon={} style={{ fontSize: '14px' }}> 创建联系人
- + { + if (e.target.value == '') { + getSearchProjContactList('') + } + }} placeholder="请输入持有者名称搜索对应信息" onSearch={applicantPeopleSearch} style={{ width: '353px' }} />
@@ -1357,7 +1378,7 @@ export default function ProjEditStep2(props: any) {
{/*
姓名或公司名称:
*/}
{belongShow == 'PERSONAL' ? '姓名' : '公司名称'} - *
@@ -1406,7 +1427,7 @@ export default function ProjEditStep2(props: any) {
{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'} - *
@@ -1422,7 +1443,7 @@ export default function ProjEditStep2(props: any) { disabled={belongTitle == '查看所属者' ? true : false} /> -
(注:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'}可填写任意一个)
+
(注:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'}可填写任意一个)
@@ -1451,7 +1472,7 @@ export default function ProjEditStep2(props: any) { /> - +
@@ -1724,8 +1745,8 @@ export default function ProjEditStep2(props: any) { >
姓名* :
+ color: 'red', + }}>* :
@@ -1741,8 +1762,8 @@ export default function ProjEditStep2(props: any) {
电话* :
+ color: 'red', + }}>* :
name="phone" diff --git a/src/route/proj/edit/ProjEditStep2Show.tsx b/src/route/proj/edit/ProjEditStep2Show.tsx index 984ab80..9ee3f55 100644 --- a/src/route/proj/edit/ProjEditStep2Show.tsx +++ b/src/route/proj/edit/ProjEditStep2Show.tsx @@ -643,7 +643,7 @@ export default function ProjEditStep2() { formBelong.resetFields() setIsNewBelongOpen(true) setbelongTitle('创建所属者') - }} type="primary" icon={} style={{ width: "160px", height: '43px', fontSize: '14px' }}> + }} type="primary" icon={} style={{ fontSize: '14px' }}> 创建所属者
@@ -651,7 +651,7 @@ export default function ProjEditStep2() {