diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index 8f886557..64d75f65 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -28,7 +28,7 @@ class Calculate extends Component { name: "", dateRange: [ moment(new Date()).startOf("year").format("YYYY-MM"), - moment(new Date()).startOf("month").format("YYYY-MM") + moment(new Date()).endOf("year").format("YYYY-MM") ] }, isRefresh: false, progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") }, diff --git a/pc4mobx/hrmSalary/pages/declareDetail/confirm.js b/pc4mobx/hrmSalary/pages/declareDetail/confirm.js new file mode 100644 index 00000000..a64db297 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declareDetail/confirm.js @@ -0,0 +1,27 @@ +import { WeaLocaleProvider } from "ecCom"; +import { Modal } from "antd"; + +const { getLabel } = WeaLocaleProvider; +export const confirmDialog = (type, callback) => { + let content = ""; + switch (type) { + case "refresh": + content = getLabel(111, "刷新数据会重新从核算数据中取值,申报界面新增、编辑的数据会被全部覆盖,是否确认刷新?"); + break; + case "correct": + content = getLabel(111, "更正申报,当申报成功后,发现有错报、漏报的情况,可使用更正申报,更正申报成功时,企业状态会变成未申报"); + break; + case "cancel": + content = getLabel(111, "申报作废,只有申报成功,无需缴款/申报成功,未缴款的状态才能作废,当作废成功时,企业状态会变成未申报;当作废失败时,企业状态还是原来的未缴款或无需缴款的状态。"); + break; + case "declare": + content = getLabel(111, "解除劳动合同一次性补偿金、全年一次性奖金所得,不能单独申报,需要同正常工资薪金一起申报;解除劳动合同一次性补偿金、稿酬所得,由于税务规则需要,解除劳动合同一次性补偿金、稿酬所得必须填写免税附表。是否确认申报?"); + break; + default: + break; + } + return Modal.confirm({ + title: getLabel(131329, "信息确认"), content, + onOk: callback + }); +}; diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js index 1ac1f6b1..736ec8bf 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js @@ -31,6 +31,7 @@ import { convertToUrlString, getQueryString } from "../../util/url"; import IncomeTaxDeclarationPersonnelSlide from "./components/incomeTaxDeclarationPersonnelSlide"; import TaxDeclareDetailImportDialog from "./components/taxDeclareDetailImportDialog"; import TabEditDialog from "./components/tabEditDialog"; +import { confirmDialog } from "./confirm"; import "./index.less"; const { getLabel } = WeaLocaleProvider; @@ -324,9 +325,9 @@ class Index extends Component { const [__, taxDeclarationId] = selectedKey.split("%%"); let btns = [ , - , - ]; //申报状态:作废中 @@ -342,24 +343,24 @@ class Index extends Component { //申报状态:已缴款 declareInfo.declareStatus === "DECLARE_SUCCESS_PAID" && (btns.splice(1, 2, )); + onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct"))}>{getLabel(111, "更正申报")})); //申报状态:申报成功,无需缴款 declareInfo.declareStatus === "DECLARE_SUCCESS_NO_PAY" && (btns.splice(1, 2, , + onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct"))}>{getLabel(111, "更正申报")}, + onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel"))}>{getLabel(111, "作废申报")} )); //申报状态:申报成功,未缴款 declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID" && (btns.splice(1, 2, , + onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct"))}>{getLabel(111, "更正申报")}, , + onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel"))}>{getLabel(111, "作废申报")}, diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index 5f608921..e70aa4c2 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -18,7 +18,8 @@ class Index extends Component { constructor(props) { super(props); this.state = { - selectedKey: "1", salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().format("YYYY-MM")] + selectedKey: "1", + salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().endOf("year").format("YYYY-MM")] }; } diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/index.js index fb49383c..6e406620 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.js @@ -29,7 +29,7 @@ class Index extends Component { salarySobId: "", name: "", dateRange: [ moment(new Date()).startOf("year").format("YYYY-MM"), - moment(new Date()).startOf("month").format("YYYY-MM") + moment(new Date()).endOf("year").format("YYYY-MM") ] } };