diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index 565af168..7e748268 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -126,8 +126,8 @@ export default class MobilePayroll extends React.Component { }; handleGoFeedback = () => { const { mySalaryBillData } = this.state; - const { feedbackWorkflowId } = mySalaryBillData; - window.open(`${window.ecologyContentPath || ""}${feedbackWorkflowId}`); + const { feedbackUrl } = mySalaryBillData; + window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); }; render() { diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index dd16b25f..9590070e 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -56,8 +56,8 @@ class MySalaryView extends Component { }; handleGoFeedback = () => { const { mySalaryStore } = this.state; - const { feedbackWorkflowId } = mySalaryStore; - window.open(`${window.ecologyContentPath || ""}${feedbackWorkflowId}`); + const { feedbackUrl } = mySalaryStore; + window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); }; render() { diff --git a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js index 947db8db..b81e1f6e 100644 --- a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js +++ b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js @@ -21,10 +21,7 @@ export default class SalarySendList extends React.Component { // 发放回调 handleGrant(record) { - window.open( - "/spa/hrmSalary/static/index.html#/main/hrmSalary/payrollGrant?id=" + - record.id - ); + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/payrollGrant?id=${record.id}&ackFeedbackStatus=${record.ackFeedbackStatus}`); } // 查看详情 diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index da625880..9582c550 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -9,7 +9,6 @@ import { getSearchs, renderLoading } from "../../../util"; import CustomPaginationTable from "../../../components/customPaginationTable"; import PayrollPartTable from "./payrollPartTable"; import { getPayrollIssuanceProgressBar } from "../../../apis/payroll"; -import { sysConfCodeRule } from "../../../apis/ruleconfig"; import ProgressModal from "../../../components/progressModal"; const getLabel = WeaLocaleProvider.getLabel; @@ -41,7 +40,10 @@ export default class PayrollGrant extends React.Component { componentWillMount() { const { selectedKey } = this.state; let id = getQueryString("id"); - this.setState({ currentId: id }); + this.setState({ + currentId: id, + showFeedbackColumn: getQueryString("ackFeedbackStatus") === "1" + }); const { payrollStore: { getPayrollInfo, getInfoList, getPaySa } } = this.props; @@ -51,15 +53,8 @@ export default class PayrollGrant extends React.Component { isGranted: selectedKey !== "0" }); getPaySa(); - this.sysConfCodeRule(); } - sysConfCodeRule = () => { - sysConfCodeRule({ code: "SALARY_SEND_FEEDBACK" }).then(({ status, data }) => { - if (status && data === "1") this.setState({ showFeedbackColumn: data === "1" }); - }); - }; - // 撤回 handleWithdraw = (record) => { const { payrollStore } = this.props; diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js index 5cd3f6f1..b3788b60 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js @@ -1,5 +1,14 @@ import React from "react"; -import { WeaCheckbox, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaTimePicker } from "ecCom"; +import { + WeaCheckbox, + WeaFormItem, + WeaInput, + WeaInputNumber, + WeaLocaleProvider, + WeaSearchGroup, + WeaSelect, + WeaTimePicker +} from "ecCom"; import { inject, observer } from "mobx-react"; import { getReplenishRuleSetOptions } from "../../../apis/payroll"; import { commonEnumList } from "../../../apis/payrollFiles"; @@ -89,20 +98,11 @@ export default class BaseInformForm extends React.Component { }; render() { - const { request, options, replenishRuleOptions, salaryMonthOptions } = this.state; + const { request, options, replenishRuleOptions } = this.state; const { - salarySob, - name, - description, - replenishName, - replenishRule, - reissueRule, - msgStatus, - emailStatus, - autoSendStatus, - autoSendDayOfMonth, - autoSendTimeOfDay, - autoSendCycleType + salarySob, name, description, replenishName, replenishRule, reissueRule, msgStatus, emailStatus, + ackFeedbackStatus, autoAckDays, feedbackUrl, autoSendStatus, autoSendDayOfMonth, + autoSendTimeOfDay, autoSendCycleType } = request; return ( @@ -220,6 +220,34 @@ export default class BaseInformForm extends React.Component { } + + + this.handleChange({ + ackFeedbackStatus: value === "1", + autoAckDays: 7, + feedbackUrl: "/" + })}/> + + { + ackFeedbackStatus && + + + this.handleChange({ autoAckDays })} + /> + + + this.handleChange({ feedbackUrl })} + /> + + + } + ); }