custom/五院杭州中心

2025-10-15 18:28:46 +08:00 · 2025-10-15 18:28:46 +08:00 · 6eed8d6810
parent 2320b19627
commit 6eed8d6810
9 changed files with 48 additions and 31 deletions
--- a/pc4mobx/hrmSalary/components/pcTemplate/index.less
+++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less
@ -110,22 +110,26 @@
            flex-wrap: wrap;
            padding: 0 30px;

-            .even {
-              border-left: 1px solid #e5e5e5;
-            }
+            //.even {
+            //  border-left: 1px solid #e5e5e5;
+            //}

-            .zero, .first {
+            //.zero, .first {
+            //  border-top: 1px solid #e5e5e5;
+            //}
+            .zero {
              border-top: 1px solid #e5e5e5;
            }

            .list-item {
-              width: 50%;
+              width: 100%;
              display: flex;
              justify-content: left;
              min-height: 40px;
              align-items: center;
              border-bottom: 1px solid #e5e5e5;
              border-right: 1px solid #e5e5e5;
+              border-left: 1px solid #e5e5e5;

              .item-name {
                //flex-basis: 170px;
@ -178,4 +182,4 @@
      margin-right: 30px;
    }
  }
-}
+}
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@ -164,7 +164,7 @@ class SalaryDetails extends Component {
    const columns = _.filter(tempCols, o => o.column !== "acctTimes");
    if (!_.isEmpty(columns)) {
      this.postMessageToChild({
-        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
+        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 210, sumRow,
        columns: _.map(columns, (it, idx) => ({
          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true, showSee: false,
          width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : (it.width || it.oldWidth),
@ -332,4 +332,4 @@ export const converCheckedCol = (data) => {
    if (!_.isEmpty(item)) return [...pre, { ...item, id: item.id || item.column, name: item.name || item.text }];
    return pre;
  }, []);
-};
+};
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.less
@ -5,7 +5,7 @@
  top: -2.5px;

  .wea-advanced-search {
-    top: 1px!important;
+    top: 2px!important;
    left: -1px;
    height: 28px;
    line-height: 1;
@ -25,4 +25,4 @@
    white-space: nowrap;
    text-overflow: ellipsis;
  }
-}
+}
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
@ -21,8 +21,8 @@ class Index extends Component {
  constructor(props) {
    super(props);
    this.state = {
-      showSearchAd: false, showTotalCell: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
-      loading: false, sumRow: {}
+      showSearchAd: false, showTotalCell: false, loading: false, sumRow: {},
+      pageInfo: { current: 1, pageSize: 200, total: 0, pageSizeOptions: ["200"] }
    };
  }

@ -68,10 +68,10 @@ class Index extends Component {
        this.setState({ loading: false });
        if (status && !_.isEmpty(data)) {
          const { columns, pageInfo: { pageNum: current, pageSize, total, list: dataSource } } = data;
-          this.setState({ pageInfo: { current, pageSize, total } }, () => {
+          this.setState({ pageInfo: { ...pageInfo, current, pageSize, total } }, () => {
            const { pageInfo, sumRow } = this.state;
            this.postMessageToChild({
-              dataSource, pageInfo, showTotalCell: true, sumRowlistUrl: "", calcDetail: true, tableScrollHeight: 179,
+              dataSource, pageInfo, showTotalCell: true, sumRowlistUrl: "", calcDetail: true, tableScrollHeight: 210,
              sumRow,
              columns: _.every(traverse(columns, true), (it, idx) => !it.fixed) ? _.map(traverse(columns, true), (it, idx) => ({
                ...it, fixed: idx < 2 ? "left" : false
@ -79,8 +79,8 @@ class Index extends Component {
            });
          });
          !isPageChange && this.getAcctresultListSum({
-            dataSource, pageInfo: { current, pageSize, total }, showTotalCell: true, sumRowlistUrl: "",
-            calcDetail: true, tableScrollHeight: 179,
+            dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, showTotalCell: true, sumRowlistUrl: "",
+            calcDetail: true, tableScrollHeight: 210,
            columns: _.every(traverse(columns, true), (it, idx) => !it.fixed) ? _.map(traverse(columns, true), (it, idx) => ({
              ...it, fixed: idx < 2 ? "left" : false
            })) : traverse(columns, true)
@ -133,7 +133,7 @@ class Index extends Component {
          onToggleSwitch={this.openAdvanceSearch}
          onAdSearch={this.onAdSearch}/>
      </div>
-      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, minHeight: "356px", maxHeight: "678px" }}>
+      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, minHeight: "356px" }}>
        <Spin spinning={loading}>
          <iframe
            style={{ border: 0, width: "100%", height: "100%" }}
@ -146,4 +146,4 @@ class Index extends Component {
  }
 }

-export default Index;
+export default Index;
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
@ -109,7 +109,7 @@ class Index extends Component {
          onToggleSwitch={this.openAdvanceSearch}
          onAdSearch={this.onAdSearch}/>
      </div>
-      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, minHeight: "287px", maxHeight: "678px" }}>
+      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, minHeight: "287px" }}>
        <Spin spinning={loading}>
          <iframe
            style={{ border: 0, width: "100%", height: "100%" }}
@ -122,4 +122,4 @@ class Index extends Component {
  }
 }

-export default Index;
+export default Index;
--- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
+++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
@ -45,14 +45,14 @@ export default class GenerateDeclarationDetail extends React.Component {
          columns: _.map(_.filter(columns, it => it.dataIndex !== "jobNum"), item => {
            if (item.dataIndex === "username") {
              return {
-                ...item, width: 180,
+                ...item, width: 109,
                render: (text, record) => (<a className="ellipsis" href={`javaScript:openhrm(${record.employeeId});`}
                                              onClick={e => window.pointerXY(e)}
                                              title={text}>{text}</a>)
              };
            }
            return {
-              ...item, width: (item.dataIndex === "cardType" || item.dataIndex === "cardNum") ? 180 : 100,
+              ...item, width: (item.dataIndex === "cardType" || item.dataIndex === "cardNum") ? 109 : 109,
              render: (text) => (<span className="ellipsis" title={text}>{text}</span>)
            };
          })
@ -109,4 +109,4 @@ export default class GenerateDeclarationDetail extends React.Component {
      </div>
    </WeaTop>);
  }
-}
+}
--- a/pc4mobx/hrmSalary/pages/declare/index.less
+++ b/pc4mobx/hrmSalary/pages/declare/index.less
@ -5,6 +5,14 @@

  .wea-new-table {
    background: #FFF;
+
+    .ellipsis {
+      width: 100%;
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
  }
 }

@ -88,4 +96,4 @@
      }
    }
  }
-}
+}
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
@ -89,10 +89,10 @@ class Index extends Component {
    if (!_.isEmpty(columns)) {
      this.postMessageToChild({
        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true,
-        tableScrollHeight: pageInfo.total === 0 ? 90 : 156,
+        tableScrollHeight: pageInfo.total === 0 ? 90 : 166,
        sumRowlistUrl, payload: { ...payload, updateSum },
        columns: _.map(columns, (it, idx) => ({
-          ...it, width: it.oldWidth, fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
+          ...it, width: it.oldWidth + "px", fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
          ellipsis: true
        }))
      });
@ -123,9 +123,10 @@ class Index extends Component {
    const columnNum = total > 10 ? pageSize + 1 : total + 1;
    return (
      <div style={{
-        height: `calc((39px * ${columnNum}) + 126.84px)`,
-        maxHeight: "678px",
-        minHeight: !total ? "270px" : "inherit"
+        flex: 1
+        // height: `calc((39px * ${columnNum}) + 126.84px)`,
+        // maxHeight: "678px",
+        // minHeight: !total ? "270px" : "inherit"
      }}>
        <Spin spinning={loading}>
          <iframe
@ -142,4 +143,4 @@ class Index extends Component {
  }
 }

-export default Index;
+export default Index;
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.less
@ -40,6 +40,10 @@

  .salary-payroll-details {
    padding: 0 16px 16px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    background: rgb(241, 241, 241);

    .salary-tb-tip {
      display: flex;
@ -102,4 +106,4 @@

    }
  }
-}
+}