release/2.16.1.2410.01

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) => (<span>{moment(record[it["column"]]).format("YYYY-MM")}</span>)
+                render: (__, record) => (<span>{record[it["column"]]}</span>)
               };
             }
             return {

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;

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 (
       <React.Fragment>
         <WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
@@ -204,6 +204,14 @@ class TemplateBaseSettings extends Component {
         <WeaSearchGroup title={getLabel(111, "工资单时效设置")} showGroup needTigger className="waterMarkWrapper">
           <div className="agingBox">
             <span>{getLabel(111, "仅可查看")}</span>
+            <WeaSelect
+              value={monthType} onChange={monthType => this.setState({
+              salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting, monthType }
+            })}
+              options={[
+                { key: "SALARY_DATE", showname: getLabel(111, "薪资所属月"), selected: true },
+                { key: "SEND_DATE", showname: getLabel(111, "发放日期") }
+              ]}/>
             <WeaInputNumber min={0} value={limitMonth}
                             onChange={limitMonth => this.setState({
                               salaryBillViewingLimitSetting: {

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;