master

src/pages/calcTable/index.tsx

@@ -32,6 +32,7 @@ const index: FunctionComponent<Props> = (props) => {
   const [showTotalCell, setShowTotalCell] = useState<boolean>(false);
   const [isDetailTable, setIsDetailTable] = useState<boolean>(false);
   const [sumRowlistUrl, setSumRowlistUrl] = useState<string>("");
+  const [tableScrollHeight, setTableScrollHeight] = useState<Number>(0);
   const [payload, setPayload] = useState<string>("");
   const [fixed, setFixed] = useState<fixedProps>(true);
 
@@ -48,7 +49,7 @@ const index: FunctionComponent<Props> = (props) => {
       const {
         columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {},
         showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail,
-        fixed = true
+        fixed = true, tableScrollHeight
       } = data;
       setSumRowlistUrl(sumRowlistUrl);
       setShowTotalCell(showTotalCell);
@@ -59,6 +60,7 @@ const index: FunctionComponent<Props> = (props) => {
       setPageInfo(pageInfo);
       setDataSource(dataSource);
       setSelectedRowKeys(selectedRowKeys);
+      setTableScrollHeight(tableScrollHeight);
       setColumns([...convertColumns(_.map(columns, o => ({ ...o, i18n: i18nRes }))), {
         title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: 120,
         render: (__, record) => (<Button type="link" onClick={() => handleEdit(record?.id)}>{i18nRes["编辑"]}</Button>)
@@ -135,7 +137,7 @@ const index: FunctionComponent<Props> = (props) => {
   return (<Table
     rowKey="id" size="small" bordered className={styles.tableWrapper}
     dataSource={dataSource} rowSelection={rowSelection}
-    scroll={{ x: 1200, y: `calc(100vh - ${!showTotalCell ? 165 : 200}px)` }}
+    scroll={{ x: 1200, y: `calc(100vh - ${ tableScrollHeight || (!showTotalCell ? 165 : 200)}px)` }}
     columns={!isDetailTable ? columns : _.filter(columns, o => o.dataIndex !== "operate")}
     footer={() => !isDetailTable ? <CalcExplainFooter i18n={i18n}/> : null}
     pagination={{

src/pages/salaryFileTable/index.tsx

@@ -9,7 +9,8 @@ import { ColumnType } from "antd/lib/table";
 import { PaginationData } from "rc-pagination";
 import styles from "@/pages/atdTable/components/index.less";
 import { exceptStr, paginationAction } from "@/utils/common";
-import { Table } from "antd";
+import { Button, Dropdown, MenuProps, Space, Table } from "antd";
+import { MoreOutlined } from "@ant-design/icons";
 
 interface OwnProps {
 }
@@ -24,6 +25,7 @@ const Index: FunctionComponent<Props> = (props) => {
   const [i18n, setI18n] = useState<any>({});
   const [runStatuses, setRunStatuses] = useState<string>("");
   const [showOperateBtn, setShowOperateBtn] = useState<boolean>(false);
+  const [showDelSalaryFileBtn, setShowDelSalaryFileBtn] = useState<boolean>(false);//待定薪、停薪员工 是否允许删除薪资档案
 
   useEffect(() => {
     window.parent.postMessage({ type: "init" }, "*");
@@ -38,15 +40,16 @@ const Index: FunctionComponent<Props> = (props) => {
     if (!_.isEmpty(data)) {
       const {
         columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {},
-        runStatuses, showOperateBtn
+        selectedKey, showOperateBtn, showDelSalaryFileBtn
       } = data;
       setShowOperateBtn(showOperateBtn);
-      setRunStatuses(runStatuses);
+      setRunStatuses(selectedKey);
       setI18n(i18nRes);
       setPageInfo(pageInfo);
       setDataSource(dataSource);
       setSelectedRowKeys(selectedRowKeys);
       setColumns(columns);
+      setShowDelSalaryFileBtn(showDelSalaryFileBtn);
     }
   };
   const onChange = (current: number, pageSize: number) => {
@@ -70,13 +73,13 @@ const Index: FunctionComponent<Props> = (props) => {
       window.parent.postMessage(
         {
           type: "turn",
-          payload: { id: "CHECKBOX", params: { selectedRowKeys } }
+          payload: { id: "ROWSELECTION", params: { selectedRowKeys } }
         },
         "*"
       );
     }
   };
-  const handleWelfareOperate = (type: string, record: any, interfaceParams?: any) => {
+  const handleSalaryFileOperate = (type: string, record: any, interfaceParams?: any) => {
     window.parent.postMessage(
       {
         type: "turn",
@@ -86,10 +89,109 @@ const Index: FunctionComponent<Props> = (props) => {
     );
   };
   const cols: any = useMemo(() => {
-    return showOperateBtn ? [...columns] : [...columns];
-  }, [columns, runStatuses, i18n, showOperateBtn]);
+    if (!_.isEmpty(columns)) {
+      let opts: any = _.find(columns, o => o.dataIndex === "operate");
+      switch (runStatuses) {
+        case "pending":
+          opts = {
+            ...opts,
+            render: (__: any, record: any) => {
+              let items: MenuProps["items"] = [
+                {
+                  key: "DeleteTodoList",
+                  label: i18n["删除待办"],
+                  onClick: () => handleSalaryFileOperate("DEL-PENDITNG-TO-DO", record, [record?.id])
+                },
+                {
+                  key: "DeleteFiles",
+                  label: i18n["删除档案"],
+                  onClick: () => handleSalaryFileOperate("DEL-SALARY-FILES", record, [record?.id])
+                }
+              ];
+              !showDelSalaryFileBtn && (items = _.dropRight(items));
+              return (<Space>
+                <Button type="link" onClick={() => handleSalaryFileOperate("EDIT", record)}>{i18n["编辑"]}</Button>
+                <Button type="link"
+                        onClick={() => handleSalaryFileOperate("ADD-TO-SALARYPAYMENT", record, [record?.id])}>{i18n["设为发薪人员"]}</Button>
+                <Dropdown menu={{ items }} placement="bottomRight">
+                  <Button type="link" icon={<MoreOutlined/>}/>
+                </Dropdown>
+              </Space>);
+            }
+          };
+          break;
+        case "fixed":
+        case "ext":
+          opts = {
+            ...opts,
+            render: (__: any, record: any) => (
+              <Button type="link"
+                      onClick={() => handleSalaryFileOperate("CHANGE-SALARY", record)}>{i18n["调薪"]}</Button>)
+          };
+          break;
+        case "suspend":
+          opts = {
+            ...opts,
+            render: (__: any, record: any) => {
+              const downsizingItems: MenuProps["items"] = [
+                {
+                  key: "DeleteTodoList",
+                  label: i18n["删除待办"],
+                  onClick: () => handleSalaryFileOperate("DEL-SUSPEND-TO-DO", record, [record?.id])
+                }
+              ];
+              return (<Space>
+                <Button type="link" onClick={() => handleSalaryFileOperate("EDIT", record)}>{i18n["编辑"]}</Button>
+                <Button type="link"
+                        onClick={() => handleSalaryFileOperate("SALARY-SUSPENSION", record, [record?.id])}>{i18n["停薪"]}</Button>
+                <Dropdown menu={{ items: downsizingItems }} placement="bottomRight">
+                  <Button type="link" icon={<MoreOutlined/>}/>
+                </Dropdown>
+              </Space>);
+            }
+          };
+          break;
+        case "stop":
+          opts = {
+            ...opts,
+            render: (__: any, record: any) => {
+              let stopItems: MenuProps["items"] = [
+                {
+                  key: "CancelSuspension",
+                  label: i18n["删除档案"],
+                  onClick: () => handleSalaryFileOperate("DEL-SALARY-FILES", record, [record?.id])
+                }
+              ];
+              !showDelSalaryFileBtn && (stopItems = _.dropRight(stopItems));
+              return (<Space>
+                <Button type="link" onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>
+                <Button type="link"
+                        onClick={() => handleSalaryFileOperate("CANCEL-SALARY-SUSPENSION", record, [record?.id])}>{i18n["取消停薪"]}</Button>
+                {
+                  !_.isEmpty(stopItems) &&
+                  <Dropdown menu={{ items: stopItems }} placement="bottomRight">
+                    <Button type="link" icon={<MoreOutlined/>}/>
+                  </Dropdown>
+                }
+              </Space>);
+            }
+          };
+          break;
+        default:
+          break;
+      }
+      return showOperateBtn ? [..._.filter(columns, o => o.dataIndex !== "operate"), opts] :
+        [..._.filter(columns, o => o.dataIndex !== "operate"), {
+          ...opts,
+          render: (__: any, record: any) => (
+            <Button type="link" onClick={() => handleSalaryFileOperate("VIEW", record)}>{i18n["查看"]}</Button>)
+        }];
+    } else {
+      return [];
+    }
+  }, [columns, runStatuses, i18n, showOperateBtn, showDelSalaryFileBtn]);
   return (<Table
-    rowKey="baseInfo" size="small" className={styles.tableWrapper}
+    rowKey="id" size="small" className={styles.tableWrapper}
     columns={cols} dataSource={dataSource} rowSelection={rowSelection}
     scroll={{ x: 1200, y: `calc(100vh - 103px)` }}
     pagination={{