diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index fcfcfcc8..9d5d987c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -7,7 +7,7 @@
import React, { Component } from "react";
import { Button, Icon, message, Modal, Spin, Tooltip } from "antd";
import { inject, observer } from "mobx-react";
-import { WeaInputSearch, WeaTab } from "ecCom";
+import { WeaInputSearch, WeaTab, WeaSearchGroup, WeaInput, WeaFormItem } from "ecCom";
import { calcPageNo } from "../../../../util";
import { getQueryString } from "../../../../util/url";
import ProgressModal from "../../../../components/progressModal";
@@ -43,6 +43,7 @@ export default class NormalIndex extends Component {
total: 0
},
searchValue: "",
+ workcode: "",
progressVisible: false,
progress: 0,
fieldData: {}, //选中的表单头信息
@@ -440,13 +441,19 @@ export default class NormalIndex extends Component {
});
};
getSearchs=()=> {
- let group = [];
- return group;
+ return
+
+ this.setState({ workcode: v })}
+ />
+
+ ;
}
render() {
const { remarks, billMonth, selectedKey, paymentOrganization, standingBookStore } = this.props;
- const { addProps, adjustSlide, importParams, returnEditPersonSlide, showSearchAd } = this.state;
+ const { addProps, adjustSlide, importParams, returnEditPersonSlide, showSearchAd, searchValue } = this.state;
const { loading } = standingBookStore;
return (
@@ -476,7 +483,125 @@ export default class NormalIndex extends Component {
datas={[]} selectedKey="" advanceHeight={200} searchsAd={this.getSearchs()}
searchType={["base", "advanced"]} showSearchAd={showSearchAd}
setShowSearchAd={bool => this.setState({ showSearchAd: bool })}
+ onSearchChange={searchValue => this.setState({ searchValue })}
+ buttons={
+ (this.props.type !== "detail" && this.props.selectedKey == "3") ? [
+
+
+ ,
+
+
+ ,
+
+
+
+ ] : (selectedKey === "1" && this.props.type !== "detail") ? [
+
,
+
,
+
+
+
+ ] : selectedKey === "1" ? [
+
,
+
+
+
+ ] : this.props.type !== "detail" ? [
+
+ this.setState({ importParams: { ...importParams, visible: true } })}
+ />
+ ,
+
+
+
+ ] : []
+ }
/>
+
{
+ 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({
+ 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.props.type !== "detail" && this.props.selectedKey == "3"*/}
{/* ?
*/}
@@ -492,24 +617,6 @@ export default class NormalIndex extends Component {
{/* */}
{/* */}
{/* :
}*/}
- {/*
{*/}
- {/* this.setState({*/}
- {/* addProps: {*/}
- {/* ...addProps,*/}
- {/* visible: false*/}
- {/* }*/}
- {/* }, () => {*/}
- {/* isRefresh && this.getSupplementaryList({*/}
- {/* billMonth,*/}
- {/* current: this.state.current,*/}
- {/* paymentOrganization*/}
- {/* });*/}
- {/* });*/}
- {/* }}*/}
- {/* />*/}
{/* {*/}
{/* selectedKey === "1" && this.props.type !== "detail" &&*/}
{/* */}
@@ -534,15 +641,6 @@ export default class NormalIndex extends Component {
{/* }}>线下对比*/}
{/* */}
{/* }*/}
- {/* /!*核算进度条*!/*/}
- {/* {*/}
- {/* this.setState({ progressVisible: false, progress: 0 });*/}
- {/* }}*/}
- {/* progress={this.state.progress}*/}
- {/* />*/}
{/* {*/}
{/* this.props.type !== "detail" &&*/}
{/* */}
@@ -553,31 +651,6 @@ export default class NormalIndex extends Component {
{/* />*/}
{/* */}
{/* }*/}
- {/* /!*导入弹框*!/*/}
- {/* {*/}
- {/* 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}*/}
- {/* />*/}
- {/* }*/}
-
{/* */}
{/*