diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 2179f9ee..c9c0e3cf 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -145,7 +145,7 @@ const Routes = ( - + diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index ae98e007..8f886557 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -123,7 +123,7 @@ class Calculate extends Component { break; case "3": //查看详情 - window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/placeOnFileDetail?id=${id}`); + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/placeOnFileDetail/${id}?id=${id}`); break; case "4": //重新核算 diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index b0418614..98cfc21f 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -82,12 +82,17 @@ } .ant-table-tbody { + .ant-table-row-indent { + display: none; + } + td { span { width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + display: inline-block; } } } diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js index 3f5096fe..4cdd5a9c 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js @@ -8,8 +8,9 @@ import FileMergeDetail from "./fileMergeDetail"; import { getQueryString } from "../../util/url"; import { inject, observer } from "mobx-react"; import { getExportField } from "../../apis/calculate"; -import "./index.less"; import CustomExportDialog from "./customExportDialog"; +import Layout from "../calculate/doCalc/layout"; +import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @inject("calculateStore") @@ -162,17 +163,18 @@ export default class PlaceOnFileDetail extends React.Component { }; return ( -
- -
- 薪资所属月:{baseSalarySobCycle.salaryMonth} - +
+ +
+ 薪资所属月:{baseSalarySobCycle.salaryMonth} + +
+
+ 公式= + {toJS(columnDescList)[columnIndex] && toJS(columnDescList)[columnIndex].formulaContent} +
+
+