update

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

src/pages/reports/Finance/businessAnalysis/components/projectsScore.less

@@ -17,6 +17,7 @@
     height: 115px;
     border-bottom: 2px solid #EBEDF5;
     margin-bottom: 16px;
+
     .serverPartBox {
       width: 80px;
       height: 80px;
@@ -24,19 +25,24 @@
       overflow: hidden;
       position: relative;
       margin-right: 12px;
+
       .serverPartBoxBg {
         width: 80px;
         height: 80px;
         position: absolute;
-            top: 0;left: 0;
+        top: 0;
+        left: 0;
         z-index: 1;
       }
+
       .nameBox {
         position: absolute;
         z-index: 2;
-            top: 14px;left: 10px;
+        top: 14px;
+        left: 10px;
         display: flex;
         flex-direction: column;
+
         .titleName {
           font-family: PingFangSC, PingFang SC;
           font-weight: 600;
@@ -46,6 +52,7 @@
           text-align: left;
           font-style: normal;
         }
+
         .labelName {
           font-family: PingFangSC, PingFang SC;
           font-weight: 500;
@@ -67,18 +74,22 @@
         z-index: 2;
         display: inline-block;
         position: absolute;
-            top: 0;right: 0;
+        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;
@@ -88,6 +99,7 @@
           text-align: left;
           font-style: normal;
         }
+
         .serverPartType {
           margin-left: 8px;
           background: linear-gradient(134deg, #FFEED1 0%, #FFE1CD 100%);
@@ -97,9 +109,11 @@
           padding: 0 10px;
         }
       }
+
       .serverPartDetailBottom {
         display: flex;
         margin-top: 12px;
+
         .businessBox {
           margin-right: 8px;
           background: #E7F0FF;
@@ -108,11 +122,13 @@
           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;
@@ -124,6 +140,7 @@
             margin-right: 4px;
             white-space: nowrap;
           }
+
           .businessValue {
             font-family: DINAlternate, DINAlternate;
             font-weight: bold;
@@ -151,10 +168,12 @@
       display: flex;
       width: 250px;
       flex-direction: column;
+
       .brandIcon {
         width: 80px;
         height: 80px;
       }
+
       .brandName {
         font-family: PingFangSC, PingFang SC;
         font-weight: 600;
@@ -170,15 +189,18 @@
       }
     }
   }
+
   .operateLeft {
     display: flex;
     align-items: center;
     margin-bottom: 6px;
+
     .operateIcon {
       width: 24px;
       height: 24px;
       margin-right: 6px;
     }
+
     .titleName {
       font-family: PingFangSC, PingFang SC;
       font-weight: 600;
@@ -190,6 +212,7 @@
 
     }
   }
+
   .bigTitlte {
     font-family: PingFangSC, PingFang SC;
     font-weight: 600;
@@ -199,15 +222,18 @@
     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;
     }
+
     .proposalTitle {
       font-weight: 600;
       color: #FE7628;
@@ -226,14 +252,17 @@
     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;
@@ -245,6 +274,7 @@
       transform: translateY(-50%);
       left: 1rem;
     }
+
     .titleName {
       font-family: PingFangSC, PingFang SC;
       font-weight: 600;
@@ -254,6 +284,7 @@
       text-align: left;
       font-style: normal;
     }
+
     .numberValue {
       font-family: PingFangSC, PingFang SC;
       font-weight: bold;
@@ -263,6 +294,7 @@
       text-align: left;
       font-style: normal;
     }
+
     .compare {
       font-family: PingFangSC, PingFang SC;
       font-weight: bold;
@@ -272,6 +304,7 @@
       text-align: left;
       font-style: normal;
     }
+
     .unit {
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;

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<ContractListModel>[] = [
@@ -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',

src/versionEnv.ts

@@ -1,4 +1,4 @@
 // 由 scripts/writeVersion.js 自动生成
-export const VERSION = "4.5.75";
+export const VERSION = "4.5.77";
-export const GIT_HASH = "4b17ea4";
+export const GIT_HASH = "f2fa634";
-export const BUILD_TIME = "2025-12-05T03:57:31.975Z";
+export const BUILD_TIME = "2025-12-11T08:48:46.590Z";