Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图

src/layouts/PageEmptyLayout/index.tsx

@@ -0,0 +1,9 @@
+import * as React from "react";
+import { useEffect } from "react";
+
+export default ({ children }: any) => {
+  useEffect(() => {
+    return () => {};
+  }, []);
+  return <div>{children}</div>;
+};

src/layouts/index.tsx

@@ -7,9 +7,10 @@ import { Provider } from "mobx-react";
 import zhCN from "antd/lib/locale/zh_CN";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import { connect, IRouteComponentProps, useModel } from "umi";
-import BaseLayout from "./BaseLayout";
+// import BaseLayout from "./BaseLayout";
 import BlankLayout from "./BlankLayout";
-import UserLayout from "./UserLayout";
+// import UserLayout from "./UserLayout";
+import PageEmptyLayout from "./PageEmptyLayout";
 import { IRouterProps, RouterContext } from "./RouterContext";
 import { layoutConfig } from "@/layouts/config";
 import stores from "@/store";
@@ -64,18 +65,18 @@ const Layout = ({ children, location, route, history, match }: IRouteComponentPr
 
     if (type) {
       switch (type) {
-        case "user":
+        // case "user":
-          layout = <UserLayout {...props} />;
+        //   layout = <UserLayout {...props} />;
-          break;
+        //   break;
         case "blank":
           layout = <BlankLayout {...props} />;
           break;
         default:
-          layout = <BaseLayout {...props} />;
+          layout = <PageEmptyLayout {...props} />;
           break;
       }
     } else {
-      layout = <BaseLayout {...props} />;
+      layout = <PageEmptyLayout {...props} />;
     }
   }
 

src/pages/calcTable/index.tsx

@@ -86,6 +86,32 @@ const index: FunctionComponent<Props> = (props) => {
               <Button type="link" onClick={() => handleEdit(record?.id)}>
                 {i18nRes["编辑"]}
               </Button>
+              {optWidth && (
+                <>
+                  <Button
+                    type="link"
+                    onClick={() =>
+                      handleLockEmp({
+                        lockStatus: "LOCK",
+                        acctEmpIds: [record?.id]
+                      })
+                    }
+                  >
+                    {i18nRes["锁定"]}
+                  </Button>
+                  <Button
+                    type="link"
+                    onClick={() =>
+                      handleLockEmp({
+                        lockStatus: "UNLOCK",
+                        acctEmpIds: [record?.id]
+                      })
+                    }
+                  >
+                    {i18nRes["解锁"]}
+                  </Button>
+                </>
+              )}
               {record?.lockTime && <Text>{record?.lockTime}</Text>}
             </Space>
           )
@@ -106,7 +132,7 @@ const index: FunctionComponent<Props> = (props) => {
           i18n: item.i18n,
           onCell: (record: any) => ({
             onContextMenu: (e: any) => {
-              record.lockItems && e.preventDefault();
+              !item.calcDetail && e.preventDefault();
             }
           }),
           render: (text: string, record: any) => {
@@ -135,7 +161,7 @@ const index: FunctionComponent<Props> = (props) => {
               }
             ];
             return (
-              <Dropdown menu={{ items: record.lockItems ? items : [] }} trigger={["contextMenu"]} overlayClassName={styles.contextMenu} destroyPopupOnHide>
+              <Dropdown menu={{ items: !item.calcDetail ? items : [] }} trigger={["contextMenu"]} overlayClassName={styles.contextMenu} destroyPopupOnHide>
                 <span className={styles.contentSpan}>
                   <span title={text} className={styles.contentTitle} style={{ color: `${record?.[item.dataIndex + "_color"]}` }}>
                     {text}

src/pages/unitTable/index.tsx

@@ -15,6 +15,7 @@ export type extraType = {
   rowKey: string;
   showTotalCell: boolean;
   isSpecial: boolean;
+  showRowSelection: boolean;
 };
 const UnitTable: FC = (props) => {
   const [unitTableType, setUnitTableType] = useState<string>("");
@@ -48,7 +49,8 @@ const UnitTable: FC = (props) => {
         rowKey,
         showTotalCell = false,
         sumDataSource = {},
-        isSpecial = false
+        isSpecial = false,
+        showRowSelection = true
       } = data;
       setI18n(i18n);
       setColumns(columns);
@@ -63,6 +65,7 @@ const UnitTable: FC = (props) => {
         rowKey,
         showTotalCell,
         isSpecial,
+        showRowSelection,
         selectedRowKeys: [...(extraParams.selectedRowKeys as string[] | number[]), ...rowKeys]
       });
     }
@@ -99,15 +102,8 @@ const UnitTable: FC = (props) => {
       columns={renderCols(columns, unitTableType, i18n, extraParams)}
       scroll={{ x: 1200, y: `calc(100vh - ${extraParams?.scrollHeight || 109}px)` }}
       bordered={_.some(columns, (k) => k.children)}
-      rowSelection={!_.isNil(extraParams?.selectedRowKeys) ? rowSelection : undefined}
+      rowSelection={extraParams?.showRowSelection ? rowSelection : undefined}
-      pagination={
+      pagination={!_.isNil(pageInfo) ? { ...paginationAction(pageInfo, i18n, onChange), size: "default" } : false}
-        !_.isNil(pageInfo)
-          ? {
-              ...paginationAction(pageInfo, i18n, onChange),
-              size: "default"
-            }
-          : false
-      }
       summary={() =>
         !extraParams.showTotalCell ? (
           <></>
@@ -117,7 +113,7 @@ const UnitTable: FC = (props) => {
               <Table.Summary.Cell index={0} align="center">
                 <Text type="danger">{i18n["总计"]}</Text>
               </Table.Summary.Cell>
-              <CaclFixedTotal columns={!_.isNil(extraParams?.selectedRowKeys) ? columns : columns.slice(1)} dataSourceUrl="" payload={{}} sumRow={sumRow} />
+              <CaclFixedTotal columns={extraParams?.showRowSelection ? columns : columns.slice(1)} dataSourceUrl="" payload={{}} sumRow={sumRow} />
             </Table.Summary.Row>
           </Table.Summary>
         )

src/pages/unitTable/renderColsOpts.tsx

@@ -69,7 +69,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
           width: 185,
           fixed: "right",
           render: (__: string, record: any) => {
-            const { billStatus } = record;
+            const { billStatus, customOptAuth } = record;
             const items: MenuProps["items"] = [
               {
                 key: "DeleteList",
@@ -111,9 +111,11 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
                         <Button type="link" onClick={() => postMessageToParent("CALC", record)}>
                           {i18n?.["核算"]}
                         </Button>
-                        <Button type="link" onClick={() => postMessageToParent("FILE", record)}>
+                        {(_.isEmpty(customOptAuth) || customOptAuth.FILE) && (
-                          {i18n?.["归档"]}
+                          <Button type="link" onClick={() => postMessageToParent("FILE", record)}>
-                        </Button>
+                            {i18n?.["归档"]}
+                          </Button>
+                        )}
                         <Dropdown menu={{ items }} placement="bottomRight">
                           <Button type="link" icon={<MoreOutlined />} />
                         </Dropdown>
@@ -124,9 +126,11 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
                         <Button type="link" onClick={() => postMessageToParent("VIEW", record)}>
                           {i18n?.["查看"]}
                         </Button>
-                        <Button type="link" onClick={() => postMessageToParent("RECALC", record)}>
+                        {(_.isEmpty(customOptAuth) || customOptAuth.RECALC) && (
-                          {i18n?.["重新核算"]}
+                          <Button type="link" onClick={() => postMessageToParent("RECALC", record)}>
-                        </Button>
+                            {i18n?.["重新核算"]}
+                          </Button>
+                        )}
                         <Dropdown
                           menu={{
                             items: [