From 4339e89f37a3748ab5bcf76c6408b2cd1e20f08f Mon Sep 17 00:00:00 2001 From: lyp Date: Fri, 14 Mar 2025 17:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/menu/MenuWithTopButton.tsx | 28 ++- src/components/menu/menu-with-top-button.css | 30 +-- src/layout/head/Head.tsx | 185 +++++++++++++------ src/layout/head/head.css | 2 +- src/route/proj/edit/ProjEditStep2.tsx | 63 +++++-- src/static/create.png | Bin 0 -> 404 bytes src/static/pack.png | Bin 0 -> 1952 bytes 7 files changed, 218 insertions(+), 90 deletions(-) create mode 100644 src/static/create.png create mode 100644 src/static/pack.png 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 0000000000000000000000000000000000000000..fc79319aa5909ee2c51253ce7884ff4cba8af9fa GIT binary patch literal 404 zcmV;F0c-w=P)Px$PDw;TR9Hvtn89trKoCX$aKK!MXaYeAa3>8U4PenkL;;8_|H+0n+$7n!n$FckQ=J2=H(cwE;{48l2>K0pNw=^iwNOS^<8II;dd< zP^+xPYaGy{QTm}7LvJvN-T->4Ho-HB)8{K2YC_)GQH8(AJ>sVrd82XGTg$s#}7m-&Kj{s(<`al;P@|zdT8oc`n?Deo6&TvXkfh zq{DUbj5u-dT)2_^lro;Y1A{JP_j~bhUHKH(y8tc!A9}(KKt>q`D<2B_!1?K`9}rZV5^WN%eb3@YXLdZ~hAS y5>FO97k|G?%fxv@t7-n}J>$uYFn@VYtA7Od=fRh;^isnB0000Px+T1iAfRCr$PTxp0LMHGIorq>VbJ#3cY=ne+))Ddhpct*+~?HpxfzH%-v& z*|R&_+S;B4fYYi3HKku0^alWNjqAE);w{O*i^XD}*7`*NI3$Vu4jIDJS_ew0hdj@_ zB`MxSjHVv2udlCdbaeDn0O)OIpdqqSN_nC0`!AU6aLylLj9sa%+st=Wf`r zp_0^KVuCp5s}YfwRcx!dHSG9nh);h6L2#Du`|mW$*|vQn0NmeVJc>(KyRQ3~$?o_v zO(NLc-CeXSi(*Dx8v}rTtu+NkiHH<04hMjP3?ywv#6!#F^3OZu=FFLMl9Y0dL673g z_fpFDbGh6`rBoYZ?8pSmUso!XT?YpTN0U5zA`jx6zln$^#~6H#F}Ac^F0Y>`LousT zsnE`I9RTbSreE9T9LI4euBq_g_01Jf>ksiHh(IRVTXlPZ`q*nj`iQ_m&B}q4o9>h7HkBA>e4EQUh)I!hm zD94Fywr!tCr9Nkj9TQ_{6Cy4mcQfJ5nl;#*5b>lC`7w%D z<#PE8lPx1b#bR+8t=R}e^Mw!}n?NS^7mLMr0pPe8PYN}sl)8(SV3SyPXstta7-L75 z%VkPhW1Ep6&iR9gczu`^rPN%{^S&~HOzfw8s#2-Ef{2Tg>LKDAj^h|pj7EF5ZC?Wb z4~OAst&ewI_dU}Xj0D-Xy|lUmtq3zDrM$rReM%miYPHvu0RWg4r&!zJ)<`MO^gM4{ zQy_o6*ggdSmqZY>z;)e^Og4=Kan2Vb;#(0Qt6kSU!vqr6&p9t3q8q2HwXSq^b#?al z_Xo{l&?H!v^#LNz3DMn@%jM>+Tet3OlU*Z0g+hTd#%P=G3^6t$rCjX${`)4N2$CK^ z#2X@XY3n~f?o}iXvsf%%thIhRVq)DO2rKSgH?5{1~TM%(+b#q}6`VR;pZc1W%oS>OA zXYSt7(Q$AP1a;}BWm#LLluM#s8f$SvYpv;!YGp2$`$j1>k_5b(4R1xn6A|&jMtR0q zpOkWoWm)ZGV|B^$B-55R4wAL3zBvph(r*a($0xG>9CE;eG3?-S<8kA^&SneGA@;}!ik_wsAw)+;P)5*BujI^w4Af-=Wd!Z?>e{ZDc~Is-nFpm~AoHMf{ADpH z^PqGdv{eYP+xAzDCeBgPLH@V2e-uI-NCd5{UG-*f^|c8^#9x$BD_qxIWjvGqZ%umZ zN1G93;4~vBBPiXntMi~zskAT%f-9<5Jc+JtQb4onM^(R>?xuQrdJbcZT?+t-z6MJ% z9#Y*jJUo0?F@rjn9#vA%c2(f>h$UjLC0DM=eRP2nP=o!ffGOUb@pp2k&!87xq%!4uyO2HmnFpm~AoHMf{ADpH^Ps=mgKXQTs^G`d;Uw0cQpX)h&x0;Q#3vI!VmiSo zMGycC)~c84iUaEo%nF4)$?dtzEl6+uq)ONn-^yjV<(E zZ0_8-UE8*8qjGL4u%&b3rmA=n5KBcQKL{b{ms}#7ZQG|-i|*)mLQ?&LOBetZuh2QP m*7~99I3j-{BfB^>%;ujNiPCO6sq$a|0000Kc