diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/index.less b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/index.less index de54d442..6304c53a 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/index.less +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/index.less @@ -4,10 +4,6 @@ height: 30px; line-height: 0; } - - .wea-form-item { - min-width: 250px; - } } .lingyue-body { @@ -15,6 +11,26 @@ padding: 16px 16px 0 16px; background: #F6F6F6; + .lingyue-query { + display: flex; + justify-content: flex-end; + padding: 16px 24px 16px 24px; + background: #FFF; + margin-bottom: 16px; + + .wea-form-item:last-child { + width: 500px !important; + } + + .wea-form-item { + width: 300px; + + .customMuiSelect .ant-select-selection--multiple { + max-height: 110px !important; + } + } + } + .custom_lingyue_list { .ant-spin-nested-loading, .ant-spin-container { height: 100%; diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js index 87d754e9..6527b930 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js @@ -27,15 +27,7 @@ class Layout extends Component { const { salaryMonth, ffgsqc } = query; let buttons = [ , - , - - onChange({ ...query, salaryMonth: value, isQuery: !isQuery })}/> - , - - onChange({ ...query, ffgsqc: value, isQuery: !isQuery })}/> - + ]; const dropMenuDatas = [ { key: "EXPORTALL", icon: , content: getLabel(81272, "导出全部") } @@ -48,7 +40,19 @@ class Layout extends Component { title={title} icon={} buttons={buttons} showDropIcon={true} iconBgcolor="#F14A2D" className="custom_salary_lingyue" dropMenuDatas={dropMenuDatas} onDropMenuClick={key => listRef.handleOperate(key)}> -
{this.props.children}
+
+
+ + onChange({ ...query, salaryMonth: value, isQuery: !isQuery })}/> + + + onChange({ ...query, ffgsqc: value, isQuery: !isQuery })}/> + +
+ {this.props.children} +
); } }