diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js index cceb5f89..a1656d53 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js @@ -120,7 +120,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { const { list } = salaryArchiveItemDetail; let payload = { ...adjForm.getFormParams(), salaryArchiveId, - effectiveTime: moment(adjForm.getFormParams().effectiveTime).format("YYYY-MM-DD"), + effectiveTime: moment(new Date(adjForm.getFormParams().effectiveTime)).format("YYYY-MM-DD"), salaryArchiveItems: _.map(list, o => ({ salaryItemId: o.salaryItem, adjustValue: o.adjustAfter })) }; if (salaryArchiveItemId) { @@ -173,7 +173,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { title: getLabel(111, "调整后"), dataIndex: "adjustAfter", key: "adjustAfter", - com: [{ label: "", type: "INPUTNUMBER", precision: 3, viewAttr: 3, key: "adjustAfter" }], + com: [{ label: "", type: "INPUTNUMBER", otherParams: { precision: 3 }, viewAttr: 3, key: "adjustAfter" }], colSpan: 1, width: "30%" } @@ -184,7 +184,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { scalable hasScroll className="declareResultDialog" initLoadCss style={{ width: 800, - height: 606.6, + height: 406.6, minHeight: 200, minWidth: 380, maxHeight: "80%", @@ -202,6 +202,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { this.tableEdit = dom} deleteConfirm columns={adjColumns} datas={list} showCopy={false} + showAdd={!id} showDelete={!id} onChange={o => this.setState({ salaryArchiveItemDetail: { ...salaryArchiveItemDetail, list: o diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js index 410e4a6d..21b8042a 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js @@ -1,5 +1,5 @@ import React from "react"; -import { Menu, message, Modal, Popover } from "antd"; +import { message, Modal } from "antd"; import { WeaLocaleProvider, WeaTable } from "ecCom"; import { inject, observer } from "mobx-react"; import { deleteSalaryItem } from "../../apis/archive"; @@ -89,14 +89,8 @@ export default class SalaryItemChangeList extends React.Component { render: (text, record) => { return
this.handleEdit(record)}>编辑 - this.deleteSalaryItem(record.id)}> - 删除 - } title=""> - - + this.deleteSalaryItem(record.id)}>{getLabel(535052, "删除")}
; } }];