From 797cb912a293fc3dbd7daee4057f586c4c75f12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 13 Jun 2023 09:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
=?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E6=B0=B4?=
=?UTF-8?q?=E5=8D=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/index.js | 24 ++++++++-
pc4mobx/hrmSalary/pages/payroll/index.less | 22 ++++++++
.../pages/payroll/templateBaseSettings.js | 52 +++++++++++++++++++
3 files changed, 96 insertions(+), 2 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/payroll/index.less
create mode 100644 pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index 9297b134..1a6307d7 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -3,8 +3,16 @@ import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
import { Button, DatePicker, message, Modal } from "antd";
import moment from "moment";
-import { WeaHelpfulTip, WeaInputSearch, WeaNewScroll, WeaSelect, WeaSlideModal, WeaTop } from "ecCom";
-import { renderLoading } from "../../util"; // 渲染form数据的方法:因为多个页面都会使用,所以抽的公共方法在util中
+import {
+ WeaHelpfulTip,
+ WeaInputSearch,
+ WeaLocaleProvider,
+ WeaNewScroll,
+ WeaSelect,
+ WeaSlideModal,
+ WeaTop
+} from "ecCom";
+import { renderLoading } from "../../util";
import CustomTab from "../../components/customTab";
import StepSlide from "../../components/stepSlide";
import BaseInformForm from "./stepForm/baseInformForm";
@@ -12,11 +20,13 @@ import ShowSettingForm from "./stepForm/showSettingForm";
import SlideModalTitle from "../../components/slideModalTitle";
import TemplateSettingList from "./templateSettingList";
import TemplateSettingForm from "./stepForm/tmplateSettingForm";
+import TemplateBaseSettings from "./templateBaseSettings";
import CopyModal from "./copyModal";
import SalarySendList from "./SalarySendList";
import { getReplenishForm } from "../../apis/payroll";
import "../dataAcquisition/cumDeduct/index.less";
+const getLabel = WeaLocaleProvider.getLabel;
const { MonthPicker } = DatePicker;
@inject("payrollStore", "taxAgentStore")
@@ -256,6 +266,10 @@ export default class Payroll extends React.Component {
{
title: "工资单模板设置",
viewcondition: "1"
+ },
+ {
+ title: getLabel(111, "工资单模板基础设置"),
+ viewcondition: "2"
}
];
const renderRightOperation = () => {
@@ -333,6 +347,8 @@ export default class Payroll extends React.Component {
}}/>
);
+ } else if (this.state.selectedKey === "2") {
+ return ;
}
};
const steps = ["基础设置", "正常核算工资单模板", "补发工资单模版"];
@@ -405,6 +421,10 @@ export default class Payroll extends React.Component {
onDelete={(record) => this.handleTemplateListDelete(record)}
/>
}
+ {
+ this.state.selectedKey === "2" &&
+
+ }
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.less b/pc4mobx/hrmSalary/pages/payroll/index.less
new file mode 100644
index 00000000..f760536f
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/index.less
@@ -0,0 +1,22 @@
+.waterMarkWrapper {
+ .wea-form-cell-wrapper {
+ border: 1px solid #e5e5e5;
+ border-bottom: none;
+ }
+
+ .wea-form-item {
+ padding: 5px 16px;
+ border-bottom: 1px solid #e5e5e5;
+
+ .waterMarkTitle {
+ margin-left: 10px;
+ cursor: pointer;
+ color: #2db7f5;
+ position: absolute;
+ display: inline-block;
+ width: 48px;
+ top: 50%;
+ margin-top: -10px;
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
new file mode 100644
index 00000000..e7ca064b
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -0,0 +1,52 @@
+/*
+ * Author: 黎永顺
+ * name: 工资单模板基础设置
+ * Description:
+ * Date: 2023/6/12
+ */
+import React, { Component } from "react";
+import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSelect } from "ecCom";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class TemplateBaseSettings extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ watermarkStatus: "0",
+ watermark: "DEFAULT"
+ };
+ }
+
+ render() {
+ const { watermarkStatus, watermark } = this.state;
+ return (
+
+
+ this.setState({ watermarkStatus, watermark: "DEFAULT" })}/>
+
+ {
+ watermarkStatus === "1" &&
+
+ this.setState({ watermark })}
+ />
+ {
+ watermark === "CUSTOM" &&
+ {getLabel(111, "水印设置")}
+ }
+
+ }
+
+ );
+ }
+}
+
+export default TemplateBaseSettings;