diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 626b9ca2..fdfd4990 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -21,7 +21,8 @@ import PayrollGrant from "./pages/payroll/payrollGrant"; import PayrollDetail from "./pages/payroll/payrollDetail"; import Declare from "./pages/declare"; import TaxRate from "./pages/taxRate"; -import TaxAgent from "./pages/taxAgent"; +// import TaxAgent from "./pages/taxAgent"; +import TaxAgent from "./pages/salary/taxAgent"; import CalculateDetail from "./pages/calculateDetail"; import PlaceOnFileDetail from "./pages/calculateDetail/placeOnFileDetail"; import CompareDetail from "./pages/calculateDetail/compareDetail"; diff --git a/pc4mobx/hrmSalary/pages/salary/components/comHint.js b/pc4mobx/hrmSalary/pages/salary/components/comHint.js new file mode 100644 index 00000000..da3f5fb0 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salary/components/comHint.js @@ -0,0 +1,42 @@ +/* + * Author: 黎永顺 + * name: 个税扣缴义务人小提示组件 + * Description: + * Date: 2022/11/22 + */ +import React, { Component } from "react"; +import "./index.less"; + +class ComHint extends Component { + /* + * Author: 黎永顺 + * Description: 提示语注释 + * Params: isChief=总管理员 + * Date: 2022/11/22 + */ + renderTips = () => { + const { isChief = true } = this.props; + if (isChief) { + return [ +

1、个税扣缴义务人与档案中的个税扣缴义务人匹配,修改个税扣缴义务人名称,薪资档案的个税扣缴义务人数据同步更新;

, +

2、删除个税扣缴义务人需先确认档案里无人员使用该个税扣缴义务人,否则不予删除;

, +

3、开启分权,需维护个税扣缴义务人的管理员;当前总管理员默认有管理员的权限;

+ ]; + } else { + return []; + } + }; + + render() { + return ( +
+
小提示
+
+ {this.renderTips()} +
+
+ ); + } +} + +export default ComHint; diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less new file mode 100644 index 00000000..ec181e16 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salary/components/index.less @@ -0,0 +1,24 @@ +.comHint { + width: 100%; + margin: 16px 0; + border: 1px solid #e5e5e5; + + .hintHeader { + background: #f6f6f6; + height: 40px; + border-bottom: 1px solid #e5e5e5; + padding-left: 16px; + line-height: 40px; + } + + .hintTips { + width: 100%; + color: #999; + line-height: 20px; + padding: 0 16px; + display: inline-block; + p{ + margin: 1rem 0; + } + } +} diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less new file mode 100644 index 00000000..b9c1951d --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salary/index.less @@ -0,0 +1,7 @@ +.salaryAgentWrapper{ + .comContent{ + .wea-search-group{ + padding: 0; + } + } +} diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js new file mode 100644 index 00000000..eaa8fc0c --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js @@ -0,0 +1,25 @@ +import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; +import { WeaSearchGroup, WeaTop } from "ecCom"; +import ComHint from "./components/comHint"; +import "./index.less"; + +@inject("taxAgentStore") +@observer +class TaxAgent extends Component { + render() { + return ( +
+ } iconBgcolor="#F14A2D"> +
+ + +
+ +
+
+ ); + } +} + +export default TaxAgent;