From cc4d9df1e179efc8025af41ad58de6ccd8237872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 17 Nov 2022 16:30:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/calculateDetail/salaryDetail.js     |  4 +-
 .../archives/accumulationFundForm.js          |  1 +
 .../socialSecurityBenefits/archives/index.js  | 46 +++++++++++++++++--
 .../archives/otherForm.js                     |  8 ++--
 .../archives/socialSecurityForm.js            | 13 +++---
 pc4mobx/hrmSalary/stores/archives.js          |  2 +-
 6 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index e380517b..2b3c8c21 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -204,8 +204,8 @@ export default class SalaryDetail extends React.Component {
         <div className="tableWrapper">
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}
-            // src="http://localhost:7607/#/atdTable"
-            src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
+            src="http://localhost:7607/#/atdTable"
+            // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
             id="atdTable"
           />
         </div>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
index 85faec6e..3e223310 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
@@ -74,6 +74,7 @@ export default class AccumulationFundForm extends React.Component {
             <Col span={6} className="formItem borderR-none borderB-none">公积金起始缴纳月：</Col>
             <Col span={6} className="formItem borderR-none borderB-none">
               <WeaDatePicker
+                viewAttr={(accumulationFundForm.data && accumulationFundForm.data.fundSchemeId) ? 3 : 2}
                 format="yyyy-MM"
                 value={data && data.fundStartTime}
                 onChange={value => this.handleFormChange({ fundStartTime: value })}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index 0e92f71d..d574bacb 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -120,7 +120,7 @@ export default class Archives extends React.Component {
         item.column,
         title: item.text,
         render: (text) => {
-          return <span className='tdEllipsis' title={text}>{text}</span>
+          return <span className="tdEllipsis" title={text}>{text}</span>;
         }
       };
     });
@@ -211,16 +211,40 @@ export default class Archives extends React.Component {
   // 保存
   handleEditSlideSave = () => {
     const { selectedTab } = this.state;
-    const { archivesStore: { save } } = this.props;
+    const { archivesStore: { save, socialSecurityForm, accumulationFundForm, otherForm } } = this.props;
     if (selectedTab == 1) {
+      const { data } = socialSecurityForm;
+      if (data.socialSchemeId && !data.socialStartTime) {
+        Modal.warning({
+          title: "信息确认",
+          content: "必要信息不完整，红色*为必填项！"
+        });
+        return;
+      }
       save("SOCIAL_SECURITY").then(() => {
         this.query();
       });
     } else if (selectedTab == 2) {
+      const { data } = accumulationFundForm;
+      if (data.fundSchemeId && !data.fundStartTime) {
+        Modal.warning({
+          title: "信息确认",
+          content: "必要信息不完整，红色*为必填项！"
+        });
+        return;
+      }
       save("ACCUMULATION_FUND").then(() => {
         this.query();
       });
     } else if (selectedTab == 3) {
+      const { data } = otherForm;
+      if (data.otherSchemeId && !data.otherStartTime) {
+        Modal.warning({
+          title: "信息确认",
+          content: "必要信息不完整，红色*为必填项！"
+        });
+        return;
+      }
       save("OTHER").then(() => {
         this.query();
       });
@@ -760,14 +784,26 @@ export default class Archives extends React.Component {
               }
               {
                 selectedTab == 1 &&
-                <SocialSecurityForm employeeId={this.state.employeeId} record={this.record} onChangeRecordSchemeId={(siSchemeId)=> this.record= {...this.record,siSchemeId}}/>
+                <SocialSecurityForm employeeId={this.state.employeeId} record={this.record}
+                                    onChangeRecordSchemeId={(siSchemeId) => this.record = {
+                                      ...this.record,
+                                      siSchemeId
+                                    }}/>
               }
               {
                 selectedTab == 2 &&
-                <AccumulationFundForm employeeId={this.state.employeeId} record={this.record} onChangeRecordFundSchemeId={(fundSchemeId)=> this.record= {...this.record,fundSchemeId}}/>
+                <AccumulationFundForm employeeId={this.state.employeeId} record={this.record}
+                                      onChangeRecordFundSchemeId={(fundSchemeId) => this.record = {
+                                        ...this.record,
+                                        fundSchemeId
+                                      }}/>
               }
               {
-                selectedTab == 3 && <OtherForm employeeId={this.state.employeeId} record={this.record} onChangeRecordOtherSchemeId={(otherSchemeId)=> this.record= {...this.record,otherSchemeId}}/>
+                selectedTab == 3 && <OtherForm employeeId={this.state.employeeId} record={this.record}
+                                               onChangeRecordOtherSchemeId={(otherSchemeId) => this.record = {
+                                                 ...this.record,
+                                                 otherSchemeId
+                                               }}/>
               }
             </div>}
             onClose={() => this.setState({ editSlideVisible: false }, () => {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
index c60da390..81d61f61 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
@@ -1,12 +1,11 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-import { Col, Row, Select } from "antd";
+import {toJS} from 'mobx';
+import { Col, Row } from "antd";
 import { WeaCheckbox, WeaDatePicker, WeaInputNumber, WeaSelect } from "ecCom";
 import GroupCard from "../../../components/groupCard";
 import "./index.less";
 
-const { Option } = Select;
-
 @inject("archivesStore")
 @observer
 export default class OtherForm extends React.Component {
@@ -66,8 +65,6 @@ export default class OtherForm extends React.Component {
         }
       });
     }
-
-
     return (
       <div className="socialFormWrapper">
         <div style={{ overflow: "hidden" }}>
@@ -81,6 +78,7 @@ export default class OtherForm extends React.Component {
             <Col span={6} className="formItem borderR-none borderB-none">其他福利起始缴纳月：</Col>
             <Col span={6} className="formItem borderR-none borderB-none">
               <WeaDatePicker
+                viewAttr={(otherForm.data && otherForm.data.otherSchemeId) ? 3 : 2}
                 format="yyyy-MM"
                 value={data && data.otherStartTime}
                 onChange={value => this.handleFormChange({ otherStartTime: value })}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
index 8e4ab2fb..f3329fc9 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
@@ -1,13 +1,11 @@
 import React from "react";
 import GroupCard from "../../../components/groupCard";
-import { Col, Row, Select } from "antd";
+import { Col, Row } from "antd";
 import { WeaCheckbox, WeaDatePicker, WeaInput, WeaInputNumber, WeaSelect } from "ecCom";
 import { inject, observer } from "mobx-react";
 import cs from "classnames";
 import "./index.less";
 
-const { Option } = Select;
-
 @inject("archivesStore")
 @observer
 export default class SocialSecurityForm extends React.Component {
@@ -26,8 +24,8 @@ export default class SocialSecurityForm extends React.Component {
     let form = { ...socialSecurityForm };
     form.data = request;
     setSocialSecurityForm(form);
-    Object.keys(params).length>1 &&
-    onChangeRecordSchemeId(params.socialSchemeId)
+    Object.keys(params).length > 1 &&
+    onChangeRecordSchemeId(params.socialSchemeId);
   }
 
   // 获取基数表单
@@ -79,9 +77,12 @@ export default class SocialSecurityForm extends React.Component {
             <Col span={6} className="formItem borderR-none borderB-none">社保起始缴纳月：</Col>
             <Col span={6} className="formItem borderR-none borderB-none">
               <WeaDatePicker
+                viewAttr={(socialSecurityForm.data && socialSecurityForm.data.socialSchemeId) ? 3 : 2}
                 format="YYYY-MM"
                 value={data && data.socialStartTime}
-                onChange={value => this.handleFormChange({ socialStartTime: value })}
+                onChange={value => {
+                  this.handleFormChange({ socialStartTime: value });
+                }}
               />
             </Col>
             <Col span={6} className="formItem borderR-none borderB-none">社保方案名称：</Col>
diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js
index 0a4be119..b2df90d8 100644
--- a/pc4mobx/hrmSalary/stores/archives.js
+++ b/pc4mobx/hrmSalary/stores/archives.js
@@ -176,7 +176,7 @@ export class ArchivesStore {
           _.map(baseList.items, item => {
             obj = {
               ...obj,
-              [item["domkey"][0]]: ""
+              [item["domkey"][0]]: "0"
             };
           });
         }

From bde6840850b7580a21a28d619ecfb1ff34f319bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 17 Nov 2022 16:34:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E9=A1=B5=E9=9D=A2=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/socialSecurityBenefits/standingBook/index.js     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index 5ae02de4..78aefbbb 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -322,7 +322,7 @@ export default class StandingBook extends React.Component {
             this.setState({
               progressVisible: false,
               progress: 0
-            },()=>{
+            }, () => {
               message.success("核算成功");
               this.handleClose();
               this.getCommonList({
@@ -445,7 +445,7 @@ export default class StandingBook extends React.Component {
         >
           <WeaTop
             title="社保福利台账" // 文字
-            icon={<i className="icon-coms-fa" />} // 左侧图标
+            icon={<i className="icon-coms-fa"/>} // 左侧图标
             iconBgcolor="#F14A2D" // 左侧图标背景色
             buttons={showOperateBtn ? rightBtns : []}
             // showDropIcon={true} // 是否显示下拉按钮
@@ -477,10 +477,11 @@ export default class StandingBook extends React.Component {
               columns={_.filter(columns, (it) => it.dataIndex !== "id").map(item => {
                 item.width = "150px";
                 if (item.dataIndex === "billMonth") item.fixed = "left";
+                if (item.dataIndex === "action") return { ...item };
                 return {
                   ...item,
                   render: (text) => {
-                    return <span className='tdEllipsis' title={text}>{text}</span>
+                    return <span className="tdEllipsis" title={text}>{text}</span>;
                   }
                 };
               })}