From 2af9059775229c650fe480d0614a9c699beec99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 17 Jul 2023 14:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=B7=B3=E8=BD=AC=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/payroll.js | 4 +++ .../hrmSalary/pages/mobilePayroll/index.js | 24 +++++++++++++----- .../hrmSalary/pages/mySalary/mySalaryView.js | 25 ++++++++++++++----- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js index 6f48f359..14c949d5 100644 --- a/pc4mobx/hrmSalary/apis/payroll.js +++ b/pc4mobx/hrmSalary/apis/payroll.js @@ -375,6 +375,10 @@ export const sendMobileCode = (params) => { export const payrollCheckType = params => { return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/payrollCheckType", "GET", params); }; +//工资单-反馈验证 +export const feedBackSalaryBill = params => { + return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/feedBackSalaryBill", "GET", params); +}; //工资单-确认 export const confirmSalaryBill = params => { return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/confirmSalaryBill", "GET", params); diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index c2793533..05a4c36f 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -2,13 +2,13 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { getQueryString } from "../../util/url"; import { WeaDialog, WeaError, WeaInput, WeaLocaleProvider } from "ecCom"; -import { Button, message } from "antd"; +import { Button, message, Modal } from "antd"; import Authority from "../mySalary/authority"; import ComputerTemplate from "../payroll/templatePreview/computerTemplate"; import PhoneTemplate from "../payroll/templatePreview/phoneTemplate"; import "../payroll/templatePreview/index.less"; import * as API from "../../apis/mySalaryBenefits"; -import { confirmSalaryBill, payrollCheckType } from "../../apis/payroll"; +import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll"; import "./index.less"; import CaptchaModal from "../../components/captchaModal"; import { ConfirmBtns } from "../mySalary/mySalaryView"; @@ -117,10 +117,22 @@ export default class MobilePayroll extends React.Component { }); }; handleGoFeedback = () => { - const { mySalaryBillData } = this.state; - const { salaryTemplate } = mySalaryBillData; - const { feedbackUrl } = salaryTemplate; - window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); + Modal.confirm({ + title: getLabel(131329, "信息确认"), + content: getLabel(111, "请确认薪资信息是有误,进行反馈并发起反馈流程。"), + onOk: () => { + feedBackSalaryBill({ salaryInfoId: getQueryString("id") }).then(({ status, errorMsg }) => { + if (status) { + const { mySalaryBillData } = this.state; + const { salaryTemplate } = mySalaryBillData; + const { feedbackUrl } = salaryTemplate; + window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); + } else { + message.error(errorMsg); + } + }); + } + }); }; render() { diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index c614c952..24bf675e 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -6,11 +6,11 @@ */ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; -import { Button, message } from "antd"; +import { Button, message, Modal } from "antd"; import { WeaLocaleProvider } from "ecCom"; import Authority from "./authority"; import ComputerTemplate from "../payroll/templatePreview/computerTemplate"; -import { confirmSalaryBill, payrollCheckType } from "../../apis/payroll"; +import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll"; import CaptchaModal from "../../components/captchaModal"; import "../payroll/templatePreview/index.less"; @@ -55,10 +55,23 @@ class MySalaryView extends Component { }); }; handleGoFeedback = () => { - const { mySalaryStore } = this.state; - const { salaryTemplate } = mySalaryStore; - const { feedbackUrl } = salaryTemplate; - window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); + Modal.confirm({ + title: getLabel(131329, "信息确认"), + content: getLabel(111, "请确认薪资信息是有误,进行反馈并发起反馈流程。"), + onOk: () => { + const { params: { salaryInfoId } } = this.props; + feedBackSalaryBill({ salaryInfoId }).then(({ status, errorMsg }) => { + if (status) { + const { mySalaryStore } = this.state; + const { salaryTemplate } = mySalaryStore; + const { feedbackUrl } = salaryTemplate; + window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); + } else { + message.error(errorMsg); + } + }); + } + }); }; render() {