From a00d4ccd24946e29e9ce8f8b9d08ab304cf4a394 Mon Sep 17 00:00:00 2001 From: lyp Date: Fri, 23 May 2025 14:19:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/route/Correction/Correction.tsx | 67 ++++++----- src/route/index/Index.tsx | 16 +-- src/route/proj/ProjNew.tsx | 175 +++++++++++++++++++++++++++- 3 files changed, 219 insertions(+), 39 deletions(-) diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx index cb1841a..4caeaa5 100644 --- a/src/route/Correction/Correction.tsx +++ b/src/route/Correction/Correction.tsx @@ -8,7 +8,7 @@ import { message, Spin, Empty, Dropdown, - Button + // Button } from 'antd'; // import { // // MenuFoldOutlined, @@ -1136,43 +1136,50 @@ export default function Correction() { } - - +
@@ -1247,7 +1254,15 @@ export default function Correction() { }} style={{ display: item.applyStatus == 'PENDING' ? 'block' : 'none' }} >撤销补正
-
+
+ 项目已关闭 +
+
*/} - {THEME == 'mzw' ? ( + {/* {THEME == 'mzw' ? ( <>
) : ( <> - )} + )} */} {THEME == 'mzw' ? ( { + get({ + messageApi: messageApi, + url: `/api/proj/get/${projId}`, + onSuccess({ data }) { + // console.log('项目信息', data); + if (state.type == 'replace') { + setChangePrice( + data.pay.servicePackageId?0:(data.pay.payment) / 100) + } + setChangeProjName(data.projName) + // 给表单赋值 + form.setFieldsValue({ + projName: state.type == 'replace' ? '' : data.projName, //全称 + projSubName: data.apply.projSubName, //简称 + projDevCompleteDate: data.apply.projDevCompleteDate ? dayjs(data.apply.projDevCompleteDate, 'YYYY-MM-DD') : '', + projVersion: data.apply.projVersion, //版本 + backendCodeLang: data.apply.envLang, + belongPeople: data.apply.authorName, + contacts: data.apply.applyContactName, + }) + setBelongPeopleInfo({ + authorName: data.apply.authorName, + authorType: data.apply.authorType, + authorIdCardType: data.apply.authorIdCardType, + authorIdCard: data.apply.authorIdCard, + authorCrcAccount: data.apply.authorCrcAccount, + authorId: data.apply.authorId, + authorProvinceCity: data.apply.authorProvinceCity, + authorCrcAccountUsername: data.apply.authorCrcAccountUsername, + authorCrcAccountPassword: data.apply.authorCrcAccountPassword, + }) + setConcatPeopleInfo({ + applyConcatId: data.apply.applyContactId, + applyContactCsaNo: data.apply.applyContactCsaNo, + applyContactEmail: data.apply.applyContactEmail, + applyContactName: data.apply.applyContactName, + applyContactPhone: data.apply.applyContactPhone, + applyContactCompany: data.apply.applyContactCompany, + }) + } + }) + } + useEffect(() => { + if (state && state.projId) { + getProjInfo(state.projId) + } + }, []) return ( <> @@ -545,8 +598,9 @@ export default function ProjNew() { justifyContent: 'center', fontSize: 18, fontWeight: 'bold', + textAlign: 'center', }}> - 换名项目 + 换名项目: {changeProjName}
{/* {(showPrice / 100 - couponNum) < 0 ? 0 : showPrice / 100 - couponNum} */} - {state && state.price ? state.price / 100 : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} + {state && state.type == 'replace' ? changePrice : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} {/* {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} */} 元
@@ -1285,8 +1339,117 @@ export default function ProjNew() { // console.log('最终',listProjChargeAdditional); // console.log(belongPeopleInfo.authorId); if (state && state.type == 'replace') { - alert('替换项目') - } else { + console.log(concatPeopleInfo); + // return + + post({ + messageApi, + url: `/api/proj/rename/proj-id/${state.projId}`, + body: { + // packageInfoId: projInfo.packageInfoId, + projName: projInfo.projName, + projSubName: projInfo.projSubName, + projVersion: projInfo.projVersion, + backendCodeLang: projInfo.backendCodeLang, + projChargeType: pathParams.projChargeType, + listProjChargeAdditional: listProjChargeAdditional, + // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat), + projDevCompleteDate: projInfo.projDevCompleteDate ? dayjs(projInfo.projDevCompleteDate).format(dateFormat) : '', + authorCrcAccount: belongPeopleInfo.authorCrcAccount, + authorCrcAccountPassword: belongPeopleInfo.authorCrcAccountPassword, + authorCrcAccountUsername: belongPeopleInfo.authorCrcAccountUsername, + authorId: belongPeopleInfo.authorId, + authorIdCard: belongPeopleInfo.authorIdCard, + authorIdCardType: belongPeopleInfo.authorIdCardType, + authorName: belongPeopleInfo.authorName, + authorProvinceCity: belongPeopleInfo.authorProvinceCity, + authorType: belongPeopleInfo.authorType, + + applyContactCompany: concatPeopleInfo.applyContactCompany, + applyContactCsaNo: concatPeopleInfo.applyContactCsaNo, + applyContactEmail: concatPeopleInfo.applyContactEmail, + applyContactId: concatPeopleInfo.applyConcatId, + applyContactName: concatPeopleInfo.applyContactName, + applyContactPhone: concatPeopleInfo.applyContactPhone, + // couponId: couponId ? couponId : '', + // packageInfoId: packageInfoId ? packageInfoId : '' + // packageOrderId: packageOrderId ? packageOrderId : '', + + }, + onBefore() { + setLoading(true); + }, + onSuccess({ data }) { + // console.log(data); + // return + + setIsEditModalOpen(true); + setCreateProjId(data.data); + reloadUser(messageApi, globalDispatchContext).then(() => { + messageApi.success('扣款成功'); + }); + getMyPackNum() + }, + onFinally() { + setLoading(false); + } + }) + } + else if (state && state.type == 'copy') { + post({ + messageApi, + url: `/api/proj/copy/proj-id/${state.projId}`, + body: { + // packageInfoId: projInfo.packageInfoId, + // projName: projInfo.projName, + // projSubName: projInfo.projSubName, + // projVersion: projInfo.projVersion, + // backendCodeLang: projInfo.backendCodeLang, + projChargeType: pathParams.projChargeType, + listProjChargeAdditional: listProjChargeAdditional, + // // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat), + // projDevCompleteDate: projInfo.projDevCompleteDate ? dayjs(projInfo.projDevCompleteDate).format(dateFormat) : '', + // authorCrcAccount: belongPeopleInfo.authorCrcAccount, + // authorCrcAccountPassword: belongPeopleInfo.authorCrcAccountPassword, + // authorCrcAccountUsername: belongPeopleInfo.authorCrcAccountUsername, + // authorId: belongPeopleInfo.authorId, + // authorIdCard: belongPeopleInfo.authorIdCard, + // authorIdCardType: belongPeopleInfo.authorIdCardType, + // authorName: belongPeopleInfo.authorName, + // authorProvinceCity: belongPeopleInfo.authorProvinceCity, + // authorType: belongPeopleInfo.authorType, + + // applyContactCompany: concatPeopleInfo.applyContactCompany, + // applyContactCsaNo: concatPeopleInfo.applyContactCsaNo, + // applyContactEmail: concatPeopleInfo.applyContactEmail, + // applyContactId: concatPeopleInfo.applyConcatId, + // applyContactName: concatPeopleInfo.applyContactName, + // applyContactPhone: concatPeopleInfo.applyContactPhone, + couponId: couponId ? couponId : '', + // // packageInfoId: packageInfoId ? packageInfoId : '' + packageOrderId: packageOrderId ? packageOrderId : '', + + }, + onBefore() { + setLoading(true); + }, + onSuccess({ data }) { + // console.log(data); + // return + + setIsEditModalOpen(true); + setCreateProjId(data.data); + reloadUser(messageApi, globalDispatchContext).then(() => { + messageApi.success('扣款成功'); + }); + getMyPackNum() + }, + onFinally() { + setLoading(false); + } + }) + } + else { post({ messageApi, url: '/api/proj/create', @@ -1352,7 +1515,7 @@ export default function ProjNew() { {/* {(chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} */} {/* {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} */} - {state && state.price ? state.price / 100 : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} + {state && state.type == 'replace' ? changePrice : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} 元，确定操作吗？