From 1935a552df45073f78a0ce39d0ced5d1248814b3 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, 29 May 2024 11:07:05 +0800
Subject: [PATCH] =?UTF-8?q?release/2.14.3.2406.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/employeeDeclareDetailSchemaEditDialog.js   | 5 ++++-
 .../hrmSalary/pages/employeedeclareDetail/constants.js    | 8 ++++----
 pc4mobx/hrmSalary/stores/employeeDeclare.js               | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
index bb6f4b44..df581337 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
@@ -32,7 +32,10 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) this.employeedeclareGetForm(nextProps);
-    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.employeeChangeInfo = {};
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+      this.props.employeeDeclareStore.initDeclareForm()
+      this.employeeChangeInfo = {};
+    }
   }
 
   employeedeclareGetForm = async (props) => {
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
index a9e370ab..b9f64232 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
@@ -421,7 +421,7 @@ export const declareConditions = [
         label: "是否残疾",
         lanId: 111,
         labelcol: 6,
-        value: "",
+        value: "OFF",
         viewAttr: 2,
         detailtype: 3,
         options: []
@@ -445,7 +445,7 @@ export const declareConditions = [
         label: "是否孤老",
         lanId: 111,
         labelcol: 6,
-        value: "",
+        value: "OFF",
         viewAttr: 2,
         detailtype: 3,
         options: []
@@ -458,7 +458,7 @@ export const declareConditions = [
         label: "是否是烈属",
         lanId: 111,
         labelcol: 6,
-        value: "",
+        value: "OFF",
         viewAttr: 2,
         detailtype: 3,
         options: []
@@ -482,7 +482,7 @@ export const declareConditions = [
         label: "是否扣除减除费用",
         lanId: 111,
         labelcol: 6,
-        value: "",
+        value: "ON",
         viewAttr: 2,
         detailtype: 3,
         options: []
diff --git a/pc4mobx/hrmSalary/stores/employeeDeclare.js b/pc4mobx/hrmSalary/stores/employeeDeclare.js
index d4e9961e..bf969d11 100644
--- a/pc4mobx/hrmSalary/stores/employeeDeclare.js
+++ b/pc4mobx/hrmSalary/stores/employeeDeclare.js
@@ -6,6 +6,7 @@ const { TableStore } = WeaTableNew;
 export class EmployeeDeclareStore {
   @observable advanceForm = new WeaForm(); //人员信息报送详情页面，高级搜索form实例
   @observable declareForm = new WeaForm(); //人员信息报送详情页面，新增编辑报送信息form实例
+  @action initDeclareForm = () => this.declareForm = new WeaForm();
   @observable tableStore = new TableStore();
 
   @action("...")