Merge branch 'master' into feature/业务线管理

src/pages/OCTable/index.tsx

@@ -65,10 +65,10 @@ const OCTable: FC = (props) => {
                 <span>{excelResultValue}</span>
               </div>
               {
-                showDifference &&
+                showDifference && !!parseInt(calculateDifference(acctResultValue, excelResultValue || 0)) &&
                 <div className={cs(styles["danger"], styles["comparison-single-row"])}>
                   <span>{lanObj["差值"]}：</span>
-                  <span>{calculateDifference(acctResultValue, excelResultValue)}</span>
+                  <span>{calculateDifference(acctResultValue, excelResultValue || 0)}</span>
                 </div>
               }
             </div>;
@@ -104,7 +104,7 @@ const OCTable: FC = (props) => {
   return <Table
     rowKey="id" className={styles.tableWrapper}
     columns={columns} dataSource={dataSource} bordered size="small"
-    scroll={{ x: 1200, y: `calc(100vh - 137px)` }}
+    scroll={{ x: 1200, y: `calc(100vh - 165px)` }}
     pagination={{
       ...paginationFun(pageInfo, sizeChange, onChange, i18n),
       size: "default"

src/pages/standingbookTable/index.tsx

@@ -1,8 +1,9 @@
 import React, { FC, useEffect, useState } from "react";
-import { Button, Table, Typography } from "antd";
+import { Button, Spin, Table, Typography } from "antd";
 import { exceptStr, paginationFun } from "@/utils/common";
 import { defaultPage, IPage } from "@/common/types";
 import styles from "@/pages/atdTable/components/index.less";
+import API from "@/api";
 
 const { Text } = Typography;
 const StandingbookTable: FC = (props) => {
@@ -11,6 +12,7 @@ const StandingbookTable: FC = (props) => {
   const [dataSource, setDataSource] = useState<Array<any>>([]);
   const [pageInfo, setPageInfo] = useState<IPage>(defaultPage);
   const [sumRow, setSumRow] = useState<Partial<{}>>({});
+  const [showSumrow, setShowSumrow] = useState<boolean>(false);
 
   useEffect(() => {
     window.parent.postMessage({ type: "init" }, "*");
@@ -22,108 +24,134 @@ const StandingbookTable: FC = (props) => {
   const receiveMessageFromIndex = async (event: any) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
-      const { columns, dataSource, pageInfo, showOperates, selectedRowKeys, sumRow } = data;
+      const {
+        columns, dataSource, pageInfo, showOperates, selectedRowKeys,
+        sumpayload, selectedKey
+      } = data;
       const { current: pageNum, pageSize: size, total } = pageInfo;
-      const conventColumns = _.map(
+      const conventColumns = _.map(_.filter(columns, it => it.dataIndex !== "id"), item => {
-        _.filter(columns, (it) => it.dataIndex !== "id"),
+        const { dataIndex } = item;
-        (item) => {
+        if (dataIndex === "employeeId") {
-          const { dataIndex } = item;
-          if (dataIndex === "employeeId") {
-            return {
-              title: "姓名",
-              dataIndex,
-              fixed: "left",
-              width: 150,
-              render: (_: any, record: Partial<any>) => <span>{record?.userName}</span>
-            };
-          }
           return {
-            dataIndex,
+            title: "姓名", dataIndex, fixed: "left", width: 150,
-            width: 150,
+            render: (_: any, record: Partial<any>) => (
-            title: <span dangerouslySetInnerHTML={{ __html: item.title }} />
+              <span>{record?.userName}</span>
+            )
           };
         }
-      );
+        return {
+          dataIndex, width: 150,
+          title: <span dangerouslySetInnerHTML={{ __html: item.title }}/>
+        };
+      });
       setDataSource(dataSource);
       setColumns(
-        !showOperates
+        !showOperates ? conventColumns :
-          ? conventColumns
+          [
-          : [
+            ...conventColumns,
-              ...conventColumns,
+            {
-              {
+              title: "操作",
-                title: "操作",
+              dataIndex: "operate",
-                dataIndex: "operate",
+              fixed: "right",
-                fixed: "right",
+              width: 120,
-                width: 120,
+              render: (_: any, record: any) => {
-                render: (_: any, record: any) => {
+                return (
-                  return (
+                  <Button type="link" onClick={() => handleEdit(record)}>编辑</Button>
-                    <Button type="link" onClick={() => handleEdit(record)}>
+                );
-                      编辑
-                    </Button>
-                  );
-                }
               }
-            ]
+            }
+          ]
       );
       setPageInfo({ pageNum, size, total });
       setSelected(selectedRowKeys);
-      setSumRow(sumRow);
+      const confCode: any = await API.CalculateService.getSysconfcode({ code: "OPEN_ACCT_RESULT_SUM" });
+      setShowSumrow(confCode.data.status && confCode.data.data === "1");
+      if (confCode.data.status && confCode.data.data === "1") {
+        const sumRowlist: any = selectedKey === "1" ? await API.CalculateService.siaccountDetailCommonListSum(sumpayload) :
+          selectedKey === "3" ? await API.CalculateService.siaccountDetailSupplementaryListSum(sumpayload) :
+            selectedKey === "regression" ? await API.CalculateService.siaccountDetailRecessionListSum(sumpayload) :
+              selectedKey === "difference" ? await API.CalculateService.siaccountDetailBalanceListSum(sumpayload) : {
+                data: {
+                  status: false,
+                  data: { sumRow: {} }
+                }
+              };
+        if (sumRowlist.data.status) {
+          if (!_.isEmpty(sumRowlist.data.data.sumRow)) {
+            setSumRow(sumRowlist.data.data.sumRow);
+          } else {
+            setSumRow({ [new Date().getTime()]: new Date().getTime() });
+          }
+        }
+        if (sumRowlist.data.status && _.isNil(sumRowlist.data.data.sumRow)) {
+          setSumRow({ [new Date().getTime()]: new Date().getTime() });
+        }
+      }
     }
   };
   const handleEdit = (record: any) => {
     window.parent.postMessage({ type: "turn", payload: { id: "EDIT", params: { ...record } } }, "*");
   };
-  const sizeChange = (pageobj: IPage) => {};
+  const sizeChange = (pageobj: IPage) => {
+  };
   const onChange = (pageobj: IPage) => {
     setPageInfo({ ...pageInfo, ...pageobj });
-    window.parent.postMessage({ type: "turn", payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } }, "*");
+    window.parent.postMessage(
+      {
+        type: "turn",
+        payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } }
+      },
+      "*"
+    );
   };
   const rowSelection = {
     selectedRowKeys: selected,
-    columnWidth: 60,
+    columnWidth: 80,
     onChange: (selectedRowKeys: Array<any>) => {
       setSelected(selectedRowKeys);
-      window.parent.postMessage({ type: "turn", payload: { id: "ROWSELECT", params: { selectedRowKeys } } }, "*");
+      window.parent.postMessage(
+        {
+          type: "turn",
+          payload: { id: "ROWSELECT", params: { selectedRowKeys } }
+        },
+        "*"
+      );
     }
   };
-  return (
+  return <Table
-    <Table
+    rowKey="id"
-      rowKey="id"
+    className={styles.tableWrapper}
-      className={styles.tableWrapper}
+    columns={columns}
-      columns={columns}
+    dataSource={dataSource}
-      dataSource={dataSource}
+    size="small"
-      size="small"
+    rowSelection={rowSelection}
-      rowSelection={rowSelection}
+    pagination={{
-      pagination={{
+      ...paginationFun(pageInfo, sizeChange, onChange),
-        ...paginationFun(pageInfo, sizeChange, onChange),
+      size: "default"
-        size: "default"
+    }}
-      }}
+    scroll={{ x: 1200, y: `calc(100vh - 172px)` }}
-      scroll={{ x: 1200, y: `calc(100vh - 172px)` }}
+    summary={() => {
-      summary={() => {
+      if (_.isEmpty(columns) || !showSumrow) return;
-        if (_.isEmpty(sumRow)) return;
+      return (
-        return (
+        <Table.Summary fixed>
-          <Table.Summary fixed>
+          <Table.Summary.Row>
-            <Table.Summary.Row>
+            {
-              {_.map([{}, ...columns], (item, index) => {
+              _.isEmpty(sumRow) ? <Spin tip="加载中"/> :
-                if (index === 0) {
+                _.map([{}, ...columns], (item, index) => {
-                  return (
+                  if (index === 0) {
-                    <Table.Summary.Cell index={0} key={index} align="center">
+                    return <Table.Summary.Cell index={0} key={index} align="center"><Text
-                      <Text type="danger">总计</Text>
+                      type="danger">总计</Text></Table.Summary.Cell>;
-                    </Table.Summary.Cell>
+                  }
-                  );
+                  return <Table.Summary.Cell index={index} key={index}>
-                }
-                return (
-                  <Table.Summary.Cell index={index} key={index}>
                     <Text type="danger">{!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"}</Text>
-                  </Table.Summary.Cell>
+                  </Table.Summary.Cell>;
-                );
+                })
-              })}
+            }
-            </Table.Summary.Row>
+          </Table.Summary.Row>
-          </Table.Summary>
+        </Table.Summary>
-        );
+      );
-      }}
+    }}
-    />
+  />;
-  );
 };
 
 export default StandingbookTable;