diff --git a/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js b/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js index cd51bce3..aaaf35d5 100644 --- a/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js +++ b/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js @@ -53,3 +53,7 @@ export const apiflowWarnReceiverGetForm = (params) => { export const apiflowWarnReceiverDelete = (params) => { return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/apiflow/warn/receiver/delete", "GET", params); }; +//智能算薪-月度统计详情 +export const getStatisticsDetailList = (params) => { + return postFetch("/api/bs/hrmsalary/taxdeclaration/apiflow/statistics/detail/list", params); +}; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js index b1b07677..f8d9cde3 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js @@ -108,7 +108,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { if (id) { const filedKes = _.map(columns, it => it.dataIndex); _.map(filedKes, item => { - if (item === "disability" || item === "lonelyOld" || item === "martyrDependents") { + if (item === "disability" || item === "lonelyOld" || item === "martyrDependents" || item === "reissueSalary") { declareForm.updateFields({ [item]: result[item] || "OFF" }); } else if (item === "deductExpenses") { declareForm.updateFields({ [item]: result[item] || "ON" }); @@ -180,6 +180,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { valueSpan: ["employeeId"] } }); + if (value === "NORMAL" && declareForm.getFormParams().dismissDate) declareForm.updateFields({ dismissDate: "" }); }); break; case "employmentType": @@ -245,6 +246,63 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { }); }); break; + case "dismissDate": + const { employmentStatus } = declareForm.getFormParams(); + this.setState({ + eConditions: _.map(eConditions, it => { + return { + ...it, items: _.map(it.items, child => { + if (getKey(child) === "dismissDate") { + return { ...child, viewAttr: 2 }; + } + return { ...child }; + }) + }; + }) + }, () => declareForm.updateFields({ employmentStatus: (!value && employmentStatus === "ABNORMAL") ? "NORMAL" : "ABNORMAL" })); + break; + case "reissueSalary": + this.setState({ + eConditions: _.map(eConditions, it => { + return { + ...it, items: _.map(it.items, child => { + if (getKey(child) === "reissueTaxCycle") { + return { ...child, viewAttr: value === "ON" ? 3 : 2 }; + } + return { ...child }; + }) + }; + }) + }, () => { + declareForm.initFormFields(this.state.eConditions); + const [employeeData] = this.state.employeeInfo["employee"] || this.employeeChangeInfo["employee"] || []; + !_.isEmpty(employeeData) && declareForm.updateFields({ + employeeType: { + value: [employeeData._entityType, [employeeData.id, employeeData.name, [{ + id: employeeData.id, + lastname: employeeData.name + }]]], + valueSpan: ["employeeId"] + } + }); + if (value === "OFF" && declareForm.getFormParams().reissueTaxCycle) declareForm.updateFields({ reissueTaxCycle: "" }); + }); + break; + case "reissueTaxCycle": + const { reissueSalary } = declareForm.getFormParams(); + if (!value && reissueSalary === "ON") this.setState({ + eConditions: _.map(eConditions, it => { + return { + ...it, items: _.map(it.items, child => { + if (getKey(child) === "reissueTaxCycle") { + return { ...child, viewAttr: 2 }; + } + return { ...child }; + }) + }; + }) + }, () => declareForm.updateFields({ reissueSalary: "OFF" })); + break; default: break; } @@ -256,12 +314,16 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { if (f.isValid) { const { employmentType, employmentDate, employmentStatus, dismissDate, cardType, entryDate, departureDate, - birthplace, taxReasons, ...params + birthplace, taxReasons, reissueSalary, reissueTaxCycle, ...params } = form.getFormParams(); if ((employmentType !== "OTHER" && !employmentDate) || (employmentStatus === "ABNORMAL" && !dismissDate)) { form.showError("dismissDate", getLabel(111, "\"离职日期\"未填写")); return; } + if (reissueSalary === "ON" && !reissueTaxCycle) { + form.showError("reissueTaxCycle", getLabel(111, "\"补发税款所属月份\"未填写")); + return; + } if ((cardType !== "RESIDENT_IDENTITY_CARDS" && !entryDate && !departureDate && !birthplace && !taxReasons)) { form.showError("entryDate", getLabel(111, "\"首次入境时间\"未填写")); form.showError("departureDate", getLabel(111, "\"预计离境时间\"未填写")); @@ -288,7 +350,8 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { const payload = { ...form.getFormParams(), id: this.props.id, taxAgentId: getQueryString("id"), - taxCycle: this.props.taxCycle + taxCycle: this.props.taxCycle, + reissueTaxCycle: reissueTaxCycle ? `${reissueTaxCycle}-01` : "" }; this.setState({ loading: true }); getEmployeeSave(payload).then(({ status, errormsg }) => { @@ -331,4 +394,4 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { } } -export default EmployeeDeclareDetailSchemaEditDialog; +export default EmployeeDeclareDetailSchemaEditDialog; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js index 4e2525a7..dcbd7d7a 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js @@ -371,6 +371,30 @@ export const declareConditions = [ value: "", viewAttr: 2 }, + { + colSpan: 1, + conditionType: "SELECT", + domkey: ["reissueSalary"], + fieldcol: 12, + label: "是否离职后补发工资", + lanId: 111, + labelcol: 6, + value: "OFF", + viewAttr: 2, + detailtype: 3, + options: [] + }, + { + colSpan: 1, + conditionType: "MONTHPICKER", + domkey: ["reissueTaxCycle"], + fieldcol: 12, + label: "补发税款所属月份", + lanId: 111, + labelcol: 6, + value: "", + viewAttr: 2 + }, { colSpan: 1, conditionType: "DATEPICKER", @@ -517,4 +541,4 @@ export const deductConditions = [ ], defaultshow: true } -]; +]; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index 159567b1..7b9ef0d7 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -468,7 +468,8 @@ class Index extends Component { {getLabel(542240, "税款所属期")}: this.setState({ - taxCycle: val, pageInfo: { ...pageInfo, current: 1 } + taxCycle: val, pageInfo: { ...pageInfo, current: 1 }, + selectedRowKeys: [] }, () => this.queryEmployeeList())}/> ,