From 964af55e3a922ddc0ce34b84690db003403d01a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 26 Jul 2024 10:02:35 +0800
Subject: [PATCH] hotfix/2.15.1.2407.01

---
 .../components/salaryEditCalc/baseInfo.js     | 54 +++++++++++++++++--
 .../salaryEditCalc/editSalaryCalcSlide.js     | 16 ++++--
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
index 129d9cb7..2380cfae 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
@@ -5,7 +5,7 @@
  * Date: 2023/9/25
  */
 import React, { Component } from "react";
-import { WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { WeaBrowser, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
 import cs from "classnames";
 import { Col, Row } from "antd";
 import "./index.less";
@@ -13,6 +13,48 @@ import "./index.less";
 const getLabel = WeaLocaleProvider.getLabel;
 
 class EditSalaryBaseInfo extends Component {
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (this.props.visible !== nextProps.visible && nextProps.visible && !_.isEmpty(nextProps.baseInfo)) {
+      nextProps.onChange(_.map(nextProps.baseInfo, it => {
+        const { fieldValue, canEdit, fieldValueObj } = it;
+        if (canEdit) {
+          const { id: value, name: valueSpan } = fieldValueObj || fieldValue;
+          return { ...it, fieldValue: value, fieldValueObj: { id: value, name: valueSpan } };
+        }
+        return { ...it };
+      }));
+    }
+  }
+
+  renderBrowser = (item) => {
+    const { fieldType, fieldValue, fieldCode } = item;
+    const { id: value, name: valueSpan } = fieldValue;
+    let browserType = {};
+    switch (fieldType) {
+      case "subcompanyBrowser":
+        browserType = { ...browserType, type: 164, title: getLabel(111, "选择分部") };
+        break;
+      case "departmentBrowser":
+        browserType = { ...browserType, type: 4, title: getLabel(111, "选择部门") };
+        break;
+      case "jobtitleBrowser":
+        browserType = { ...browserType, type: 24, title: getLabel(111, "选择岗位") };
+        break;
+      case "jobcallBrowser":
+        browserType = { ...browserType, type: 260, title: getLabel(111, "选择职称") };
+        break;
+      default:
+        break;
+    }
+    return <WeaBrowser {...browserType} viewAttr={3} value={value} valueSpan={valueSpan} inputStyle={{ width: 200 }}
+                       onChange={(value, valueSpan) => this.props.onChange(_.map(this.props.baseInfo, it => {
+                         if (fieldCode === it.fieldCode) {
+                           return { ...it, fieldValue: value, fieldValueObj: { id: value, name: valueSpan } };
+                         }
+                         return { ...it };
+                       }))}/>;
+  };
+
   render() {
     const { baseInfo } = this.props;
     return (
@@ -32,7 +74,7 @@ class EditSalaryBaseInfo extends Component {
         <Row type="flex" className="esf-form-content">
           {
             _.map(baseInfo, (item, index) => {
-              const { fieldName, fieldValue } = item;
+              const { fieldName, fieldType, fieldValue, fieldValueObj } = item;
               return (
                 <Col span={(index === baseInfo.length - 1 && (index + 1) % 2 === 1) ? 24 : 12}>
                   <Row className={cs("esf-form-item", {
@@ -43,7 +85,13 @@ class EditSalaryBaseInfo extends Component {
                       <span className="label" title={fieldName}>{fieldName}</span>
                     </Col>
                     <Col span={(index === baseInfo.length - 1 && (index + 1) % 2 === 1) ? 21 : 18}>
-                      <span className="value" title={fieldValue}>{fieldValue}</span>
+                      <span className="value" title={fieldValue}>
+                        {
+                          fieldType.indexOf("Browser") !== -1 ?
+                            this.renderBrowser({ ...item, fieldValue: fieldValueObj || fieldValue }) :
+                            fieldValue
+                        }
+                      </span>
                     </Col>
                   </Row>
                 </Col>
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
index 16cacd2c..0943bd38 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
@@ -5,7 +5,7 @@
  * Date: 2023/9/25
  */
 import React, { Component } from "react";
-import { Button, message } from "antd";
+import { Button, message, Modal } from "antd";
 import { WeaLocaleProvider, WeaSlideModal, WeaTab } from "ecCom";
 import EditSalaryBaseInfo from "./baseInfo";
 import PayrollItemsTable from "../../../../calculateDetail/payrollItemsTable";
@@ -87,9 +87,16 @@ class EditSalaryCalcSlide extends Component {
   };
   save = () => {
     const { id: salaryAcctEmpId } = this.props;
-    const { issuedAndReissueItems, itemsByGroup } = this.state;
+    const { issuedAndReissueItems, itemsByGroup, baseInfo } = this.state;
+    if (_.every(baseInfo, it => !it.canEdit || (it.canEdit && !it.fieldValue))) {
+      Modal.warning({
+        title: getLabel(131329, "信息确认"),
+        content: getLabel(518702, "必要信息不完整，红色*为必填项！")
+      });
+      return;
+    }
     const payload = {
-      salaryAcctEmpId,
+      salaryAcctEmpId, employeeInfos: baseInfo,
       items: [
         ..._.reduce(itemsByGroup, (pre, cur) => {
           return [
@@ -133,7 +140,8 @@ class EditSalaryCalcSlide extends Component {
           top={0} width={60} height={100} measure={"%"}
           direction={"right"} title={this.renderTitle()}
           content={<div className="salary-calculate-esf-area">
-            <EditSalaryBaseInfo baseInfo={baseInfo}/>
+            <EditSalaryBaseInfo {...this.props} baseInfo={baseInfo}
+                                onChange={baseInfo => this.setState({ baseInfo })}/>
             <WeaTab keyParam="viewcondition" className="calc-esf-tab"
                     selectedKey={selectedKey} onChange={v => this.setState({ selectedKey: v })}
                     datas={!_.isEmpty(issuedAndReissueItems) ? topTab : topTab.slice(0, 1)}