From 6abefce41d3bf94532d7e9dba7c59e616a9f4846 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 7 Jan 2025 15:54:20 +0800
Subject: [PATCH] =?UTF-8?q?custom-=E9=93=B6=E7=9B=9B=E7=A7=91=E6=8A=80?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=9B=86=E5=9B=A2=E6=9C=89=E9=99=90=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/calculateDialog/condition.js      |  2 +-
 .../components/calculateDialog/index.js          | 16 +++++++++++++---
 pc4mobx/hrmSalary/style/index.less               |  4 ++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js
index 419478a8..5382f5ab 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js
@@ -16,7 +16,7 @@ export const calculateConditions = [
       {
         colSpan: 1,
         conditionType: "SELECT",
-        domkey: ["salarySobId"],
+        domkey: ["salarySobIds"],
         fieldcol: 14,
         label: "核算账套",
         lanId: 519146,
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
index 37984ed4..6f638077 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js
@@ -7,10 +7,11 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { WeaSwitch } from "comsMobx";
 import { Button, message } from "antd";
-import { getSearchs } from "../../../../util";
 import { salaryacctGetForm, saveBasic } from "../../../../apis/calculate";
 import { calculateConditions } from "./condition";
+import FormInfo from "../../../../components/FormInfo";
 
 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
@@ -39,7 +40,7 @@ class Index extends Component {
           conditions: _.map(calculateConditions, item => ({
             ...item,
             items: _.map(item.items, o => {
-              if (getKey(o) === "salarySobId") {
+              if (getKey(o) === "salarySobIds") {
                 return {
                   ...o,
                   options: _.map(salarySobs, g => ({ key: g.id.toString(), showname: g.name }))
@@ -76,6 +77,14 @@ class Index extends Component {
   render() {
     const { conditions, loading } = this.state;
     const { calculateStore: { calculateForm } } = this.props;
+    const itemRender = {
+      salarySobIds: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} className="multiple_select"
+                           form={form} formParams={formParams}
+          // onBlur={(v) => v && form.updateFields({ freeAmount: { value: toDecimal_n(v, 2) } })}
+        />);
+      }
+    };
     return (
       <WeaDialog
         {...this.props} style={{ width: 480, height: 174 }} initLoadCss
@@ -83,7 +92,8 @@ class Index extends Component {
           <Button type="primary" onClick={this.save} loading={loading}>{getLabel(543233, "保存并进入核算")}</Button>
         ]}
       >
-        <div className="form-dialog-layout">{getSearchs(calculateForm, conditions, 1, false)}</div>
+        <FormInfo className="form-dialog-layout" center={false} itemRender={itemRender}
+                  form={calculateForm} formFields={conditions}/>
       </WeaDialog>
     );
   }
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 6bc0127b..c10d1873 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -39,6 +39,10 @@
 .form-dialog-layout {
   background: #f6f6f6;
 
+  .wea-form-item-wrapper {
+    display: block;
+  }
+
   .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
     line-height: 28px;
   }