diff --git a/package.json b/package.json index 60e6624..ef71dc8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.65", + "version": "4.5.67", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/contract/components/editor.tsx b/src/pages/contract/components/editor.tsx index 31c4e5c..7d36686 100644 --- a/src/pages/contract/components/editor.tsx +++ b/src/pages/contract/components/editor.tsx @@ -1122,6 +1122,20 @@ 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 4d5950c..cb19eae 100644 --- a/src/pages/reports/contractWarningQuery/index.tsx +++ b/src/pages/reports/contractWarningQuery/index.tsx @@ -155,6 +155,8 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => show: false, } }); + + const columns: ProColumns[] = [ // { // title: '所属服务区', @@ -187,6 +189,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => hideInSearch: true, hideInDescriptions: true, // width:'25%', + width: 250, sorter: true, ellipsis: true, render: (_, record) => { @@ -206,6 +209,31 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => // hideInSearch: true, }, + { + title: '首年租金', + dataIndex: '', + hideInSearch: true, + align: 'right', + width: 130, + valueType: 'digit' + }, + { + title: '提成比例', + dataIndex: '', + hideInSearch: true, + align: 'right', + width: 130, + }, + { + title: '物业费(年)', + dataIndex: '', + hideInSearch: true, + align: 'right', + width: 130, + valueType: 'digit' + }, + + { title: '合同金额(万元)', dataIndex: 'COMPACT_AMOUNT', @@ -338,6 +366,21 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => ellipsis: true, hideInTable: true }, + + { + title: '合同附属类型', + dataIndex: '', + valueType: 'select', + align: 'center', + width: 130, + // valueEnum: {}, + request: async () => { + const options = session.get("COMPACT_CHILDTYPEList") + return options + }, + ellipsis: true, + hideInTable: true + }, { title: '开始日期', hideInSearch: true, @@ -375,6 +418,12 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => hideInTable: true, hideInSearch: true, }, + { + dataIndex: '', + width: 200, + title:
合同注意事项
, + hideInSearch: true, + }, { // 如果是商户账号,则只能查看合同信息,不能做编辑、删除操作 title: '操作', @@ -548,6 +597,185 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => tempTable.remove() // 防止重复打印一个内容 } + const exportColumns: any = [ + { + title: '合同名称', + dataIndex: 'COMPACT_NAME', + // ellipsis: true, + hideInSearch: true, + hideInDescriptions: true, + // width:'25%', + width: 250, + sorter: true, + ellipsis: true, + render: (_, record) => { + return { + setCurrentRow(record) + setShowDetail(1) + }}>{record.COMPACT_NAME} + }, + }, + { + title: '经营模式', + dataIndex: 'BUSINESS_TYPE', + valueType: 'select', + valueEnum: contractType, + width: 110, + align: "center", + // hideInSearch: true, + }, + { + title: '首年租金', + dataIndex: '首年租金', + hideInSearch: true, + align: 'right', + width: 130, + valueType: 'digit' + }, + { + title: '提成比例', + dataIndex: '提成比例', + hideInSearch: true, + align: 'right', + width: 130, + }, + { + title: '物业费(年)', + dataIndex: '物业费', + hideInSearch: true, + align: 'right', + width: 130, + valueType: 'digit' + }, + { + title: '合同金额(万元)', + dataIndex: 'COMPACT_AMOUNT', + hideInSearch: true, + align: 'right', + width: 130, + sorter: true, + render: (_) => { + return {numeral(_).format('0,0.00')} + }, + }, + { + title: '乙方', + dataIndex: 'SECONDPART_NAME', + hideInDescriptions: true, + hideInSearch: true, + sorter: true, + width: 130, + ellipsis: true, + }, + { + title: '丙方联系人', + dataIndex: 'THREEPART_LINKMAN', + hideInDescriptions: true, + hideInSearch: true, + align: 'center', + width: 130, + sorter: true, + }, + { + title: '合同主体', + dataIndex: 'SERVERPART_NAME', + ellipsis: true, + hideInDescriptions: true, + hideInSearch: true, + width: 120, + align: 'center', + }, + { + title: '合同附属类型', + dataIndex: '合同附属类型', + valueType: 'select', + align: 'center', + width: 130, + // valueEnum: {}, + request: async () => { + const options = session.get("COMPACT_CHILDTYPEList") + return options + }, + ellipsis: true, + }, + { + title: '关联合同', + dataIndex: 'RELATE_COMPACT', + hideInDescriptions: true, + hideInSearch: true, + width: 100, + align: 'center', + render: (_, record) => { + return {record?.RELATE_COMPACT > 0 ? '是' : ''} + } + }, + { + title: '附件', + dataIndex: 'ATTACHMENT_STATE', + hideInSearch: true, + align: 'center', + width: 60, + render: (_, record) => { + return
+ { + record?.ATTACHMENT_STATE === 1000 ? + : '' + } +
+ } + }, + { + title: '合同类型', + dataIndex: 'COMPACT_TYPE', + valueType: 'select', + align: 'center', + width: 130, + valueEnum: compactType, + ellipsis: true, + initialValue: "340001" + }, + { + title: '类型子项', + dataIndex: 'COMPACT_DETAILS', + valueType: 'select', + align: 'center', + width: 130, + valueEnum: COMPACT_DETAILS, + ellipsis: true, + initialValue: "1000" + }, + { + title: '开始日期', + hideInSearch: true, + dataIndex: 'COMPACT_STARTDATE', + valueType: 'date', + sorter: true, + width: 110 + }, + { + title: '结束日期', + hideInSearch: true, + dataIndex: 'COMPACT_ENDDATE', + valueType: 'date', + sorter: true, + width: 110 + }, + { + title: '撤场时间', + hideInSearch: true, + dataIndex: 'CLOSED_DATE', + valueType: 'date', + sorter: true, + width: 110 + }, + { + dataIndex: '合同注意事项', + width: 200, + title:
合同注意事项
, + hideInSearch: true, + }, + ] + return ( = (props) => { showExportTable && reqDetailList && reqDetailList.length > 0 ? = (props) => setSearchParams(searchWholeParams); return list }} + scroll={{ x: '100%' }} actionRef={actionRef} - search={{ span: 6 }} + search={{ span: 6, labelWidth: 120 }} columns={columns} toolbar={{ // 如果是商户账号,则只能查看合同信息,不能做新增操作 diff --git a/src/versionEnv.ts b/src/versionEnv.ts index fc71c48..294c155 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.65"; -export const GIT_HASH = "e90dabf"; -export const BUILD_TIME = "2025-10-21T01:48:13.490Z"; +export const VERSION = "4.5.67"; +export const GIT_HASH = "bd01d65"; +export const BUILD_TIME = "2025-11-14T08:27:05.179Z";