Merge branch 'master' into contract

谢忠泽
2 parents 3e215a90 18552cea
Showing 11 changed files with 53 additions and 22 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddEvaGroupModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddStaffRewardsModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/IndivatorsTable.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/PersonModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/PreviewReport.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RewardsTableSal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RewardsTableSalShop.tsx
src/pages/performance/EvaSetting/components/EditModal.tsx
src/pages/performance/EvaSetting/components/Filter.tsx
src/pages/performance/KpiSetting/components/EditModal.tsx
@@ -268,7 +268,7 @@ export default function AddIndicatorsModal(props: Props) {
               <Form.Item
                 name="staffRewardDims"
                 label="人员考评奖惩"
-                rules={[{ required: !(shopRewardDims) }]}
+                rules={[{ required: !shopRewardDims || (shopRewardDims && shopRewardDims?.length == 0) }]}
               >
                 <StaffRewardDims postId={postId} personModal={personModal} scopeType={scopeType} shopIds={shopIds} />
               </Form.Item>
@@ -285,7 +285,7 @@ export default function AddIndicatorsModal(props: Props) {
               <Form.Item
                 name="shopRewardDims"
                 label="门店考评奖惩"
-                rules={[{ required: !(staffRewardDims) }]}
+                rules={[{ required: !staffRewardDims || (staffRewardDims && staffRewardDims?.length == 0) }]}
               >
                 <ShopRewardDims personModal={personModal} scopeType={scopeType} shopIds={shopIds} />
               </Form.Item>
@@ -43,6 +43,12 @@ export default function CreateModal(props: Props) {
   useEffect(() => {
     if (visible && currentItem.index !== undefined) {
       setPostListId(currentItem.postIds);
+      setPersonModal({
+        ...personModal,
+        postIds: currentItem.postIds.join(","),
+        shopIds,
+        visible: false,
+      });
       const res = transformFormDataReward(currentItem);
       form.setFieldsValue({
         ...res,
@@ -120,6 +126,16 @@ export default function CreateModal(props: Props) {
         <div style={{ marginBottom: 20 }}>
           <a onClick={() => personView()}>{`人员查看 >`}</a>
         </div>
+        {/* <Form.Item
+          noStyle
+          shouldUpdate={(prevValues, currentValues) => prevValues.post !== currentValues.post}
+        >
+          {({ getFieldValue }) => {
+            const post = getFieldValue("post");
+            console.log('post', post);
+            return null;
+          }}
+        </Form.Item> */}
         <Form.Item name="rewards" label="考评奖惩">
           <RewardsTableSal scopeType={scopeType} shopIds={shopIds} rewardLength={rewardLength} />
         </Form.Item>
@@ -42,10 +42,6 @@ const IndivatorsTable = ({ value, onChange, personModal, scopeType }: Props) =&gt; 
   const [ladderList, setladderList] = useState<EvaGroupSetteing.Ladders[]>([]);
   // 添加指标
   const addIndicators = () => {
-    if (!shopIds) {
-      message.error("请先选择门店");
-      return;
-    }
     setVisible(true);
     // setSelectedIndicators([]);
     setSelectedIndicatorsConds([]);
@@ -48,6 +48,7 @@ export default function PersonModal({ item, setPersonModal }: Props) {
       setParams({ postIds, shopIds }, true);
       setDelay(false);
     }
+    console.log(111, postIds, shopIds);
   }, [visible]);
  
   return (
@@ -39,6 +39,7 @@ const TargetModal = ({ reportVisible, stages, setReportVisible }: Props) =&gt; {
   const [comList, setComList] = useState<any[]>([]);
   const [allIndicator, setAllIndicator] = useState<any[]>([]);
   const [delay, setDelay] = useState(true);
+  const [maybePostIds, setMaybePostIds] = useState<any[]>([]);
   const { data, setParams, loading } = useInitial(fetchRealtimeStaffs, [], { postIds: "", shopIds: "" }, delay);
   useEffect(() => {
     if (reportVisible && stages && stages.length > 0) {
@@ -46,12 +47,23 @@ const TargetModal = ({ reportVisible, stages, setReportVisible }: Props) =&gt; {
         return item.evalGroups.map((i: any) => i.shopIds);
       });
       const newShopIdsArr = [...new Set(shopIdsArr.flat(2))];
+      console.log("shopIdsArr", newShopIdsArr);
       const postIdsArr = stages.map((i1: any) => {
-        return i1.evalGroups.map((i2: any) => i2.rewards.map((i3: any) => i3.postIds));
+        return i1.evalGroups.map((i2: any) => {
+          if (i2?.staffRewardDims && i2?.staffRewardDims?.length > 0) {
+            return i2?.staffRewardDims.map((i3: any) => i3.postIds);
+          } else {
+            return [];
+          }
+        });
       });
       const newPostIdsArr = [...new Set(postIdsArr.flat(3))];
-      setParams({ postIds: newPostIdsArr.join(","), shopIds: newShopIdsArr.join(",") }, true);
-      setDelay(false);
+      console.log(newPostIdsArr);
+      setMaybePostIds(newPostIdsArr);
+      if (newPostIdsArr.length > 0) {
+        setParams({ postIds: newPostIdsArr.join(","), shopIds: newShopIdsArr.join(",") }, true);
+        setDelay(false);
+      }
       // const arr = kpiGroups.map((item) => {
       //   return item.indicators;
       // });
@@ -147,8 +159,8 @@ const TargetModal = ({ reportVisible, stages, setReportVisible }: Props) =&gt; {
         <Table
           bordered
           dataSource={data}
-          columns={realList}
-          loading={loading}
+          columns={columns}
+          loading={maybePostIds.length > 0 ? loading : false}
           scroll={{ x: true, y: 500 }}
           pagination={false}
         />
@@ -421,7 +421,7 @@ const TotalAmount = ({
       {type === 2 ? (
         <Modal
           title="查看指标"
-          visible={visible}
+          open={visible}
           maskClosable={false}
           footer={null}
           width={700}
@@ -27,6 +27,9 @@ const IndivatorsTable = ({ value, onChange, scopeType, shopIds, rewardLength }: 
     setCommissionParamAlias,
     setLadderParamAlias,
     setPreconditionAliasSal,
+    setCommissionParamAliasShop,
+    setLadderParamAliasShop,
+    setPreconditionAliasSalShop,
   } = useStore();
   const [tableData, setTableData] = useState<Item[]>(value || []);
   const [visible, setVisible] = useState(false);
@@ -56,6 +59,9 @@ const IndivatorsTable = ({ value, onChange, scopeType, shopIds, rewardLength }: 
     setCommissionParamAlias("");
     setLadderParamAlias("");
     setPreconditionAliasSal("");
+    // setCommissionParamAliasShop("");
+    // setLadderParamAliasShop("");
+    // setPreconditionAliasSalShop("");
   };
   const onCancel = () => {
     setVisible(false);
@@ -188,7 +194,7 @@ const IndivatorsTable = ({ value, onChange, scopeType, shopIds, rewardLength }: 
         extra={
           <div style={{ display: "flex", justifyContent: "flex-end" }}>
             <Button type="link" onClick={() => addIndicators()} disabled={readOnly || rewardLength > 1}>
-              + 添加指标名称
+              + 添加考评奖惩
             </Button>
           </div>
         }
 import React, { useState, useEffect } from "react";
 import { Table, Typography, Button, message, Card, Divider, Space } from "antd";
-import AddRewardsModal from "./AddRewardsModal";
+import AddRewardsModalShop from "./AddRewardsModalShop";
 import { useStore } from "../index";
 import { OptionalMethod_Enum } from "../../entity";
 import TargetModal from "./TargetModal";
@@ -186,14 +186,14 @@ const IndivatorsTable = ({ value, onChange, scopeType, shopIds, rewardLength }: 
         extra={
           <div style={{ display: "flex", justifyContent: "flex-end" }}>
             <Button type="link" onClick={() => addIndicators()} disabled={readOnly || rewardLength > 1}>
-              + 添加指标名称
+              + 添加考评奖惩
             </Button>
           </div>
         }
       >
         <Table bordered dataSource={value || []} rowKey={(record: Item) => String(record.id)} columns={getColumns()} />
       </Card>
-      <AddRewardsModal
+      <AddRewardsModalShop
         visible={visible}
         currentItem={currentItem}
         onCancel={onCancel}
@@ -102,7 +102,7 @@ export default function EditModal({ onClose, setItem, item, roleList }: Props) {
   return (
     <Modal
       width={960}
-      title={`${currentItem.code ? "编辑" : "新增"}考评指标`}
+      title={`${currentItem.code ? "编辑" : "新增"}自定义指标`}
       open={visible}
       onOk={form.submit}
       onCancel={() => onClose?.(false)}
@@ -24,12 +24,12 @@ export default function Filter({ setParams, roleList }: Props) {
     { value: 1, label: "启用" },
   ];
   const comAble = [
-    { value: 0, label: "是" },
-    { value: 1, label: "否" },
+    { value: 1, label: "是" },
+    { value: 0, label: "否" },
   ];
   const targetType = [
-    { value: 0, label: "无" },
-    { value: 1, label: "是" },
+    { value: true, label: "是" },
+    { value: false, label: "无" },
   ];
  
   return (
@@ -55,7 +55,7 @@ export default function EditModal({ onClose, setItem, item, roleList }: Props) {
  
   return (
     <Modal
-      title={`${currentItem.id ? "编辑" : "新增"}绩效指标`}
+      title={`${currentItem.id ? "编辑" : "新增"}系统指标`}
       visible={visible}
       onOk={form.submit}
       onCancel={() => onClose?.(false)}