From 19e42b8ff5ed6fbc1d57d37d142f267503b82f51 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Fri, 19 Dec 2025 15:28:16 +0800 Subject: [PATCH] update --- package.json | 2 +- .../components/projectsScore.less | 555 ++++++++++-------- .../reports/contractWarningQuery/index.tsx | 81 ++- src/versionEnv.ts | 6 +- 4 files changed, 375 insertions(+), 269 deletions(-) diff --git a/package.json b/package.json index 9b66c52..58b47d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.75", + "version": "4.5.77", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/reports/Finance/businessAnalysis/components/projectsScore.less b/src/pages/reports/Finance/businessAnalysis/components/projectsScore.less index ded680b..1985e39 100644 --- a/src/pages/reports/Finance/businessAnalysis/components/projectsScore.less +++ b/src/pages/reports/Finance/businessAnalysis/components/projectsScore.less @@ -1,285 +1,318 @@ -.projectsScoreContent{ - width: 100%; - height: 700px; - box-sizing: border-box; - padding: 24px; - border-radius: 6px; - border: 1px solid #E3E5EC; - background: linear-gradient(180deg, #EAF3FF 0%, #fff 10%); - overflow-y: scroll; +.projectsScoreContent { + width: 100%; + height: 700px; + box-sizing: border-box; + padding: 24px; + border-radius: 6px; + border: 1px solid #E3E5EC; + background: linear-gradient(180deg, #EAF3FF 0%, #fff 10%); + overflow-y: scroll; - - .serverPart{ - display: flex; - //align-items: center; - justify-content: space-between; - width: 100%; - height: 115px; - border-bottom: 2px solid #EBEDF5; - margin-bottom: 16px; - .serverPartBox{ - width: 80px; - height: 80px; - border-radius: 8px; - overflow: hidden; - position: relative; - margin-right: 12px; - .serverPartBoxBg{ - width: 80px; - height: 80px; - position: absolute; - top: 0;left: 0; - z-index: 1; - } - .nameBox{ - position: absolute; - z-index: 2; - top: 14px;left: 10px; - display: flex; - flex-direction: column; - .titleName{ - font-family: PingFangSC, PingFang SC; - font-weight: 600; - font-size: 14px; - color: #2858CC; - line-height: 20px; - text-align: left; - font-style: normal; - } - .labelName{ - font-family: PingFangSC, PingFang SC; - font-weight: 500; - font-size: 12px; - color: #2858CC; - line-height: 12px; - text-align: left; - font-style: normal; - } - } - - .statusBox{ - padding: 1px 4px; - box-sizing: border-box; - color: #fff; - font-size: 10px; - background: #2ABAC6; - border-radius: 0px 8px 0px 8px; - z-index: 2; - display: inline-block; - position: absolute; - top: 0;right: 0; - } - } - .serverPartDetail{ - height: 80px; - display: flex; - flex-direction: column; - justify-content: space-between; - .serverPartDetailTop{ - display: flex; - align-items: center; - flex-wrap: wrap; - .serverPartName{ - font-family: PingFangSC, PingFang SC; - font-weight: 600; - font-size: 20px; - color: #333333; - line-height: 28px; - text-align: left; - font-style: normal; - } - .serverPartType{ - margin-left: 8px; - background: linear-gradient( 134deg, #FFEED1 0%, #FFE1CD 100%); - border-radius: 2px; - box-sizing: border-box; - color: #FFA509; - padding: 0 10px; - } - } - .serverPartDetailBottom{ - display: flex; - margin-top: 12px; - .businessBox{ - margin-right: 8px; - background: #E7F0FF; - box-sizing: border-box; - padding: 2px 8px; - border-radius: 2px; - display: flex; - align-items: center; - .businessIcon{ - width: 16px; - height: 16px; - margin-right: 4px; - } - .businessText{ - font-family: PingFangSC, PingFang SC; - font-weight: 400; - font-size: 14px; - color: #1E58BE; - line-height: 22px; - text-align: left; - font-style: normal; - margin-right: 4px; - white-space: nowrap; - } - .businessValue{ - font-family: DINAlternate, DINAlternate; - font-weight: bold; - font-size: 18px; - color: #1E58BE; - line-height: 22px; - text-align: left; - font-style: normal; - } - } - } - - .bigTitlte{ - font-family: PingFangSC, PingFang SC; - font-weight: 600; - font-size: 20px; - color: #333333; - line-height: 28px; - text-align: left; - margin-bottom: 0!important; - } - } - - .brandBox{ - display: flex; - width: 250px; - flex-direction: column; - .brandIcon{ - width: 80px; - height: 80px; - } - .brandName{ - font-family: PingFangSC, PingFang SC; - font-weight: 600; - font-size: 14px; - color: #2858CC; - line-height: 20px; - text-align: left; - font-style: normal; - width: 170px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - } - } + + .serverPart { + display: flex; + //align-items: center; + justify-content: space-between; + width: 100%; + height: 115px; + border-bottom: 2px solid #EBEDF5; + margin-bottom: 16px; + + .serverPartBox { + width: 80px; + height: 80px; + border-radius: 8px; + overflow: hidden; + position: relative; + margin-right: 12px; + + .serverPartBoxBg { + width: 80px; + height: 80px; + position: absolute; + top: 0; + left: 0; + z-index: 1; } - .operateLeft{ + + .nameBox { + position: absolute; + z-index: 2; + top: 14px; + left: 10px; display: flex; - align-items: center; - margin-bottom: 6px; - .operateIcon{ - width: 24px; - height: 24px; - margin-right: 6px; - } - .titleName{ + flex-direction: column; + + .titleName { font-family: PingFangSC, PingFang SC; font-weight: 600; font-size: 14px; - color: #183362; - line-height: 24px; + color: #2858CC; + line-height: 20px; + text-align: left; + font-style: normal; + } + + .labelName { + font-family: PingFangSC, PingFang SC; + font-weight: 500; + font-size: 12px; + color: #2858CC; + line-height: 12px; text-align: left; font-style: normal; - } } - .bigTitlte{ + + .statusBox { + padding: 1px 4px; + box-sizing: border-box; + color: #fff; + font-size: 10px; + background: #2ABAC6; + border-radius: 0px 8px 0px 8px; + z-index: 2; + display: inline-block; + position: absolute; + top: 0; + right: 0; + } + } + + .serverPartDetail { + height: 80px; + display: flex; + flex-direction: column; + justify-content: space-between; + + .serverPartDetailTop { + display: flex; + align-items: center; + flex-wrap: wrap; + + .serverPartName { + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 20px; + color: #333333; + line-height: 28px; + text-align: left; + font-style: normal; + } + + .serverPartType { + margin-left: 8px; + background: linear-gradient(134deg, #FFEED1 0%, #FFE1CD 100%); + border-radius: 2px; + box-sizing: border-box; + color: #FFA509; + padding: 0 10px; + } + } + + .serverPartDetailBottom { + display: flex; + margin-top: 12px; + + .businessBox { + margin-right: 8px; + background: #E7F0FF; + box-sizing: border-box; + padding: 2px 8px; + border-radius: 2px; + display: flex; + align-items: center; + + .businessIcon { + width: 16px; + height: 16px; + margin-right: 4px; + } + + .businessText { + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 14px; + color: #1E58BE; + line-height: 22px; + text-align: left; + font-style: normal; + margin-right: 4px; + white-space: nowrap; + } + + .businessValue { + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 18px; + color: #1E58BE; + line-height: 22px; + text-align: left; + font-style: normal; + } + } + } + + .bigTitlte { font-family: PingFangSC, PingFang SC; font-weight: 600; font-size: 20px; color: #333333; line-height: 28px; text-align: left; - margin-bottom: 8px; + margin-bottom: 0 !important; + } } - .proposal{ - text-indent: 2rem; - font-size: 14px!important; - line-height: 28px!important; + + .brandBox { + display: flex; + width: 250px; + flex-direction: column; + + .brandIcon { + width: 80px; + height: 80px; + } + + .brandName { font-family: PingFangSC, PingFang SC; - .keynote{ - font-weight: 600; - color: #1890ff; - } - .proposalTitle{ - font-weight: 600; - color: #FE7628; - } + font-weight: 600; + font-size: 14px; + color: #2858CC; + line-height: 20px; + text-align: left; + font-style: normal; + width: 170px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + } + } + + .operateLeft { + display: flex; + align-items: center; + margin-bottom: 6px; + + .operateIcon { + width: 24px; + height: 24px; + margin-right: 6px; } - .lineBox{ - width: 100%; - height: 2px; - background: #EBEDF5; - margin: 8px 0; + .titleName { + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 14px; + color: #183362; + line-height: 24px; + text-align: left; + font-style: normal; + + } + } + + .bigTitlte { + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 20px; + color: #333333; + line-height: 28px; + text-align: left; + margin-bottom: 8px; + } + + .proposal { + text-indent: 2rem; + font-size: 14px !important; + line-height: 28px !important; + font-family: PingFangSC, PingFang SC; + + .keynote { + font-weight: 600; + color: #1890ff; } - - .paragraph{ - font-family: PingFangSC, PingFang SC; - font-size: 14px!important; - line-height: 28px!important; - .keynote{ - font-weight: 600; - color: #1890ff; - font-family: PingFangSC, PingFang SC; - } - .beforeBluePoint{ - position: relative; - } - .beforeBluePoint::before{ - content:''; - width:8px; - height:8px; - border-radius: 50%; - background-color: #1890ff; - position: absolute; - top: 50%; - transform: translateY(-50%); - left: 1rem; - } - .titleName{ - font-family: PingFangSC, PingFang SC; - font-weight: 600; - font-size: 14px; - color: #333333; - line-height: 20px; - text-align: left; - font-style: normal; - } - .numberValue{ - font-family: PingFangSC, PingFang SC; - font-weight: bold; - font-size: 14px; - color: #243F6E; - line-height: 28px; - text-align: left; - font-style: normal; - } - .compare{ - font-family: PingFangSC, PingFang SC; - font-weight: bold; - font-size: 14px; - color: #FE7628; - line-height: 28px; - text-align: left; - font-style: normal; - } - .unit{ - font-family: PingFangSC, PingFang SC; - font-weight: 400; - font-size: 14px; - color: #788395; - line-height: 22px; - text-align: left; - font-style: normal; - } + .proposalTitle { + font-weight: 600; + color: #FE7628; } + } + + .lineBox { + width: 100%; + height: 2px; + background: #EBEDF5; + margin: 8px 0; + } + + + .paragraph { + font-family: PingFangSC, PingFang SC; + font-size: 14px !important; + line-height: 28px !important; + + .keynote { + font-weight: 600; + color: #1890ff; + font-family: PingFangSC, PingFang SC; + } + + .beforeBluePoint { + position: relative; + } + + .beforeBluePoint::before { + content: ''; + width: 8px; + height: 8px; + border-radius: 50%; + background-color: #1890ff; + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 1rem; + } + + .titleName { + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 14px; + color: #333333; + line-height: 20px; + text-align: left; + font-style: normal; + } + + .numberValue { + font-family: PingFangSC, PingFang SC; + font-weight: bold; + font-size: 14px; + color: #243F6E; + line-height: 28px; + text-align: left; + font-style: normal; + } + + .compare { + font-family: PingFangSC, PingFang SC; + font-weight: bold; + font-size: 14px; + color: #FE7628; + line-height: 28px; + text-align: left; + font-style: normal; + } + + .unit { + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 14px; + color: #788395; + line-height: 22px; + text-align: left; + font-style: normal; + } + } } \ No newline at end of file diff --git a/src/pages/reports/contractWarningQuery/index.tsx b/src/pages/reports/contractWarningQuery/index.tsx index 0bd9e65..1dec04c 100644 --- a/src/pages/reports/contractWarningQuery/index.tsx +++ b/src/pages/reports/contractWarningQuery/index.tsx @@ -24,7 +24,7 @@ import session from "@/utils/session"; import PageTitleBox from "@/components/PageTitleBox"; import { delCompact, getList, handleContractSupple } from "@/pages/contract/service"; import { ContractListModel } from "@/pages/contract/data"; -import { contractType } from "@/pages/contract/emun"; +import { businessType, contractType } from "@/pages/contract/emun"; import ContractDetail from "@/pages/contract/components/detail"; import ContractEdit from "@/pages/contract/components/editor"; import ReactHTMLTableToExcel from "react-html-table-to-excel"; @@ -156,6 +156,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => show: false, } }); + const SERVERPARTTYPEOBJ = session.get('ServerpartTypeObj') const columns: ProColumns[] = [ @@ -225,6 +226,42 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => align: 'right', width: 130, }, + + { + title: '面积', + dataIndex: 'OPERATING_AREA', + hideInSearch: true, + align: 'right', + width: 130, + }, + { + title: '服务区类型', + dataIndex: 'SERVERPART_TYPE', + hideInSearch: true, + valueType: 'select', + valueEnum: SERVERPARTTYPEOBJ, + align: 'center', + width: 130, + }, + { + title: '经营业态', + dataIndex: 'BUSINESS_TRADE', + hideInSearch: true, + valueType: 'select', + valueEnum: businessType, + ellipsis: true, + align: 'center', + width: 130, + }, + { + title: '保证金(万元)', + dataIndex: 'SECURITYDEPOSIT', + hideInSearch: true, + align: 'right', + valueType: "digit", + width: 130, + }, + { title: '物业费(年)', dataIndex: '', @@ -391,7 +428,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => dataIndex: 'COMPACT_STARTDATE', valueType: 'date', sorter: true, - width: 110 + width: 130 }, { title: '结束日期', @@ -399,7 +436,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => dataIndex: 'COMPACT_ENDDATE', valueType: 'date', sorter: true, - width: 110 + width: 130 }, { title: '撤场时间', @@ -407,7 +444,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => dataIndex: 'CLOSED_DATE', valueType: 'date', sorter: true, - width: 110 + width: 130 }, { title: '操作人', @@ -643,6 +680,42 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => align: 'right', width: 130, }, + + { + title: '面积', + dataIndex: 'OPERATING_AREA', + hideInSearch: true, + align: 'right', + width: 130, + }, + { + title: '服务区类型', + dataIndex: 'SERVERPART_TYPE', + hideInSearch: true, + valueType: 'select', + valueEnum: SERVERPARTTYPEOBJ, + align: 'center', + width: 130, + }, + { + title: '经营业态', + dataIndex: 'BUSINESS_TRADE', + hideInSearch: true, + valueType: 'select', + valueEnum: businessType, + align: 'center', + width: 180, + }, + { + title: '保证金', + dataIndex: 'SECURITYDEPOSIT', + hideInSearch: true, + align: 'right', + valueType: "digit", + width: 130, + }, + + { title: '物业费(年)', dataIndex: 'PROPERTY_FEE', diff --git a/src/versionEnv.ts b/src/versionEnv.ts index f0194d8..d3b275a 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.75"; -export const GIT_HASH = "4b17ea4"; -export const BUILD_TIME = "2025-12-05T03:57:31.975Z"; +export const VERSION = "4.5.77"; +export const GIT_HASH = "f2fa634"; +export const BUILD_TIME = "2025-12-11T08:48:46.590Z";