更新选择反显按钮，新增列表颜色控制，导出功能

Procedure/frontend/projectb/src/pages/rwa_data_check/diffconfig_list.tsx

@@ -33,6 +33,7 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
   const [visible2,setVisible2] = useState<boolean>(false);//弹窗是否显示
   const formRef = useRef<FormInstance<any>>();
   const [editType, setEditType] = useState<EditType>('update');
+  const [editType1, setEditType1] = useState<EditType>('create');
 
   const parentformRef = useRef<FormInstance<any>>();
   const childenformRef= useRef<FormInstance<any>>();
@@ -45,10 +46,10 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
   const [currentRow, setCurrentRow] = useState<resultListModel>();
   const [removeSelectedRow,setRemoveSelectedRow] = useState<resultListModel[]>();
   const actionRef = useRef<ActionType>();
-  const parentActionRef = useRef<ActionType>();
   const { fetchDict } = useModel('dict');   
   const [selectedValue, setSelectedValue] = useState('');
   const [allSelectedRowKeys, setAllSelectedRowKeys] = useState<Key[]>();
+  const [stare,setStare] = useState<any>();
 
 
   const selectdata = async (record:any)=>{
@@ -77,9 +78,6 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
       actionRef.current?.reloadAndRest?.();
     }
 
-    const upperLimit =(_?: RuleObject, value?: any)=>{
-
-    }
     const inst =  async(formData : difftoleranceModel) => {
       setEditType('create')
     if(mockData.length==0){
@@ -160,6 +158,8 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
       
       { title : '区间开闭类型',
       dataIndex : 'intervalType',
+      valueType:'select',
+      request:()=>fetchDict('limitinterval'),
       search:false,
       width : 150
       },
@@ -182,20 +182,19 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
               
               onClick={()=>{ 
                 setEditType('update');
+                setStare(record.ruleNo);
                 selectdata(record);
                 setVisible(true);
                } }
             >
               修改
             </SDOperate>,
-      
            <SDOperate
            key="roleCfg"
            icon={<WomanOutlined />}
            successMessage=""
            onClick={()=>{ 
             deldata(record);
-           
             } }
          >
           删除
@@ -283,7 +282,6 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
     actionRef={actionRef}
    formRef={formRef}
    setEditType={setEditType}
-   //handleRemove={deletedata}
     toolBarRender={(_, { selectedRows }) => [
       <SDButton
       key="create"
@@ -292,11 +290,11 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
         //setVisible(true);
         setEditType('create');
         setVisible2(false);
-        if (removeSelectedRow && removeSelectedRow.length !== 0) {
-          setMockData(removeSelectedRow)
-        } else {
+        // if (removeSelectedRow && removeSelectedRow.length !== 0) {
+        //   setMockData(removeSelectedRow)
+        // } else {
           setMockData([])
-        }
+       // }
         setVisible(true);
       }}
       >
@@ -339,8 +337,8 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
       }
   }
       >
-      <SDFormText name="ruleNo"   label="规则编号"  required  readonlyCond='update' max='50'/>
-      <SDFormText name="ruleName"   label="规则名称" max='400' width={210}  required />
+      <SDFormText name="ruleNo"   label="规则编号"  required  readonlyCond='update' max={50}/>
+      <SDFormText name="ruleName"   label="规则名称" max={400} width={210}  required />
       <SDFormDict name="ruleAreaType"   label="适用范围类型" dictKey='RULE_AREA_TYPE'  required/>
       <SDFormDict name="intervalType"   label="区间开闭类型"  dictKey='limitinterval' required/>
       <SDFormText name="lowerLimit"   label="容忍度上限%"   required />
@@ -354,17 +352,23 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
       search={false} 
       dataSource={mockData}
       actionRef={actionRef}
-      request={async(formData : resultListModel)=>{
-        if(editType!='update')
-        {const sd = await rule_list(formData);
-            formDataList1=[...sd];
-            setMockData(sd);
-            return {data:sd}
-         } else {
-          return setMockData([]);
-         }
-         
-      }}
+    //   request={(async(formData : resultListModel)=>{
+    //     if(editType!='update')
+    //     {const sd = await rule_list(formData);
+    //         formDataList1=[...sd];
+    //         setMockData(sd);
+    //         return {data:sd}
+    //      } else {
+    //   //     const sd =await rule_queryone(stare);
+    //   //  if(sd.result1[0].ruleAreaType=='05'){
+    //   //   setVisible2(true)
+    //   // }else{
+    //   //   setVisible2(false);
+    //   // }
+    //   // return  setMockData(sd.result2);
+    //   //    
+    //  return setMockData([])} })
+    //     }
       columns={columns1}
      formRef={childenformRef}
       toolBarRender={(_, { selectedRowKeys }) => {
@@ -374,11 +378,20 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
               successMessage=''
               icon={<WomanOutlined />}
               onClick={async() => {
+                const ruleid: ((prevState: React.Key[] | undefined) => React.Key[] | undefined) | any[] | undefined =[];
                 setVisible1(true);
-                setEditType('create');
-                mockData.forEach(function (item){
-                  setCurrentRow(item);
-                });
+                setEditType1('create');
+                // mockData.forEach(function (item){
+                //   setCurrentRow(item);
+                //  // item.ruleId.push(mockData[item].ruleId)
+                // },
+              
+                // );
+                Object.keys(mockData).forEach(key=>{
+                  ruleid.push(mockData[Number(key)].ruleId);
+                }
+                )
+                setAllSelectedRowKeys(ruleid)
               }}
               >
                 新增
@@ -397,6 +410,7 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
         rowSelection={
           {
 selections:[Table.SELECTION_ALL, Table.SELECTION_INVERT],
+
 type:'checkbox'
 }
 }
@@ -434,7 +448,6 @@ type:'checkbox'
                   setMockData([]);
                 }
                 setVisible1(false);
-               // actionRef.current?.reload?.(true)
               }}
               >
                 选择

Procedure/frontend/projectb/src/pages/rwa_data_check/result_list.tsx

@@ -8,6 +8,10 @@ import { renderTemplate } from '../rdpMng/Template/components/common';
 import { FcLoanModel } from '@/services/rwa/fcLoan';
 import DiscountTable from '../project/dataquality/DiscountTable';
 import { renderTemplate1 } from '../project/commom/common';
+import { useModel } from '@umijs/max';
+import { fetchDetailData } from '@/services/rwa/AccountReconciliation';
+import { fetchDictList } from '@/services/sysMng/nounMng';
+import { exportExcelModel } from '@/services/rwa/result_list';
 
 
 type aaa = {
@@ -23,22 +27,42 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
     const [visible,setVisible] = useState<boolean>(false);//弹窗是否显示
     const formRef = useRef<FormInstance<any>>();
     const [editType, setEditType] = useState<EditType>('update');
-    var formDataList1 = new Array<FcLoanModel>;
+
 
     const actionRef = useRef<ActionType>();
 
     const subjcode = useRef<any>();
+      /** 登录后初始化的前台全局变量 */
+      const { initialState } = useModel('@@initialState');
+      const workdate = initialState?.workDate;
+
+      const { fetchDict } = useModel('dict');   
 
       /** 当前行对象，查看详情、修改时，作为详细信息表单的查询条件 */
       const [currentRow, setCurrentRow] = useState<resultListModel>();
+
+      var getColumnStyle = (record:any,value:any) => {
+        if (value.leartresulttype =='nodeviation') {
+        return  <div style={{background :'green'}}>{record}</div> ; // 返回红色
+        } else if (value.leartresulttype =='in_range_tolerance') {
+          return <div style={{background :'yellow'}}>{record}</div> ; // 返回红色
+        }else{
+        return <div style={{background :'red'}}>{record}</div> ; // 返回红色
+        }
+      };
     const columns: ProColumns<resultListModel>[] = [
         { title : '数据期次',
         dataIndex : 'term',
+        valueType:'dateMonth',
+        initialValue: ( workdate?.substring(0,7)),
         width : 150
         },
         
         { title : '法人机构',
         dataIndex : 'orgcode',
+        valueType:'select',
+        initialValue:'晋商银行',
+      // request:()=>fetchDict('orgnodept'),
         width : 150
         },
         
@@ -49,46 +73,61 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
         
         { title : '科目名称',
         dataIndex : 'subjname',
+        search:false,
         width : 150
         },
         
         { title : '币种',
         dataIndex : 'ccy',
+        search:false,
+        hideInTable:true,
         width : 150
         },
         
         { title : '总账科目余额(万元)',
         dataIndex : 'glamt',
+        search:false,
         width : 150
         },
         
-        { title : '勾稽汇总金额(万元)',
+        { title : '勾稽明细汇总金额(万元)',
         dataIndex : 'ledgartamt',
+        search:false,
         width : 150
         },
         
         { title : '核对差异金额(万元)',
         dataIndex : 'differamt',
+        search:false,
         width : 150
         },
         
         { title : '核对差异率%',
         dataIndex : 'differrate',
-        width : 150
-        },
+        search:false,
+        width : 150,
+        render: (record,value) => {
+           return getColumnStyle(record,value)
+        }
+        },  
         
         { title : '差异容忍度%',
         dataIndex : 'percthreshold',
+        search:false,
         width : 150
         },
         
         { title : '是否超过容忍度',
         dataIndex : 'leartresulttype',
+        valueType:'select',
+        request:()=>fetchDict('LEARTRESULTTYPE'),
+        hideInTable:true,
         width : 150
         },
         
         { title : '轧差后核对差异(万元)',
         dataIndex : 'offsetdifferamt',
+        search:false,
         width : 150
         },
         {
@@ -130,23 +169,23 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
       //displayColumn="custName"
      actionRef={actionRef}
      formRef={formRef}
+     
      //handleRemove={deletedata}
       setCurrentRow={setCurrentRow}
       setEditType={setEditType}
       setDetailVisible={setVisible} 
-      // toolBarRender={(_, { selectedRows }) => [
-      //   <SDButton
-      //   key="create"
-      //   successMessage=''
-      //   onClick={() => {
-      //     setVisible(true);
-      //     setOnoroff(true);
-      //     setEditType('create');
-      //   }}
-      //   >
-      //     新增
-      //   </SDButton>
-      // ]} 
+      toolBarRender={(_, { selectedRows }) => [
+        <SDButton
+        key="export"
+        //  successMessage='导出成功'
+          onClick={async () => {
+            exportExcelModel("result_list",formDataList);
+            //baseFun.info('处理完成');
+          }}
+        >
+          导出Excel
+        </SDButton>
+      ]} 
       />
 
 
@@ -154,18 +193,6 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
 {visible  &&(
   <SDModal title={undefined} visible={visible}  onCancel={() => { setVisible(false); }
     } >
-      {/* <ProTable
-      rowKey="id"
-      key="tableQuery"
-      request={async(formData : FcLoanModel)=>{
-        const sd = await getFcLoan(formData);
-        formDataList1 =[...sd];
-        return {data :sd };
-      }}
-      columns={columns1}
-      formRef={formRef}
-      search={false}
-      ></ProTable> */}
 <SDTabs defaultActiveKey="t2" tabPosition="top" type="card" 
 
                 items={[                    
@@ -351,4 +378,5 @@ const resultlist: React.FC<aaa>= (prop : aaa) => {
     );
 
 }
-    export default resultlist;
+    export default resultlist;
+

Procedure/frontend/projectb/src/services/rwa/fcCommitment.ts

@@ -83,5 +83,5 @@ export async function getFcCommitment1(subjectNumber:String){
 }
      /** 全部导出 */
      export async function exportExcelModel(fileName:string,body:any) {
-        baseFun.download('/api/product/rwa/parameter/FaGlBalanceSheetAction/exportExcelModel.do?fileName='+fileName,body);
+        baseFun.download('/api/product/rwa/parameter/FcCommitmentAction/exportExcelModel.do?fileName='+fileName,body);
       }

Procedure/frontend/projectb/src/services/rwa/fcLoan.ts

@@ -109,6 +109,7 @@ export type FcLoanModel ={
      orgname1 :String;
      orgname2 :String;
      subjectNumber :String;
+     investIndustryCds:string;
 
 }
 export async function getFcLoan(body:any){

Procedure/frontend/projectb/src/services/rwa/itItfRate.ts

@@ -2,19 +2,20 @@ import { baseFun, DictTree, SDTable, SDTableProps,TableData } from "@sundata/ui-
 
 export type ItItfRateModel ={
     //计算实例号
-calcindex : String;
+calcindex : string;
 //起始数据日期
-sdate : String;
+sdate : string;
 //截止数据日期
-edate : String;
+edate : string;
 //期次
-term : String;
+term : string;
 //数据日期
-dataDate : String;
+dataDate : string;
 //币种
-currcd : String[];
+currcd : string[];
 //人民币汇率
 rmbexchrate : number;
+currcds: string;
 
 }
 
@@ -28,5 +29,5 @@ export async function getItItfRate(body:any){
 
      /** 全部导出 */
      export async function exportExcelModel(fileName:string,body:any) {
-        return baseFun.request('/api/product/rwa/parameter/ItItfRateAction/exportExcelModel.do?fileName='+fileName,body);
+         baseFun.download('/api/product/rwa/parameter/ItItfRateAction/exportExcelModel.do?fileName='+fileName,body);
       }

Procedure/frontend/projectb/src/services/rwa/product_list.ts

@@ -25,7 +25,8 @@ productStageId : String;
 //产品序号
 productIndex : number;
 //来源系统
-productFromSystem : String;
+productFromSystem : string[];
+productFromSystems : string;
 //默认取数逻辑
 defaultGetdatarule : String;
 //默认输出
@@ -118,7 +119,7 @@ classRiskRule?:string
 
 //产品参数的查询
 export async function productlist(body:any){
-    return baseFun.request<productListModel[]>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/productlist',{
+    return baseFun.request<productListModel[]>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/productlist',{
         data:body
     })
     ;
@@ -127,7 +128,7 @@ export async function productlist(body:any){
 
  //初始页面删除
 export async function product_deleteone(productNo:String){
-    return baseFun.request<void>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_deleteone',{
+    return baseFun.request<void>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_deleteone',{
         params:{productNo}
     })
     ;
@@ -135,14 +136,14 @@ export async function product_deleteone(productNo:String){
 
  //科目取数规则页面删除
  export async function product_deleteone1(ruleCode:String){
-    return baseFun.request<void>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_deleteone1',{
+    return baseFun.request<void>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_deleteone1',{
         params:{ruleCode}
     })
     ;
 }
 //科目取数规则列表的查询
 export async function product_querylist(productNo:any){
-    return baseFun.request<rwaCalcConfProductrulesModel[]>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/productlist1',{
+    return baseFun.request<rwaCalcConfProductrulesModel[]>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/productlist1',{
         params:{productNo}
     })
     ;
@@ -150,7 +151,7 @@ export async function product_querylist(productNo:any){
 
 //修改科目取数规则页面的查询
 export async function product_modifyone(ruleCode:String){
-    return baseFun.request<rwaCalcConfProductrulesModel>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_modifyone',{
+    return baseFun.request<rwaCalcConfProductrulesModel>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_modifyone',{
        params:{ruleCode}
     })
     ;
@@ -158,7 +159,7 @@ export async function product_modifyone(ruleCode:String){
 
 //产品参数页面点修改的查询
 export async function product_modifyone1(productNo:String){
-    return baseFun.request<productListModel>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_modifyone1',{
+    return baseFun.request<productListModel>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_modifyone1',{
        params:{productNo}
     })
     ;
@@ -166,7 +167,7 @@ export async function product_modifyone1(productNo:String){
 
 //产品参数页面点修改的科目取数规则列表的查询
 export async function product_modifyone2(productNo:String){
-    return baseFun.request<rwaCalcConfProductrulesModel[]>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_modifyone2',{
+    return baseFun.request<rwaCalcConfProductrulesModel[]>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_modifyone2',{
        params:{productNo}
     })
     ;
@@ -174,7 +175,7 @@ export async function product_modifyone2(productNo:String){
 
 //保存产品参数
 export async function product_addone(body:productListModel){
-    return baseFun.request<any>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_addone',{
+    return baseFun.request<void>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_addone',{
         data:body
     })
     ;
@@ -182,7 +183,7 @@ export async function product_addone(body:productListModel){
 
 //科目取数规则
 export async function product_addone1(body:rwaCalcConfProductrulesModel[],productNo:String){
-    return baseFun.request<any>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_addone1',{
+    return baseFun.request<any>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_addone1',{
         data:body,
         params:{productNo}
     })
@@ -191,7 +192,7 @@ export async function product_addone1(body:rwaCalcConfProductrulesModel[],produc
 
 //科目取数规则
 export async function product_addone2(body:rwaCalcConfProductrulesModel){
-    return baseFun.request<any>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/product_addone2',{
+    return baseFun.request<any>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/product_addone2',{
         data:body
        
     })
@@ -200,7 +201,7 @@ export async function product_addone2(body:rwaCalcConfProductrulesModel){
 
 //科目取数规则
 export async function select(productNo:String){
-    return baseFun.request<rwaCalcConfOffbalanceprotyperuleModel[]>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/select',{
+    return baseFun.request<rwaCalcConfOffbalanceprotyperuleModel[]>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/select',{
         params:{productNo}
     })
     ;
@@ -208,14 +209,24 @@ export async function select(productNo:String){
 
   /** 全部导出 */
   export async function exportExcelModel(fileName:string,body:any) {
-    baseFun.download('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/exportExcelModel.do?fileName='+fileName,body);
+    baseFun.download('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/exportExcelModel.do?fileName='+fileName,body);
  }
 
 
  //风险暴漏列表的查询
 export async function selectRiskList(productNo:String){
-    return baseFun.request<riskListModel[]>('/api/product/rwa/rwaCalcConfigDataparam/ProductListAction/selectRiskList',{
+    return baseFun.request<riskListModel[]>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/selectRiskList',{
        params:{productNo}
     })
     ;
-}
+}
+
+ //校验产品代码新增是是否存在
+ export async function jiaoyan(productNo:String){
+    return baseFun.request<number>('/api/product/rwa/rwacalcconfigdataparam/ProductListAction/jiaoyan',{
+       params:{productNo}
+    })
+    ;
+}
+
+

Procedure/frontend/projectb/src/services/rwa/result_list.ts

@@ -34,4 +34,9 @@ export async function result_list(body:any){
         data:body
     })
     ;
-}
+}
+
+  /** 全部导出 */
+  export async function exportExcelModel(fileName:string,body:any) {
+    baseFun.download('/api/product/rwa/resultList/ResultListAction/exportExcelModel.do?fileName='+fileName,body);
+ }