This commit is contained in:
lyp 2025-05-20 15:07:26 +08:00
parent 2c154f2cf8
commit 421c278520
9 changed files with 137 additions and 68 deletions

View File

@ -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={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{}}>
</Button>
<div className='belongPeople-search' >
<Search placeholder="请输入持有者名称搜索对应信息模板" onSearch={belongPeopleSearch} style={{ width: '353px' }} />
<Search placeholder="请输入持有者名称搜索对应信息模板" onChange={(e: any) => {
// console.log('打印',e.target.value);
if (e.target.value == '') {
getSearchProjOwnerList('', type)
}
}} onSearch={belongPeopleSearch} style={{ width: '300px', }} allowClear />
</div>
<div className='belongPeople-select'>
<Select
style={{ height: '43px', width: '183px', fontSize: '16px' }}
allowClear
style={{ width: '183px', fontSize: '16px' }}
onChange={(value: string) => {
// 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=""
/>
</div>
{/* <div className='belongPeople-select'>
@ -572,6 +588,18 @@ export default function BelongPeople(props: propsInfo) {
// selectedRowKeys: belongselectedKeys // 设置默认选中的行
}}
dataSource={tableBelongData}
// pagination={
// {
// pageSize: 5,
// total: 15,
// onChange: (currentPage) => {
// // setPage(currentPage);
// },
// showSizeChanger: false,
// current: 1
// }
// }
pagination={{
defaultPageSize: 5, // 设置默认一页显示 5 条数据
}}
@ -752,6 +780,18 @@ export default function BelongPeople(props: propsInfo) {
pagination={{
defaultPageSize: 5, // 设置默认一页显示 5 条数据
}}
// pagination={
// {
// pageSize: 5,
// total: 15,
// onChange: (currentPage) => {
// // setPage(currentPage);
// },
// showSizeChanger: false,
// current: 1
// }
// }
style={{ textAlign: 'center', height: 390 }} // 设置表格内容居中显示
rowKey="projOwnerId" // 指定数据项的唯一标识符
>
@ -887,7 +927,7 @@ export default function BelongPeople(props: propsInfo) {
marginLeft: 20
}} type="primary"
onClick={() => {
if ( !authorName) {
if (!authorName) {
messageApi.error('请选择所属者')
return
}
@ -1067,7 +1107,7 @@ export default function BelongPeople(props: propsInfo) {
disabled={belongTitle == '查看所属者' ? true : false}
/>
</Form.Item>
<div className='prompt' style={{left:180}}>(:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'})</div>
<div className='prompt' style={{ left: 180 }}>(:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'})</div>
</div>
</Col>

View File

@ -220,11 +220,15 @@ export default function ContactPeople(props: any) {
steIsContantOpen(true)
setContactTitle('创建联系人')
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ fontSize: '14px' }}>
</Button>
<div className='belongPeople-search' style={{ height: 43 }}>
<Search placeholder="请输入持有者名称搜索对应信息" onSearch={applicantPeopleSearch} style={{ width: '353px' }} />
<Search allowClear placeholder="请输入持有者名称搜索对应信息" onSearch={applicantPeopleSearch} onChange={(e: any) => {
if (e.target.value == '') {
getSearchProjContactList('')
}
}} style={{ width: '353px' }} />
</div>
</div>
<div className='showInfo' style={{ display: props.isShow ? 'block' : 'none' }}>
@ -268,10 +272,10 @@ export default function ContactPeople(props: any) {
ContantRowSelection.onChange([record.projContactId], [record]);
}
},
style: { cursor: 'pointer' }
style: { cursor: 'pointer' }
};
}}
dataSource={tableContactData}
pagination={{
@ -322,7 +326,7 @@ export default function ContactPeople(props: any) {
<Column
align="center"
title="操作"
className="ant-table-cell-action"
className="ant-table-cell-action"
render={(_text, record: any) => (
<Space size="middle">
<a onClick={() => {
@ -513,8 +517,8 @@ export default function ContactPeople(props: any) {
>
<div className='blongNameInt'>
<div className='blongTitle ' style={{ width: 65, marginRight: '15px' }}><span style={{
color: 'red',
}}>*</span> : </div>
color: 'red',
}}>*</span> : </div>
<Form.Item<ContactType>
@ -530,8 +534,8 @@ export default function ContactPeople(props: any) {
</div>
<div className='blongNameInt'>
<div className='blongTitle ' style={{ width: 65, marginRight: '15px' }}><span style={{
color: 'red',
}}>*</span> : </div>
color: 'red',
}}>*</span> : </div>
<Form.Item<ContactType>
name="phone"

View File

@ -40,7 +40,7 @@ export default function AppEdit() {
color: editProcess >= 1 ? '#353535' : '#878787',
fontWeight: editProcess >= 1 ? 'bold' : 'normal'
}}
></div>
></div>
</div>
<div className='editright'><RightOutlined /></div>
<div className='editProcess'>
@ -54,7 +54,7 @@ export default function AppEdit() {
color: editProcess >= 2 ? '#353535' : '#878787',
fontWeight: editProcess >= 2 ? 'bold' : 'normal'
}}
></div>
></div>
</div>
<div className='editright'><RightOutlined /></div>
<div className='editProcess'>

View File

@ -12,7 +12,7 @@ export default function AppElectron() {
const [page, setPage] = useState(1);
const [total, setTotal] = useState(0);
const data = [
{ name: '123' }
// { name: '123' }
]
useEffect(() => {
setTotal(100)

View File

@ -92,6 +92,8 @@ export default function EditAppFiles(props: any) {
// 处理表单提交逻辑
console.log('表单提交成功', values);
submitInfo(values)
console.log(upCodeArray);
};
return (
<div>
@ -144,6 +146,8 @@ export default function EditAppFiles(props: any) {
defaultFileList={upCodeArray}
onChange={({ fileList }) => {
console.log(fileList);
// console.log(upCodeArray);
}}
onRemove={() => {
setUpCodeArray([])

View File

@ -1866,25 +1866,6 @@ export default function Index() {
list={agentMenu.list}
handleListItem={agentMenu.handleListItem}
/> */}
{THEME == 'mzw' ? (
<MenuWithBottomButtom
button={sellMenu.button}
list={sellMenu.list}
handleListItem={sellMenu.handleListItem}
sellKeywords={sellKeywords}
sellBelongType={sellBelongType}
sellDate={sellDate}
language={language}
sellBoxtype={sellBoxtype}
sellStatrtTime={sellStatrtTime}
sellEndTime={sellEndTime}
sellOrderStatus={sellOrderStatus}
sellOrderKeywords={sellOrderKeywords}
/>
) : (
<></>
)}
{THEME == 'mzw' ? (
<>
<div style={{
@ -1923,7 +1904,7 @@ export default function Index() {
<div style={{
background: getMenuActive() == 'TRADEMARK' ? 'linear-gradient(90deg, #FF9F08 0%, #FF7331 100%)' : ' var(--color-menuback)',
borderTop: '1px solid var(--color-menuborder)',
borderBottom: '1px solid var(--color-menuborder)',
// borderBottom: '1px solid var(--color-menuborder)',
height: 56,
cursor: 'pointer',
display: 'flex',
@ -1959,6 +1940,26 @@ export default function Index() {
) : (
<></>
)}
{THEME == 'mzw' ? (
<MenuWithBottomButtom
button={sellMenu.button}
list={sellMenu.list}
handleListItem={sellMenu.handleListItem}
sellKeywords={sellKeywords}
sellBelongType={sellBelongType}
sellDate={sellDate}
language={language}
sellBoxtype={sellBoxtype}
sellStatrtTime={sellStatrtTime}
sellEndTime={sellEndTime}
sellOrderStatus={sellOrderStatus}
sellOrderKeywords={sellOrderKeywords}
/>
) : (
<></>
)}
{/* <MenuWithBottomButtom
button={buyMenu.button}

View File

@ -4,7 +4,7 @@ import { FolderAddOutlined } from '@ant-design/icons';
import locale from 'antd/es/date-picker/locale/zh_CN';
import { useParams } from "react-router-dom";
import { useEffect, useState } from "react";
import { get, put, post, del, downloadUrl,getRealNameUrl } from "../../../util/AjaxUtils.ts";
import { get, put, post, del, downloadUrl, getRealNameUrl } from "../../../util/AjaxUtils.ts";
import { Button, Form, Input } from 'antd';
import { AxiosResponse } from "axios";
import dayjs, { Dayjs } from 'dayjs';
@ -725,34 +725,49 @@ export default function ProjEditStep2(props: any) {
authorType: 'ORGANIZATION',
})
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ fontSize: '14px' }}>
</Button>
<div className='belongPeople-search'
// style={{ height: '43px' }}
>
<Search placeholder="请输入持有者名称搜索对应信息模板" onSearch={belongPeopleSearch}
onChange={(e: any) => {
// console.log('打印',e.target.value);
if (e.target.value == '') {
getSearchProjOwnerList('', type)
}
}}
style={{ width: '353px' }}
className="custom-search"
allowClear
/>
</div>
<div className='belongPeople-select'>
<Select
style={{ height: '43px', width: '183px', fontSize: '16px' }}
allowClear
style={{ width: '183px', fontSize: '16px' }}
onChange={(value: string) => {
// 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=""
/>
</div>
{/* <div className='belongPeople-select'>
@ -990,11 +1005,17 @@ export default function ProjEditStep2(props: any) {
steIsContantOpen(true)
setContactTitle('创建联系人')
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ fontSize: '14px' }}>
</Button>
<div className='belongPeople-search' style={{ height: 43 }}>
<Search placeholder="请输入持有者名称搜索对应信息" onSearch={applicantPeopleSearch} style={{ width: '353px' }} />
<Search
allowClear
onChange={(e: any) => {
if (e.target.value == '') {
getSearchProjContactList('')
}
}} placeholder="请输入持有者名称搜索对应信息" onSearch={applicantPeopleSearch} style={{ width: '353px' }} />
</div>
</div>
<div className='showInfo'>
@ -1357,7 +1378,7 @@ export default function ProjEditStep2(props: any) {
<div className='blongNameInt blongSmallNamel promptBox'>
{/* <div className='blongTitle blongsmallTitle '>姓名或公司名称:</div> */}
<div className='blongTitle blongsmallTitle '>{belongShow == 'PERSONAL' ? '姓名' : '公司名称'}
<span style={{
<span style={{
color: 'red',
}}>*</span>
</div>
@ -1406,7 +1427,7 @@ export default function ProjEditStep2(props: any) {
<Col span={12}>
<div className='blongNameInt blongSmallNameR'>
<div className='blongTitle blongsmallTitle '>{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'}
<span style={{
<span style={{
color: 'red',
}}>*</span>
</div>
@ -1422,7 +1443,7 @@ export default function ProjEditStep2(props: any) {
disabled={belongTitle == '查看所属者' ? true : false}
/>
</Form.Item>
<div className='prompt' style={{left:180}}>(:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'})</div>
<div className='prompt' style={{ left: 180 }}>(:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'})</div>
</div>
</Col>
@ -1451,7 +1472,7 @@ export default function ProjEditStep2(props: any) {
/>
</Form.Item>
</div>
@ -1724,8 +1745,8 @@ export default function ProjEditStep2(props: any) {
>
<div className='blongNameInt'>
<div className='blongTitle ' style={{ width: 65, marginRight: '15px' }}><span style={{
color: 'red',
}}>*</span> : </div>
color: 'red',
}}>*</span> : </div>
<Form.Item<ContactType>
@ -1741,8 +1762,8 @@ export default function ProjEditStep2(props: any) {
</div>
<div className='blongNameInt'>
<div className='blongTitle ' style={{ width: 65, marginRight: '15px' }}><span style={{
color: 'red',
}}>*</span> : </div>
color: 'red',
}}>*</span> : </div>
<Form.Item<ContactType>
name="phone"

View File

@ -643,7 +643,7 @@ export default function ProjEditStep2() {
formBelong.resetFields()
setIsNewBelongOpen(true)
setbelongTitle('创建所属者')
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ fontSize: '14px' }}>
</Button>
<div className='belongPeople-search' style={{ height: 43 }}>
@ -651,7 +651,7 @@ export default function ProjEditStep2() {
</div>
<div className='belongPeople-select'>
<Select
style={{ height: '43px', width: '183px', fontSize: '16px' }}
style={{ width: '183px', fontSize: '16px' }}
onChange={(value: string) => {
// console.log(`selected ${value}`);
// alert(`selected ${value}`)
@ -745,7 +745,7 @@ export default function ProjEditStep2() {
steIsContantOpen(true)
setContactTitle('创建联系人')
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
}} type="primary" icon={<FolderAddOutlined style={{ fontSize: '18px' }} />} style={{ fontSize: '14px' }}>
</Button>
<div className='belongPeople-search' style={{ height: 43 }}>

View File

@ -91,14 +91,13 @@
height: 43px;
width: 43px;
} */
.belongPeople-search .ant-input {
/* .belongPeople-search .ant-input {
height: 43px !important;
/* line-height: 43px; */
}
.belongPeople-search .ant-input-search .ant-input-group-addon:last-child .ant-btn {
height: 43px !important;
width: 43px !important;
}
} */
.belongPeople-bot {