diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js index 4e746a70..16f992b3 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js @@ -46,7 +46,7 @@ class Index extends Component { if (it.column === "salaryYearMonth" || it.column === "sendTime") { return { dataIndex: it.column, title: it.text, width: it.width, - render: (__, record) => ({moment(record[it["column"]]).format("YYYY-MM")}) + render: (__, record) => ({record[it["column"]]}) }; } return { diff --git a/pc4mobx/hrmSalary/pages/payroll/index.less b/pc4mobx/hrmSalary/pages/payroll/index.less index e0f417dd..f3809e53 100644 --- a/pc4mobx/hrmSalary/pages/payroll/index.less +++ b/pc4mobx/hrmSalary/pages/payroll/index.less @@ -26,6 +26,11 @@ padding: 5px 16px; border-bottom: 1px solid #e5e5e5; + .wea-select { + width: 120px !important; + margin-left: 10px; + } + .wea-input-number { width: 80px !important; margin: 0 10px; diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index 9eaa2ece..7d2edc9c 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component { render() { const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting; - const { limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting; + const { monthType = "SALARY_DATE", limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting; return ( @@ -204,6 +204,14 @@ class TemplateBaseSettings extends Component {
{getLabel(111, "仅可查看")} + this.setState({ + salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting, monthType } + })} + options={[ + { key: "SALARY_DATE", showname: getLabel(111, "薪资所属月"), selected: true }, + { key: "SEND_DATE", showname: getLabel(111, "发放日期") } + ]}/> this.setState({ salaryBillViewingLimitSetting: { diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less index 245c991f..0caebb48 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less +++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less @@ -27,6 +27,7 @@ .salary-payroll-content { padding: 8px 16px; height: 100%; + overflow-y: auto; & > .wea-search-group { background: #FFF;