Merge remote-tracking branch 'origin/bug_fix'

莫红玲
2 parents 34e0922d d73d0ffc
Showing 2 changed files with 64 additions and 5 deletions
src/pages/ehr/PhoneChargeAndSubsidy/subpages/SubsidyConfirm/components/ConfirmModal.tsx
src/pages/ehr/PhoneChargeAndSubsidy/subpages/SubsidyConfirm/interface.d.ts
@@ -9,6 +9,7 @@ import {
 import { message, Modal, Popover, Row, Select } from "antd";
 import { priceToThousands } from "@/utils/utils";
 import FeeweeFilterOption from "@/pages/notice/components/FeeweeFilterOption";
+import moment from "moment";
  
 interface FilterItem {
   value?: number;
@@ -22,11 +23,13 @@ export default function SubsidyConfirmModal() {
     staffs?: FilterItem[];
     shops?: FilterItem[];
     posts?: FilterItem[];
+    standardAmounts?: FilterItem[];
   }>({});
   const [filterValue, setFilterValue] = useState<{
     staffId?: number;
     shopId?: number;
     postId?: number;
+    standardAmount?: number;
   }>({});
  
   useEffect(() => {
@@ -53,7 +56,16 @@ export default function SubsidyConfirmModal() {
         })) || [],
         "value"
       );
-      setFilters({ staffs, shops, posts });
+      const standardAmounts = unique(
+        confirmModalInfo.value?.map((staff) => ({
+          value: staff.standardAmount,
+          label: `${staff.standardAmount ?? "-"} 元`,
+        })) || [],
+        "value"
+      );
+      setFilters({ staffs, shops, posts, standardAmounts });
+    } else {
+      setFilterValue({});
     }
   }, [confirmModalInfo.open, confirmModalInfo.value]);
  
@@ -112,7 +124,9 @@ export default function SubsidyConfirmModal() {
   const onCancel = () => setConfirmModalInfo({ open: false });
  
   const onOk = () => {
-    const item = items.find((i) => checkNull(i.realAmount) && (i.selected ?? true));
+    const item = items.find(
+      (i) => checkNull(i.realAmount) && (i.selected ?? true)
+    );
     if (item) {
       return message.warning(`${item.staffName} 的实际补贴不能为空`);
     }
@@ -192,12 +206,35 @@ export default function SubsidyConfirmModal() {
             ))}
           </Select>
         </FeeweeFilterOption>
+        <FeeweeFilterOption title="补贴标准">
+          <Select
+            allowClear
+            placeholder="选择补贴标准筛选"
+            style={{ minWidth: 260, marginRight: 10, marginBottom: 10 }}
+            value={filterValue.postId}
+            onChange={(standardAmount) => setFilterValue({ ...filterValue, standardAmount })}
+            showSearch
+            optionFilterProp="children"
+          >
+            {filters.standardAmounts?.map((standardAmount) => (
+              <Select.Option
+                key={standardAmount.value}
+                value={standardAmount.value}
+              >
+                {standardAmount.label}
+              </Select.Option>
+            ))}
+          </Select>
+        </FeeweeFilterOption>
       </Row>
       <EditTable
         value={items.filter(
           (i) => (filterValue.staffId ? i.staffId === filterValue.staffId : true) &&
             (filterValue.shopId ? i.shopId === filterValue.shopId : true) &&
-            (filterValue.postId ? i.postId === filterValue.postId : true)
+            (filterValue.postId ? i.postId === filterValue.postId : true) &&
+            (!checkNull(filterValue.standardAmount)
+              ? i.standardAmount === filterValue.standardAmount
+              : true)
         )}
         onChange={(items) => setItems(items || [])}
         pagination={{
@@ -244,6 +281,22 @@ export default function SubsidyConfirmModal() {
                     {record.postName || "-"}
                   </span>
                 </span>
+                <span className="span_limit_1">
+                  <span style={{ color: "#999" }}>入职时间：</span>
+                  <span style={{ color: "#333" }}>
+                    {record.entryDate
+                      ? moment(record.entryDate).format("YYYY-MM-DD")
+                      : "-"}
+                  </span>
+                </span>
+                <span className="span_limit_1">
+                  <span style={{ color: "#999" }}>转正时间：</span>
+                  <span style={{ color: "#333" }}>
+                    {record.regularDate
+                      ? moment(record.regularDate).format("YYYY-MM-DD")
+                      : "-"}
+                  </span>
+                </span>
               </span>
             ),
           },
@@ -283,7 +336,11 @@ export default function SubsidyConfirmModal() {
             title: "补贴标准",
             width: 150,
             dataIndex: "standardAmount",
-            render: (standardAmount: number) => priceToThousands(standardAmount),
+            sorter: (
+              a: EHrSubsidyConfirm.TypeStaffVO,
+              b: EHrSubsidyConfirm.TypeStaffVO
+            ) => (a.standardAmount ?? -1) - (b.standardAmount ?? -1),
+            render: (standardAmount: number) => `${priceToThousands(standardAmount)} 元`,
           },
           {
             title: "实际补贴",
@@ -292,7 +349,7 @@ export default function SubsidyConfirmModal() {
             editable: true,
             inputType: "number",
             max: 999.99,
-            render: (realAmount: number) => priceToThousands(realAmount),
+            render: (realAmount: number) => `${priceToThousands(realAmount)} 元`,
           },
           {
             title: "备注",
@@ -90,6 +90,8 @@ declare namespace EHrSubsidyConfirm {
     postName?: string;
     shopId?: number;
     shopName?: string;
+    entryDate?: number; // 入职时间
+    regularDate?: number; // 转正时间
     workDays?: number; // 上班天数
     askForLeaveDays?: number; // 请假天数
     evectionDays?: number; // 出差天数