Merge remote-tracking branch 'origin/bug_fix'

张志伟
2 parents b000b1a3 1a951613
Showing 12 changed files with 135 additions and 65 deletions
src/pages/attendance/Attend/subpages/AttendanceGroup/api.ts
src/pages/attendance/Attend/subpages/AttendanceGroup/components/GroupModal.tsx
src/pages/attendance/Attend/subpages/AttendanceGroup/components/TimeModal.tsx
src/pages/attendance/Attend/subpages/AttendanceGroup/index.tsx
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
@@ -15,6 +15,8 @@ export interface Item {
   // timeList: timeList[];
   shops?: Shop[];
   posts?: Post[];
+  morningRatio?: number; // 早班比例
+  nightRatio?: number; // 晚班比例
 }
  
 export interface ClockInCycles {
 import React, { useEffect, useState } from 'react';
-import { Modal, Form, Select, message, Radio, Input, Spin } from 'antd';
+import type { RadioChangeEvent, SliderSingleProps } from 'antd';
+import { Modal, Form, Select, message, Radio, Input, Spin, Slider, Row, InputNumber } from 'antd';
 import GroupDetail from './GroupDetail/index';
 import * as API from '../api';
 import ShopSelectNew from '@/components/ShopSelectNew';
@@ -86,12 +87,26 @@ export default function GroupModal(props: Props) {
       width="60%"
     >
       <Spin spinning={confirmLoading}>
-        <Form form={form} onFinish={submit} labelCol={{ span: 6 }} wrapperCol={{ span: 20 }}>
+        <Form form={form} onFinish={submit} labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}>
           <Form.Item name="attendanceGroupName" label="考勤组名称" rules={[{ required: true, message: '请输入考勤组名称' }]}>
             <Input style={{ width: '100%' }} />
           </Form.Item>
  
-          <FormItem name="common" label="是否集团通用配置" rules={[{ required: true, message: '请选择集团通用配置' }]}>
+          <FormItem
+            name="common"
+            label="是否集团通用配置"
+            rules={[{ required: true, message: '请选择集团通用配置' }]}
+            getValueFromEvent={(e: RadioChangeEvent) => {
+              form.setFieldsValue({
+                shops: [],
+                posts: [],
+                clockInCycles: [],
+                morningRatio: undefined,
+                nightRatio: undefined,
+              });
+              return e.target.value;
+            }}
+          >
             <Radio.Group>
               <Radio value>是</Radio>
               <Radio value={false}>否</Radio>
@@ -109,17 +124,19 @@ export default function GroupModal(props: Props) {
                       label="班组类型"
                       rules={[{ required: true, message: '班组类型' }]}
                       getValueFromEvent={(name) => {
-                        form.setFieldValue(
-                          'clockInCycles',
-                          name === 1
-                            ? ([{ cycleType: 1, cycleName: '正常班次' }] as API.ClockInCycles[])
-                            : name === 2
-                            ? ([
-                                { cycleType: 2, cycleName: '早班' },
-                                { cycleType: 3, cycleName: '晚班' },
-                              ] as API.ClockInCycles[])
-                            : [],
-                        );
+                        form.setFieldsValue({
+                          clockInCycles:
+                            name === 1
+                              ? ([{ cycleType: 1, cycleName: '正常班次' }] as API.ClockInCycles[])
+                              : name === 2
+                              ? ([
+                                  { cycleType: 2, cycleName: '早班' },
+                                  { cycleType: 3, cycleName: '晚班' },
+                                ] as API.ClockInCycles[])
+                              : [],
+                          morningRatio: name == 2 ? 50 : undefined,
+                          nightRatio: name == 2 ? 50 : undefined,
+                        });
                         return name;
                       }}
                     >
@@ -134,6 +151,41 @@ export default function GroupModal(props: Props) {
                     <Form.Item name="posts" label="适用岗位" rules={[{ required: true, message: '请选择' }]}>
                       <PostSelectNew multiple labelInValue />
                     </Form.Item>
+                    <Form.Item noStyle shouldUpdate={(prev, cur) => prev.name !== cur.name}>
+                      {({ getFieldValue }) => {
+                        const name: number | undefined = getFieldValue('name');
+                        if (name == 2) {
+                          return (
+                            <>
+                              <Form.Item
+                                name="morningRatio"
+                                label="早班比例"
+                                rules={[{ required: true, message: '请配置' }]}
+                                getValueFromEvent={(ratio) => {
+                                  form.setFieldValue('nightRatio', 100 - ratio);
+                                  return ratio;
+                                }}
+                              >
+                                <SliderItem unit="%" min={0} max={100} marks={{ 0: '0%', 25: '25%', 50: '50%', 75: '75%', 100: '100%' }} />
+                              </Form.Item>
+                              <Form.Item
+                                name="nightRatio"
+                                label="晚班比例"
+                                rules={[{ required: true, message: '请配置' }]}
+                                getValueFromEvent={(ratio) => {
+                                  form.setFieldValue('morningRatio', 100 - ratio);
+                                  return ratio;
+                                }}
+                              >
+                                <SliderItem unit="%" reverse min={0} max={100} marks={{ 0: '0%', 25: '25%', 50: '50%', 75: '75%', 100: '100%' }} />
+                              </Form.Item>
+                            </>
+                          );
+                        } else {
+                          return null;
+                        }
+                      }}
+                    </Form.Item>
                   </>
                 );
               } else if (_common === true) {
@@ -198,3 +250,24 @@ export default function GroupModal(props: Props) {
     </Modal>
   );
 }
+
+interface SliderProps extends SliderSingleProps {
+  unit?: string;
+}
+
+function SliderItem(props: SliderProps) {
+  return (
+    <Row style={{ width: '100%', gap: 20 }}>
+      <Slider {...props} style={{ flex: 1 }} />
+      <InputNumber
+        style={{ width: 100 }}
+        min={props.min ?? 0}
+        max={props.max ?? 100}
+        step={props.step ?? 1}
+        addonAfter={props.unit}
+        value={props.value}
+        onChange={(v) => props.onChange?.(v ?? 0)}
+      />
+    </Row>
+  );
+}
 import React from 'react';
 import { Modal, Table } from 'antd';
-import type { ClockInCycles } from '@/pages/attendance/Attend/subpages/AttendanceGroup/api';
+import type { ClockInCycles, Item } from '@/pages/attendance/Attend/subpages/AttendanceGroup/api';
  
 const { Column } = Table;
 interface Props {
+  current: Item | undefined;
   timeModal: { visible: boolean; record?: ClockInCycles[] };
   onCancel: Function;
 }
  
-export default function TimeModal({ timeModal, onCancel }: Props) {
+export default function TimeModal({ current, timeModal, onCancel }: Props) {
   const { visible, record } = timeModal;
   return (
     <Modal title="打卡时间列表" open={visible} onCancel={() => onCancel()} onOk={() => onCancel()}>
       {record?.map((item, index) => (
         <div key={`${Date.now() + index}`} style={{ display: 'flex', flexDirection: 'column' }}>
-          <span style={{ marginTop: 20 }}>{item.cycleName ?? '打卡周期'}</span>
+          <span style={{ marginTop: 20 }}>
+            {item.cycleName ?? '打卡周期'}
+            {current?.name == 2 && item.cycleType == 2 ? <span style={{ fontSize: 12, color: '#666' }}>({current.morningRatio}%)</span> : null}
+            {current?.name == 2 && item.cycleType == 3 ? <span style={{ fontSize: 12, color: '#666' }}>({current.nightRatio}%)</span> : null}
+          </span>
           <Table dataSource={item.cycles || []} rowKey="clockBeginTime" pagination={false}>
             <Column title="打卡时间" dataIndex="clockBeginTime" key="clockBeginTime" />
             <Column title="待办通知类型" dataIndex="noticeTypeDesc" key="noticeTypeDesc" />
@@ -9,7 +9,7 @@ import ShopModal from &#39;@/pages/attendance/components/ShopModal&#39;;
 import TimeModal from './components/TimeModal';
 import useMenuElement from '@/hooks/useMenuElement';
 import TableArrayColumnFormat from '@/pages/ehr/components/TableArrayColumnFormat';
-import type { ClockInCycles } from './api';
+import type { ClockInCycles, Item } from './api';
  
 const Column = Table.Column;
 const defaultModal = {
@@ -23,7 +23,7 @@ const defaultModal = {
 const AttendanceGroup = () => {
   const { elements } = useMenuElement();
   const { list, loading, setLoading } = usePagination<API.Item>(API.fetchList, undefined);
-  const [current, setCurrent] = useState<any>();
+  const [current, setCurrent] = useState<Item>();
   const [visivle, setVisible] = useState(false);
   const [timeModal, setTimeModal] = useState<{
     visible: boolean;
@@ -93,17 +93,18 @@ const AttendanceGroup = () =&gt; {
               <Column
                 dataIndex="clockInCycles"
                 title="打卡时间列表"
-                render={(timeList: ClockInCycles[]) =>
+                render={(timeList: ClockInCycles[], record: Item) =>
                   timeList ? (
                     timeList.length ? (
                       <Button
                         type="link"
-                        onClick={() =>
+                        onClick={() => {
+                          setCurrent(record);
                           setTimeModal({
                             visible: true,
                             record: timeList,
-                          })
-                        }
+                          });
+                        }}
                       >
                         查看
                       </Button>
@@ -150,7 +151,14 @@ const AttendanceGroup = () =&gt; {
           </Card>
         </div>
         <ShopModal shopModal={shopModal} onCancel={() => setShopModal(defaultModal)} />
-        <TimeModal timeModal={timeModal} onCancel={() => setTimeModal({ visible: false, record: [] })} />
+        <TimeModal
+          timeModal={timeModal}
+          current={current}
+          onCancel={() => {
+            setTimeModal({ visible: false, record: [] });
+            setCurrent(undefined);
+          }}
+        />
       </Card>
       <GroupModal visible={visivle} setVisible={setVisible} current={current} setCurrent={setCurrent} setLoading={setLoading} />
     </PageHeaderWrapper>
@@ -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();