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 />
{/*
@@ -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}
/>
-
(注:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'}可填写任意一个)
+
(注:如有多个著作人{belongShow == 'PERSONAL' ? '身份证号' : '统一社会信用代码'}可填写任意一个)
diff --git a/src/components/ContactPeople/ContactPeople.tsx b/src/components/ContactPeople/ContactPeople.tsx
index dcf1ef7..b3fe0b6 100644
--- a/src/components/ContactPeople/ContactPeople.tsx
+++ b/src/components/ContactPeople/ContactPeople.tsx
@@ -220,11 +220,15 @@ export default function ContactPeople(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('')
+ }
+ }} style={{ width: '353px' }} />
@@ -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) {
(
{
@@ -513,8 +517,8 @@ export default function ContactPeople(props: any) {
>
姓名* :
+ color: 'red',
+ }}>* :
@@ -530,8 +534,8 @@ export default function ContactPeople(props: any) {
电话* :
+ color: 'red',
+ }}>* :
name="phone"
diff --git a/src/route/AppElectron/AppEdit.tsx b/src/route/AppElectron/AppEdit.tsx
index e928bf2..161be50 100644
--- a/src/route/AppElectron/AppEdit.tsx
+++ b/src/route/AppElectron/AppEdit.tsx
@@ -40,7 +40,7 @@ export default function AppEdit() {
color: editProcess >= 1 ? '#353535' : '#878787',
fontWeight: editProcess >= 1 ? 'bold' : 'normal'
}}
- >软件基本信息
+ >机构认证
@@ -54,7 +54,7 @@ export default function AppEdit() {
color: editProcess >= 2 ? '#353535' : '#878787',
fontWeight: editProcess >= 2 ? 'bold' : 'normal'
}}
- >权力说明
+ >软件基本信息
diff --git a/src/route/AppElectron/AppElectron.tsx b/src/route/AppElectron/AppElectron.tsx
index 8ae3e22..29b9e9e 100644
--- a/src/route/AppElectron/AppElectron.tsx
+++ b/src/route/AppElectron/AppElectron.tsx
@@ -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)
diff --git a/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx b/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx
index d420498..e64e0f3 100644
--- a/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx
+++ b/src/route/AppElectron/components/EditAppFiles/EditAppFiles.tsx
@@ -92,6 +92,8 @@ export default function EditAppFiles(props: any) {
// 处理表单提交逻辑
console.log('表单提交成功', values);
submitInfo(values)
+ console.log(upCodeArray);
+
};
return (
@@ -144,6 +146,8 @@ export default function EditAppFiles(props: any) {
defaultFileList={upCodeArray}
onChange={({ fileList }) => {
console.log(fileList);
+ // console.log(upCodeArray);
+
}}
onRemove={() => {
setUpCodeArray([])
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx
index 1bbfb1b..40f3c9e 100644
--- a/src/route/index/Index.tsx
+++ b/src/route/index/Index.tsx
@@ -1866,25 +1866,6 @@ export default function Index() {
list={agentMenu.list}
handleListItem={agentMenu.handleListItem}
/> */}
- {THEME == 'mzw' ? (
-
- ) : (
- <>>
- )}
{THEME == 'mzw' ? (
<>
>
)}
+ {THEME == 'mzw' ? (
+
+ ) : (
+ <>>
+ )}
+
{/*
} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
+ }} type="primary" icon={
} style={{ fontSize: '14px' }}>
创建所属者
{
+ // console.log('打印',e.target.value);
+ if (e.target.value == '') {
+ getSearchProjOwnerList('', type)
+ }
+
+ }}
style={{ width: '353px' }}
className="custom-search"
+ allowClear
/>
{/*
@@ -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() {