🐹 feat(*): 绩效bug修复

张志伟
1 parent cdb1e168
Showing 8 changed files with 23 additions and 41 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/components/LadderParams.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/AddIndicatorsModal.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/AddKpiGroups.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/CommissionParams.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/IndivatorsTable.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/KpiGroups.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/LadderParams.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/index.tsx
@@ -34,8 +34,9 @@ const LadderParams = ({ postId, shopIds, value, onChange, setItemId, isHundred, 
   }, []);
   useEffect(() => {
     if (indicatorsList && indicatorsList.length > 0) {
-      const res = indicatorsList.filter((item) => !selectedIndicatorsLadder.find((y) => y === item.code));
-      setNewIndicators([...res]);
+      // fixme  这里有问题，限制在整个排名组了。实际上只能在单个组里。暂时不做限制，需要调整
+      // const res = indicatorsList.filter((item) => !selectedIndicatorsLadder.find((y) => y === item.code));
+      setNewIndicators([...indicatorsList]);
     }
   }, [indicatorsList]);
   //  编辑
-/* eslint-disable no-return-assign */
-/* eslint-disable no-return-assign */
 import React, { useEffect, useState } from 'react';
 import { Modal, Form, Select, InputNumber, message, Spin, Radio, Input, Button } from 'antd';
-import { saveRewardsListApi } from '../RewardsList/api';
 import { useStore } from '../index';
-import { queryPostIndicatorApi } from '../api';
 import _ from 'lodash';
-import useInitail from '@/hooks/useInitail';
 import LadderTable from './LadderTable';
 import CommissionParams from '@/pages/performance/KpiGroupSetting/EditComfirm/components/CommissionParams';
 import LadderParams from '@/pages/performance/KpiGroupSetting/EditComfirm/components/LadderParams';
 import Conds from '@/pages/performance/KpiGroupSetting/EditComfirm/components/Conds';
-import { KpiGroupSetteing } from '@/pages/performance/KpiGroupSetting/interface';
+import type { KpiGroupSetteing } from '@/pages/performance/KpiGroupSetting/interface';
  
 const Option = Select.Option;
 interface Props {
   visible: boolean;
-  onCancel: Function;
+  onCancel: () => void;
   postId?: number;
   shopIds?: string;
   onOk: (vales: any) => void;
@@ -66,7 +61,6 @@ export default function AddIndicatorsModal(props: Props) {
   // }, [indicatorsList]);
   // 校验表单数据
   function transformDTO(formData: any) {
-    console.log('InformData', formData);
     const detail = {};
     _.each(formData, (value: any, key: string) => {
       switch (key) {
@@ -122,7 +116,6 @@ export default function AddIndicatorsModal(props: Props) {
         Object.assign(item, { sort: index + 1 });
       });
     }
-    console.log('cond', pa?.conds);
  
     // 校验标准分不能大于绩效分值
     const indicatorValue = pa.baseScore;
@@ -142,18 +135,9 @@ export default function AddIndicatorsModal(props: Props) {
       }
     }
  
-    const newItemId = pa.id;
-    // 编辑时，不需要push id
-    // if (currentItem.id) {
-    //   const tmpIds = [...selectedIndicators];
-    //   tmpIds.push(newItemId);
-    //   setSelectedIndicators([...tmpIds]);
-    //   setSelectedIndicatorsConds([...tmpIds]);
-    // }
     if (hundred === 100) {
       setIsHundred(false);
       onOk(pa);
-      console.log(pa);
       onCancel && onCancel();
     } else {
       setIsHundred(true);
@@ -178,7 +162,7 @@ export default function AddIndicatorsModal(props: Props) {
   return (
     <Modal
       title={`${currentItem.name ? '编辑' : '新增'}指标`}
-      visible={visible}
+      open={visible}
       maskClosable={false}
       afterClose={() => {
         form.resetFields();
@@ -2,10 +2,11 @@ import React, { useEffect, useState, useRef } from &quot;react&quot;;
 import { Modal, Form, Select, message, Radio, Input } from "antd";
 import { useStore } from "../index";
 import _ from "lodash";
-import { KpiGroupSetteing } from "@/pages/performance/KpiGroupSetting/interface";
-import ShopSelectNew, { ShopSelectNewRef } from "@/components/ShopSelectNew";
+import type { KpiGroupSetteing } from "@/pages/performance/KpiGroupSetting/interface";
+import type { ShopSelectNewRef } from "@/components/ShopSelectNew";
+import ShopSelectNew from "@/components/ShopSelectNew";
 import { transformDTO, transformFormData } from "../../entity";
-import { ShopList } from "../api";
+import type { ShopList } from "../api";
 import * as api from "../api";
 import IndivatorsTable from './IndivatorsTable';
 import PersonModal from "../../components/PersonModal";
@@ -15,7 +16,7 @@ import useInitail from &#39;@/hooks/useInitail&#39;;
 const Option = Select.Option;
 interface Props {
   visible: boolean;
-  onCancel: Function;
+  onCancel: () => void;
   onOk: (vales: any) => void;
   kpiGroupsItem: KpiGroupSetteing.KpiGroupDetail;
 }
@@ -55,8 +55,9 @@ const CommissionParams = ({ postId, shopIds, value, onChange, setItemId, isHundr
   }, [value]);
   useEffect(() => {
     if (indicatorsList && indicatorsList.length > 0) {
-      const res = indicatorsList.filter((item) => !selectedIndicators.find((y) => y === item.indicatorCode));
-      setNewIndicators([...res]);
+      // fixme  这里有问题，限制在整个排名组了。实际上只能在单个组里。暂时不做限制，需要调整
+      // const res = indicatorsList.filter((item) => !selectedIndicators.find((y) => y === item.indicatorCode));
+      setNewIndicators([...indicatorsList]);
     }
   }, [indicatorsList]);
   // console.log('selectedIndicators', selectedIndicators);
 import React, { useState, useEffect } from 'react';
 import { Table, Typography, Button, message, Card, Divider, Space } from 'antd';
-import Column from 'antd/lib/table/Column';
 import AddIndicatorsModal from './AddIndicatorsModal';
-import { KpiGroupSetteing } from '@/pages/performance/KpiGroupSetting/interface';
+import type { KpiGroupSetteing } from '@/pages/performance/KpiGroupSetting/interface';
 import LadderTable from '@/pages/performance/KpiGroupSetting/EditComfirm/components/LadderTable';
 import { useStore } from '../index';
 import TargetModal from './TargetModal';
  
 interface Props {
   value?: any[];
-  onChange?: Function;
+  onChange?: () => void;
   postId?: number;
   personModal: KpiGroupSetteing.Person;
 }
 import React, { useState, useEffect } from 'react';
 import { Table, Typography, Button, Card, Divider, Space } from 'antd';
-import { KpiGroupSetteing } from '@/pages/performance/KpiGroupSetting/interface';
+import type { KpiGroupSetteing } from '@/pages/performance/KpiGroupSetting/interface';
 import { useStore } from '../index';
 import EmployeesModal from '../../components/EmployeesModal';
 import ShopModal from '../../components/ShopModal';
@@ -8,11 +8,10 @@ import AddKpiGroups from &#39;./AddKpiGroups&#39;;
  
 interface Props {
   value?: any[];
-  onChange?: Function;
+  onChange?: () => void;
 }
  
 type Item = KpiGroupSetteing.KpiGroupDetail;
-type CommissionParams = KpiGroupSetteing.CommissionParams;
 const IndivatorsTable = ({ value, onChange }: Props) => {
   const { readOnly, setSelectedIndicators } = useStore();
   const [tableData, setTableData] = useState<Item[]>(value || []);
@@ -57,7 +56,6 @@ const IndivatorsTable = ({ value, onChange }: Props) =&gt; {
   };
   //复制
   const onCopy = (record: Item, index: number) => {
-    console.log('kpirecord', record);
     tableData.push({ ...record, index: tableData.length });
     onChange && onChange(tableData);
   };
@@ -65,7 +63,6 @@ const IndivatorsTable = ({ value, onChange }: Props) =&gt; {
   const onEdit = (record: Item, index: number) => {
     setVisible(true);
     setKpiGroupsItem({ ...record, index });
-    console.log({ ...record, index });
   };
   // 删除
   const _onDelete = (record: Item, index: number) => {
@@ -52,8 +52,9 @@ const LadderParams = ({ postId, shopIds, value, onChange, setItemId, isHundred }
   }, [value]);
   useEffect(() => {
     if (indicatorsList && indicatorsList.length > 0) {
-      const res = indicatorsList.filter((item) => !selectedIndicatorsLadder.find((y) => y === item.indicatorCode));
-      setNewIndicators([...res]);
+      // fixme  这里有问题，限制在整个排名组了。实际上只能在单个组里。暂时不做限制，需要调整
+      // const res = indicatorsList.filter((item) => !selectedIndicatorsLadder.find((y) => y === item.indicatorCode));
+      setNewIndicators([...indicatorsList]);
     }
   }, [indicatorsList]);
   const onCancel = () => {
 import React, { useEffect, useState, useMemo } from 'react';
 import { Card, Popconfirm, Row, Button, message, Result, Form, Radio, Input, Select } from 'antd';
 import { FeeweeFileAccept, FeeweeFileChange } from '@/utils/getFidFile';
-import type { common } from '@/typing/common';
 import { PlusOutlined } from '@ant-design/icons';
 import { IMGURL } from '@/utils';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
@@ -16,15 +15,14 @@ import moment from &#39;moment&#39;;
 import KpiGroups from './components/KpiGroups';
 import PreviewRrport from './components/PreviewReport';
 import _ from 'lodash';
-import useInitial from '@/hooks/useInitail';
-import { fetchRealtimeStaffs } from '../api';
+import type { ConnectProps } from '@/typing/common';
  
 const Option = Select.Option;
  
 // 星级数据：
 export const { Provider, useStore } = createStore(store);
  
-type Props = common.ConnectProps;
+type Props = ConnectProps;
 function Index(props: Props) {
   const { detailError, configId, setId, data, readOnly, setReadOnly, setSubmit, loading, kpiGroups, setKpiGroups } = useStore();
   const [form] = Form.useForm();