Merge branch 'bug_fix' of gitlab.feewee.cn:FEV2/fw-cms into ehr-archives

王强
2 parents 1e9bdd03 f8f46545
Showing 3 changed files with 57 additions and 40 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx
@@ -219,7 +219,6 @@ export default function CreateModal(props: Props) {
                   onChange={(value) => {
                     const _type = value;
                     setCalType(_type);
-                    console.log(calType);
                   }}
                 >
                   <Option value={1} key={1}>
@@ -343,27 +342,29 @@ export default function CreateModal(props: Props) {
                   >
                     {({ getFieldValue }) => {
                       const rankType = getFieldValue("rankType");
-                      if (rankType == 1 && !currentItem.ladders) {
+                      if (rankType == 1 && (!currentItem.ladders || currentItem.ladders.length == 0)) {
                         form.setFieldValue("ladders", [{ lower: 1, money: 0, key: 0, rankOrderType: 1 }]);
-                      } else if (rankType == 2 && !currentItem.ladders) {
+                      } else if (rankType == 2 && (!currentItem.ladders || currentItem.ladders.length == 0)) {
+                        form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0, rankOrderType: 1 }]);
+                      } else if (!rankType && (!currentItem.ladders || currentItem.ladders.length == 0)) {
                         form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0, rankOrderType: 1 }]);
                       }
-                      return (
-                        <Form.Item
-                          name="ladders"
-                          label="排名设置"
-                          rules={[{ required: true, message: "请配置排名" }]}
-                          style={{ width: "100%" }}
-                        >
-                          <RankModal
-                            visible
-                            isPercent={isPercent}
-                            laddersType={currentItem?.laddersType}
-                            calType={calType}
-                            rankType={rankType}
-                          />
-                        </Form.Item>
-                      );
+                        return (
+                          <Form.Item
+                            name="ladders"
+                            label="排名设置"
+                            rules={[{ required: true, message: "请配置排名" }]}
+                            style={{ width: "100%" }}
+                          >
+                            <RankModal
+                              visible
+                              isPercent={isPercent}
+                              laddersType={currentItem?.laddersType}
+                              calType={calType}
+                              rankType={rankType}
+                            />
+                          </Form.Item>
+                        );
                     }}
                   </Form.Item>
                 </>
@@ -433,11 +434,12 @@ export default function CreateModal(props: Props) {
         >
           {({ getFieldValue }) => {
             const caculateType = getFieldValue("calMethod");
+            // console.log(caculateType, currentItem);
             //阶梯（总）
             if (caculateType == 3 || caculateType == 5) {
-              if (caculateType == 3 && !currentItem.ladders) {
+              if (caculateType == 3 && (!currentItem.ladders || currentItem.ladders.length == 0)) {
                 form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0 }]);
-              } else if (caculateType == 5 && !currentItem.ladders) {
+              } else if (caculateType == 5 && (!currentItem.ladders || currentItem.ladders.length == 0)) {
                 form.setFieldValue("ladders", [{ lower: 0, money: 0, capMoney: 0, key: 0 }]);
               }
                 return (
@@ -166,6 +166,7 @@ const TotalAmount = ({
   };
   const _add = async (key: React.Key, record: Item) => {
+    // console.log("record.key", record.key);
     try {
       const row = (await form.validateFields()) as Item;
       let newData = [...value.map((i) => ({ ...i }))];
@@ -320,7 +321,11 @@ const TotalAmount = ({
         const editable = isEditing(record);
         return editable ? (
           <Space split={<Divider type="vertical" />}>
-            <Typography.Link onClick={() => _add(record.key, record)} style={{ marginRight: 8 }}>
+            <Typography.Link
+              onClick={() => _add(record.key, record)}
+              style={{ marginRight: 8 }}
+              disabled={index !== value?.length - 1}
+            >
               保存并新增排名区间
             </Typography.Link>
             <Typography.Link onClick={() => save(record.key, record)} style={{ marginRight: 8 }}>
@@ -59,6 +59,9 @@ function PlayBackPicker(props: any) {
     const { _d: checkDate, _i: nowDate } = date;
     const checkYear = moment(checkDate).format('YYYY-MM-DD');
     const nowYear = moment(nowDate).format('YYYY-MM-DD');
+    const checkHours = moment(checkDate).format('HH');
+    const nowHours = moment(nowDate).format('HH');
+
     // if (type === 'start') {
     //     const hour = moment(date).hour();
     //     const minute = moment(date).minute();
@@ -83,24 +86,30 @@ function PlayBackPicker(props: any) {
     //         },
     //     };
     // }
-    if (checkYear === nowYear) {
-      const nowHour = moment(nowDate).hour();
-      const nowMinute = moment(nowDate).minute();
-      const nowSecond = moment(nowDate).second();
-      return {
-        disabledHours: () => {
-          const disabledArr = timeArr(24).splice(nowHour, timeArr(24).length - nowHour);
-          return disabledArr;
-        },
-        disabledMinutes: () => {
-          const disabledArr = timeArr(60).splice(nowMinute, timeArr(60).length - nowMinute);
-          return disabledArr;
-        },
-        disabledSeconds: () => {
-          const disabledArr = timeArr(60).splice(nowSecond, timeArr(60).length - nowSecond);
-          return disabledArr;
-        },
-      };
+
+    const nowHour = moment(nowDate).hour();
+    const nowMinute = moment(nowDate).minute();
+    const nowSecond = moment(nowDate).second();
+    const resultLimit = {
+      // type: 'end',
+      disabledHours: () => {
+        const disabledArr = timeArr(24).splice(nowHour + 1, timeArr(24).length - nowHour);
+        return disabledArr;
+      },
+      disabledMinutes: () => {
+        const disabledArr = timeArr(60).splice(nowMinute, timeArr(60).length - nowMinute);
+        return disabledArr;
+      },
+      disabledSeconds: () => {
+        const disabledArr = timeArr(60).splice(nowSecond, timeArr(60).length - nowSecond);
+        return disabledArr;
+      },
+    };
+    if (checkYear === nowYear && checkHours !== nowHours) {
+      return { disabledHours: resultLimit.disabledHours };
+    }
+    if (checkYear === nowYear && checkHours === nowHours) {
+      return resultLimit;
     }
   };
   /**
@@ -135,6 +144,7 @@ function PlayBackPicker(props: any) {
         }}
         disabledDate={disabledDate}
         disabledTime={disabledTracksTime}
+        // max={disabledTracksTime}
         onCalendarChange={
           (value: any) => {
             setDateFlag(value);