code4eat пре 2 година
родитељ
комит
aca85665b9

+ 4 - 3
src/pages/secondaryDistribute/employeeInfoCheck/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-12 10:06:07
+ * @LastEditTime: 2023-05-12 13:48:08
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
  */
@@ -392,7 +392,7 @@ const EmployeeInfoCheck: React.FC = () => {
             title: '注意',
             title: '注意',
             okText: '确定',
             okText: '确定',
             cancelText: '取消',
             cancelText: '取消',
-            content: '提交当前选择的核算单元的数据?',
+            content: `${commitStatus == '1'?'取消':'提交'}当前选择的核算单元的数据?`,
             onOk: async () => {
             onOk: async () => {
                 const resp = await commitRequest({
                 const resp = await commitRequest({
                     computeDate: currentComputeDate as string,
                     computeDate: currentComputeDate as string,
@@ -514,6 +514,7 @@ const EmployeeInfoCheck: React.FC = () => {
 
 
 
 
     useEffect(()=>{
     useEffect(()=>{
+          console.log({auditType});
           if(auditType == '1'){
           if(auditType == '1'){
                 //当审核中时,禁掉所有操作
                 //当审核中时,禁掉所有操作
                 set_commitStatus('1');
                 set_commitStatus('1');
@@ -621,7 +622,7 @@ const EmployeeInfoCheck: React.FC = () => {
 
 
                             <div className='btnGroupWrap'>
                             <div className='btnGroupWrap'>
                                 <Popover open={ifShowTip} content={auditType == '1'?'当前处于审核中,无法操作!':'当前处于提交中,无法操作!'} >
                                 <Popover open={ifShowTip} content={auditType == '1'?'当前处于审核中,无法操作!':'当前处于提交中,无法操作!'} >
-                                    <div className={commitStatus != '0' ? 'btnGroup disabled' : 'btnGroup'}
+                                    <div className={commitStatus != '0' || auditType == '1' ? 'btnGroup disabled' : 'btnGroup'}
                                         /**
                                         /**
                                          * 当审核中,三个操作按钮都不可点击
                                          * 当审核中,三个操作按钮都不可点击
                                          * 当非审核中,生成和添加不可操作
                                          * 当非审核中,生成和添加不可操作

+ 3 - 2
src/pages/setting/projectSetting/secondaryProjectDistribute/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-11 16:39:44
+ * @LastEditTime: 2023-05-12 13:32:53
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
  */
@@ -165,7 +165,8 @@ export default function BilingProjectMana() {
                     type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                     type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                 }
                 }
                 onFinish={(val) => {
                 onFinish={(val) => {
-                    return updateTable(type == 'EDIT' ? { ...record, ...val } : { ...val }, type);
+                    console.log({val});
+                    return updateTable(type == 'EDIT' ? { ...record, ...val,sql:val.source == 2?val.sql:'-' } : { ...val }, type);
                 }}
                 }}
                 modalProps={{ destroyOnClose: true }}
                 modalProps={{ destroyOnClose: true }}
                 colProps={{ span: 24 }}
                 colProps={{ span: 24 }}