diff --git a/src/route/index/index.css b/src/route/index/index.css
index c586900..8ad4ab4 100644
--- a/src/route/index/index.css
+++ b/src/route/index/index.css
@@ -2,17 +2,28 @@
/* position: relative; */
height: 100vh;
/* margin-top: 74px; */
+ display: flex;
}
-
-.index .left {
+.leftbox{
+ width: 250px;
+ height: calc(100vh - 65px);
+ /* background-color: red; */
position: fixed;
- /* width: 267px; */
- width: 230px;
- height: 100%;
- /* overflow: auto; */
top: 65px;
left: 0;
+ overflow: auto;
+
+}
+.index .left {
+ /* position: fixed; */
+ /* width: 267px; */
+ width: 230px;
+ min-height: calc(100vh - 65px);
+ /* overflow: auto; */
+ /* top: 65px; */
+ /* left: 0; */
background-color: var(--color-light);
+
}
.index .right {
diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx
index 81e025b..8651ff5 100644
--- a/src/route/proj/edit/ProjEditStep2.tsx
+++ b/src/route/proj/edit/ProjEditStep2.tsx
@@ -1,5 +1,5 @@
import './proj-edit-step.css';
-import { Radio, Cascader, Col, DatePicker, Flex, message, Modal, Row, Spin, Select, Table, Space } from "antd";
+import { Radio, Cascader, Col, DatePicker, Flex, message, Modal, Row, Spin, Table, Space, Select } from "antd";
import { FolderAddOutlined } from '@ant-design/icons';
import locale from 'antd/es/date-picker/locale/zh_CN';
import { useParams } from "react-router-dom";
@@ -21,7 +21,7 @@ type FieldType = {
projDevCompleteDate: Dayjs;
companyName: string;
companyNameEn: string;
- projName:string
+ projName: string
};
// 所属人信息类型
type BelongPeopleType = {
@@ -45,6 +45,7 @@ type ContactType = {
phone: string
projContactId: string
email: string
+ company: string
}
// interface DataType {
// key: React.Key;
@@ -93,6 +94,7 @@ export default function ProjEditStep2(props: any) {
const [applyContactEmail, setapplyContactEmail] = useState('') //联系人邮箱
const [applyContactName, setapplyContactName] = useState('') //联系人姓名
const [applyContactPhone, setapplyContactPhone] = useState('') //联系人手机
+ const [applyContactCompany,setapplyContactCompany] = useState('')
// 设置所属者more你选中的行
// const [selectedRowKeys, setSelectedRowKeys] = useState
([]);
@@ -146,7 +148,7 @@ export default function ProjEditStep2(props: any) {
setapplyContactEmail(selectedRows[0].email)
setapplyContactName(selectedRows[0].name)
setapplyContactPhone(selectedRows[0].phone)
-
+ setapplyContactCompany(selectedRows[0].company)
},
};
@@ -257,13 +259,14 @@ export default function ProjEditStep2(props: any) {
setApplyConcatId(data.applyContactId)
setapplyContactName(data.applyContactName)
setapplyContactPhone(data.applyContactPhone)
+ // setapplyContactCompany(data.applyContactCompany)
setapplyContactCsaNo(data.applyContactCsaNo)
setapplyContactEmail(data.applyContactEmail)
console.log('基本信息', data);
setAuthorId(data.authorId)
setApplyConcatId(data.applyContactId)
formInfo.setFieldsValue({
- projName : data.projName,
+ projName: data.projName,
projSubName: data.projSubName,
projVersion: data.projVersion,
projDevCompleteDate: data.projDevCompleteDate ? dayjs(data.projDevCompleteDate, 'YYYY-MM-DD') : '',
@@ -426,6 +429,7 @@ export default function ProjEditStep2(props: any) {
name: formContact.getFieldValue('name'),
phone: formContact.getFieldValue('phone'),
email: formContact.getFieldValue('email'),
+ company: formContact.getFieldValue('company')
},
onBefore() {
@@ -449,7 +453,7 @@ export default function ProjEditStep2(props: any) {
name: formContact.getFieldValue('name'),
phone: formContact.getFieldValue('phone'),
email: formContact.getFieldValue('email'),
-
+ company: formContact.getFieldValue('company')
},
onBefore() {
},
@@ -472,8 +476,8 @@ export default function ProjEditStep2(props: any) {
// console.log(data.target.value);
setBelongShow(data.target.value)
}
- const [CrcAccountShow,setCrcAccountShow] = useState('0')
- const isCrcAccountChange = (data:any) => {
+ const [CrcAccountShow, setCrcAccountShow] = useState('0')
+ const isCrcAccountChange = (data: any) => {
// console.log(data.target.value);
setCrcAccountShow(data.target.value)
}
@@ -637,7 +641,7 @@ export default function ProjEditStep2(props: any) {
@@ -651,12 +655,12 @@ export default function ProjEditStep2(props: any) {
setIsNewBelongOpen(true)
setbelongTitle('创建所属者')
formBelong.setFieldsValue({
-
+
// 是否提供平台账号
isCrcAccount: '0',
// 个人/企业
authorType: 'ORGANIZATION',
-
+
})
}} type="primary" icon={
} style={{ width: "160px", height: '43px', fontSize: '14px' }}>
创建所属者
@@ -745,7 +749,7 @@ export default function ProjEditStep2(props: any) {
render={(text, record: any) => (
{
-
+
// alert(record.projOwnerId);
console.log('text:', text);
@@ -858,7 +862,7 @@ export default function ProjEditStep2(props: any) {
当前申请人:
请选择申请人
- {applyContactName}/{applyContactPhone}/{applyContactEmail}
+ {applyContactName}/{applyContactPhone}{applyContactEmail?'/'+applyContactEmail:''}
@@ -880,6 +884,9 @@ export default function ProjEditStep2(props: any) {
+
(text !== '' ? text : '一')}
+ />
{/* */}
编辑
|
@@ -959,7 +967,7 @@ export default function ProjEditStep2(props: any) {
// 如果验证通过，则执行确认操作
// 这里可以放置你的确认操作逻辑
setIsEditModalOpen(true)
-
+
}).catch(() => {
// 如果验证不通过，可以根据需要处理错误信息
@@ -1041,7 +1049,8 @@ export default function ProjEditStep2(props: any) {
applyContactCsaNo,
applyContactEmail,
applyContactName,
- applyContactPhone
+ applyContactPhone,
+ applyContactCompany
},
onBefore() {
@@ -1088,9 +1097,9 @@ export default function ProjEditStep2(props: any) {
}
width={1280}
// 确认按钮样式
- okButtonProps={{size:'large', style: { display: belongTitle == '查看所属者' ? 'none' : 'block' } }}
+ okButtonProps={{ size: 'large', style: { display: belongTitle == '查看所属者' ? 'none' : 'block' } }}
// 返回按钮样式
- cancelButtonProps={{ size:'large' }}
+ cancelButtonProps={{ size: 'large' }}
onCancel={() => {
setIsNewBelongOpen(false)
// setBelongShow('')
@@ -1131,7 +1140,7 @@ export default function ProjEditStep2(props: any) {
>
企业/组织
@@ -1318,7 +1327,7 @@ export default function ProjEditStep2(props: any) {
-
+
中国版权登记业务平台用户名
// label="中国版权登记业务平台用户名"
@@ -1346,7 +1355,7 @@ export default function ProjEditStep2(props: any) {
-
+
中国版权登记业务平台密码
// label="中国版权登记业务平台密码"
@@ -1394,9 +1403,9 @@ export default function ProjEditStep2(props: any) {
}
width={745}
// 确认按钮样式
- okButtonProps={{ style: { width: '102px', height: '49px', background: '#FFBA00', fontSize: '18px', color: '#FFFFFF', display: contactTitle == '查看联系人' ? 'none' : 'block' } }}
+ okButtonProps={{ size: 'large', style: { display: contactTitle == '查看联系人' ? 'none' : 'block' } }}
// 返回按钮样式
- cancelButtonProps={{ style: { border: 'none', width: '102px', height: '49px', background: '#F3F3F3', fontSize: '18px', color: '#8C8C8C' } }}
+ cancelButtonProps={{ size: 'large', style: {} }}
onCancel={() => {
steIsContantOpen(false)
@@ -1421,7 +1430,7 @@ export default function ProjEditStep2(props: any) {
autoComplete="off"
>
-
姓名:
+
姓名:
@@ -1429,37 +1438,52 @@ export default function ProjEditStep2(props: any) {
rules={[{ required: true, message: '请输入姓名' }]}
>
-
电话:
+
电话:
name="phone"
rules={[{ required: true, message: '请输入电话号码' }]}
>
-
邮箱:
+
所属公司:
+
+
+ name="company"
+ rules={[{ required: false, message: '请输入所属公司' }]}
+ >
+
+
+
+