Ver Fonte

Merge branch 'master' of http://softwarescience.top:3000/RWA/RWAServer

CodeLife Leno há 3 semanas atrás
pai
commit
7ab1f0ba72
23 ficheiros alterados com 150 adições e 62 exclusões
  1. 23 23
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/CapitalOccupyMonitorMapper.xml
  2. 1 1
      Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/MultiDimensionalCreditRiskMapper.xml
  3. 2 2
      Procedure/frontend/projectb/src/pages/product/internal/capitaloccupymonitor.tsx
  4. 2 2
      Procedure/frontend/projectb/src/pages/project/businessconfig/AccountReconciliation.tsx
  5. 8 2
      Procedure/frontend/projectb/src/pages/project/dataquality/BondInvestment.tsx
  6. 1 0
      Procedure/frontend/projectb/src/pages/project/dataquality/CollateralTable.tsx
  7. 1 0
      Procedure/frontend/projectb/src/pages/project/dataquality/CustomerTable.tsx
  8. 9 2
      Procedure/frontend/projectb/src/pages/project/dataquality/DiscountTable.tsx
  9. 2 0
      Procedure/frontend/projectb/src/pages/project/dataquality/GuaranteeTable.tsx
  10. 8 1
      Procedure/frontend/projectb/src/pages/project/dataquality/InterbankDepositOrLendingTable.tsx
  11. 8 1
      Procedure/frontend/projectb/src/pages/project/dataquality/NonStandardInvestment.tsx
  12. 8 1
      Procedure/frontend/projectb/src/pages/project/dataquality/OffCreditCard.tsx
  13. 7 1
      Procedure/frontend/projectb/src/pages/project/dataquality/OnCreditCard.tsx
  14. 3 2
      Procedure/frontend/projectb/src/pages/project/dataquality/PledgeRelatedTable.tsx
  15. 3 2
      Procedure/frontend/projectb/src/pages/project/dataquality/RepoRelatedTable.tsx
  16. 1 0
      Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/faGlBalanceSheet.tsx
  17. 17 6
      Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/fcCommitment.tsx
  18. 12 3
      Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/fcLoan.tsx
  19. 10 0
      Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/fcOffSheet.tsx
  20. 10 0
      Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/ffRepo.tsx
  21. 1 0
      Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/itItfRate.tsx
  22. 12 12
      Procedure/frontend/projectb/src/pages/rwa_data_check/result_list.tsx
  23. 1 1
      Procedure/frontend/projectb/src/services/rwa/result_list.ts

+ 23 - 23
Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/CapitalOccupyMonitorMapper.xml

@@ -51,7 +51,7 @@
     <select id="getDetailDataList" resultType="com.sundata.product.rwa.internal.model.MultiDimensionalCreditRiskModel" parameterType="com.sundata.product.rwa.internal.model.CapitalOccupyMonitorModel">
         select
         t.LOAN_REFERENCE_NO                 AS   loanReferenceNo,
-        t.CONT_NO                           AS   contNo,
+        null                           AS   contNo,
         t.MGMT_BRANCH_NO                    AS   mgmtBranchNo,
         t.CUST_NO                           AS   custNo,
         t.CUST_NAME                         AS   custName,
@@ -73,27 +73,27 @@
         end                               AS   regulatoryRetail,
         t1.PRODUCT_TYPE                   AS   productType,
         t.PRODUCT_NAME                      AS   productName,
-        t.ON_OFF_FLAG                       AS   onOffFlag,
-        t.DISC_TYPE                         AS   discType,
-        t.VOUCH_TYPE_CD                     AS   vouchTypeCd,
-        t.IS_MYBANK_SET_FLAG                AS   isMybankSetFlag,
-        t.ACCEPTOR_No                       AS   acceptorNo,
-        t.ACCEPTOR_NAME                     AS   acceptorName,
-        t.SEC_TYPE_CD                       AS   secTypeCd,
-        t.PURPOSE_FLAG                      AS   purposeFlag,
-        t.CCY_CD                            AS   ccyCd,
-        t.START_DT                          AS   startDt,
-        t.MAT_DT                            AS   matDt,
+        null                      AS   onOffFlag,
+        null                        AS   discType,
+        null                    AS   vouchTypeCd,
+        null               AS   isMybankSetFlag,
+        null                       AS   acceptorNo,
+        null                     AS   acceptorName,
+        null                       AS   secTypeCd,
+        null                     AS   purposeFlag,
+        null                            AS   ccyCd,
+        null                          AS   startDt,
+        null                            AS   matDt,
         --        ORIGINAL_TERM                     AS   originalTerm,
         --        RESIDUAL_TERM                     AS   residualterm,
-        t.FIVE_CLASS_CD                     AS   FIVE_CLASS_CD,
-        t.OVERDUE_DAYS                      AS   overdueDays,
-        t.INVEST_INDUSTRY_CD                AS   investIndustryCd,
-        t.ZHIYA_MAIDUAN_CD                  AS   zhiyaMaiduanCd,
-        t.REPO_TYPE_CD                      AS   repoTypeCd,
-        t.REPO_DAYS                         AS   repoDays,
-        t.BILL_NO                           AS   billNo,
-        t.CORE_MARKET_PART_FLAG             AS   coreMarketPartFlag,
+        null                     AS   FIVE_CLASS_CD,
+        null                     AS   overdueDays,
+        null               AS   investIndustryCd,
+        null                 AS   zhiyaMaiduanCd,
+        null                      AS   repoTypeCd,
+        null                         AS   repoDays,
+        null                           AS   billNo,
+        null            AS   coreMarketPartFlag,
         t.BALANCE                           AS   balance,
         t.GL_ACCOUNT_ID                     AS   glAccountId,
         t.REC_INT                           AS   recInt,
@@ -106,11 +106,11 @@
         t.FAIR_VAL_ACCOUNT                  AS   fairValAccount,
         t.CHARGE_FEE                        AS   chargeFee,
         t.CHARGE_FEE_ACCOUNT                AS   chargeFeeAccount,
-        t.BUS_LINE                          AS   busLine,
-        t.COMM_TYPE                         AS   commType,
+        null                          AS   busLine,
+        null                         AS   commType,
         t.RESERVE                           AS   reserve,
         t.RESERVE_ACCOUNT                   AS   reserveAccount,
-        t.BALANCEALL                        AS   balanceAll,
+        t.BALANCE                        AS   balanceAll,
         t2.MITIGANT_COVERAGE_PARTITION_RISK_EXPOSE                  AS   cashRisk,
         t3.MITIGANT_COVERAGE_PARTITION_RISK_EXPOSE                  AS   governmentRisk,
         t4.MITIGANT_COVERAGE_PARTITION_RISK_EXPOSE                  AS   financeRisk,

+ 1 - 1
Procedure/backend/project/src/main/java/com/sundata/product/rwa/internal/mybatis/MultiDimensionalCreditRiskMapper.xml

@@ -68,7 +68,7 @@
         null                         AS   commType,
         t.RESERVE                           AS   reserve,
         t.RESERVE_ACCOUNT                   AS   reserveAccount,
-        t.BALANCEALL                        AS   balanceAll,
+        t.BALANCE                        AS   balanceAll,
         t2.MITIGANT_COVERAGE_PARTITION_RISK_EXPOSE                  AS   cashRisk,
         t3.MITIGANT_COVERAGE_PARTITION_RISK_EXPOSE                  AS   governmentRisk,
         t4.MITIGANT_COVERAGE_PARTITION_RISK_EXPOSE                  AS   financeRisk,

+ 2 - 2
Procedure/frontend/projectb/src/pages/product/internal/capitaloccupymonitor.tsx

@@ -157,7 +157,7 @@ formDatas.forEach(function(erement,index,array){
           dataIndex: 'sDate',
           order:-2,
           hideInTable: true,
-          render:(text)=>moment().format('YYYYMM'),
+          render:(text,recode)=>moment(recode.sDate).format('YYYYMM'),
           valueType:'dateMonth'
         },
         {
@@ -166,7 +166,7 @@ formDatas.forEach(function(erement,index,array){
           order:-3,
           hideInTable: true,
           valueType:'dateMonth',
-          render:(text)=>moment().format('YYYYMM'),
+          render:(text,recode)=>moment(recode.eDate).format('YYYYMM'),
         },
         {
           title: '期次',

+ 2 - 2
Procedure/frontend/projectb/src/pages/project/businessconfig/AccountReconciliation.tsx

@@ -3,9 +3,9 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDForm,SDSubmitButton,EditType, SDAreaTtile, SDLayout, SDOperate, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
+
 import {getDataList,deleteRows,fetchDetailData,selectDetailData,
-  updateExistData,exportExcelModel,templateUpload,uploadAction} from '@/services/rwa/AccountReconciliation';
+  updateExistData,exportExcelModel,templateUpload,uploadAction, SysListModel} from '@/services/rwa/AccountReconciliation';
 import { WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
 

+ 8 - 2
Procedure/frontend/projectb/src/pages/project/dataquality/BondInvestment.tsx

@@ -38,8 +38,13 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
     const [importVisible, setImportVisible] = useState<boolean>(false);
   
     useEffect(() => {
-      }, []);
-    
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
      
     // 页面展示元素
     const columns: ProColumns<SysListModel>[] = [
@@ -472,6 +477,7 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 1 - 0
Procedure/frontend/projectb/src/pages/project/dataquality/CollateralTable.tsx

@@ -321,6 +321,7 @@ const CollateralTable : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 1 - 0
Procedure/frontend/projectb/src/pages/project/dataquality/CustomerTable.tsx

@@ -324,6 +324,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 9 - 2
Procedure/frontend/projectb/src/pages/project/dataquality/DiscountTable.tsx

@@ -33,9 +33,14 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
     const [fileData, setFileData] = useState<File>();
     // 导入窗口显示
     const [importVisible, setImportVisible] = useState<boolean>(false);
-
     useEffect(() => {
-      }, []);
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
      
     // 页面展示元素
     const columns: ProColumns<SysListModel>[] = [
@@ -445,6 +450,7 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
             setList(true)
           }
           const data = await getDataList(formdata)
+          formDataList = [...data]
            return {data: data}
          }  }
          columns={columns}
@@ -462,6 +468,7 @@ const DiscountTable : React.FC<widowRush> = (prop:widowRush) => {
          actionRef={actionRef}
          formRef={formRef}
          search={list}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 2 - 0
Procedure/frontend/projectb/src/pages/project/dataquality/GuaranteeTable.tsx

@@ -214,6 +214,7 @@ const GuaranteeTable : React.FC<widowRush> = (prop:widowRush) => {
          rowKey="customerName"
          request={async (formdata:SysListModel) =>{
           const data = await getDataList(formdata)
+          formDataList = [...data]
            return {data: data}
          }  }
          columns={columns}
@@ -230,6 +231,7 @@ const GuaranteeTable : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 8 - 1
Procedure/frontend/projectb/src/pages/project/dataquality/InterbankDepositOrLendingTable.tsx

@@ -38,7 +38,13 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
     const [importVisible, setImportVisible] = useState<boolean>(false);
 
     useEffect(() => {
-      }, []);
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
     
 
 
@@ -419,6 +425,7 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
          singleSelect={false}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 8 - 1
Procedure/frontend/projectb/src/pages/project/dataquality/NonStandardInvestment.tsx

@@ -38,7 +38,13 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
     const [importVisible, setImportVisible] = useState<boolean>(false);
 
     useEffect(() => {
-      }, []);
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
      
     // 页面展示元素
     const columns: ProColumns<SysListModel>[] = [
@@ -414,6 +420,7 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
          }  }
          columns={columns}
          search={list}
+         initLoad={false}
          toolBarRender={(_, { selectedRows }) => [
           <SDButton
             key="export"

+ 8 - 1
Procedure/frontend/projectb/src/pages/project/dataquality/OffCreditCard.tsx

@@ -37,7 +37,13 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
     const [importVisible, setImportVisible] = useState<boolean>(false);
 
     useEffect(() => {
-      }, []);
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
     
      
     // 页面展示元素
@@ -444,6 +450,7 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          search={list}
          setEditType={setEditType}

+ 7 - 1
Procedure/frontend/projectb/src/pages/project/dataquality/OnCreditCard.tsx

@@ -39,7 +39,12 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
 
     useEffect(() => {
 
-      }, []);
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
 
      
     // 页面展示元素
@@ -447,6 +452,7 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 3 - 2
Procedure/frontend/projectb/src/pages/project/dataquality/PledgeRelatedTable.tsx

@@ -3,8 +3,8 @@ import type { ProColumns, ActionType } from '@ant-design/pro-components';
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDModalForm,SDTable,SDFormItem,SDButton,SDForm,SDSubmitButton,EditType, SDOperate, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel,} from '@/services/rwa/dataquality/PledgeRelatedTable';
+
+import {getDataList,selectDetailData,exportExcelModel, SysListModel,} from '@/services/rwa/dataquality/PledgeRelatedTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -159,6 +159,7 @@ const PledgeRelatedTable : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 3 - 2
Procedure/frontend/projectb/src/pages/project/dataquality/RepoRelatedTable.tsx

@@ -3,8 +3,8 @@ import type { ProColumns, ActionType, ProFormInstance } from '@ant-design/pro-co
 import type {FormInstance} from 'antd'
 import  {Upload} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDFormItem,SDButton,SDForm,SDSubmitButton,EditType, SDAreaTtile, SDLayout, SDOperate, baseFun, } from "@sundata/ui-frame";
-import type { SysListModel } from '@/services/rwa/ListOfPublicSector';
-import {getDataList,selectDetailData,exportExcelModel,} from '@/services/rwa/dataquality/RepoRelatedTable';
+
+import {getDataList,selectDetailData,exportExcelModel, SysListModel,} from '@/services/rwa/dataquality/RepoRelatedTable';
 import { ProductProps } from "@/sundataImport";
 import { useModel } from '@umijs/max';
 
@@ -257,6 +257,7 @@ const RepoRelatedTable : React.FC<widowRush> = (prop:widowRush) => {
         ]}
          actionRef={actionRef}
          formRef={formRef}
+         initLoad={false}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
          setCurrentRow={setCurrentRow}

+ 1 - 0
Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/faGlBalanceSheet.tsx

@@ -110,6 +110,7 @@ const faGlBalanceSheetModel: React.FC<aaa>= (prop : aaa) => {
      //handleRemove={deletedata}
      // setCurrentRow={setCurrentRow}
       setEditType={setEditType}
+      initLoad={false}
       setDetailVisible={setVisible}   
       toolBarRender={(_, { selectedRows }) => [
         <SDButton

+ 17 - 6
Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/fcCommitment.tsx

@@ -28,8 +28,19 @@ const fcOffSheetts: React.FC<aaa>= (prop : aaa) => {
 
     var formDataList = new Array<FcCommitmentModel>;
     const { fetchDict } = useModel('dict');
-    const [list ,setList] =useState<any>(false);
+    const [list ,setList] =useState<any>();
     const [row , setRow]=useState<boolean>(true)
+ 
+
+    useEffect(() => {
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
+       
     const columns: ProColumns<FcCommitmentModel>[] = [
       //   {
       //   title  : '计算实例号',
@@ -342,8 +353,6 @@ const fcOffSheetts: React.FC<aaa>= (prop : aaa) => {
         }else{
           setList(true);
           setRow(false);
-          let search = '1';
-          let subjectNumber = '-1'
         const sd = await getFcCommitment(formData);
         formDataList =[...sd];
         return {data :sd };
@@ -351,15 +360,17 @@ const fcOffSheetts: React.FC<aaa>= (prop : aaa) => {
       }}
       columns={columns}
      //  singleSelect={false}
-     //operations={["create"]}
+   //  operations={["create"]} 
       //displayColumn="custName"
-      search={list}
+      
      actionRef={actionRef}
      formRef={formRef}
+     search={list}
+     initLoad={false}
      //handleRemove={deletedata}
       setCurrentRow={setCurrentRow}
+      
       setEditType={setEditType}
-      setDetailVisible={setVisible} 
 
         toolBarRender={(_, { selectedRows }) => [
           <SDButton

+ 12 - 3
Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/fcLoan.tsx

@@ -13,6 +13,7 @@ export type FcLoanModel1 ={
   subjectNumber ?:any;
   search ?:any;
   term ?:any;
+  list:any;
 }//信贷表
 
 
@@ -35,8 +36,15 @@ const fcLoan: React.FC<FcLoanModel1>= (props : FcLoanModel1) => {
     // 控制查询条件显隐
     const [list ,setList] =useState<any>();
     //控制列显隐
-     const [a,setA]=useState<boolean>(true);
+     const [a,setA]=useState<boolean>();
+     useEffect(() => {
 
+      if(props.search ==='0'){
+        setList(false);
+      }else{
+        setList(true);
+      }
+       }, [props.search]);
      const columns: ProColumns<FcLoanModel>[] = [
       { 
         title  : '数据日期',
@@ -578,7 +586,7 @@ const fcLoan: React.FC<FcLoanModel1>= (props : FcLoanModel1) => {
       // },
 
     ]
-  
+
     return(
         <SDPage >
         <SDTable
@@ -602,12 +610,13 @@ const fcLoan: React.FC<FcLoanModel1>= (props : FcLoanModel1) => {
       }}
       columns={columns}
      //  singleSelect={false}
-   //  operations={["create"]}
+   //  operations={["create"]} 
       //displayColumn="custName"
       
      actionRef={actionRef}
      formRef={formRef}
      search={list}
+     initLoad={false}
      //handleRemove={deletedata}
       setCurrentRow={setCurrentRow}
       

+ 10 - 0
Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/fcOffSheet.tsx

@@ -31,6 +31,15 @@ type aaa = {
     const [list , setList] =useState<any>();
     const [row , setRow]=useState<boolean>(true)
 
+    useEffect(() => {
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
+
     const { fetchDict } = useModel('dict');
     const columns: ProColumns<FcOffSheetModel>[] = [
 //  {
@@ -513,6 +522,7 @@ type aaa = {
       //displayColumn="custName"
      actionRef={actionRef}
      formRef={formRef}
+     initLoad={false}
      search={list}
      //handleRemove={deletedata}
       setCurrentRow={setCurrentRow}

+ 10 - 0
Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/ffRepo.tsx

@@ -31,6 +31,15 @@ type aaa = {
     var formDataList =new Array<FfRepoModel>;
     const [list , setList] =useState<any>();
     const [row , setRow]=useState<boolean>(true)
+
+    useEffect(() => {
+
+      if(prop.search ==='0'){
+        setList(false)
+      }else(
+        setList(true)
+      )
+       }, []);
     const columns: ProColumns<FfRepoModel>[] = [
         { 
         title  : '截止数据日期',
@@ -373,6 +382,7 @@ type aaa = {
      //handleRemove={deletedata}
       setCurrentRow={setCurrentRow}
       setEditType={setEditType}
+      initLoad={false}
       setDetailVisible={setVisible}    
       toolBarRender={(_, { selectedRows }) => [
         <SDButton

+ 1 - 0
Procedure/frontend/projectb/src/pages/rdpMng/Template/Coding/components/itItfRate.tsx

@@ -114,6 +114,7 @@ const itItfRateModel: React.FC<aaa>= (prop : aaa) => {
      formRef={formRef}
      //handleRemove={deletedata}
       setCurrentRow={setCurrentRow}
+      initLoad={false}
       setEditType={setEditType}
       setDetailVisible={setVisible}    
       

+ 12 - 12
Procedure/frontend/projectb/src/pages/rwa_data_check/result_list.tsx

@@ -59,8 +59,8 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
         { title : '数据期次',
         dataIndex : 'term',
         valueType:'dateMonth',
-        render:(text)=>moment().format('YYYYMM'),
-         initialValue: ( workdate?.substring(0,7)),
+        render:(text,recode)=>moment(recode.term).format('YYYYMM'),
+       //  initialValue: ( workdate?.substring(0,7)),
         width : 150
         },
         
@@ -236,7 +236,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                             key: "scbaseinfo",
                             prodCode:"fcLoan",
                             openType:"child",
-                            initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                            initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                         },"coding")
                         )
                         
@@ -251,7 +251,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"DiscountTable",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                           },"coding")
                       )
                       
@@ -265,7 +265,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"OnCreditCard",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                           },"coding")
                       )
                       
@@ -279,7 +279,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"OffCreditCard",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                           },"coding")
                       )
                       
@@ -293,7 +293,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"InterbankDepositOrLendingTable",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                           },"coding")
                       )
                       
@@ -307,7 +307,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"BondInvestment",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                           },"coding")
                       )
                       
@@ -321,7 +321,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"NonStandardInvestment",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:trem.current,list:false},
                           },"coding")
                       )
                       
@@ -335,7 +335,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"fcOffSheet",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:term.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:term.current,list:false},
                           },"coding")
                       )
                       
@@ -349,7 +349,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"fcCommitment",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:term.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:term.current,list:false},
                           },"coding")
                       )
                       
@@ -363,7 +363,7 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
                               key: "scbaseinfo",
                               prodCode:"ffRepo",
                               openType:"child",
-                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:term.current},
+                              initParams:{editType:'display',subjectNumber:subjcode.current,search:'0',term:term.current,list:false},
                           },"coding")
                       )
                       

+ 1 - 1
Procedure/frontend/projectb/src/services/rwa/result_list.ts

@@ -2,7 +2,7 @@ import { baseFun } from "@sundata/ui-frame"
 
 export type resultListModel={
     //数据期次
-term : String;
+term : string;
 //法人机构
 orgcode : String;
 //科目代码