This commit is contained in:
xixi 2024-06-11 17:45:40 +08:00
parent 7dba8de8e4
commit 793b781fb8
9 changed files with 844 additions and 302 deletions

View File

@ -2,10 +2,10 @@ import './copyrightG-goods.css'
import { import {
Select, DatePicker, Button, Table, Select, DatePicker, Button, Table,
// message, // message,
Space, Input, Empty Space, Input, Empty, Pagination
} from 'antd'; } from 'antd';
// import type { TableColumnsType } from 'antd'; // import type { TableColumnsType } from 'antd';
import { SearchOutlined,ClearOutlined } from '@ant-design/icons'; import { SearchOutlined, ClearOutlined } from '@ant-design/icons';
import type { DatePickerProps } from 'antd'; import type { DatePickerProps } from 'antd';
import locale from 'antd/es/date-picker/locale/zh_CN'; import locale from 'antd/es/date-picker/locale/zh_CN';
const { Column } = Table; const { Column } = Table;
@ -33,7 +33,7 @@ export default function CopyrightGgoods() {
{ {
name: '智能管理系统', name: '智能管理系统',
short: '简称', short: '简称',
number: '31234567891234561789', number: '312345678912345617891',
price: '5.00', price: '5.00',
version: '1-1-1', version: '1-1-1',
time: '2020-04-19 1542:21', time: '2020-04-19 1542:21',
@ -42,7 +42,7 @@ export default function CopyrightGgoods() {
{ {
name: '商城管理系统', name: '商城管理系统',
short: '简称', short: '简称',
number: '1123456789123456789', number: '11234567891234567892',
price: '5.00', price: '5.00',
version: '1-1-1', version: '1-1-1',
time: '2020-04-19 1542:21', time: '2020-04-19 1542:21',
@ -51,7 +51,70 @@ export default function CopyrightGgoods() {
{ {
name: 'xx系统', name: 'xx系统',
short: '简称', short: '简称',
number: '2123456789123456789', number: '21234567891234567893',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567894',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567895',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567896',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567897',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567898',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567899',
price: '5.00',
version: '1-1-1',
time: '2020-04-19 1542:21',
language: 'java'
},
{
name: 'xx系统',
short: '简称',
number: '21234567891234567890',
price: '5.00', price: '5.00',
version: '1-1-1', version: '1-1-1',
time: '2020-04-19 1542:21', time: '2020-04-19 1542:21',
@ -62,7 +125,7 @@ export default function CopyrightGgoods() {
return ( return (
<div className='copyrightG-goods' style={{ height: `${height}px`, overflow: 'auto' }}> <div className='copyrightG-goods' style={{ height: `${height}px`, overflow: 'hidden' }}>
{/* {contextHolder} */} {/* {contextHolder} */}
<div className='copyrightG-goods-search'> <div className='copyrightG-goods-search'>
<Input placeholder="最低价格" type="number" min={0} <Input placeholder="最低价格" type="number" min={0}
@ -134,62 +197,77 @@ export default function CopyrightGgoods() {
'暂无数据' '暂无数据'
} /> } />
</div>) : ( </div>) : (
<Table <div>
rowSelection={{ <div style={{ height: `${height - 130}px`}}>
type: 'checkbox', <Table
// selectedRowKeys: belongselectedKeys // 设置默认选中的行 scroll={{ y: `${height - 190}px` }}
}} rowSelection={{
type: 'checkbox',
// selectedRowKeys: belongselectedKeys // 设置默认选中的行
}}
dataSource={data} dataSource={data}
// pagination={{ // pagination={{
// defaultPageSize: 10, // 设置默认一页显示 5 条数据 // defaultPageSize: 10, // 设置默认一页显示 5 条数据
// }} // }}
pagination={false} // 不显示分页 pagination={false} // 不显示分页
style={{ textAlign: 'center' }} // 设置表格内容居中显示 style={{ textAlign: 'center' }} // 设置表格内容居中显示
rowKey="number" // 指定数据项的唯一标识符 rowKey="number" // 指定数据项的唯一标识符
> >
<Column title="序号" render={(_text, _record, index: number) => ( <Column
index + 1 width={70}
)} align="center" /> title="序号" render={(_text, _record, index: number) => (
<Column index + 1
title="软著名称" )} align="center" />
dataIndex="name" <Column
align="center" title="软著名称"
render={(text) => ( dataIndex="name"
<span style={{ color: '#1B8BD2', fontSize: '16px', fontWeight: '700' }}>{text}</span> align="center"
)} render={(text) => (
/> <span style={{ color: '#1B8BD2', fontSize: '16px', fontWeight: '700' }}>{text}</span>
<Column )}
title="软著简称" />
dataIndex="short" <Column
align="center" title="软著简称"
/> dataIndex="short"
<Column align="center"
title="软著证号" />
dataIndex="number" <Column
align="center" title="软著证号"
/> dataIndex="number"
<Column title="售价" dataIndex="price" align="center" align="center"
render={(text) => ( // ellipsis
<span style={{ color: '#FF5D15', fontSize: '24px', fontWeight: '700' }}>{text}</span> />
)} /> <Column title="售价" dataIndex="price" align="center"
<Column title="软著版本" dataIndex="version" align="center" /> render={(text) => (
<Column title="软著取得时间" dataIndex="time" align="center" /> <span style={{ color: '#FF5D15', fontSize: '24px', fontWeight: '700' }}>{text}</span>
<Column title="软著开发语言" dataIndex="language" align="center" /> )} />
{/* <Column title="实名认证状态" dataIndex="address" key="key" /> */} <Column title="软著版本" dataIndex="version" align="center" />
<Column <Column title="软著取得时间" dataIndex="time" align="center" />
align="center" <Column title="软著开发语言" dataIndex="language" align="center" />
title="软著电子版" {/* <Column title="实名认证状态" dataIndex="address" key="key" /> */}
render={(_text, record: any) => ( <Column
<Space size="middle"> align="center"
<span className='copyrightG-goods-table-btn' onClick={() => { title="软著电子版"
console.log(record.number); render={(_text, record: any) => (
<Space size="middle">
<span className='copyrightG-goods-table-btn' onClick={() => {
console.log(record.number);
}}></span> }}></span>
</Space> </Space>
)} )}
/> />
</Table>)} </Table>
</div>
{/* defaultCurrent: 默认当前页数 total:数据总数 defaultPageSize:'页面显示几条' */}
<div className='product-release-pagination'>
<Pagination defaultCurrent={1} total={20} defaultPageSize={10} onChange={(page) => {
console.log(page)
}} />
</div>
</div>
)}

View File

@ -3,7 +3,7 @@ import './product-release.css'
import { import {
Select, DatePicker, Button, Select, DatePicker, Button,
// message, // message,
Checkbox, Empty, Switch, Modal Checkbox, Empty, Switch, Modal, Pagination
} from 'antd'; } from 'antd';
import EditModal from './components/EditModal/EditModal' import EditModal from './components/EditModal/EditModal'
// import type { CheckboxProps } from 'antd'; // import type { CheckboxProps } from 'antd';
@ -31,17 +31,36 @@ export default function ProductRelease() {
console.log('日期', dayjs(date).format(dateFormat)); console.log('日期', dayjs(date).format(dateFormat));
}; };
// 选择开发者语言
const [language, setLanguage] = useState<any>(undefined)
const selectLanguage = (value: string) => {
setLanguage(value)
}
// 选择软著类型
const [type, setType] = useState<any>(undefined)
const selectType = (value: string) => {
setType(value)
}
// 初始化搜索条件 // 初始化搜索条件
const init = () => { const init = () => {
setBelongType(undefined) setBelongType(undefined)
setDate(undefined) setDate(undefined)
setLanguage(undefined)
setType(undefined)
}
// 点击搜索
const searchKeyWords = () => {
console.log(
belongType,language,dayjs(date).format(dateFormat),type
);
} }
// 点击清除 // 点击清除
const clearKeyWords = () => { const clearKeyWords = () => {
init() init()
// 重新获取数据 // 重新获取数据
} }
// 选框选择时触发事件 // 选框选择时触发事件
const checkChange = (e: any, item: any) => { const checkChange = (e: any, item: any) => {
console.log(`checked = ${e.target.checked}`); console.log(`checked = ${e.target.checked}`);
@ -74,7 +93,7 @@ export default function ProductRelease() {
console.log(item.order); console.log(item.order);
setDelModalOpen(true) setDelModalOpen(true)
}; };
// 删除点击确认
// 控制出售弹窗 // 控制出售弹窗
const [sellModalOpen, setSellModalOpen] = useState(false) const [sellModalOpen, setSellModalOpen] = useState(false)
@ -104,7 +123,6 @@ export default function ProductRelease() {
time1: '2020-04-19 11:51:03', time1: '2020-04-19 11:51:03',
img: 'xxx', img: 'xxx',
name: 'xxxx系统', name: 'xxxx系统',
v: '1-1-v', v: '1-1-v',
price: '5.00', price: '5.00',
time2: '2020-04-19 11:51:03', time2: '2020-04-19 11:51:03',
@ -112,7 +130,7 @@ export default function ProductRelease() {
status: '平台已审核', status: '平台已审核',
}, },
{ {
order: '121', order: '124',
time1: '2020-04-19 11:51:03', time1: '2020-04-19 11:51:03',
img: 'xxx', img: 'xxx',
name: 'xxxx系统', name: 'xxxx系统',
@ -122,12 +140,35 @@ export default function ProductRelease() {
open: '0', open: '0',
status: '平台已审核', status: '平台已审核',
}, },
{
order: '125',
time1: '2020-04-19 11:51:03',
img: 'xxx',
name: 'xxxx系统',
v: '1-1-v',
price: '5.00',
time2: '2020-04-19 11:51:03',
open: '0',
status: '平台已审核',
},
{
order: '126',
time1: '2020-04-19 11:51:03',
img: 'xxx',
name: 'xxxx系统',
v: '1-1-v',
price: '5.00',
time2: '2020-04-19 11:51:03',
open: '0',
status: '平台已审核',
},
]; ];
return ( return (
<div className='product-release' style={{ height: `${height}px`, overflow: 'auto' }}> <div className='product-release' style={{ height: `${height}px`, overflow: 'hidden' }}>
{/* {contextHolder} */} {/* {contextHolder} */}
<div className='product-release-search'> <div className='product-release-search'>
<Select <Select
@ -151,28 +192,30 @@ export default function ProductRelease() {
// defaultValue="lucy" // defaultValue="lucy"
placeholder='请选择所开发者语言' placeholder='请选择所开发者语言'
style={{ width: 198, height: 36, marginRight: 12 }} style={{ width: 198, height: 36, marginRight: 12 }}
onChange={belongTypeChange} onChange={selectLanguage}
options={[ options={[
{ value: 'person', label: '123' }, { value: 'java', label: 'java' },
{ value: 'lucy', label: '123' }, { value: 'php', label: 'php' },
]} ]}
value={language}
/> />
<Select <Select
// defaultValue="lucy" // defaultValue="lucy"
placeholder='请选择软著类型' placeholder='请选择软著类型'
style={{ width: 198, height: 36, marginRight: 12 }} style={{ width: 198, height: 36, marginRight: 12 }}
onChange={belongTypeChange} onChange={selectType}
options={[ options={[
{ value: 'person', label: '1' }, { value: 'person', label: '1' },
{ value: 'lucy', label: '2' }, { value: 'lucy', label: '2' },
]} ]}
value={type}
/> />
<Button type="primary" <Button type="primary"
style={{ style={{
height: 36, height: 36,
// backgroundColor: '#FF9F08' // backgroundColor: '#FF9F08'
}} }}
onClick={searchKeyWords}
icon={<SearchOutlined />}> icon={<SearchOutlined />}>
</Button> </Button>
@ -184,13 +227,13 @@ export default function ProductRelease() {
}} }}
icon={<ClearOutlined />} icon={<ClearOutlined />}
onClick={clearKeyWords} onClick={clearKeyWords}
> >
</Button> </Button>
</div> </div>
<div> <div>
{/* 表格 */} {/* 表格 */}
<div className='product-release-table'> <div className='product-release-table' style={{ height: `${height - 130}px` }}>
{data.length == 0 ? ( {data.length == 0 ? (
<div className='nodata' style={{ height: `${height - 93}px` }}> <div className='nodata' style={{ height: `${height - 93}px` }}>
<Empty <Empty
@ -198,84 +241,94 @@ export default function ProductRelease() {
'暂无数据' '暂无数据'
} /> } />
</div>) : ( </div>) : (
<table style={{ width: '100%', borderCollapse: 'collapse' }}> <div style={{ height: `${height - 130}px`, overflow: 'auto', position: 'relative' }}>
<thead> <table style={{ width: '100%', borderCollapse: 'collapse' }}>
<tr style={{ background: '#F7F7F7', height: 32, fontSize: 14 }}> <thead >
<th style={{ width: 50 }}></th> <tr style={{ background: '#F7F7F7', height: 32, fontSize: 14 }}>
<th style={{ width: 110 }}></th> <th style={{ width: 50 }}></th>
<th></th> <th style={{ width: 110 }}></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
</tr> <th></th>
</thead> </tr>
<tbody style={{ color: '#888888' }}> </thead>
{data.map((item: any, index: any) => { <tbody style={{ color: '#888888' }}>
return ( {data.map((item: any, index: any) => {
<React.Fragment key={item.order}> return (
<tr style={{ height: 15 }}> <React.Fragment key={item.order}>
<td colSpan={9} style={{ border: 'none' }}> <tr style={{ height: 15 }}>
<td colSpan={9} style={{ border: 'none' }}>
</td> </td>
</tr> </tr>
<tr style={{ background: '#F7F7F7', height: 45 }}> <tr style={{ background: '#F7F7F7', height: 45 }}>
<td colSpan={9}> <td colSpan={9}>
<Checkbox style={{ marginLeft: 16 }} onChange={ <Checkbox style={{ marginLeft: 16 }} onChange={
(event) => checkChange(event, item) (event) => checkChange(event, item)
}></Checkbox> }></Checkbox>
<span style={{ marginLeft: 32 }}> <span style={{ marginLeft: 32 }}>
: {item.order} : {item.order}
</span> </span>
<span style={{ marginLeft: 45 }}> <span style={{ marginLeft: 45 }}>
: {item.time1} : {item.time1}
</span> </span>
</td> </td>
</tr> </tr>
<tr style={{ textAlign: 'center', height: 110 }}> <tr style={{ textAlign: 'center', height: 110 }}>
<td>{index + 1}</td> <td>{index + 1}</td>
<td className='product-release-table-img-td'> <td className='product-release-table-img-td'>
<div className='product-release-table-img'> <div className='product-release-table-img'>
{item.img} {item.img}
</div> </div>
</td> </td>
<td> <td>
<div className='product-release-table-name'> <div className='product-release-table-name'>
{item.name} {item.name}
</div> </div>
<div> <div>
() ()
</div> </div>
</td> </td>
<td>{item.v}</td> <td>{item.v}</td>
<td style={{ fontSize: 24, color: '#FF5D15' }}>{item.price}</td> <td style={{ fontSize: 24, color: '#FF5D15' }}>{item.price}</td>
<td>{item.time2}</td> <td>{item.time2}</td>
<td> <td>
<Switch checkedChildren="On" unCheckedChildren="Off" onChange={(e) => { opneChange(e, item) }} defaultChecked={item.open == 0 ? false : true} /> <Switch checkedChildren="On" unCheckedChildren="Off" onChange={(e) => { opneChange(e, item) }} defaultChecked={item.open == 0 ? false : true} />
</td> </td>
<td>{item.status}</td> <td>{item.status}</td>
<td> <td>
<span className='product-release-table-btn' onClick={() => edit(item)}></span> <span className='product-release-table-btn' onClick={() => edit(item)}></span>
<span className='product-release-table-btn product-btn' onClick={() => del(item)}></span> <span className='product-release-table-btn product-btn' onClick={() => del(item)}></span>
<span className='product-release-table-btn product-btn' onClick={() => sell(item)}></span> <span className='product-release-table-btn product-btn' onClick={() => sell(item)}></span>
<span className='product-release-table-btn product-btn' onClick={() => submit(item)}></span> <span className='product-release-table-btn product-btn' onClick={() => submit(item)}></span>
</td> </td>
</tr> </tr>
</React.Fragment> </React.Fragment>
) )
})} })}
</tbody>
</table>
{/* <div style={{ height: 10 }}></div> */}
</div>
</tbody>
</table>
)} )}
</div> </div>
{/* defaultCurrent: 默认当前页数 total:数据总数 defaultPageSize:'页面显示几条' */}
<div className='product-release-pagination'>
<Pagination defaultCurrent={1} total={20} defaultPageSize={10} onChange={(page) => {
console.log(page)
}} />
</div>
</div> </div>
{/* 编辑弹窗 */} {/* 编辑弹窗 */}
@ -289,7 +342,7 @@ export default function ProductRelease() {
}} }}
> >
<div style={{ height: `${height - 20}px`, overflow: 'auto', borderTop: '1px solid #e8e8e8' }}> <div style={{ height: `${height - 20}px`, overflow: 'auto', borderTop: '1px solid #e8e8e8' }}>
<EditModal closeModal={()=>{ setEditModalOpen(false)}} ></EditModal> <EditModal closeModal={() => { setEditModalOpen(false) }} ></EditModal>
</div> </div>
</Modal> </Modal>
{/* 删除弹窗 */} {/* 删除弹窗 */}
@ -312,14 +365,14 @@ export default function ProductRelease() {
height: `${height}px`, height: `${height}px`,
}}> }}>
<div style={{ <div style={{
width:700, width: 700,
marginTop:20 marginTop: 20
}}> }}>
</div> </div>
</Modal> </Modal>
{/* 出售弹窗 */} {/* 出售弹窗 */}
<Modal title="出售" <Modal title="出售"
okText="确认" okText="确认"
cancelText="取消" cancelText="取消"
destroyOnClose={true} destroyOnClose={true}
@ -338,8 +391,8 @@ export default function ProductRelease() {
height: `${height}px`, height: `${height}px`,
}}> }}>
<div style={{ <div style={{
width:700, width: 700,
marginTop:20 marginTop: 20
}}> }}>
</div> </div>

View File

@ -1,5 +1,5 @@
.editModal { .editModal {
padding: 32px 32px 58px 33px; padding: 32px 32px 18px 33px;
box-sizing: border-box; box-sizing: border-box;
} }
@ -7,6 +7,7 @@
.editModal-title { .editModal-title {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 34px;
} }
.editModal-title-box { .editModal-title-box {
@ -25,10 +26,30 @@
.editModal-img-box { .editModal-img-box {
width: 489px; width: 489px;
height: 60px; height: 50px;
background: #F8F8F8; background: #F8F8F8;
border-radius: 5px; border-radius: 5px;
display: flex;
justify-content: space-between;
align-items: center;
} }
.css-dev-only-do-not-override-1ae8k9u.ant-select-outlined.ant-select-multiple .ant-select-selection-item{
background-color: rgba(0,114,255,0.13); .css-dev-only-do-not-override-1ae8k9u.ant-select-outlined.ant-select-multiple .ant-select-selection-item {
background-color: rgba(0, 114, 255, 0.13);
}
.editModalBtn {
margin-left: 857px;
margin-top: 57px;
}
.css-dev-only-do-not-override-1ae8k9u.ant-upload-wrapper.ant-upload-picture-card-wrapper .ant-upload.ant-upload-select,
.css-dev-only-do-not-override-1ae8k9u.ant-upload-wrapper.ant-upload-picture-circle-wrapper .ant-upload.ant-upload-select {
width: 40px;
height: 40px;
margin-top: 8px;
margin-left: 17px;
border: 0;
background: #E1E1E1;
border-radius: 0;
} }

View File

@ -6,24 +6,129 @@ import {
DatePicker, DatePicker,
Select, Select,
InputNumber, InputNumber,
Modal Modal,
Cascader,
message,
Upload,
UploadFile
} from "antd"; } from "antd";
import type { GetProp, UploadProps } from 'antd';
import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
import { useEffect, useState } from "react";
import { get ,uploadImageUrl,DevUserId,downloadUrl} from "../../../../util/AjaxUtils";
// import type { InputNumberProps } from 'antd'; // import type { InputNumberProps } from 'antd';
import locale from 'antd/es/date-picker/locale/zh_CN'; import locale from 'antd/es/date-picker/locale/zh_CN';
import './EditModal.css' import './EditModal.css'
import { useState } from "react"; import { ITree } from "../../../../interfaces/dict/IDict";
const dateFormat = 'YYYY年MM月DD日'; const dateFormat = 'YYYY年MM月DD日';
const { TextArea } = Input; const { TextArea } = Input;
interface Option {
value?: string | number | null;
label: React.ReactNode;
children?: Option[];
isLeaf?: boolean;
id: string;
pId: string;
}
type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
export default function EditModal(props: any) { export default function EditModal(props: any) {
const [messageApi, contextHolder] = message.useMessage();
const height = window.innerHeight - 180;
const [areaArray, setAreaArray] = useState<Option[]>([]);
const listArea = (pId: string) => {
return new Promise<ITree[]>((resolve) => {
get<ITree[]>({
messageApi,
url: '/api/area/list-area-ztree',
config: {
params: {
id: pId
}
},
onSuccess({ data }) {
resolve(data);
}
})
})
}
const [form] = Form.useForm(); const [form] = Form.useForm();
const [promptModal, setPromptModal] = useState(false) const [promptModal, setPromptModal] = useState(false)
// 上传图片
const [logoImgArray, setLogoImgArray] = useState<UploadFile[]>([]);
const beforeUpload = (file: FileType) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
if (!isJpgOrPng) {
message.error('只能上传 JPG/PNG 格式文件!');
}
// 限制图片大小
// const isLt2M = file.size / 1024 / 1024 < 2;
// if (!isLt2M) {
// message.error('Image must smaller than 2MB!');
// }
// return isJpgOrPng && isLt2M;
return isJpgOrPng;
};
const [loading, setLoading] = useState(false);
// const [imageUrl, setImageUrl] = useState<string>();
const handleChange: UploadProps['onChange'] = (info) => {
if (info.file.status === 'uploading') {
setLoading(true);
return;
}
if (info.file.status === 'done') {
setLoading(false);
const fileId = info.file.response.data.fileId;
const url = downloadUrl(fileId);
logoImgArray.splice(0, 1, {
uid: info.file.response.data.fileId,
name: 'xixi.png',
status: 'done',
url: url,
thumbUrl: url,
})
setLogoImgArray([
...logoImgArray
])
return;
}
};
const uploadButton = (
<button style={{ border: 0, background: 'none' }} type="button">
{loading ? <LoadingOutlined /> : <PlusOutlined />}
</button>
);
useEffect(() => {
listArea('0').then(data => {
console.log('省市1', data);
// data.slice(0, 2).map
const options: Option[] = data.map(item => {
return {
value: item.name,
label: item.name,
isLeaf: !item.isParent,
id: item.id,
pId: item.pId
}
})
setAreaArray(options);
// console.log('省市2', options);
});
}, [])
return ( return (
<div className='editModal'> <div className='editModal'>
{contextHolder}
<div className='editModal-title'> <div className='editModal-title'>
<div className='editModal-title-box'></div> <div className='editModal-title-box'></div>
<div className='editModal-title-name'></div> <div className='editModal-title-name'></div>
</div> </div>
<div className="form-body" style={{ marginTop: 39 }}> <div className="form-body" >
<Form <Form
name="basic" name="basic"
form={form} form={form}
@ -46,7 +151,7 @@ export default function EditModal(props: any) {
rules={[{ required: true, message: '请输入软著名称' }]} rules={[{ required: true, message: '请输入软著名称' }]}
> >
<Input <Input
style={{ height: '60px', width: '498px' }} placeholder="请输入软著名称" style={{ height: '50px', width: '498px' }} placeholder="请输入软著名称"
/> />
</Form.Item> </Form.Item>
@ -54,11 +159,37 @@ export default function EditModal(props: any) {
<Col span={12}> <Col span={12}>
<Form.Item <Form.Item
label="软著图片" label="软著图片"
name="" name="imageUrl"
rules={[{ required: true, message: '请上传软著图片' }]} rules={[{ required: true, message: '请上传软著图片' }]}
> >
<div className="editModal-img-box"> <div className="editModal-img-box">
<div>
<Upload
name="image"
listType="picture-card"
maxCount={1}
defaultFileList={logoImgArray}
className="avatar-uploader"
showUploadList={false}
action={uploadImageUrl()}
headers={{ 'X-USER-ID': DevUserId }}
beforeUpload={beforeUpload}
onChange={handleChange}
onRemove={() => {
logoImgArray.splice(0)
setLogoImgArray([
...logoImgArray
])
}}
>
{logoImgArray.length > 0 ? <img src={logoImgArray[0].url} alt="avatar" style={{ width: '100%' }} /> : uploadButton}
</Upload>
</div>
<div style={{ color: '#919191', marginRight: '27px' }}>
{logoImgArray.length > 0 ?'点击图片更换':'点击+上传图片'}
</div>
</div> </div>
</Form.Item> </Form.Item>
@ -78,7 +209,7 @@ export default function EditModal(props: any) {
rules={[{ required: true, message: '请输入软著简称' }]} rules={[{ required: true, message: '请输入软著简称' }]}
> >
<Input <Input
style={{ height: '60px', width: '498px' }} style={{ height: '50px', width: '498px' }}
placeholder="请输入软著简称" placeholder="请输入软著简称"
/> />
</Form.Item> </Form.Item>
@ -94,7 +225,7 @@ export default function EditModal(props: any) {
rules={[{ required: true, message: '请输入软著证号' }]} rules={[{ required: true, message: '请输入软著证号' }]}
> >
<Input <Input
style={{ height: '60px', width: '498px' }} style={{ height: '50px', width: '498px' }}
placeholder="请输入软著证号" placeholder="请输入软著证号"
/> />
</Form.Item> </Form.Item>
@ -112,8 +243,11 @@ export default function EditModal(props: any) {
rules={[{ required: true, message: '请输入软著说明' }]} rules={[{ required: true, message: '请输入软著说明' }]}
> >
<TextArea <TextArea
style={{ resize: 'none', width: "995px", height: '174px' }} style={{
placeholder="请输入软著说明请输入软著说明请输入软著说明" resize: 'none', width: "995px", height: '154px',
// background:'#F8F8F8'
}}
placeholder="请输入软著说明..."
/> />
</Form.Item> </Form.Item>
@ -133,7 +267,7 @@ export default function EditModal(props: any) {
rules={[{ required: true, message: '请输入软著版本' }]} rules={[{ required: true, message: '请输入软著版本' }]}
> >
<Input <Input
style={{ height: '60px', width: '498px' }} placeholder="请输入软著版本" style={{ height: '50px', width: '498px' }} placeholder="请输入软著版本"
/> />
</Form.Item> </Form.Item>
@ -148,7 +282,7 @@ export default function EditModal(props: any) {
format={dateFormat} format={dateFormat}
locale={locale} locale={locale}
// style={{ width: '100%' }} // style={{ width: '100%' }}
style={{ height: '60px', width: '498px' }} style={{ height: '50px', width: '498px' }}
/> />
</Form.Item> </Form.Item>
@ -173,7 +307,7 @@ export default function EditModal(props: any) {
<Select <Select
// defaultValue="lucy" // defaultValue="lucy"
placeholder='请选择软著类型' placeholder='请选择软著类型'
style={{ width: 498, height: 60 }} style={{ width: 498, height: 50 }}
options={[ options={[
{ value: 'java', label: 'java' }, { value: 'java', label: 'java' },
{ value: 'php', label: 'php' }, { value: 'php', label: 'php' },
@ -191,7 +325,7 @@ export default function EditModal(props: any) {
<Select <Select
// defaultValue="lucy" // defaultValue="lucy"
placeholder='请选择取得方式' placeholder='请选择取得方式'
style={{ width: 498, height: 60 }} style={{ width: 498, height: 50 }}
options={[ options={[
{ value: '1', label: '跟别人抢的' }, { value: '1', label: '跟别人抢的' },
{ value: '2', label: '路上捡的' }, { value: '2', label: '路上捡的' },
@ -214,7 +348,7 @@ export default function EditModal(props: any) {
<Select <Select
mode="multiple" mode="multiple"
placeholder="请选择软著类型" placeholder="请选择软著类型"
style={{ width: 498, height: 60 }} style={{ width: 498, height: 50 }}
options={[ options={[
{ value: '嘻嘻', label: '嘻嘻' }, { value: '嘻嘻', label: '嘻嘻' },
{ value: '呵呵', label: '呵呵' }, { value: '呵呵', label: '呵呵' },
@ -237,7 +371,7 @@ export default function EditModal(props: any) {
style={{ height: '60px', width: '498px', fontSize: '16px' }} placeholder="请输入售卖价格" style={{ height: '60px', width: '498px', fontSize: '16px' }} placeholder="请输入售卖价格"
/> */} /> */}
<InputNumber min={0} style={{ height: '60px', width: '498px', display: 'flex', alignItems: 'center' }} placeholder="请输入售卖价格" /> <InputNumber min={0} style={{ height: '50px', width: '498px', display: 'flex', alignItems: 'center' }} placeholder="请输入售卖价格" />
</Form.Item> </Form.Item>
</Col> </Col>
@ -254,7 +388,7 @@ export default function EditModal(props: any) {
format={dateFormat} format={dateFormat}
locale={locale} locale={locale}
// style={{ width: '100%' }} // style={{ width: '100%' }}
style={{ height: '60px', width: '498px' }} style={{ height: '50px', width: '498px' }}
/> />
</Form.Item> </Form.Item>
@ -262,14 +396,133 @@ export default function EditModal(props: any) {
</Col> </Col>
</Row> </Row>
<div className='editModal-title' style={{ marginTop: 30 }}> <div className='editModal-title' style={{ marginTop: 30 }}>
<div className='editModal-title-box'></div> <div className='editModal-title-box'></div>
<div className='editModal-title-name'></div> <div className='editModal-title-name'></div>
</div> </div>
<Row gutter={15}>
<div className='setProBtn'> <Col span={12}>
<Form.Item
label="类别"
name="peopleClass"
rules={[{ required: true, message: '请选择类别' }]}
>
<Select
// defaultValue="lucy"
placeholder='请选择类别'
style={{ width: 498, height: 50 }}
options={[
{ value: '1', label: '跟别人抢的' },
{ value: '2', label: '路上捡的' },
]}
/>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="姓名或名称"
name="peopleName"
rules={[{ required: true, message: '请输入姓名或名称' }]}
>
<Input
style={{ height: '50px', width: '498px' }} placeholder="请输入姓名或名称"
/>
</Form.Item>
</Col>
</Row>
<Row gutter={15}>
<Col span={12}>
<Form.Item
label="省市"
name="authorProvince"
rules={[{ required: true, message: '请选择省市' }]}
>
<Cascader options={areaArray}
style={{ height: '50px', width: '498px', }}
loadData={(selectedOptions: Option[]) => {
const targetOption = selectedOptions[selectedOptions.length - 1];
// console.log(targetOption.id);
listArea(targetOption.id).then(data => {
targetOption.children = data.map(item => {
return {
value: item.name,
label: item.name,
isLeaf: true, //二级判断这个 以前不是 以前是 !item.isParent
id: item.id,
pId: item.pId
}
});
setAreaArray([
...areaArray
])
});
}}
placeholder="请选择省市"
changeOnSelect
/>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="联系电话"
name="peoplePhone"
rules={[{ required: true, message: '请输入联系电话' }]}
>
<Input
style={{ height: '50px', width: '498px' }} placeholder="请输入联系电话"
/>
</Form.Item>
</Col>
</Row>
<Row gutter={15}>
<Col span={12}>
<Form.Item
label="证件类型"
name="papersType"
rules={[{ required: true, message: '请选择证件类型' }]}
>
<Select
// defaultValue="lucy"
placeholder='请选择证件类型'
style={{ width: 498, height: 50 }}
options={[
{ value: 'person', label: '身份证号' },
{ value: 'license', label: '营业执照' },
]}
/>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="证件号"
name="papersNum"
rules={[{ required: true, message: '请输入证件号' }]}
>
<Input
style={{ height: '50px', width: '498px' }} placeholder="请输入证件号"
/>
</Form.Item>
</Col>
</Row>
<div className='editModalBtn'>
<Form.Item wrapperCol={{ span: 24 }}> <Form.Item wrapperCol={{ span: 24 }}>
<Flex align="center" justify="center" gap="large"> <Flex align="center" justify="center" gap="large">
<Button type="default" htmlType="button" <Button type="default" htmlType="button"
@ -284,6 +537,11 @@ export default function EditModal(props: any) {
htmlType="submit" htmlType="submit"
// style={{ width: '262px', height: '58px', fontSize: '16px', color: '#FDFDF2', backgroundColor: 'var(--color-primary)' }} // style={{ width: '262px', height: '58px', fontSize: '16px', color: '#FDFDF2', backgroundColor: 'var(--color-primary)' }}
size='large' size='large'
onClick={() => {
console.log(form.getFieldValue('imageUrl'));
console.log(logoImgArray);
}}
> >
</Button> </Button>
@ -296,15 +554,25 @@ export default function EditModal(props: any) {
<Modal title="提示" <Modal title="提示"
okText="确定" okText="确定"
cancelText="取消" cancelText="取消"
destroyOnClose={true} destroyOnClose={true}
open={promptModal} open={promptModal}
onOk={() => { onOk={() => {
console.log('分类', form.getFieldValue('class'))
console.log('价格', form.getFieldValue('price'))
}} }}
onCancel={() => { onCancel={() => {
setPromptModal(false); setPromptModal(false);
}}> }}
<div></div>
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
height: `${height}px`,
}}
>
<div style={{ width: 500 }}></div>
</Modal> </Modal>
</div> </div>
) )

View File

@ -38,9 +38,32 @@
font-size: 16px; font-size: 16px;
color: #1B8BD2; color: #1B8BD2;
} }
.product-release-table-btn{
.product-release-table-btn {
cursor: pointer; cursor: pointer;
} }
.product-btn{
.product-btn {
margin-left: 20px; margin-left: 20px;
} }
.product-release-pagination {
height: 50px;
display: flex;
justify-content: end;
align-items: center;
/* position: fixed;
bottom: 30px;
right: 30px;
width:calc(100vw - 280px); */
background: rgb(255, 255, 255);
z-index: 2;
}
thead {
position: sticky;
top: 0;
background: #F7F7F7;
z-index: 1;
}

View File

@ -1,9 +1,11 @@
import './trading-goods.css' import './trading-goods.css'
import { Select, DatePicker, Button, Table, import {
Select, DatePicker, Button, Table,
// message, // message,
Space, Empty } from 'antd'; Space, Empty, Pagination
} from 'antd';
// import type { TableColumnsType } from 'antd'; // import type { TableColumnsType } from 'antd';
import { SearchOutlined,ClearOutlined } from '@ant-design/icons'; import { SearchOutlined, ClearOutlined } from '@ant-design/icons';
import type { DatePickerProps } from 'antd'; import type { DatePickerProps } from 'antd';
import locale from 'antd/es/date-picker/locale/zh_CN'; import locale from 'antd/es/date-picker/locale/zh_CN';
const { Column } = Table; const { Column } = Table;
@ -30,12 +32,12 @@ export default function TradingGoods() {
const data: DataType[] = [ const data: DataType[] = [
{ {
order: '123', order: '123111111111',
name: '后台管理系统', name: '后台管理系统',
price: '5.00', price: '5.00',
status: '过户', status: '过户',
time1: '2020-04-19 1542:21', time1: '2020-04-19 15:42:21',
time2: '2020-04-19 1542:21 ', time2: '2020-04-19 15:42:21',
}, },
{ {
@ -43,16 +45,16 @@ export default function TradingGoods() {
name: '后台管理系统', name: '后台管理系统',
price: '5.00', price: '5.00',
status: '过户', status: '过户',
time1: '2020-04-19 1542:21', time1: '2020-04-19 15:42:21',
time2: '2020-04-19 1542:21 ', time2: '2020-04-19 15:42:21',
}, },
{ {
order: '1235678', order: '1235678',
name: '后台管理系统', name: '后台管理系统',
price: '5.00', price: '5.00',
status: '过户', status: '过户',
time1: '2020-04-19 1542:21', time1: '2020-04-19 15:42:21',
time2: '2020-04-19 1542:21 ', time2: '2020-04-19 15:42:21',
}, },
]; ];
@ -60,7 +62,7 @@ export default function TradingGoods() {
return ( return (
<div className='trading-goods' style={{ height: `${height}px`, overflow: 'auto' }}> <div className='trading-goods' style={{ height: `${height}px`, overflow: 'hidden' }}>
{/* {contextHolder} */} {/* {contextHolder} */}
<div className='trading-goods-search'> <div className='trading-goods-search'>
<DatePicker placeholder="开始时间" <DatePicker placeholder="开始时间"
@ -86,17 +88,18 @@ export default function TradingGoods() {
]} ]}
/> />
<Button type="primary" <Button type="primary"
style={{ height: 36, style={{
height: 36,
// backgroundColor: '#FF9F08' // backgroundColor: '#FF9F08'
}} }}
icon={<SearchOutlined />}> icon={<SearchOutlined />}>
</Button> </Button>
<Button <Button
style={{ style={{
height: 36, height: 36,
marginLeft:10, marginLeft: 10,
// backgroundColor: '#FF9F08' // backgroundColor: '#FF9F08'
}} }}
icon={<ClearOutlined />}> icon={<ClearOutlined />}>
@ -112,57 +115,70 @@ export default function TradingGoods() {
'暂无数据' '暂无数据'
} /> } />
</div>) : ( </div>) : (
<Table <div>
rowSelection={{ <div style={{ height: `${height - 130}px` }}>
type: 'checkbox', <Table
// selectedRowKeys: belongselectedKeys // 设置默认选中的行 scroll={{ y: `${height - 190}px` }}
}} rowSelection={{
type: 'checkbox',
// selectedRowKeys: belongselectedKeys // 设置默认选中的行
}}
dataSource={data} dataSource={data}
// pagination={{ // pagination={{
// defaultPageSize: 10, // 设置默认一页显示 5 条数据 // defaultPageSize: 10, // 设置默认一页显示 5 条数据
// }} // }}
pagination={false} // 不显示分页 pagination={false} // 不显示分页
style={{ textAlign: 'center' }} // 设置表格内容居中显示 style={{ textAlign: 'center' }} // 设置表格内容居中显示
rowKey="order" // 指定数据项的唯一标识符 rowKey="order" // 指定数据项的唯一标识符
> >
<Column title="序号" render={(_text, _record, index: number) => ( <Column title="序号"
index + 1 width={70}
)} align="center" /> render={(_text, _record, index: number) => (
<Column index + 1
title="订单编号" )} align="center" />
dataIndex="order" <Column
align="center" title="订单编号"
/> dataIndex="order"
<Column align="center"
title="软著名称" />
dataIndex="name" <Column
align="center" title="软著名称"
render={(text) => ( dataIndex="name"
<span style={{ color: '#1B8BD2', fontSize: '16px', fontWeight: '700' }}>{text}</span> align="center"
)} render={(text) => (
/> <span style={{ color: '#1B8BD2', fontSize: '16px', fontWeight: '700' }}>{text}</span>
<Column title="订单价格" dataIndex="price" align="center" )}
render={(text) => ( />
<span style={{ color: '#FF5D15', fontSize: '24px', fontWeight: '700' }}>{text}</span> <Column title="订单价格" dataIndex="price" align="center"
)} /> render={(text) => (
<Column title="订单状态" dataIndex="status" align="center" /> <span style={{ color: '#FF5D15', fontSize: '24px', fontWeight: '700' }}>{text}</span>
<Column title="下单时间" dataIndex="time1" align="center" /> )} />
<Column title="付款时间" dataIndex="time2" align="center" /> <Column title="订单状态" dataIndex="status" align="center" />
{/* <Column title="实名认证状态" dataIndex="address" key="key" /> */} <Column title="下单时间" dataIndex="time1" align="center" />
<Column <Column title="付款时间" dataIndex="time2" align="center" />
align="center" {/* <Column title="实名认证状态" dataIndex="address" key="key" /> */}
title="操作" <Column
render={(_text, record: any) => ( align="center"
<Space size="middle"> title="操作"
<span className='trading-goods-table-btn' onClick={() => { render={(_text, record: any) => (
console.log(record.order); <Space size="middle">
<span className='trading-goods-table-btn' onClick={() => {
console.log(record.order);
}}></span> }}></span>
</Space> </Space>
)} )}
/> />
</Table> </Table>
</div>
{/* defaultCurrent: 默认当前页数 total:数据总数 defaultPageSize:'页面显示几条' */}
<div className='product-release-pagination' >
<Pagination defaultCurrent={1} total={20} defaultPageSize={10} onChange={(page) => {
console.log(page)
}} />
</div>
</div>
)} )}

View File

@ -1,10 +1,12 @@
// import React from 'react' // import React from 'react'
import './transaction-order.css' import './transaction-order.css'
import { Select, DatePicker, Button, Table, import {
Select, DatePicker, Button, Table,
// message, // message,
Space, Empty } from 'antd'; Space, Empty, Pagination
} from 'antd';
// import type { TableColumnsType } from 'antd'; // import type { TableColumnsType } from 'antd';
import { SearchOutlined,ClearOutlined } from '@ant-design/icons'; import { SearchOutlined, ClearOutlined } from '@ant-design/icons';
import type { DatePickerProps } from 'antd'; import type { DatePickerProps } from 'antd';
import locale from 'antd/es/date-picker/locale/zh_CN'; import locale from 'antd/es/date-picker/locale/zh_CN';
const { Column } = Table; const { Column } = Table;
@ -55,13 +57,70 @@ export default function TransactionOrder() {
time1: '2020-04-19 1542:21', time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ', time2: '2020-04-19 1542:21 ',
}, },
{
order: '94449848941',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
{
order: '94449848942',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
{
order: '94449848943',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
{
order: '94449848944',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
{
order: '94449848945',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
{
order: '94449848946',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
{
order: '94449848947',
name: 'xx系统',
price: '5.00',
status: '过户',
time1: '2020-04-19 1542:21',
time2: '2020-04-19 1542:21 ',
},
]; ];
return ( return (
<div className='transaction-order' style={{ height: `${height}px`, overflow: 'auto' }}> <div className='transaction-order' style={{ height: `${height}px`, overflow: 'hidden' }}>
{/* {contextHolder} */} {/* {contextHolder} */}
<div className='transaction-order-search'> <div className='transaction-order-search'>
<DatePicker placeholder="开始时间" <DatePicker placeholder="开始时间"
@ -87,17 +146,18 @@ export default function TransactionOrder() {
]} ]}
/> />
<Button type="primary" <Button type="primary"
style={{ height: 36, style={{
height: 36,
// backgroundColor: '#FF9F08' // backgroundColor: '#FF9F08'
}} }}
icon={<SearchOutlined />}> icon={<SearchOutlined />}>
</Button> </Button>
<Button <Button
style={{ style={{
height: 36, height: 36,
marginLeft:10, marginLeft: 10,
// backgroundColor: '#FF9F08' // backgroundColor: '#FF9F08'
}} }}
icon={<ClearOutlined />}> icon={<ClearOutlined />}>
@ -111,57 +171,67 @@ export default function TransactionOrder() {
description={ description={
'暂无数据' '暂无数据'
} /> } />
</div>) : (<Table </div>) : (
rowSelection={{ <div>
type: 'checkbox', <div style={{ height: `${height - 130}px` }}>
// selectedRowKeys: belongselectedKeys // 设置默认选中的行 <Table
}} scroll={{ y: `${height - 190}px` }}
rowSelection={{
type: 'checkbox',
}}
dataSource={data}
pagination={false} // 不显示分页
style={{ textAlign: 'center' }} // 设置表格内容居中显示
rowKey="order" // 指定数据项的唯一标识符
>
<Column title="序号"
width={70}
render={(_text, _record, index: number) => (
index + 1
)} align="center" />
<Column
title="订单编号"
dataIndex="order"
align="center"
/>
<Column
title="软著名称"
dataIndex="name"
align="center"
render={(text) => (
<span style={{ color: '#1B8BD2', fontSize: '16px', fontWeight: '700' }}>{text}</span>
)}
/>
<Column title="订单价格" dataIndex="price" align="center"
render={(text) => (
<span style={{ color: '#FF5D15', fontSize: '24px', fontWeight: '700' }}>{text}</span>
)} />
<Column title="订单状态" dataIndex="status" align="center" />
<Column title="下单时间" dataIndex="time1" align="center" />
<Column title="付款时间" dataIndex="time2" align="center" />
{/* <Column title="实名认证状态" dataIndex="address" key="key" /> */}
<Column
align="center"
title="操作"
render={(_text, record: any) => (
<Space size="middle">
<span className='transaction-order-table-btn' onClick={() => {
console.log(record.order);
dataSource={data} }}></span>
// pagination={{ </Space>
// defaultPageSize: 10, // 设置默认一页显示 5 条数据 )}
// }} />
pagination={false} // 不显示分页 </Table>
style={{ textAlign: 'center' }} // 设置表格内容居中显示 </div>
rowKey="order" // 指定数据项的唯一标识符 {/* defaultCurrent: 默认当前页数 total:数据总数 defaultPageSize:'页面显示几条' */}
> <div className='product-release-pagination' >
<Column title="序号" render={(_text, _record, index: number) => ( <Pagination defaultCurrent={1} total={20} defaultPageSize={10} onChange={(page) => {
index + 1 console.log(page)
)} align="center" /> }} />
<Column </div>
title="订单编号" </div>
dataIndex="order" )}
align="center"
/>
<Column
title="软著名称"
dataIndex="name"
align="center"
render={(text) => (
<span style={{ color: '#1B8BD2', fontSize: '16px', fontWeight: '700' }}>{text}</span>
)}
/>
<Column title="订单价格" dataIndex="price" align="center"
render={(text) => (
<span style={{ color: '#FF5D15', fontSize: '24px', fontWeight: '700' }}>{text}</span>
)} />
<Column title="订单状态" dataIndex="status" align="center" />
<Column title="下单时间" dataIndex="time1" align="center" />
<Column title="付款时间" dataIndex="time2" align="center" />
{/* <Column title="实名认证状态" dataIndex="address" key="key" /> */}
<Column
align="center"
title="操作"
render={(_text, record: any) => (
<Space size="middle">
<span className='transaction-order-table-btn' onClick={() => {
console.log(record.order);
}}></span>
</Space>
)}
/>
</Table>)}

View File

@ -259,7 +259,19 @@ export default function Index() {
} else if (location.pathname.includes('/product-release')) { } else if (location.pathname.includes('/product-release')) {
setNow('首页') setNow('首页')
setPathArray([{ title: '首页' }]) setPathArray([{ title: '首页' }])
// /config-mod-edit /product-release // /config-mod-edit /product-release /transaction-order
}else if (location.pathname.includes(' /transaction-order')) {
setNow('首页')
setPathArray([{ title: '首页' }])
// /config-mod-edit /product-release /transaction-order
}else if (location.pathname.includes(' /copyright-goods')) {
setNow('首页')
setPathArray([{ title: '首页' }])
// /config-mod-edit /product-release /transaction-order
}else if (location.pathname.includes(' /trading-goods')) {
setNow('首页')
setPathArray([{ title: '首页' }])
// /config-mod-edit /product-release /transaction-order
} }
}, [location.pathname]) }, [location.pathname])
useEffect(() => { useEffect(() => {

View File

@ -500,7 +500,7 @@ export default function ProjEditStep2(props: any) {
}) })
setAreaArray(options); setAreaArray(options);
console.log('省市2', options); // console.log('省市2', options);
}); });
}, []) }, [])
@ -1188,7 +1188,7 @@ export default function ProjEditStep2(props: any) {
<Form.Item<BelongPeopleType> <Form.Item<BelongPeopleType>
// label="公司英文名" // label="公司英文名"
name="nameEn" name="nameEn"
// rules={[{ required: true, message: belongShow == 'PERSONAL' ? '请输入英文名' : '请输入公司英文名称' }]} // rules={[{ required: true, message: belongShow == 'PERSONAL' ? '请输入英文名' : '请输入公司英文名称' }]}
> >
<Input placeholder={belongShow == 'ORGANIZATION' ? '请输入公司英文名称' : '请输入英文名'} <Input placeholder={belongShow == 'ORGANIZATION' ? '请输入公司英文名称' : '请输入英文名'}
style={{ height: '44px', width: '384px', fontSize: '15px', marginTop: '22px' }} style={{ height: '44px', width: '384px', fontSize: '15px', marginTop: '22px' }}
@ -1285,6 +1285,7 @@ export default function ProjEditStep2(props: any) {
changeOnSelect changeOnSelect
disabled={belongTitle == '查看所属者' ? true : false} disabled={belongTitle == '查看所属者' ? true : false}
/> />
</Form.Item> </Form.Item>
</div> </div>