diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 4a1ed275..6027fcec 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -30,7 +30,7 @@ class SalaryItemForm extends Component { componentDidMount() { const { salaryItemFieldsList } = this.state; const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props; - const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request; + const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType, pattern } = request; this.setState({ salaryItemFieldsList: _.map(salaryItemFieldsList, item => { const { key } = item; @@ -87,6 +87,7 @@ class SalaryItemForm extends Component { case "defaultValue": return { ...item, + precision: pattern ? pattern : item.precision, type: dataType === "number" ? "INPUTNUMBER" : "INPUT", display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0, viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js index bc9c1816..c42f0ec4 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js @@ -22,6 +22,7 @@ export const socialAccountConditions = [ lanId: 537996, labelcol: 6, options: [], + multiple: true, rules: "required|string", viewAttr: 3 }, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js index 334b851e..fd5a783a 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js @@ -54,6 +54,12 @@ class WelfareAdvanceSearchPannel extends Component { viewAttr: 2 } }; + } else if (getKey(o) === "siSchemeId" || getKey(o) === "fundSchemeId" || getKey(o) === "otherSchemeId" || getKey(o) === "taxAgentId") { + return { + ...o, otherParams: { + showSearch: true, optionFilterProp: "children" + } + }; } return { ...o }; }) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js index e00b4f83..98e7009f 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js @@ -111,7 +111,10 @@ class Index extends Component { return { ...g, label: getLabel(g.lanId, g.label), viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr, - options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options + options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options, + otherParams: { + showSearch: true, optionFilterProp: "children" + } }; } else if (getKey(g).indexOf("StartTime") !== -1) { return {