From 990fd642ffc4eb0ba51608d61a865e615ee78ac2 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, 15 Nov 2022 17:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/salaryItem/customSalaryItemSlide.js | 75 +++++++++++++++---- pc4mobx/hrmSalary/pages/salaryItem/index.js | 18 +++-- pc4mobx/hrmSalary/pages/salaryItem/index.less | 2 +- pc4mobx/hrmSalary/stores/salaryItem.js | 8 +- 4 files changed, 79 insertions(+), 24 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js index 34df10d7..66dca1c9 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js @@ -1,10 +1,9 @@ import React from "react"; -import { Col, Radio, Row, Switch } from "antd"; +import { Col, Row, Switch } from "antd"; import { WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom"; -import "./index.less"; import { dataTypeOptions, patternOptions, roundingModeOptions } from "./options"; -import RequiredLabelTip from "../../components/requiredLabelTip"; import FormalFormModal from "./formalFormModal"; +import "./index.less"; export default class CustomSalaryItemSlide extends React.Component { constructor(props) { @@ -32,9 +31,10 @@ export default class CustomSalaryItemSlide extends React.Component { } render() { - const { editable, request, isAdd } = this.props; + const { editable, request, isAdd, userStatusList, taxAgentAdminOption } = this.props; const { name, + systemType, useDefault, useInEmployeeSalary, roundingMode, @@ -43,10 +43,11 @@ export default class CustomSalaryItemSlide extends React.Component { description, dataType, formulaContent, - formulaId + formulaId, + sharedType, + taxAgentIds } = request; const { formalModalVisible } = this.state; - return (
@@ -69,9 +70,7 @@ export default class CustomSalaryItemSlide extends React.Component { { @@ -92,9 +91,7 @@ export default class CustomSalaryItemSlide extends React.Component { { @@ -109,7 +106,53 @@ export default class CustomSalaryItemSlide extends React.Component { /> - + { + (systemType == 0 || isAdd) && + + + + 可见性 + + { + let payload = {}; + (value === "0" || value === "") && (payload.taxAgentIds = ""); + payload.sharedType = value; + this.handleChange(payload); + }} + style={{ width: "200px" }} + /> + + + + + } + { + sharedType === "1" && + + + + 可见性范围 + + { + this.handleChange({ taxAgentIds: value }); + }} + /> + + + + + } @@ -177,9 +220,9 @@ export default class CustomSalaryItemSlide extends React.Component { viewAttr={3} detailtype={3} options={[ - {key: "1", showname: "输入"}, - {key: "2", showname: "公式"}, - {key: "3", showname: "SQL"} + { key: "1", showname: "输入" }, + { key: "2", showname: "公式" }, + { key: "3", showname: "SQL" } ]} onChange={value => { this.handleChange({ diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index b1de5c9a..d6543870 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -1,6 +1,6 @@ import React from "react"; import { inject, observer } from "mobx-react"; -import { Button, Dropdown, Menu, Modal, Switch, message } from "antd"; +import { Button, Dropdown, Menu, message, Modal, Switch } from "antd"; import { WeaInputSearch, WeaRightMenu, WeaSlideModal, WeaTop } from "ecCom"; import { renderLoading } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中 import CustomTab from "../../components/customTab"; @@ -12,7 +12,7 @@ import DeleteSalaryItemModal from "./deleteSalaryItemModal"; import CustomPaginationTable from "../../components/customPaginationTable"; import "../socialSecurityBenefits/programme/index.less"; -@inject("salaryItemStore", "taxAgentStore") +@inject("salaryItemStore", "taxAgentStore", "salaryFileStore") @observer export default class SalaryItem extends React.Component { constructor(props) { @@ -50,7 +50,11 @@ export default class SalaryItem extends React.Component { componentWillMount() { // 初始化渲染页面 - const { salaryItemStore: { getTableDatas } } = this.props; + const { salaryItemStore: { getTableDatas }, salaryFileStore, taxAgentStore } = this.props; + const { commonEnumList } = salaryFileStore; + const { getTaxAgentSelectListAsAdmin } = taxAgentStore; + getTaxAgentSelectListAsAdmin(); + commonEnumList("user", { enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" }); getTableDatas({}).then(res => { this.setState({ searchParams: { @@ -143,7 +147,8 @@ export default class SalaryItem extends React.Component { }}>删除 }> - + ); } else { @@ -196,7 +201,8 @@ export default class SalaryItem extends React.Component { } render() { - const { salaryItemStore, taxAgentStore: { showOperateBtn, showSalaryItemBtn } } = this.props; + const { salaryItemStore, salaryFileStore, taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentAdminOption } } = this.props; + const { userStatusList } = salaryFileStore; const { selectedRowKeys } = this.state; const { loading, @@ -443,6 +449,8 @@ export default class SalaryItem extends React.Component { { handleSaveSlideChange(value); }}/> diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.less b/pc4mobx/hrmSalary/pages/salaryItem/index.less index e0bee60e..d02b10df 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.less +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.less @@ -2,7 +2,7 @@ padding: 20px; .formItem { - line-height: 40px; + margin-bottom: 20px; } } diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js index 53727474..ad31ecdb 100644 --- a/pc4mobx/hrmSalary/stores/salaryItem.js +++ b/pc4mobx/hrmSalary/stores/salaryItem.js @@ -29,7 +29,9 @@ export class SalaryItemStore { pattern: 0, valueType: 1, dataType: "number", - description: "" + description: "", + sharedType: "", + taxAgentIds: "" }; @observable tableDataSource = []; // 主列表 @@ -67,7 +69,9 @@ export class SalaryItemStore { pattern: 0, valueType: "1", dataType: "number", - description: "" + description: "", + sharedType: "", + taxAgentIds: "" }; @action