From 377039ade2fdf5d48c0856f86ca16ce42aafe472 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 17:40:30 +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=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/index.js              |  2 +-
 .../pages/payroll/stepForm/baseInformForm.js          | 11 ++++++++++-
 .../hrmSalary/pages/payroll/templateBaseSettings.js   |  6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index c974b699..10c526ea 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -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="%"
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 5a3d8681..94719f8d 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -2,6 +2,7 @@ import React from "react";
 import {
   WeaCheckbox,
   WeaFormItem,
+  WeaHelpfulTip,
   WeaInput,
   WeaInputNumber,
   WeaLocaleProvider,
@@ -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
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index 08b4e813..2d876674 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -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