支行列表追加

Procedure/frontend/projectb/src/pages/product/internal/capitaloccupymonitor.tsx

@@ -3,7 +3,7 @@ import { type ProColumns, type ActionType, type ProFormInstance, ProTable, Edita
 import type {FormInstance} from 'antd'
 import  {Table, Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDSubmitButton,EditType, SDAreaTtile, SDOperate, baseFun,SDModal, validateFun, SDLayout, } from "@sundata/ui-frame";
-import type { CapitalOccupyMonitorModel,detailInfoListModel } from '@/services/rwa/product/internal/capitaloccupymonitor';
+import type { CapitalOccupyMonitorModel,detailInfoListModel,SubBranchListModel } from '@/services/rwa/product/internal/capitaloccupymonitor';
 import {getDataList,exportExcelModel,getDetailDataList} from '@/services/rwa/product/internal/capitaloccupymonitor';
 import { PlusSquareTwoTone, WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
@@ -680,6 +680,137 @@ formDatas.forEach(function(erement,index,array){
 
     ]
 
+    // 页面展示元素
+    const subBatchColumns: ProColumns<SubBranchListModel>[] = [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          search: false,
+          render: (text, record, index) => { index  = index + 1;dataIndex = index; return index},
+          width:100,
+          ellipsis:true
+        },
+        {
+          title: '计算实例号',
+          dataIndex: 'calcIndex',
+          search: false,
+          hideInTable: true,
+        },
+        {
+          title: '起始数据日期',
+          dataIndex: 'startDate',
+          order:-2,
+          hideInTable: true,
+          valueType:'date'
+        },
+        {
+          title: '截止数据日期',
+          dataIndex: 'endDate',
+          order:-3,
+          hideInTable: true,
+          valueType:'date'
+        },
+        {
+          title: '期次',
+          dataIndex: 'term',
+          search: false,
+          hideInTable: true,
+        },
+        {
+          title: '数据日期',
+          dataIndex: 'dataDate',
+          search: false,
+          hideInTable: true,
+        },
+        {
+          title: '经营机构',
+          dataIndex: 'orgCode',
+          
+          order:-1,
+        },
+        {
+          title: '资产余额(不含利息)',
+          dataIndex: '',
+          search: false,
+          children: [
+            {
+                title: '期末资产余额合计',
+                dataIndex: 'sumBalance',
+                search: false,
+            },
+            { title: '资产余额（表内）', dataIndex: 'onBalance',search: false, },
+            { title: '资产余额（表外）', dataIndex: 'offBalance',search: false, },
+            { title: '月均资产余额', dataIndex: 'monthaverageBalance',search: false, },
+          ],
+        },
+        {
+          title: '本期余额(含利息)',
+          dataIndex: '',
+          search: false,
+          children: [
+            {
+                title: '期末本期余额合计',
+                dataIndex: 'endoftermBalance',
+                search: false,
+            },
+            { title: '本期余额（表内）', dataIndex: 'thistermOnBalance',search: false, },
+            { title: '本期余额（表外）', dataIndex: 'thistermOffBalance',search: false, },
+            { title: '月均本期余额', dataIndex: 'monthaverageThistermBalance',search: false, },
+          ],
+        },
+        {
+          title: '减值准备',
+          dataIndex: '',
+          search: false,
+          children: [
+            {
+                title: '期末减值准备',
+                dataIndex: 'endoftermEcl',
+                search: false,
+            },
+            { title: '期末减值准备（表内）', dataIndex: 'endoftermOnEcl',search: false, },
+            { title: '期末减值准备（表外）', dataIndex: 'endoftermOffEcl',search: false, },
+          ],
+        },
+        {
+          title: '风险暴漏',
+          dataIndex: '',
+          search: false,
+          children: [
+            {
+                title: '期末风险暴露合计',
+                dataIndex: 'endoftermSumEad',
+                search: false,
+            },
+            { title: '期末风险暴露（表内）', dataIndex: 'endoftermOnEad',search: false, },
+            { title: '期末风险暴露（表外）', dataIndex: 'endoftermOffEad',search: false, },
+            { title: '月均风险暴露', dataIndex: 'monthaverageEad',search: false, },
+          ],
+        },
+        {
+          title: '风险加权资产',
+          dataIndex: '',
+          search: false,
+          children: [
+            {
+                title: '期末风险加权资产合计',
+                dataIndex: 'sumRwa',
+                search: false,
+            },
+            { title: '期末风险加权资产（表内）', dataIndex: 'onRwa',search: false, },
+            { title: '期末风险加权资产（表外）', dataIndex: 'offRwa',search: false, },
+            { title: '月均风险加权资产', dataIndex: 'monthaverageRwa',search: false, },
+          ],
+        },
+        {
+          title: '缓释后平均风险权重（%）',
+          dataIndex: 'averageRiskWeight',
+          search: false,
+        },
+
+      ];
+
+
     
 
     return (

Procedure/frontend/projectb/src/services/rwa/product/internal/capitaloccupymonitor.ts

@@ -185,7 +185,62 @@ export type detailInfoListModel = {
   rwa: number;
 }
 
+// 支行列表查询Model
+export type SubBranchListModel = {
+  // 计算实例号
+  calcIndex: string;
+  // 起始数据日期
+  sDate: string;
+  // 截止数据日期
+  eDate: string;
+  // 年月
+  term: string;
+  // 数据日期
+  dataDate: string;
+  // 经营机构
+  orgCode: string;
+  // 期末资产余额合计
+  sumBalance: string;
+  // 资产余额（表内）
+  onBalance: string;
+  // 资产余额（表外）
+  offBalance: string;
+  // 月均资产余额
+  monthaverageBalance: string;
+  // 期末本期余额合计
+  endoftermBalance: string;           
+  // 本期余额（表内）
+  thistermOnBalance: string;
+  // 本期余额（表外）
+  thistermOffBalance: string;
+  // 月均本期余额
+  monthaverageThistermBalance: string;
+  // 期末减值准备
+  endoftermEcl: string;
+  // 期末减值准备（表内）
+  endoftermOnEcl: string;
+  // 期末减值准备（表外）
+  endoftermOffEcl: string;
+  // 期末风险暴露合计
+  endoftermSumEad: string;
+  // 期末风险暴露（表内）
+  endoftermOnEad: string;
+  // 期末风险暴露（表外）
+  endoftermOffEad: string;
+  // 月均风险暴露
+  monthaverageEad: string;
+  // 期末风险加权资产合计
+  sumRwa: string;
+  // 期末风险加权资产（表内）
+  onRwa: string;
+  // 期末风险加权资产（表外）
+  offRwa: string;
+  // 月均风险加权资产
+  monthaverageRwa: string;
+  // 缓释后平均风险权重（%）
+  averageRiskWeight: string;
 
+} & BasePageModel;
 
 /** 获取页面初始化及条件查询 POST*/
 export async function getDataList(body:CapitalOccupyMonitorModel) {