修复bug

src/pages/budgetMana/monthlyDataCheck/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-03-30 17:55:14
+ * @LastEditTime: 2023-03-31 12:41:30
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -520,7 +520,7 @@ const MonthlyDataCheck: React.FC = () => {
             if (type == '4') {
                 if (currentSelectedManaGroup) {
 
-                    const resp = await getManaIndexTableData({ ...params, computeDate: currentComputeDate, groupId: currentSelectedManaGroup.groupCode });
+                    const resp = await getManaIndexTableData({ ...params, computeDate: currentComputeDate, groupId: currentSelectedManaGroup.id });
                     if (resp) {
                         const columns = resp.title.map((item: any) => (item.children ? {
                             title: () => {
@@ -1037,9 +1037,10 @@ const MonthlyDataCheck: React.FC = () => {
 
 
     useEffect(() => {
+        console.log({currentSelectedManaGroup});
         set_tableDataFilterParams({
             ...tableDataFilterParams,
-            groupId: currentSelectedManaGroup?.groupCode,
+            id: currentSelectedManaGroup?.id,
         });
     }, [currentSelectedManaGroup]);
 

src/pages/setting/manaPerformanceSet/classAssessAndGradeSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-30 18:05:29
+ * @LastEditTime: 2023-03-31 12:32:11
  * @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
  */
@@ -29,6 +29,7 @@ export default function ClassAssessAndGradeSet() {
 
     const [tableDataFilterParams, set_tableDataFilterParams] = useState<any | undefined>();
     const [tableColumn, set_tableColumn] = useState<ProColumns[] | any[]>([]);
+    const [respColumns,set_respColumns ] = useState([]);
 
     const tableRef = useRef<ActionType>();
 
@@ -63,6 +64,7 @@ export default function ClassAssessAndGradeSet() {
                     }
                 }
             });
+            set_respColumns(columns);
             set_tableColumn([{
                 title: '职类',
                 dataIndex: 'unitTypeName',
@@ -108,21 +110,20 @@ export default function ClassAssessAndGradeSet() {
 
 
     const updateTable = async (formVal: any, type: 'EDIT' | "ADD") => {
-
+        
         let result = {
             unitTypeCode:formVal.unitTypeCode,
             unitTypeName:formVal.unitTypeName,
-            value:formVal.value.map((a:any)=>{
+            value:formVal.record.columns.map((a:any)=>{
+                  
                   return ({
-                    code:a.code,
-                    floor:formVal[`floor${a.code}`],
-                    rate:formVal[`rate${a.code}`],
-                    ceiling:formVal[`ceiling${a.code}`],
+                    code:a.key,
+                    floor:formVal[`floor${a.key}`],
+                    rate:formVal[`rate${a.key}`],
+                    ceiling:formVal[`ceiling${a.key}`],
                   })
             })
         }
-
-        //console.log({formVal,result});
         
         if (type == 'EDIT') {
             const resp = await editData(result);
@@ -136,6 +137,31 @@ export default function ClassAssessAndGradeSet() {
     }
 
     const UpDataActBtn = ({ record, type }: { record: any, type: 'EDIT' | 'ADD' }) => {
+
+        const [formData,set_formData] = useState([]);
+
+        useEffect(()=>{
+             if(record.columns.length != record.value.length){
+                const valueCodes = record.value.map((a:any)=>a.key);
+                const newData = record.columns.map((b:any)=>{
+                       if(!valueCodes.includes(b.key)){
+                            return {
+                                code:b.key,
+                                floor:'',
+                                range:'',
+                                rate:''
+                            }
+                       }
+                       const temp = record.value.filter((c:any)=>c.code == b.key);
+                       return temp[0]
+                });
+
+                set_formData(newData);
+
+             }else{
+                set_formData(record.value);
+             } 
+        },[record])
     
         return (
             <ModalForm
@@ -147,14 +173,14 @@ export default function ClassAssessAndGradeSet() {
                     type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                 }
                 onFinish={(val) => {
-                   
-                    return updateTable(type == 'EDIT' ? {unitTypeCode:record.unitTypeCode,unitTypeName:record.unitTypeName,value:record.value, ...val } : { ...val }, type);
+                    // console.log({val});
+                    return updateTable(type == 'EDIT' ? {unitTypeCode:record.unitTypeCode,unitTypeName:record.unitTypeName,value:record.value, ...val,record} : { ...val }, type);
                 }}
 
             >
                 <div className='tip'>区间的上限及下限至少填写一个，没填表示无</div>
                 {
-                    record.value.map((item: any, index: number) => {
+                    formData.map((item: any, index: number) => {
 
                         let label = record.columns.filter((a:any) => a.key == item.code);
 
@@ -168,6 +194,7 @@ export default function ClassAssessAndGradeSet() {
                                 </div>
                             </div>
                         )
+                     
                     })
                 }
             </ModalForm>

src/pages/setting/manaPerformanceSet/manaIndicItemSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-30 16:55:35
+ * @LastEditTime: 2023-03-31 12:15:11
  * @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
  */
@@ -121,7 +121,7 @@ export default function manaIndicItemSet() {
             }
         }
         if (type == 'EDIT') {
-            const resp = await editData({ ...formVal });
+            const resp = await editData({ ...formVal});
             if (resp) {
                 tableRef.current?.reload();
                 message.success('操作成功！');
@@ -142,7 +142,7 @@ export default function manaIndicItemSet() {
                     type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                 }
                 onFinish={(val) => {
-                    return updateTable(type == 'EDIT' ? { ...record, ...val } : { ...val }, type);
+                    return updateTable(type == 'EDIT' ? { ...record, ...val,sql:val.sql?val.sql:'' } : { ...val }, type);
                 }}
                 colProps={{ span: 24 }}
                 grid