Merge branch 'master' into feature/V2-系统多语言

# Conflicts:
#	src/pages/reportTable/index.tsx

src/api/calculate.service.ts

@@ -10,12 +10,13 @@ class CalculateService extends BasicService {
 
   //获取人员确认列表信息
   getPCDataList = async ({ url, queryParams }: any) => {
-    const { departmentIds = "", positionIds = "", subcompanyIds = "", ...extraParams } = queryParams || {};
+    const { departmentIds = "", positionIds = "", subcompanyIds = "", statuses, ...extraParams } = queryParams || {};
     queryParams = {
       ...extraParams,
       departmentIds: departmentIds ? departmentIds.split(",") : undefined,
       positionIds: positionIds ? positionIds.split(",") : undefined,
-      subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : undefined
+      subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : undefined,
+      statuses: statuses ? statuses.split(",") : [],
     };
     for (let key in queryParams) {
       if (queryParams[key] === "" || queryParams[key] === "0") {

src/pages/payrollFilesTable/index.tsx

@@ -107,7 +107,7 @@ const payrollFilesTable: FC = (props) => {
                       <MoreOutlined style={{ fontSize: 16 }}/>
                     </Dropdown>
                   </Space>;
-                } else if (selectedKey === "fixed") {
+                } else if (selectedKey === "fixed" || selectedKey === "ext") {
                   dom = <Button type="link" style={{ padding: "0" }} onClick={() => window.parent.postMessage(
                     {
                       type: "turn",

src/pages/reportTable/index.tsx

@@ -26,7 +26,10 @@ const ReportTable: FC = (props) => {
       setShowSumrow(showSum);
       setSumRow(countResult);
       setI18n(i18n);
-      setColumns(_.map(columns, item => {
+      setColumns(_.map(columns, (item, index: number) => {
+        if (index === 0) {
+          return { ...item, fixed: "left" };
+        }
         return {
           ...item,
           children: _.map(item.children, child => {