update

src/pages/reports/settlementSummaryTable/index.tsx

@@ -48,6 +48,13 @@ const settlementSummaryTable: React.FC<{ currentUser: CurrentUser }> = (props) =
     // 是否显示批量月度审批的按钮
     const [isShowMonthBtn, setIsShowMonthBtn] = useState<boolean>(false)
 
+    const [columnsStateMap, setColumnsStateMap] = useState<any>({
+        SettlementModes: { show: false },
+        SwitchDate: { show: false },
+    });
+
+
+
     let settlementStateObj: any = {
         "9": "已结算",
         "0": "待结算",
@@ -86,6 +93,17 @@ const settlementSummaryTable: React.FC<{ currentUser: CurrentUser }> = (props) =
                 "-1": "提前退场",
             }
         },
+
+        {
+            title: "结算类型",
+            dataIndex: 'SettlementType',
+            valueType: 'select',
+            valueEnum: {
+                "1": "线上",
+                "2": "线下"
+            },
+            hideInTable: true
+        },
         {
             title: "结算模式",
             dataIndex: 'SettlementModes',
@@ -172,7 +190,7 @@ const settlementSummaryTable: React.FC<{ currentUser: CurrentUser }> = (props) =
                     align: 'center',
                     render: (_, record) => {
                         // return record?.IndexDesc || ''
-                        return `${record?.COMPACT_STARTDATE || '-'}-${record?.COMPACT_ENDDATE || '-'}`
+                        return `${record?.COMPACT_STARTDATE || ''}-${record?.COMPACT_ENDDATE || ''}`
                     }
                 },
                 {
@@ -197,6 +215,22 @@ const settlementSummaryTable: React.FC<{ currentUser: CurrentUser }> = (props) =
                     render: (_, record) => {
                         return record?.GUARANTEERATIO ? `${record?.GUARANTEERATIO}%` : ''
                     }
+                },
+
+                {
+                    title: <div style={{ textAlign: 'center' }}>结算模式</div>,
+                    dataIndex: 'SettlementModes',
+                    align: 'center',
+                    width: 120,
+                    valueType: 'select',
+                    valueEnum: SETTLEMENT_MODESObj,
+                },
+                {
+                    title: <div style={{ textAlign: 'center' }}>切换日期</div>,
+                    dataIndex: 'SwitchDate',
+                    align: 'center',
+                    width: 120,
+
                 }
             ]
         },
@@ -678,7 +712,8 @@ const settlementSummaryTable: React.FC<{ currentUser: CurrentUser }> = (props) =
                                 StatisticsYear: params?.StatisticsYear,
                                 ServerpartId: selectedId,
                                 SettlementState: params?.SettlementState,
-                                SettlementModes: params?.SettlementModes
+                                SettlementModes: params?.SettlementModes,
+                                SettlementType: params?.SettlementType
                                 // ServerpartIds: selectedId,
                                 // // ShopRoyaltyId: compareCurrent?.ShopRoyaltyId,
                                 // // BusinessProjectId: compareCurrent?.BUSINESSPROJECT_ID,
@@ -762,6 +797,10 @@ const settlementSummaryTable: React.FC<{ currentUser: CurrentUser }> = (props) =
                                 </Button>
                             ]
                         }}
+                        columnsState={{
+                            value: columnsStateMap,
+                            onChange: setColumnsStateMap,
+                        }}
                     />
                 </div>
             </div>