From 51b2e91bfd5d5c227a8b57edbd8babdfeed58809 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Fri, 21 Nov 2025 18:50:17 +0800 Subject: [PATCH] update --- package.json | 2 +- .../components/ShareBenefit.tsx | 4 +-- src/pages/contract/components/editor.tsx | 10 ++++--- .../reports/contractWarningQuery/index.tsx | 26 ++++++++++++------- src/versionEnv.ts | 6 ++--- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index ef71dc8..9ab46cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.67", + "version": "4.5.68", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/BussinessProject/components/ShareBenefit.tsx b/src/pages/BussinessProject/components/ShareBenefit.tsx index 65ad076..0144b6c 100644 --- a/src/pages/BussinessProject/components/ShareBenefit.tsx +++ b/src/pages/BussinessProject/components/ShareBenefit.tsx @@ -304,9 +304,9 @@ const ShareBenefit: React.FC<{ props: BusinessProjectModel, showEdit?: boolean, if (data.data && data.data.length > 0) { data.data.forEach((subItem: any) => { if (new Date(item.STARTDATE).getTime() < new Date(subItem.ENDDATE).getTime() && new Date(item.ENDDATE).getTime() >= new Date(subItem.ENDDATE).getTime()) { - // 如果该行数据(上面的) 已经包括了下面的数据的时间 那么这段就不出现重新生成 - } else { subItem.showAgainBtn = true + } else { + // 如果该行数据(上面的) 已经包括了下面的数据的时间 那么这段就不出现重新生成 } }) } diff --git a/src/pages/contract/components/editor.tsx b/src/pages/contract/components/editor.tsx index 7d36686..38d72f9 100644 --- a/src/pages/contract/components/editor.tsx +++ b/src/pages/contract/components/editor.tsx @@ -201,7 +201,7 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu }>(); // 当前组件显示的 合同详情 包括主表和子表数据 const [currenMenu, setCurrenMenu] = useState(); // 当前弹出的左侧菜单选中的详细数据 const [selectedKeys, setSelectedKeys] = useState(); // 当前弹出的左侧菜单选中的ids值 - const [fileList, setFileList] = useState([]) // 需要上传的附件图片列表 + const [fileList, setFileList] = useState([]) // 需要上传的附件图片列表 const [priviewImage, setPriviewImage] = useState(); // 预览的文件地址 const [showBtn, setShowBtn] = useState(false) const [confirmLoading, handleConfirmLoading] = useState(false) // 弹出框的内容表单是否在提交 @@ -517,6 +517,7 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu }} params={{ id }} onFinish={async (values) => { + let newValue: any = { ...values }; if (fields && fields.REGISTERCOMPACT_ID) { // 编辑数据 @@ -539,6 +540,7 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu newValue.ELECTRICITY_FEES = values.ELECTRICITY_FEES ? values.ELECTRICITY_FEES : null newValue.OTHER_SCHARGE = values.OTHER_SCHARGE ? values.OTHER_SCHARGE : null newValue.EQUIPMENT_DEPOSIT = values.EQUIPMENT_DEPOSIT ? values.EQUIPMENT_DEPOSIT : null + newValue.PROPERTY_FEE = values.PROPERTY_FEE ? values.PROPERTY_FEE : null // newValue.BUSINESS_BRAND = brand?.BRAND_ID || fields?.BUSINESS_BRAND // 装修周期 if (values.contractDecorateRangeDate) { @@ -569,6 +571,8 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu newValue.REGISTERCOMPACT_HOSTID = contractId } // 提交编辑后的数据 + console.log('newValuenewValuenewValue', newValue); + const success = await handleAddUpdate({ ...newValue }); if (success) { const waitUpload = fileList.filter(n => n.status !== 'done') @@ -1125,14 +1129,14 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu 如后续不同，请在合同注意事项中填写} /> 若非固定比例，请在合同注意事项中填写} /> diff --git a/src/pages/reports/contractWarningQuery/index.tsx b/src/pages/reports/contractWarningQuery/index.tsx index 610904f..0bd9e65 100644 --- a/src/pages/reports/contractWarningQuery/index.tsx +++ b/src/pages/reports/contractWarningQuery/index.tsx @@ -57,7 +57,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { return false } const formData = new FormData(); - fileList.forEach(file => { + fileList.forEach((file: any) => { formData.append('files[]', file); }); formData.append('TableType', '1115'); @@ -212,7 +212,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => { title: '首年租金', - dataIndex: '', + dataIndex: 'FIRSTYEAR_RENT', hideInSearch: true, align: 'right', width: 130, @@ -220,7 +220,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => }, { title: '提成比例', - dataIndex: '', + dataIndex: 'GUARANTEE_RATIO', hideInSearch: true, align: 'right', width: 130, @@ -231,7 +231,10 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => hideInSearch: true, align: 'right', width: 130, - valueType: 'digit' + valueType: 'digit', + render: (_, record) => { + return record?.PROPERTY_FEE ? numeral(Number((record?.PROPERTY_FEE * 12).toFixed(2))).format('0,0.00') : "-" + } }, @@ -370,7 +373,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => { title: '合同附属类型', - dataIndex: '', + dataIndex: 'COMPACT_CHILDTYPE', valueType: 'select', align: 'center', width: 130, @@ -627,7 +630,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => }, { title: '首年租金', - dataIndex: '首年租金', + dataIndex: 'FIRSTYEAR_RENT', hideInSearch: true, align: 'right', width: 130, @@ -635,18 +638,21 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => }, { title: '提成比例', - dataIndex: '提成比例', + dataIndex: 'GUARANTEE_RATIO', hideInSearch: true, align: 'right', width: 130, }, { title: '物业费(年)', - dataIndex: '物业费', + dataIndex: 'PROPERTY_FEE', hideInSearch: true, align: 'right', width: 130, - valueType: 'digit' + valueType: 'digit', + render: (_, record) => { + return record?.PROPERTY_FEE ? numeral(Number((record?.PROPERTY_FEE * 12).toFixed(2))).format('0,0.00') : "" + } }, { title: '合同金额(万元)', @@ -688,7 +694,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => }, { title: '合同附属类型', - dataIndex: '合同附属类型', + dataIndex: 'COMPACT_CHILDTYPE', valueType: 'select', align: 'center', width: 130, diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 294c155..3dc7990 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.67"; -export const GIT_HASH = "bd01d65"; -export const BUILD_TIME = "2025-11-14T08:27:05.179Z"; +export const VERSION = "4.5.68"; +export const GIT_HASH = "d83d384"; +export const BUILD_TIME = "2025-11-21T09:29:07.216Z";