From 5927da3deb49a9189127f47d9271dd6736fe473e Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 25 Dec 2024 09:00:58 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=A2=86=E6=82=A6=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/custom-pages/lingyue/index.less     | 24 +++++++++++++++----
 .../pages/custom-pages/lingyue/layout.js      | 24 +++++++++++--------
 2 files changed, 34 insertions(+), 14 deletions(-)

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 = [
       <Button type="primary" onClick={() => listRef.handleOperate("GENERATE")}>{getLabel(111, "生成数据")}</Button>,
-      <Button type="ghost" onClick={() => listRef.handleOperate("BATCHDEL")}>{getLabel(111, "批量删除")}</Button>,
-      <WeaFormItem label={getLabel(111, "薪资所属月")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
-        <WeaDatePicker format="YYYY-MM" value={salaryMonth}
-                       onChange={value => onChange({ ...query, salaryMonth: value, isQuery: !isQuery })}/>
-      </WeaFormItem>,
-      <WeaFormItem label={ffgsqcLabel} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
-        <CustomSelect value={ffgsqc} options={companyOpts}
-                      onChange={value => onChange({ ...query, ffgsqc: value, isQuery: !isQuery })}/>
-      </WeaFormItem>
+      <Button type="ghost" onClick={() => listRef.handleOperate("BATCHDEL")}>{getLabel(111, "批量删除")}</Button>
     ];
     const dropMenuDatas = [
       { key: "EXPORTALL", icon: <i className="iconfont icon-daochu"/>, content: getLabel(81272, "导出全部") }
@@ -48,7 +40,19 @@ class Layout extends Component {
         title={title} icon={<i className="icon-coms-fa"/>} buttons={buttons} showDropIcon={true}
         iconBgcolor="#F14A2D" className="custom_salary_lingyue" dropMenuDatas={dropMenuDatas}
         onDropMenuClick={key => listRef.handleOperate(key)}>
-        <div className="lingyue-body">{this.props.children}</div>
+        <div className="lingyue-body">
+          <div className="lingyue-query">
+            <WeaFormItem label={getLabel(111, "薪资所属月")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+              <WeaDatePicker format="YYYY-MM" value={salaryMonth}
+                             onChange={value => onChange({ ...query, salaryMonth: value, isQuery: !isQuery })}/>
+            </WeaFormItem>
+            <WeaFormItem label={ffgsqcLabel} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+              <CustomSelect value={ffgsqc} options={companyOpts}
+                            onChange={value => onChange({ ...query, ffgsqc: value, isQuery: !isQuery })}/>
+            </WeaFormItem>
+          </div>
+          {this.props.children}
+        </div>
       </WeaTop>);
   }
 }