diff --git a/pc4mobx/hrmSalary/apis/otherDeduct.js b/pc4mobx/hrmSalary/apis/otherDeduct.js index e74f7e66..8c53b16c 100644 --- a/pc4mobx/hrmSalary/apis/otherDeduct.js +++ b/pc4mobx/hrmSalary/apis/otherDeduct.js @@ -43,11 +43,11 @@ export const exportOtherDeductList = (ids = "") => { window.URL.revokeObjectURL(url); }) ); - return WeaTools.callApi( - "/api/bs/hrmsalary/otherDeduction/export", - "POST", - params - ); + // return WeaTools.callApi( + // "/api/bs/hrmsalary/otherDeduction/export", + // "POST", + // params + // ); }; //数据采集-获取其他免税扣除记录 diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js index 21b0a6b9..2858427e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js @@ -112,7 +112,10 @@ export default class RefereAttendFormModal extends React.Component { { this.state.inited && this.hanldeChange({salarySob: value})}> - {this.state.options.map(item => ( - - ))} - - } - - - - 工资单模板名称 - - this.hanldeChange({name: value})}/> - - - - 备注 - - this.hanldeChange({description: value})}/> - - - - - {/* 发送位置先隐藏 */} - {/*
+ render() { + const { request } = this.state; + const { + salarySob, + salarySobOption, + name, + description, + emailStatus, + sendEmail, + sendEmailOptions, + msgStatus + } = request; + return ( +
+
+
基础信息
+
+ + + 薪资账套 + + + {this.state.inited && + } + + + + + 工资单模板名称 + + + this.hanldeChange({ name: value })} + /> + + + + 备注 + + this.hanldeChange({ description: value })} + /> + + +
+
+ {/* 发送位置先隐藏 */} + {/*
发送位置
@@ -113,7 +137,7 @@ export default class BaseInformForm extends React.Component {
*/} -
- ) - } -} \ No newline at end of file +
+ ); + } +} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index 3862e5a1..6f94ec36 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -27,8 +27,8 @@ export default class StandingBook extends React.Component { value: "", selectedKey: "0", tableParams: { - startTime: moment(new Date()).subtract(3,'months').startOf('month').format('YYYY-MM'), - endTime: moment(new Date()).subtract(-3,'months').startOf('month').format('YYYY-MM') + startTime: moment(new Date()).subtract(5,'months').startOf('month').format('YYYY-MM'), + endTime: moment(new Date()).startOf('month').format('YYYY-MM') }, current: 1, dialogProps: { @@ -115,6 +115,7 @@ export default class StandingBook extends React.Component { title: "操作", dataIndex: "action", key: "action", + fixed: 'right', render: (text, r) => { const { billStatus, billMonth } = r; return ( @@ -450,6 +451,7 @@ export default class StandingBook extends React.Component { loading={loading} columns={_.filter(columns, (it) => it.dataIndex !== "id").map(item => { item.width = "150px" + if(item.dataIndex ==='billMonth') item.fixed= 'left'; return item })} dataSource={list}