From 7104035b17d1ab1439ec9a3d3f80586c42465cf2 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Fri, 1 Apr 2022 10:39:01 +0800
Subject: [PATCH] programme insert

---
 .../socialSecurityBenefits/programme/customNewModal.js     | 3 ++-
 .../pages/socialSecurityBenefits/programme/index.js        | 7 ++++++-
 pc4mobx/hrmSalary/stores/programme.js                      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customNewModal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customNewModal.js
index d2022b77..6f57a4b2 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customNewModal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customNewModal.js
@@ -15,10 +15,11 @@ export default class CustomNewModal extends React.Component {
     handleOK() {
         const { programmeStore: {createSICategory, setCustomRequest, customRequest}} = this.props;
         createSICategory(customRequest)
+        this.props.onCancel()
     }
 
     render() {
-        const { programmeStore: {customRequest}} = this.props;
+        const { programmeStore: {customRequest, setCustomRequest}} = this.props;
         return (
             <Modal visible={this.props.visible} onCancel={() => {this.props.onCancel()}} title="新建自定义福利" onOk={() => {this.handleOK()}}>
                 {/* {getCustomSearchs(this.props.form, toJS(this.props.condition), 1)} */}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
index 21bf0e1a..89b6b4f0 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
@@ -200,6 +200,10 @@ export default class Programme extends React.Component {
     ];
 
     const options  = [
+      {
+        showname: "全部",
+        key: ""
+      },
       {
         showname: "社保",
         key: "SOCIAL_SECURITY"  
@@ -221,8 +225,9 @@ export default class Programme extends React.Component {
     }
 
     const handleCustomNewClick = () => {
-      const { programmeStore : { getCustomForm, getCumCustomForm, setCustomNewVisible }} = this.props;
+      const { programmeStore : { getCustomForm, getCumCustomForm, setCustomNewVisible, setCustomRequest }} = this.props;
       getCustomForm()
+      setCustomRequest({})
       setCustomNewVisible(true)
 
     }
diff --git a/pc4mobx/hrmSalary/stores/programme.js b/pc4mobx/hrmSalary/stores/programme.js
index f81a5652..072d8bfd 100644
--- a/pc4mobx/hrmSalary/stores/programme.js
+++ b/pc4mobx/hrmSalary/stores/programme.js
@@ -99,7 +99,7 @@ export class ProgrammeStore {
 
   // 渲染自定义福利
   @action
-  getCustomCategoryList = (selectKey = "SOCIAL_SECURITY", params) => {
+  getCustomCategoryList = (selectKey = "", params) => {
     this.loading = true;
     const formParams = this.form.getFormParams() || {};
     params = params || formParams;