diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js index 92f0f532..7f92a0cb 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js @@ -28,12 +28,18 @@ class BatchUpdateSalaryItemValDialog extends Component { } save = () => { - const { calculateStore: { batchUpdateForm }, salaryAcctRecordId, salaryItemId, idList, pattern } = this.props; + const { + calculateStore: { batchUpdateForm }, salaryAcctRecordId, salaryItemId, + idList, pattern, dataType + } = this.props; batchUpdateForm.validateForm().then(f => { if (f.isValid) { const { value } = batchUpdateForm.getFormParams(); this.setState({ loading: true }); - const payload = { salaryAcctRecordId, salaryItemId, idList, value: toDecimal_n(value, pattern) }; + const payload = { + salaryAcctRecordId, salaryItemId, idList, + value: dataType === "number" ? toDecimal_n(value, pattern) : value + }; this.setState({ loading: false }); salaryacctBatchUpdate(payload).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index e8b4c67d..83bc6f8b 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -28,7 +28,7 @@ class EditCalcTable extends Component { salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {}, batchUpdateDialog: { visible: false, salaryAcctRecordId: "", idList: [], salaryItemId: "", - conditions: [], pattern: 0 + conditions: [], pattern: 0, dataType: "" } }; this.timerLock = null; @@ -125,7 +125,7 @@ class EditCalcTable extends Component { Modal.confirm({ title: getLabel(131329, "信息确认"), content:
-
{getLabel(111, "确认编辑所有人员薪资核算记录?")}
+
{getLabel(111, "确认编辑所有人员(所选人员)薪资核算记录?")}
, onOk: () => { const { salaryItemId, salaryItemName, dataType, pattern } = payload; @@ -134,7 +134,7 @@ class EditCalcTable extends Component { this.setState({ batchUpdateDialog: { ...this.state.batchUpdateDialog, visible: true, salaryAcctRecordId, salaryItemId, - idList, pattern, conditions: _.map(batchUpdateConditions, item => ({ + idList, pattern, dataType, conditions: _.map(batchUpdateConditions, item => ({ ...item, items: _.map(item.items, o => { if (getKey(o) === "value") { const otherParams = dataType === "number" ? { precision: pattern } : {}; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js index 63c86a3f..caf11158 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js @@ -77,8 +77,8 @@ class Index extends Component { {formulaObj.formulaContent}
- + {/**/}