新添加的页面加入按钮控制

src/pages/secondaryDistribute/employeeInfoCheck/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-12 14:04:42
+ * @LastEditTime: 2023-05-26 11:03:15
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -630,8 +630,8 @@ const EmployeeInfoCheck: React.FC = () => {
                                         onMouseEnter={() => auditType == '0' ? commitStatus == '1'?set_ifShowTip(true):set_ifShowTip(false)  : set_ifShowTip(true)}
                                         onMouseLeave={() => set_ifShowTip(false)}
                                     >
-                                        <span key="2" onClick={commitStatus == '0' ? () => generateFunc() : () => { }}>生成</span>
-                                        <span key="3" onClick={commitStatus == '0' ? () => addPersonFunc() : () => { }}>添加</span>
+                                        <span key="2" onClick={commitStatus == '0'&&auditType != '1' ? () => generateFunc() : () => { }}>生成</span>
+                                        <span key="3" onClick={commitStatus == '0'&&auditType != '1' ? () => addPersonFunc() : () => { }}>添加</span>
                                     </div>
                                 </Popover>
                                 <div key="4" className={auditType == '1'?'commit disabled':'commit'} onClick={() => auditType == '0'?commitBtnhandle():()=>{}}>{commitStatus == '1' ? '取消提交' : '提交'}</div>

src/pages/secondaryDistribute/nonCheckProjectApprove/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-25 17:30:55
+ * @LastEditTime: 2023-05-26 11:12:26
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -143,10 +143,13 @@ const NonCheckProjectApprove: React.FC = () => {
 
 
 
-    const onSelect: TreeProps['onSelect'] = (selectedKeys, info) => {
+    const onSelect: TreeProps['onSelect'] = (selectedKeys, info:any) => {
         // console.log('selected', selectedKeys, info);
         const { node } = info;
-        set_currentSelectedTreeNode(node);
+        if(!node.child){
+            set_currentSelectedTreeNode(node);
+        }
+        
     };
 
 
@@ -608,8 +611,8 @@ const NonCheckProjectApprove: React.FC = () => {
                                         onMouseEnter={() => auditType == '0' ? commitStatus == '1' ? set_ifShowTip(true) : set_ifShowTip(false) : set_ifShowTip(true)}
                                         onMouseLeave={() => set_ifShowTip(false)}
                                     >
-                                        {/* <span key="2" onClick={commitStatus == '0' ? () => generateFunc() : () => { }}>获取</span> */}
-                                        <UpDataActBtn record type='ADD' />
+                                        {auditType == '1'&&commitStatus == '1'&&<span key="2" >添加</span>}
+                                        {commitStatus != '1'||auditType != '1'&&<UpDataActBtn record type='ADD' />}
                                     </div>
                                 </Popover>
                                 <div key="4" className={auditType == '1' ? 'commit disabled' : 'commit'} onClick={() => auditType == '0' ? commitBtnhandle() : () => { }}>{commitStatus == '1' ? '取消提交' : '提交'}</div>

src/pages/secondaryDistribute/secondaryDitriComputed/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-26 10:11:27
+ * @LastEditTime: 2023-05-26 11:19:35
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -116,11 +116,16 @@ const SecondaryDitriComputed: React.FC = () => {
 
     const onSelect: TreeProps['onSelect'] = (selectedKeys, info:any) => {
         // console.log('selected', selectedKeys, info);
-
-        const { node } = info;
-        if(!node.child){
-            set_currentSelectedTreeNode(node);
+        if(!ifEditMode){
+             //编辑时，需要先保存后切换
+             const { node } = info;
+             if(!node.child){
+                 set_currentSelectedTreeNode(node);
+             }
+        }else{
+            Modal.confirm({title:'提示',content:'当前存在编辑未保存，请先保存！'})
         }
+        
 
     };
 
@@ -438,6 +443,7 @@ const SecondaryDitriComputed: React.FC = () => {
 
             getTableData({});
         }
+
     }, [currentSelectedTreeNode, currentComputeDate]);
 
     //console.log({inputsRef,inputsRefKeys});
@@ -640,12 +646,12 @@ const SecondaryDitriComputed: React.FC = () => {
                                                     onMouseEnter={() => auditType == '0' ? commitStatus == '1' ? set_ifShowTip(true) : set_ifShowTip(false) : set_ifShowTip(true)}
                                                     onMouseLeave={() => set_ifShowTip(false)}
                                                 >
-                                                    {!ifEditMode && <span key="1" className='editBtn' onClick={commitStatus == '0' ? () => set_ifEditMode(true) : () => { }}>编辑</span>}
-                                                    {ifEditMode && <span key="2" className='editBtn' onClick={commitStatus == '0' ? () => saveHandle() : () => { }}>保存</span>}
-                                                    {ifEditMode && <span key="3" className='editBtn' onClick={commitStatus == '0' ? () => set_ifEditMode(false) : () => { }}>取消</span>}
+                                                    {!ifEditMode && <span key="1" className='editBtn' onClick={commitStatus == '0'&&auditType != '1' ? () => set_ifEditMode(true) : () => { }}>编辑</span>}
+                                                    {ifEditMode && <span key="2" className='editBtn' onClick={commitStatus == '0'&&auditType != '1' ? () => saveHandle() : () => { }}>保存</span>}
+                                                    {ifEditMode && <span key="3" className='cancel' onClick={commitStatus == '0' ? () => set_ifEditMode(false) : () => { }}>取消</span>}
                                                 </div>
                                             </Popover>
-                                            <div key="4" className={auditType == '1' ? 'commit disabled' : 'commit'} onClick={() => auditType == '0' ? commitBtnhandle() : () => { }}>{commitStatus == '1' ? '取消提交' : '提交'}</div>
+                                            {!ifEditMode&&<div key="4" className={auditType == '1' ? 'commit disabled' : 'commit'} onClick={() => auditType == '0' ? commitBtnhandle() : () => { }}>{commitStatus == '1' ? '取消提交' : '提交'}</div>}
                                         </>
                                     )
                                 }

src/pages/secondaryDistribute/secondaryDitriComputed/style.less

@@ -206,6 +206,11 @@
                                 color:white;
                                 background: #3377FF;
                             }
+                            &.cancel {
+                                color: #17181A;
+                                background: #FAFCFF;
+                                border: 1px solid #DAE2F2;
+                            }
 
                             &:last-child {
                                 margin-right: 0;