考评bugfix

曾柯
1 parent 2683f431
Showing 4 changed files with 61 additions and 15 deletions
src/pages/performance/EvaDataImport/components/Filter.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModalSal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
src/pages/performance/EvaGroupSetting/interface.d.ts
@@ -35,6 +35,8 @@ export default function Filter({ setParams }: Props) {
     console.log("Selected Time: ", value);
     if (value) {
       setParams({ startTime: moment(value[0]).unix() * 1000, endTime: moment(value[1]).unix() * 1000 }, true);
+      console.log(moment(value[0]).unix() * 1000);
+      console.log(moment(value[1]).unix() * 1000);
     }
   };
  
@@ -72,7 +74,12 @@ export default function Filter({ setParams }: Props) {
           </Option>
         ))}
       </Select>
-      <RangePicker onChange={onChange} style={{ height: 32 }} />
+      <RangePicker
+        showTime={{ format: "HH:mm:ss" }}
+        format="YYYY-MM-DD HH:mm:ss"
+        onChange={onChange}
+        style={{ height: 32 }}
+      />
     </Row>
   );
 }
@@ -181,13 +181,6 @@ export default function AddCondModal(props: Props) {
               ))}
             </Select>
           </Form.Item>
-          <Form.Item name="condValue" label="条件值" rules={[{ required: true, message: "请输入条件值" }]}>
-            <InputNumber
-              placeholder="请输入条件值"
-              style={{ width: "100%" }}
-              addonAfter={dataType === 1 ? "台" : dataType === 3 ? "元" : "%"}
-            />
-          </Form.Item>
           <Form.Item
             label="前置条件值类型"
             name="condType"
@@ -198,6 +191,43 @@ export default function AddCondModal(props: Props) {
               <Radio value={2}>满足排名率</Radio>
             </Radio.Group>
           </Form.Item>
+          <Form.Item
+            noStyle
+            shouldUpdate={(prevValues, currentValues) => prevValues.condType !== currentValues.condType}
+          >
+            {({ getFieldValue }) => {
+              const condType = getFieldValue("condType");
+              return (
+                <Form.Item name="condValue" label="条件值" rules={[{ required: true, message: "请输入条件值" }]}>
+                  <InputNumber
+                    placeholder="请输入条件值"
+                    style={{ width: "100%" }}
+                    addonAfter={
+                      !comItem.code
+                        ? isTarget
+                          ? "%"
+                          : condType == 2
+                          ? "%"
+                          : dataType == 1
+                          ? "台"
+                          : dataType == 3
+                          ? "元"
+                          : "%"
+                        : comItem.targetValue
+                        ? "%"
+                        : comItem.condType == 2
+                        ? "%"
+                        : comItem.dataType == 1
+                        ? "台"
+                        : comItem.dataType == 3
+                        ? "元"
+                        : "%"
+                    }
+                  />
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           {(targetType === TargetTypeEnum["百分比"] ||
             targetType === TargetTypeEnum["金额"] ||
             targetType === TargetTypeEnum["数量"]) && (
@@ -60,7 +60,8 @@ const TotalAmount = ({
     if (dataIndex == "upper" && isPercent == 2) {
       precision = 2;
     }
-    const inputNode = inputType === "number" ? <InputNumber precision={precision} max={isPercent == 2 ? 100 : 100000} /> : <Input />;
+    const inputNode =
+      inputType === "number" ? <InputNumber precision={precision} max={isPercent == 2 ? 100 : 100000} /> : <Input />;
  
     return (
       <td {...restProps}>
@@ -113,7 +114,11 @@ const TotalAmount = ({
     }
     const newObj: { lower?: number; key?: number } = {};
     const lastData = preTableData[preTableData.length - 1];
-    newObj.lower = lastData.upper;
+    if (rankType == 2) {
+      newObj.lower = lastData.upper;
+    } else if (rankType == 1) {
+      newObj.lower = lastData.upper + 1;
+    }
     newObj.key = Number(lastData.key) + 1;
  
     const pa = {
@@ -132,11 +137,15 @@ const TotalAmount = ({
  
     for (let i = 0; i < _tempData.length; i++) {
       const item = res[i];
-      if (item.upper && item.lower && item.lower >= item.upper) {
+      if (item.upper && item.lower && item.lower > item.upper) {
         item.upper = item.lower + 1;
       }
       if (i >= index && i < res.length - 1) {
-        res[i + 1].lower = item.upper;
+        if (rankType == 2) {
+          res[i + 1].lower = item.upper;
+        } else if (rankType == 1) {
+          res[i + 1].lower = item.upper + 1;
+        }
       }
     }
  
@@ -168,7 +177,6 @@ const TotalAmount = ({
       } else {
         addRow.push(row);
         onChange && onChange([...addRow.map((i) => ({ ...i }))]);
-
         setEditingKey("");
       }
     } catch (errInfo) {
@@ -231,7 +239,7 @@ const TotalAmount = ({
       editable: true,
       children: [
         {
-          title: "初始排名(≥)",
+          title: `初始排名${rankType == 1 ? "(≥)" : "(>)"}`,
           dataIndex: "lower",
           width: "20%",
           render: (value: number) => {
@@ -247,7 +255,7 @@ const TotalAmount = ({
           },
         },
         {
-          title: "结束排名(<)",
+          title: `结束排名${rankType == 1 ? "(<)" : "(≤)"}`,
           dataIndex: "upper",
           width: "20%",
           editable: true,
@@ -68,6 +68,7 @@ declare namespace EvaGroupSetteing {
     targets?: Targets[]; // 目标
   }
   interface CommissionParams {
+    condType: number;
     id: number;
     evalGroupId: number; // 考评组配置id
     evalGroupIndicatorId: number; // 考评组指标id