From 42a334ad7f13ba6b686a98b383d5f3504cda40d7 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, 16 Aug 2023 11:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-=E6=8A=A5?=
 =?UTF-8?q?=E9=80=81=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeeDeclareDetailSchemaEditDialog.js       | 14 +++++++++-----
 .../hrmSalary/pages/employeedeclareDetail/index.js |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
index c65d2ef0..8684eaf2 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
@@ -106,11 +106,15 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component {
             } else if (item === "cardType") {
               declareForm.updateFields({ [item]: "居民身份证" });
             } else if (item === "employee") {
-              declareForm.updateFields({
-                // employeeType: {
-                  // value: ["ORGANIZATION", ["13", "郑世珍", [{ id: "13", lastname: "郑世珍" }]]],
-                  // valueSpan: ["employeeId"]
-                // }
+              const [employeeData] = result[item] || [];
+              !_.isEmpty(employeeData) && declareForm.updateFields({
+                employeeType: {
+                  value: [employeeData._entityType, [employeeData.id, employeeData.name, [{
+                    id: employeeData.id,
+                    lastname: employeeData.name
+                  }]]],
+                  valueSpan: ["employeeId"]
+                }
               });
             } else {
               declareForm.updateFields({ [item]: result[item] || "" });
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index 74b8d9d2..56b8402b 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -382,6 +382,7 @@ class Index extends Component {
       />
     ];
     // !showOperateBtn && tabBtns.shift();
+    selectedKey !== "list" && tabBtns.shift();
     return (
       <WeaTop
         title={getLabel(544289, "人员信息报送")} iconBgcolor="#F14A2D"