From 953172f26a57f2b1ade5470f21c31a0c99ca89f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 28 Sep 2023 14:25:21 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryEditCalc/editCalcAdvanceSearchPannel.js         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
index 9a546c94..8c11c3dd 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js
@@ -75,14 +75,15 @@ class EditCalcAdvanceSearchPannel extends Component {
   };
   handleAddCustomSearchForm = () => {
     const { customSearchConditions, salaryItems } = this.state;
+    const uuid = uuidV4();
     this.setState({
       customSearchConditions: [
         ...customSearchConditions,
         {
           com: CustomFormFields({
-            uuid: uuidV4(), onDelete: this.handleDelete, salaryItems
+            uuid, salaryItems, onDelete: this.handleDelete
           }),
-          uuid: uuidV4()
+          uuid
         }
       ]
     });
@@ -130,11 +131,10 @@ export default EditCalcAdvanceSearchPannel;
 
 const CustomFormFields = (props) => {
   const { uuid, onDelete, salaryItems } = props;
-  console.log(133, salaryItems);
   return <WeaFormItem labelCol={{ span: 0 }} wrapperCol={{ span: 18 }}>
     <Row>
       <Col span={6} style={{ paddingRight: 10 }}>
-        <WeaSelect options={salaryItems} showSearch optionFilterProp="children"/>
+        <WeaSelect options={salaryItems} detailtype={5} showSearch optionFilterProp="children"/>
       </Col>
       <Col span={18}>
         <Row>