diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index bd5f39fa..25b9dcc3 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -20,6 +20,7 @@ export default class CalculateDetail extends React.Component { showSearchAd: false, searchItemsValue: { employeeName: "", + workcode: "", departmentIds: "", positionIds: "", subcompanyIds: "", @@ -50,19 +51,20 @@ export default class CalculateDetail extends React.Component { } Input = (value, key) => { - const { employeeName } = this.state.searchItemsValue; + const { employeeName, workcode } = this.state.searchItemsValue; return ( - this.setState({ - searchItemsValue: { - ...this.state.searchItemsValue, - [key]: val - } - })}/> + this.setState({ + searchItemsValue: { + ...this.state.searchItemsValue, + [key]: val + } + })}/> ); }; @@ -315,6 +317,7 @@ export default class CalculateDetail extends React.Component { , + + ]; + const btn2 = [ + , + + ]; + const btn3 = [ + + ]; + const btn4 = [ + + ]; + const btn5 = [ + + ]; + let btn = []; + (this.props.type !== "detail" && this.props.selectedKey == "3") && (btn = [...btn, ...btn1]); + (selectedKey === "1" && this.props.type !== "detail") && (btn = [...btn, ...btn2]); + selectedKey === "1" && (btn = [...btn, ...btn3]); + this.props.type !== "detail" && (btn = [...btn, ...btn4]); + btn = [...btn, ...btn5]; return (
{ @@ -467,125 +508,65 @@ export default class NormalIndex extends Component {
} -
- {this.props.type !== "detail" && this.props.selectedKey == "3" - ? - - - - - - - - : } - { + this.setState({ showSearchAd: bool })} + onSearchChange={searchValue => this.setState({ searchValue })} + buttons={btn} onSearch={this.handleSearch} onAdSearch={this.handleSearch} + onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder="请输入员工姓名" + /> + { + this.setState({ + addProps: { + ...addProps, + visible: false + } + }, () => { + isRefresh && this.getSupplementaryList({ + billMonth, + current: this.state.current, + paymentOrganization + }); + }); + }} + /> + {/*核算进度条*/} + { + this.setState({ progressVisible: false, progress: 0 }); + }} + progress={this.state.progress} + /> + {/*导入弹框*/} + { + importParams.visible && + { this.setState({ - addProps: { - ...addProps, - visible: false - } - }, () => { - isRefresh && this.getSupplementaryList({ - billMonth, - current: this.state.current, - paymentOrganization - }); + fieldData }); }} - /> - { - selectedKey === "1" && this.props.type !== "detail" && - - - - - } - { - selectedKey === "1" && - - - - } - {/*核算进度条*/} - { - this.setState({ progressVisible: false, progress: 0 }); + this.setState({ importParams: { ...importParams, visible: false }, fieldData: {} }, () => { + const { billMonth, selectedKey, paymentOrganization } = this.props; + const { current } = this.state; + selectedKey === "1" + ? this.getNormalList({ billMonth, current, paymentOrganization }) + : this.getSupplementaryList({ billMonth, current, paymentOrganization }); + }); }} - progress={this.state.progress} + isStandingBook + standingBookTabKey={selectedKey} /> - { - this.props.type !== "detail" && - - this.setState({ importParams: { ...importParams, visible: true } })} - /> - - } - {/*导入弹框*/} - { - importParams.visible && - { - this.setState({ - fieldData - }); - }} - onCancel={() => { - this.setState({ importParams: { ...importParams, visible: false }, fieldData: {} }, () => { - const { billMonth, selectedKey, paymentOrganization } = this.props; - const { current } = this.state; - selectedKey === "1" - ? this.getNormalList({ billMonth, current, paymentOrganization }) - : this.getSupplementaryList({ billMonth, current, paymentOrganization }); - }); - }} - isStandingBook - standingBookTabKey={selectedKey} - /> - } - - - - - { - this.setState({ searchValue: value }); - }} - placeholder={"请输入姓名"} - onSearch={value => { - this.handleSearch(value); - }} - /> -
+ } {/* table */}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js index 78a837b9..8971946d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js @@ -1,13 +1,15 @@ import React, { Component } from "react"; import { Button } from "antd"; -import { WeaHelpfulTip, WeaInputSearch, WeaTop } from "ecCom"; +import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaSearchGroup, WeaTab } from "ecCom"; import { getQueryString } from "../../../../util/url"; class RegTop extends Component { constructor(props) { super(props); this.state = { - name: "" + name: "", + workcode: "", + showSearchAd: false }; } @@ -31,43 +33,55 @@ class RegTop extends Component { placement="bottomRight" width={250} />, - , - this.setState({ name })} - onSearch={() => onChange("search")} - /> + ]; if (!type) { const [dom1, ...extra] = dom; const domBtn = regtopType === "regression" ? - : - ; + : + ; dom = [ dom1, - , domBtn, ...extra ]; } return dom; }; + getSearchs = () => { + return + + this.setState({ workcode: v })} + /> + + ; + }; render() { - const { billMonth } = this.props; + const { showSearchAd } = this.state; + const { billMonth, onChange } = this.props; return ( - 账单月份{billMonth}} - buttons={this.renderTopBtns()} + this.setState({ showSearchAd: bool })} + onSearchChange={name => this.setState({ name })} + buttons={this.renderTopBtns()} onSearch={() => onChange("search")} onAdSearch={() => onChange("search")} + onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder="请输入员工姓名" /> + // 账单月份{billMonth}} + // buttons={this.renderTopBtns()} + // /> ); } } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js index e525dd28..4b4e790d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js @@ -74,6 +74,7 @@ class Regression extends Component { handleChangeOpt = (key) => { const { returnPersonModal } = this.state; const name = this.regTopRef.state.name; + const workcode = this.regTopRef.state.workcode; const billMonth = getQueryString("billMonth"); const creator = Number(getQueryString("creator")); const paymentOrganization = getQueryString("paymentOrganization"); @@ -97,7 +98,7 @@ class Regression extends Component { window.open(url, "_self"); break; case "search": - this.regListRef.recessionList({ userName: name, current: 1 }); + this.regListRef.recessionList({ userName: name, workcode, current: 1 }); break; default: break;