diff --git a/pc4mobx/hrmSalary/pages/calculate/config.js b/pc4mobx/hrmSalary/pages/calculate/config.js index 02da5b10..287b57c0 100644 --- a/pc4mobx/hrmSalary/pages/calculate/config.js +++ b/pc4mobx/hrmSalary/pages/calculate/config.js @@ -7,7 +7,10 @@ export const queryConditions = [ fieldcol: 14, label: "个税扣缴义务人", lanI: 111, - multiple: true, + otherParams: { + showSearch: true, optionFilterProp: "children" + }, + // multiple: true, options: [], labelcol: 6, value: "", diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js index e06144ba..7cad3be8 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js @@ -289,6 +289,8 @@ class Index extends Component { const { dataIndex } = item; switch (dataIndex) { case "taxAgentName": + width = "300px"; + break; case "departmentName": width = "15%"; break; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js index 658d0808..f1fcf46e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js @@ -192,7 +192,10 @@ export const reFrenceConditions = [ labelcol: 6, valueList: [], options: [], - multiple: true, + otherParams: { + showSearch: true, optionFilterProp: "children" + }, + // multiple: true, rules: "required|string", viewAttr: 3 }, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 171944e7..a7e896eb 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -610,7 +610,7 @@ export const DataCollectionSelect = (props) => { } = props; return onChange({ key, value: val })} options={options} - viewAttr={viewAttr} multiple={multiple}/> + viewAttr={viewAttr} multiple={multiple} showSearch optionFilterProp="children"/> ; }; diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js index f687683a..c905f1b4 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js @@ -175,7 +175,7 @@ class Index extends Component { const { payrollFilesStore: { tableStore } } = this.props; const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({ dataIndex: it.dataIndex, title: it.title, align: "left", - width: (it.dataIndex === "taxAgentName" || it.dataIndex === "operate") ? 185 : 150, + width: it.dataIndex === "taxAgentName" ? 300 : it.dataIndex === "operate" ? 185 : 150, fixed: it.dataIndex === "username" ? "left" : it.dataIndex === "operate" ? "right" : it.fixed ? it.fixed : false, ellipsis: true })); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index 6616f55f..6d745626 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -328,7 +328,10 @@ export const salaryFileSearchConditions = [ fieldcol: 16, label: getLabel(537996, "个税扣缴义务人"), labelcol: 8, - multiple: true, + otherParams: { + showSearch: true, optionFilterProp: "children" + }, + // multiple: true, options: [], viewAttr: 2 }, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js index cd9dd5c7..61469284 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js @@ -131,7 +131,8 @@ class WelfareRecordList extends Component { this.setState({ loading: false }); if (status) { const { pageInfo: result } = data; - const { columns, list: dataSource, pageNum: current, pageSize, total } = result; + let { columns, list: dataSource, pageNum: current, pageSize, total } = result; + columns = _.map(columns, o => ({ ...o, width: o.dataIndex === "paymentOrganization" ? 300 : o.width })); this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns