diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index a48b9557..0c825a73 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -285,6 +285,7 @@ export default class Archives extends React.Component {
const { pageInfo } = this.state;
this.setState({
selectedKey,
+ selectedRowKeys:[],
editSlideVisible: false,
pageInfo: {
...pageInfo,
@@ -527,7 +528,7 @@ export default class Archives extends React.Component {
url = `${url}&runStatuses=3`;
break;
default:
- url = `${url}&runStatuses=4`;
+ url = `${url}&runStatuses=4,5`;
break;
}
window.open(url, "_self");
@@ -553,7 +554,7 @@ export default class Archives extends React.Component {
url = `${url}&runStatuses=3`;
break;
default:
- url = `${url}&runStatuses=4`;
+ url = `${url}&runStatuses=4,5`;
break;
}
window.open(url, "_self");
@@ -701,7 +702,10 @@ export default class Archives extends React.Component {
rowSelection={rowSelection}
scroll={{ x: 1200 }}
/>
- {this.getTipChildren()}
+ {
+ !_.isEmpty(this.getColumns()) &&
+ {this.getTipChildren()}
+ }
{
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
index 5a3004ee..369e6b5a 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
@@ -118,16 +118,6 @@ export const insertUpdateColumns = [
dataIndex: "paymentScope",
key: "paymentScope"
},
- {
- title: "缴纳比例%",
- dataIndex: "paymentProportion",
- key: "paymentProportion"
- },
- {
- title: "固定费用",
- dataIndex: "fixedCost",
- key: "fixedCost"
- },
{
title: "基数上限",
dataIndex: "upperLimit",
@@ -138,6 +128,16 @@ export const insertUpdateColumns = [
dataIndex: "lowerLimit",
key: "lowerLimit"
},
+ {
+ title: "缴纳比例%",
+ dataIndex: "paymentProportion",
+ key: "paymentProportion"
+ },
+ {
+ title: "固定费用",
+ dataIndex: "fixedCost",
+ key: "fixedCost"
+ },
{
title: "有效小数位",
dataIndex: "validNum",
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
index fc3467b3..b85a779b 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
@@ -160,20 +160,35 @@ export default class DefaultSlideForm extends React.Component {
} = this.props;
let result = { ...record };
result[key] = e;
- if (this.state.selectItem == "个人") {
- let dataSource = [...defaultPersonDataSource];
+ if(key === 'upperLimit' || key === 'lowerLimit'){
+ let dataSource = [...defaultPersonDataSource],
+ dataSource_company = [...defaultCompanyDataSource];
dataSource = dataSource.map(item => {
- if (item.id == result.id) return result;
+ if (item.insuranceName === result.insuranceName) return {...item, [key]: e, };
+ else return item;
+ });
+ dataSource_company = dataSource_company.map(item => {
+ if (item.insuranceName === result.insuranceName) return {...item, [key]: e };
else return item;
});
setDefaultPersonDataSource(dataSource);
- } else {
- let dataSource = [...defaultCompanyDataSource];
- dataSource = dataSource.map(item => {
- if (item.id == result.id) return result;
- else return item;
- });
- setDefaultCompanyDataSource(dataSource);
+ setDefaultCompanyDataSource(dataSource_company);
+ }else{
+ if (this.state.selectItem == "个人") {
+ let dataSource = [...defaultPersonDataSource];
+ dataSource = dataSource.map(item => {
+ if (item.id == result.id) return result;
+ else return item;
+ });
+ setDefaultPersonDataSource(dataSource);
+ } else {
+ let dataSource = [...defaultCompanyDataSource];
+ dataSource = dataSource.map(item => {
+ if (item.id == result.id) return result;
+ else return item;
+ });
+ setDefaultCompanyDataSource(dataSource);
+ }
}
}
@@ -189,10 +204,7 @@ export default class DefaultSlideForm extends React.Component {
const { programmeStore, salaryFileStore, taxAgentStore } = this.props;
const { userStatusList } = salaryFileStore;
const { taxAgentAdminOption,getTaxAgentSelectListAsAdmin } = taxAgentStore;
- const {
- defaultPersonDataSource,
- defaultCompanyDataSource,
- } = programmeStore;
+ const { defaultPersonDataSource, defaultCompanyDataSource } = programmeStore;
const options = [
{
key: "",
@@ -212,13 +224,9 @@ export default class DefaultSlideForm extends React.Component {
];
const handleSmallTabChange = item => {
- // let paymentArea = item == "paymentArea" ? "1": "2"
- // let requestParams = {...this.props.requestParams}
- // requestParams.paymentArea = paymentArea
this.setState({
selectItem: item.value
});
- // this.props.onChange(requestParams)
};
return (