diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js index be20527a..419478a8 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js @@ -22,9 +22,7 @@ export const calculateConditions = [ lanId: 519146, labelcol: 6, options: [], - otherParams: { - showSearch: true, optionFilterProp: "children" - }, + multiple: true, rules: "required|string", viewAttr: 3 }, diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js index 5026322a..37984ed4 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js @@ -83,7 +83,7 @@ class Index extends Component { ]} > -
{getSearchs(calculateForm, conditions, 1, false)}
+
{getSearchs(calculateForm, conditions, 1, false)}
); } diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index 045f4b8c..1dc8f4cc 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -101,39 +101,3 @@ } } - -.calculate-dialog-layout { - background: #f6f6f6; - - .wea-search-group { - padding: 16px; - } - - .wea-select, .ant-select-selection, .ant-select { - width: 100%; - } - - .wea-select { - display: inline-block; - position: relative; - } - - .ant-select-selection { - height: 30px; - border-radius: 0; - } - - .wea-content { - padding: 0; - - .wea-form-cell-wrapper { - background: #FFF; - border: 1px solid #e5e5e5; - border-bottom: none; - - .wea-form-cell { - border-bottom: 1px solid #e5e5e5; - } - } - } -}