diff --git a/src/components/menu/MenuWithTopButton.tsx b/src/components/menu/MenuWithTopButton.tsx
index c31a73d..25a8d31 100644
--- a/src/components/menu/MenuWithTopButton.tsx
+++ b/src/components/menu/MenuWithTopButton.tsx
@@ -1,12 +1,13 @@
import './menu-with-top-button.css'
import { IMenuListItem, IMenuWithTopButton } from "../../interfaces/menu/IMenuWithTopButton.ts";
import objImg from '../../static/left/obj.png'
-import newImg from '../../static/left/new.png'
+// import newImg from '../../static/create.png'
// import refunimg from '../../static/refun.png'
// import correctionImg from '../../static/correction.png'
import { useNavigate } from 'react-router-dom';
import {
- RightOutlined
+ RightOutlined,
+ PlusOutlined
} from '@ant-design/icons';
import { getMenuActive, setMenuActive } from './../../util/cache'
import { useEffect, useState } from 'react'
@@ -69,7 +70,7 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
correctionType: props.correctionType,
applyStatus: props.correctionApplyStatus,
authorId: props.authorId,
- tagCor:props.tagCor,
+ tagCor: props.tagCor,
}
})
}
@@ -137,9 +138,24 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
}}>
{/* refunimg */}
{/*
*/}
-

- {/*
*/}
- 创建
+
+ {/*

*/}
+ {/*
*/}
+
+
{/* 申请
*/}
{/* 申请
*/}
diff --git a/src/components/menu/menu-with-top-button.css b/src/components/menu/menu-with-top-button.css
index e0d0758..1dd8c85 100644
--- a/src/components/menu/menu-with-top-button.css
+++ b/src/components/menu/menu-with-top-button.css
@@ -34,19 +34,19 @@
width: 19px;
height: 19px;
margin-left: 14px;
- margin-right: 13px;
+ margin-right: 8px;
}
.menu-with-top-button .top .top-right {
display: flex;
align-items: center;
- font-size: 14px;
+ font-size: 18px;
cursor: pointer;
- width: 53px;
+ /* width: 53px; */
/* background-color: red; */
- margin-left: 82px;
+ /* margin-left: 82px; */
/* 修改 */
- margin-left: 32px;
+ margin-left: 25px;
}
@@ -56,9 +56,9 @@
}
.menu-with-top-button .top .top-right img {
/* margin-left: 96px; */
- margin-right: 10px;
- width: 14px;
- height: 13px;
+ margin-right: 8px;
+ width: 19px;
+ height: 19px;
}
.menu-with-top-button ul {
@@ -137,25 +137,25 @@
width: 19px;
height: 19px;
margin-left: 14px;
- margin-right: 13px;
+ margin-right: 8px;
}
.menu-with-top-button .top .top-right {
display: flex;
align-items: center;
- font-size: 14px;
+ font-size: 18px;
cursor: pointer;
- width: 53px;
+ /* width: 53px; */
/* background-color: red; */
- margin-left: 82px;
+ margin-left: 60px;
}
.menu-with-top-button .top .top-right img {
/* margin-left: 96px; */
- margin-right: 10px;
- width: 14px;
- height: 13px;
+ margin-right: 8px;
+ width: 19px;
+ height: 19px;
}
.menu-with-top-button ul {
diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx
index a0849f6..4c062ad 100644
--- a/src/layout/head/Head.tsx
+++ b/src/layout/head/Head.tsx
@@ -11,6 +11,7 @@ import {
Dropdown, MenuProps, message, Modal, Space, Spin, Input, Table,
// Form, Button, InputNumber
} from "antd";
+import pack from '../../static/pack.png'
// import type { TableProps, FormProps } from 'antd';
interface DataType {
usericId: string;
@@ -988,61 +989,6 @@ export default function Head() {
{/* */}
-
-
-
{
- setPackageModal(true)
- setPackPage(1);
- getPickList(1,'')
- }}
- > 套餐包
-
-
-
- 全托管
- {packNum.ALL}
- 件
-
-
- 写材料
- {packNum.MATERIAL}
- 件
-
-
{
setkfModal(true)
}}>
@@ -1054,6 +1000,135 @@ export default function Head() {
+
+
+ {/*
+
{
+ setPackageModal(true)
+ setPackPage(1);
+ getPickList(1, '')
+ }}
+ > 套餐包
+
+
+
+ 全托管
+ {packNum.ALL}
+ 件
+
+
+ 写材料
+ {packNum.MATERIAL}
+ 件
+
+
*/}
+
+
+
{
+ setPackageModal(true)
+ setPackPage(1);
+ getPickList(1, '')
+ }}
+ >
+

+
套餐包
+
+
+
+ 全托管
+ {packNum.ALL}
+ 件
+
+
+ 写材料
+ {packNum.MATERIAL}
+ 件
+
+
+
+
{/*
{
window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程')
diff --git a/src/layout/head/head.css b/src/layout/head/head.css
index a0893a1..2b2bf19 100644
--- a/src/layout/head/head.css
+++ b/src/layout/head/head.css
@@ -360,7 +360,7 @@
.headLine {
height: 20px;
width: 1px;
- background-color: rgb(218, 218, 218);
+ /* background-color: rgb(218, 218, 218); */
margin-left: 10px;
margin-right: 10px;
}
diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx
index f5e5b9a..bb71595 100644
--- a/src/route/proj/edit/ProjEditStep2.tsx
+++ b/src/route/proj/edit/ProjEditStep2.tsx
@@ -130,18 +130,46 @@ export default function ProjEditStep2(props: any) {
onChange: (selectedRowKeys: React.Key[], selectedRows: BelongDataType[]) => {
// console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
setSelectedRowKeys(selectedRowKeys);
- if (selectedRows.length > 0) {
- setauthorName(selectedRows[0].name)
- setauthorIdCardType(selectedRows[0].idCardType)
- setauthorIdCard(selectedRows[0].idCardNo)
- setauthorType(selectedRows[0].type)
- setauthorNameEn(selectedRows[0].nameEn)
- setauthorProvinceCity(selectedRows[0].provinceCity)
- setauthorCrcAccount(selectedRows[0].isCrcAccount)
- setauthorCrcAccountPassword(selectedRows[0].crcAccountPassword)
- setauthorCrcAccountUsername(selectedRows[0].crcAccountUsername)
- setAuthorId(selectedRows[0].projOwnerId)
- }
+ // if (selectedRows.length > 0) {
+ // setauthorName(selectedRows[0].name)
+ // setauthorIdCardType(selectedRows[0].idCardType)
+ // setauthorIdCard(selectedRows[0].idCardNo)
+ // setauthorType(selectedRows[0].type)
+ // setauthorNameEn(selectedRows[0].nameEn)
+ // setauthorProvinceCity(selectedRows[0].provinceCity)
+ // setauthorCrcAccount(selectedRows[0].isCrcAccount)
+ // setauthorCrcAccountPassword(selectedRows[0].crcAccountPassword)
+ // setauthorCrcAccountUsername(selectedRows[0].crcAccountUsername)
+ // setAuthorId(selectedRows[0].projOwnerId)
+ // }
+ // 判断是否是清空选中状态
+ const isClearingSelection = selectedRowKeys.length === 0;
+ if (isClearingSelection) {
+ setauthorName('');
+ setauthorIdCardType('');
+ setauthorIdCard('');
+ setauthorType('');
+ setauthorNameEn('');
+ setauthorProvinceCity('');
+ setauthorCrcAccount(0);
+ setauthorCrcAccountPassword('');
+ setauthorCrcAccountUsername('');
+ setAuthorId('');
+ } else {
+ // 正常选中时,更新相关状态
+ setSelectedRowKeys(selectedRowKeys);
+ const firstSelectedRow = selectedRows[0];
+ setauthorName(firstSelectedRow.name);
+ setauthorIdCardType(firstSelectedRow.idCardType);
+ setauthorIdCard(firstSelectedRow.idCardNo);
+ setauthorType(firstSelectedRow.type);
+ setauthorNameEn(firstSelectedRow.nameEn);
+ setauthorProvinceCity(firstSelectedRow.provinceCity);
+ setauthorCrcAccount(firstSelectedRow.isCrcAccount);
+ setauthorCrcAccountPassword(firstSelectedRow.crcAccountPassword);
+ setauthorCrcAccountUsername(firstSelectedRow.crcAccountUsername);
+ setAuthorId(firstSelectedRow.projOwnerId);
+ }
// setClom(String(selectedRowKeys))
// setbelongselectedKeys(selectedRowKeys)
@@ -774,7 +802,16 @@ export default function ProjEditStep2(props: any) {
// 阻止默认的行点击事件,以避免选中行时触发其他操作
event.stopPropagation();
// 更新选中的行
- belongRowSelection.onChange([record.projOwnerId], [record]);
+ // belongRowSelection.onChange([record.projOwnerId], [record]);
+ // 判断当前行是否已经被选中
+ const isSelected = belongRowSelection.selectedRowKeys.includes(record.projOwnerId);
+ if (isSelected) {
+ // 如果已经选中,则清空选中状态
+ belongRowSelection.onChange([], []);
+ } else {
+ // 如果未选中,则更新选中的行
+ belongRowSelection.onChange([record.projOwnerId], [record]);
+ }
}
},
style: { cursor: 'pointer' }
diff --git a/src/static/create.png b/src/static/create.png
new file mode 100644
index 0000000..fc79319
Binary files /dev/null and b/src/static/create.png differ
diff --git a/src/static/pack.png b/src/static/pack.png
new file mode 100644
index 0000000..eec79bd
Binary files /dev/null and b/src/static/pack.png differ