qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.02 

# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
This commit is contained in:
黎永顺 2023-07-20 13:44:02 +08:00
parent f323bc6b7c 377039ade2
commit 27bb5e823d
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc4mobx/hrmSalary/pages/mobilePayroll/index.js
View File

@ -9,7 +9,6 @@ import PhoneTemplate from "../payroll/templatePreview/phoneTemplate";
import "../payroll/templatePreview/index.less";
import * as API from "../../apis/mySalaryBenefits";
import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll";
import "./index.less";
import CaptchaModal from "../../components/captchaModal";
import PassSetDialog from "./passSetDialog";
import { ConfirmBtns } from "../mySalary/mySalaryView";

2
pc4mobx/hrmSalary/pages/payroll/index.js
View File

@ -506,7 +506,7 @@ export default class Payroll extends React.Component {
className="slideOuterWrapper"
visible={this.state.editSlideVisible}
top={0}
width={50}
width={65}
height={100}
direction="right"
measure="%"

13
pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
View File

@ -2,12 +2,13 @@ import React from "react";
import {
WeaCheckbox,
WeaFormItem,
WeaHelpfulTip,
WeaInput,
WeaInputNumber,
WeaLocaleProvider,
WeaSearchGroup,
WeaSelect,
WeaTimePicker,
WeaTimePicker
} from "ecCom";
import { inject, observer } from "mobx-react";
import { getReplenishRuleSetOptions } from "../../../apis/payroll";
@ -201,9 +202,12 @@ export default class BaseInformForm extends React.Component {
autoSendStatus: value === "1",
autoSendDayOfMonth: value === "1" ? "1" : null,
autoSendTimeOfDay: value === "1" ? "09:00" : null,
autoSendCycleType: value === "1" ? 1 : null,
autoSendCycleType: value === "1" ? 1 : null
});
}}/>
<WeaHelpfulTip title={getLabel(111, "开启后，还需在计划任务中配置定时任务，执行工资单定时发送任务；")}
style={{ marginLeft: 10 }}
placement="top" width={200}/>
</WeaFormItem>
{
autoSendStatus &&
@ -236,8 +240,13 @@ export default class BaseInformForm extends React.Component {
<WeaFormItem label={getLabel(111, "自动确认超时天数")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
<WeaInputNumber
min={1} value={autoAckDays} viewAttr={3}
style={{ width: "95%" }}
onChange={autoAckDays => this.handleChange({ autoAckDays })}
/>
<WeaHelpfulTip
title={getLabel(111, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；")}
style={{ marginLeft: 10 }}
placement="top" width={200}/>
</WeaFormItem>
<WeaFormItem label={getLabel(111, "反馈流程地址")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
<WeaInput

6
pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
View File

@ -8,6 +8,7 @@ import React, { Component } from "react";
import {
WeaCheckbox,
WeaFormItem,
WeaHelpfulTip,
WeaInput,
WeaInputNumber,
WeaLocaleProvider,
@ -136,11 +137,16 @@ class TemplateBaseSettings extends Component {
<WeaFormItem label={getLabel(111, "自动确认超时天数")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
<WeaInputNumber
min={1} value={autoAckDays} viewAttr={3}
style={{ width: "90%" }}
onChange={autoAckDays => this.setState({
ackFeedbackSetting: {
...ackFeedbackSetting, autoAckDays
}
})}/>
<WeaHelpfulTip
title={getLabel(111, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；")}
style={{ marginLeft: 10 }}
placement="top" width={200}/>
</WeaFormItem>
<WeaFormItem label={getLabel(111, "反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
<WeaInput