From b9e32efd1c9879d61f0134f10712b71b062aff2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 8 Feb 2023 10:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB=E5=BC=B9=E6=A1=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/stepForm/salaryItemModal.js    |  2 +-
 .../pages/payroll/stepForm/salaryItemSettings.js | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js
index 7a6e5557..1eea09a3 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js
@@ -20,7 +20,7 @@ class SalaryItemModal extends Component {
         onCancel={onCancel}
         title={title}
         visible={visible}
-        style={{ width: 500 }}
+        style={{ width: 600 }}
         hasScroll
         buttons={buttons}
         initLoadCss
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index b2865829..bdd1b1c8 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -6,7 +6,7 @@
  */
 import React, { Component } from "react";
 import { toJS } from "mobx";
-import { WeaFormItem, WeaInput, WeaSelect, WeaSortable } from "ecCom";
+import { WeaFormItem, WeaInput, WeaSortable, WeaTransfer } from "ecCom";
 import { Icon, Modal } from "antd";
 import SalaryItemModal from "./salaryItemModal";
 import { getAvailableSalaryGroupSet, getAvailableSalaryItemSet } from "../../../apis/payroll";
@@ -134,7 +134,7 @@ class SalaryItemSettings extends Component {
             visible: true,
             title,
             groupId: record.groupId,
-            options: _.map(data, it => ({ ...it, showname: it.name, key: it.salaryItemId }))
+            options: _.map(data, it => ({ ...it, name: it.name, id: it.salaryItemId }))
           }
         });
       }
@@ -155,7 +155,7 @@ class SalaryItemSettings extends Component {
             ...modalPayload,
             visible: true,
             title,
-            options: _.map(data, it => ({ ...it, showname: it.groupName, key: it.groupId }))
+            options: _.map(data, it => ({ ...it, name: it.groupName, id: it.groupId }))
           }
         });
       }
@@ -269,12 +269,10 @@ class SalaryItemSettings extends Component {
                 <WeaFormItem label="分类名称" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
                   <WeaInput value={modalPayload.groupName} onChange={this.handleChangeClassName}/>
                 </WeaFormItem>
-                : <WeaSelect
-                  multiple
-                  style={{ width: "100%" }}
-                  value={checkedValue}
-                  options={modalPayload.options}
-                  onChange={v => this.setState({ checkedValue: v })}
+                : <WeaTransfer
+                  data={modalPayload.options}
+                  selectedKeys={checkedValue ? checkedValue.split(",") : []}
+                  onChange={v => this.setState({ checkedValue: v.join(",") })}
                 />
             }
           </div>