Эх сурвалжийг харах

优化产品参数配置按钮展示

zhang_qk 6 сар өмнө
parent
commit
ad187bb795

+ 36 - 37
Procedure/frontend/projectb/src/pages/rwa_calc_config_dataparam/product_list.tsx

@@ -18,10 +18,10 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
     const [count,setCount] = useState<number>(0);
     const [count,setCount] = useState<number>(0);
     const [count1,setCount1] = useState<string>();
     const [count1,setCount1] = useState<string>();
     const formRef = useRef<FormInstance<any>>();
     const formRef = useRef<FormInstance<any>>();
-    const [editType, setEditType] = useState<EditType>('update');
-    const [editType1, setEditType1] = useState<EditType>('create');
+    const [editType, setEditType] = useState<EditType>('create');
+    const [editType1, setEditType1] = useState<EditType>('update');
     const [state,setState] = useState<String>();
     const [state,setState] = useState<String>();
-    const { fetchDict } = useModel('dict');
+    const { fetchDict } = useModel('dict');   
     const actionRef = useRef<ActionType>();
     const actionRef = useRef<ActionType>();
     const actionRef1 = useRef<ActionType>();
     const actionRef1 = useRef<ActionType>();
     const formRef1 = useRef<FormInstance<any>>();
     const formRef1 = useRef<FormInstance<any>>();
@@ -234,12 +234,10 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
              <SDOperate
              <SDOperate
              key="roleCfg"
              key="roleCfg"
              icon={<WomanOutlined />}
              icon={<WomanOutlined />}
-             successMessage=""
+             successMessage="删除成功"
              onClick={()=>{ 
              onClick={()=>{ 
              deldata(record);
              deldata(record);
               closeAndRefresh();
               closeAndRefresh();
-             //setVisible(true);
-            // setEditType('display')
               } }
               } }
            >
            >
              删除
              删除
@@ -249,9 +247,9 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
             icon={<WomanOutlined />}
             icon={<WomanOutlined />}
             successMessage=""
             successMessage=""
             onClick={()=>{ 
             onClick={()=>{ 
-            // disdata(record);
-             closeAndRefresh();
-            setVisible(true);
+              data1(record);
+              closeAndRefresh();
+             setVisible(true);
             setEditType('display')
             setEditType('display')
              } }
              } }
           >
           >
@@ -265,6 +263,7 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
            // disdata(record);
            // disdata(record);
             closeAndRefresh();
             closeAndRefresh();
            setVisible(true);
            setVisible(true);
+           setCurrentRow(record);
            setEditType('display')
            setEditType('display')
             } }
             } }
          >
          >
@@ -371,8 +370,9 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
             title: '操作',
             title: '操作',
             dataIndex: 'operate',
             dataIndex: 'operate',
             valueType: 'option',
             valueType: 'option',
+            width:130,
             render: (_, record) => [
             render: (_, record) => [
-        
+              <span style={editType.length==7 ?{display:'none'}:{}}>
               <SDOperate
               <SDOperate
                 key="roleCfg"
                 key="roleCfg"
                 icon={<WomanOutlined />}
                 icon={<WomanOutlined />}
@@ -386,7 +386,7 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
                  } }
                  } }
               >
               >
                 修改
                 修改
-              </SDOperate>,
+              </SDOperate>   
                <SDOperate
                <SDOperate
                key="roleCfg"
                key="roleCfg"
                icon={<WomanOutlined />}
                icon={<WomanOutlined />}
@@ -398,27 +398,30 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
                 } }
                 } }
              >
              >
                删除
                删除
-             </SDOperate>,
+             </SDOperate>
+             </span>
             ]}
             ]}
     ]
     ]
-    // let seq =0;
-    // const  getSequence =()=>{ seq++; return `${(seq++)}`.padStart(3, '0');}
-
-  
  
  
   function counter(counts:number) {
   function counter(counts:number) {
- console.log("-----")
       counts = counts+1;
       counts = counts+1;
       setCount(counts);
       setCount(counts);
       `${(counts)}`.padStart(3, '0');
       `${(counts)}`.padStart(3, '0');
     // count++; // 每次调用时自增
     // count++; // 每次调用时自增
       return counts;
       return counts;
-    
- 
   };
   };
 
 
 
 
-
+  const getButtons = ()=>{
+    const nodes: React.ReactNode[] = [];
+    if(editType =='display'){
+      nodes.push(<SDButton     successMessage="" onClick={()=>closeAndRefresh()} >关闭</SDButton>)
+    }else{
+      nodes.push(<SDSubmitButton  editType={editType}   formRef={formRef1} successMessage=""  doSubmit={inst} >保存</SDSubmitButton>)
+      nodes.push(<SDButton     successMessage="" onClick={()=>closeAndRefresh()} >关闭</SDButton>)
+    }
+    return nodes;
+  }
     
     
 
 
     return(
     return(
@@ -439,14 +442,10 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
       toolBarRender={(_, { selectedRows }) => [
       toolBarRender={(_, { selectedRows }) => [
         <SDButton
         <SDButton
           key="export"
           key="export"
-        //  successMessage='导出成功'
           onClick={ () => {
           onClick={ () => {
-          //  exportExcelModel("fcLoan",formDataList);
-            //baseFun.info('处理完成');m
             setVisible(true);
             setVisible(true);
             setEditType('create')
             setEditType('create')
             setState("1")
             setState("1")
-           // mockData.reverse;
           setMockData([]);
           setMockData([]);
           }}
           }}
         >
         >
@@ -467,14 +466,11 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
        />
        />
        {visible &&(
        {visible &&(
         <SDModalForm title={''} visible={visible} editType={editType} onVisibleChange={() => {  setVisible(false);  }} 
         <SDModalForm title={''} visible={visible} editType={editType} onVisibleChange={() => {  setVisible(false);  }} 
-    footer={[<SDSubmitButton  editType={editType}   formRef={formRef1} successMessage=""  doSubmit={inst} >保存</SDSubmitButton>,
-  <SDButton     successMessage="" onClick={()=>closeAndRefresh()} >关闭</SDButton>]}>
-    <SDForm editType={editType} formRef={formRef1}          
-   onValuesChange={(changedValues,Values)=>{ 
-    const aa = Values.productNo;
-    console.log(aa);
-    setState1(Values.productNo)
-   }} 
+    // footer={<span style={editType =='display'?{display:'none'}:{}}>[<SDSubmitButton  editType={editType}   formRef={formRef1} successMessage=""  doSubmit={inst} >保存</SDSubmitButton>,
+    // <SDButton     successMessage="" onClick={()=>closeAndRefresh()} >关闭</SDButton>]</span>}
+    footer={[editType == setEditType?[]:getButtons()]}
+    formRef={formRef1} 
+    onValuesChange={(changedValues,Values)=>{setState1(Values.productNo)}}
     >
     >
         <span style={{display:'none'}}>
         <span style={{display:'none'}}>
     <SDFormText name="calcindex"   label="计算实例号"  />
     <SDFormText name="calcindex"   label="计算实例号"  />
@@ -492,7 +488,7 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
     <SDFormText name="defaultOut"   label="默认输出数据源"  />
     <SDFormText name="defaultOut"   label="默认输出数据源"  />
     <SDFormText name="productBussinessCode"   label="所属业务"  />
     <SDFormText name="productBussinessCode"   label="所属业务"  />
     <SDFormText name="defaultGetdatarule"   label="默认取数逻辑"  />
     <SDFormText name="defaultGetdatarule"   label="默认取数逻辑"  />
-    </SDForm>
+
       <SDAreaTtile title='科目取数规则列表' />
       <SDAreaTtile title='科目取数规则列表' />
       <SDLayout>
       <SDLayout>
         <ProTable
         <ProTable
@@ -514,9 +510,9 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
             })
             })
             }
             }
             columns={columns1}
             columns={columns1}
-            
             toolBarRender={(_, { selectedRowKeys }) => {
             toolBarRender={(_, { selectedRowKeys }) => {
-                    return[  <SDButton
+                    return[ 
+                    <span style={editType=='display'?{display:'none'}:{}}>   <SDButton
                     key="create"
                     key="create"
                     successMessage=''
                     successMessage=''
                     icon={<WomanOutlined />}
                     icon={<WomanOutlined />}
@@ -525,13 +521,14 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
                       setEditType1('create');
                       setEditType1('create');
                       setCount1("PROD"+state1+counter(count) ) 
                       setCount1("PROD"+state1+counter(count) ) 
                       formRef2.current?.setFieldValue("ruleCode",count1)
                       formRef2.current?.setFieldValue("ruleCode",count1)
-                      //console.log(formRef1.current?.setFieldsValue(productNo));
                     }}
                     }}
                     >
                     >
                       新增
                       新增
                     </SDButton>,  
                     </SDButton>,  
+                    </span>
                ] 
                ] 
-            } }
+            }
+           }
         />
         />
       </SDLayout>
       </SDLayout>
       {visible1 &&(
       {visible1 &&(
@@ -576,3 +573,5 @@ const product_list: React.FC<aaa>= (prop : aaa) => {
 export default product_list;
 export default product_list;
 
 
 
 
+
+

+ 3 - 4
Procedure/frontend/projectb/src/pages/rwa_data_check/diffconfig_list.tsx

@@ -360,10 +360,9 @@ const diffconfig_list: React.FC<aaa>= (prop : aaa) => {
             formDataList1=[...sd];
             formDataList1=[...sd];
             setMockData(sd);
             setMockData(sd);
             return {data:sd}
             return {data:sd}
-           
-           } else {
-            return setMockData([]);
-           }
+         } else {
+          return setMockData([]);
+         }
          
          
       }}
       }}
       columns={columns1}
       columns={columns1}