ylj/newCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-11-21 18:50:17 +08:00
parent d83d384ded
commit 51b2e91bfd
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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": {

4
src/pages/BussinessProject/components/ShareBenefit.tsx
View File

@ -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 {
// 如果该行数据(上面的) 已经包括了下面的数据的时间 那么这段就不出现重新生成
}
})
}

10
src/pages/contract/components/editor.tsx
View File

@ -201,7 +201,7 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu
}>(); // 当前组件显示的 合同详情 包括主表和子表数据
const [currenMenu, setCurrenMenu] = useState<any>(); // 当前弹出的左侧菜单选中的详细数据
const [selectedKeys, setSelectedKeys] = useState<any>(); // 当前弹出的左侧菜单选中的ids值
const [fileList, setFileList] = useState<UploadFile[]>([]) // 需要上传的附件图片列表
const [fileList, setFileList] = useState<UploadFile[]>([]) // 需要上传的附件图片列表
const [priviewImage, setPriviewImage] = useState<string>(); // 预览的文件地址
const [showBtn, setShowBtn] = useState<boolean>(false)
const [confirmLoading, handleConfirmLoading] = useState<boolean>(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
<Col span={6}>
<ProFormText
label="首年租金"
name=""
name="FIRSTYEAR_RENT"
extra={<span style={{ color: 'red' }}>如后续不同，请在合同注意事项中填写</span>}
/>
</Col>
<Col span={6}>
<ProFormText
label="提成比例"
name=""
name="GUARANTEE_RATIO"
extra={<span style={{ color: 'red' }}>若非固定比例，请在合同注意事项中填写</span>}
/>
</Col>

26
src/pages/reports/contractWarningQuery/index.tsx
View File

@ -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,

6
src/versionEnv.ts
View File

@ -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";