社保福利档案页面添加提示语

pc4mobx/hrmSalary/components/TipLabel/index.js

@@ -1,18 +1,18 @@
-import React from 'react';
-import "./index.less"
+import React from "react";
+import "./index.less";
 
 export default class TipLabel extends React.Component {
-    render() {
-        return (
-            <div className="tipLabelWrapper">
-                <div className="titleWrapper">
-                    <span className="title">{this.props.title ? this.props.title : "小提示"}</span>
-                </div>
-                <div className="tipContentWrapper">
-                    {this.props.tipList && this.props.tipList.map(item => <div className="tipContentItem">{item}</div>)}
-                    {this.props.children}
-                </div>
-            </div>
-        )
-    }
-}
+  render() {
+    return (
+      <div className="tipLabelWrapper">
+        <div className="titleWrapper">
+          <span className="title">{this.props.title ? this.props.title : "小提示"}</span>
+        </div>
+        <div className="tipContentWrapper">
+          {this.props.tipList && this.props.tipList.map(item => <div className="tipContentItem">{item}</div>)}
+          {this.props.children}
+        </div>
+      </div>
+    );
+  }
+}

pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js

@@ -12,6 +12,7 @@ import OtherForm from "./otherForm";
 import { tabCondition } from "./config";
 import * as API from "../../../apis/welfareArchive";
 import ImportModal from "../../../components/importModal";
+import TipLabel from "../../../components/TipLabel";
 import "./index.less";
 
 @inject("archivesStore", "taxAgentStore")
@@ -433,6 +434,48 @@ export default class Archives extends React.Component {
     });
   };
 
+  getTipChildren = () => {
+    const { selectedKey } = this.state;
+    let dom = null;
+    switch (selectedKey) {
+      case "pending":
+        dom = <div>
+          <div>1、新入职人员、返聘人员和个税扣缴义务人发生变更从【待减员】中减员操作的会进入【待增员】；</div>
+          <div>2、返聘人员默认返聘前的社保福利缴纳方案、缴纳账号、缴纳组织数据，其他数据会清空；</div>
+          <div>3、个税扣缴义务人变更进入【待增员】的，保留所有最新版本数据；若修改了数据再增员则修改的数据作为新版本保存；</div>
+          <div>4、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；</div>
+          <div>5、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；</div>
+          <div>6、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；</div>
+          <div>7、增员失败情况：①终止缴纳月小于等于当前月；②其他的个税扣缴义务人下的在缴员工中存在该员工，在缴员工未进入停缴员工；</div>
+        </div>;
+        break;
+      case "fixed":
+        dom = <div>
+          <div>1、需缴纳社保福利的员工维护在【在缴员工】；</div>
+          <div>2、可使用更新导入，调整档案数据；</div>
+          <div>3、若维护了最后缴纳月且小于等于当前月，则自动进入【待减员】；</div>
+          <div>4、核算人员范围为，【在缴员工】中的起始缴纳月和最后缴纳月区间包含当前月的人员；</div>
+        </div>;
+        break;
+      case "suspend":
+        dom = <div>
+          <div>1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；④某员工分权时在原个税扣缴义务人下处于【在缴员工】里但又将该员工添加到其他的个税扣缴义务人下的情况；</div>
+          <div>2、【待减员】为是否不再缴纳的待办状态，数据是从【在缴员工】中复制的，若不处理列表中的待办数据，也不影响社保福利核算；【待减员】维护的数据和【在缴员工】数据是同步的；</div>
+          <div>3、点击【减员】前先维护最后缴纳月，所有有起始缴纳月的福利项的最后缴纳月都小于等于当前月且无未归档的核算数据的档案才能减员成功，减员成功后数据进入【停缴员工】；</div>
+          <div>4、数据进入【待减员】规则的第四种情况下，若还需要在当前个税扣缴义务人下进行缴纳的话，当前该员工的【待减员】数据进行【删除待办】操作即可；若不在该个税扣缴义务人下继续缴纳，维护好最后缴纳月后进行【减员】操作，员工进入【停缴员工】；</div>
+        </div>;
+        break;
+      default:
+        dom = <div>
+          <div>1、不需要缴纳社保福利的员工，保存在【停缴员工】；</div>
+          <div>2、【停缴员工】点击取消停缴，数据会回退到上次的位置（从【待减员】减员到停缴员工的，点击停缴返回到【在缴员工】，不返回到【待减员】）；</div>
+          <div>3、若员工的社保福利从一个个税扣缴义务人下转到另一个个税扣缴义务人下去缴纳，则在转后的个税扣缴义务人的【待增员】中进行增员操作成功后，员工进入待【在缴员工】，而在原个税扣缴义务人下的【停缴员工】中，该员工数据将会被删除；是否开启分权员工的档案数据都只保存一份；</div>
+        </div>;
+        break;
+    }
+    return dom;
+  };
+
   render() {
     const { archivesStore, taxAgentStore: { showOperateBtn } } = this.props;
     const { selectedTab, selectedRowKeys, selectedKey, dataSource: dataSourceActive, pageInfo, tabCount } = this.state;
@@ -658,6 +701,7 @@ export default class Archives extends React.Component {
               rowSelection={rowSelection}
               scroll={{ x: 1200 }}
             />
+            <TipLabel>{this.getTipChildren()}</TipLabel>
           </WeaTop>
         </WeaRightMenu>
         {

pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js

@@ -1,144 +1,154 @@
 // 社保
 export const socialSecurityColumns = [{
-    title: "方案名称",
-    dataIndex: 'title',
-    key: 'title',
+  title: "方案名称",
+  dataIndex: "title",
+  key: "title"
 }, {
-    title: '缴纳类型',
-    dataIndex: 'username',
-    key: 'username',
+  title: "缴纳类型",
+  dataIndex: "username",
+  key: "username"
 }, {
-    title: '缴纳范围',
-    dataIndex: 'projectName',
-    key: 'projectName',
+  title: "缴纳范围",
+  dataIndex: "projectName",
+  key: "projectName"
 }, {
-    title: '备注',
-    dataIndex: 'customer',
-    key: 'customer',
+  title: "备注",
+  dataIndex: "customer",
+  key: "customer"
 }, {
-    title: '操作',
-    dataIndex: 'customer',
-    key: 'customer',
+  title: "操作",
+  dataIndex: "customer",
+  key: "customer"
 }];
 
 // 公积金
-export const accumulationFundColumns= [{
-    title: "方案名称",
-    dataIndex: 'title',
-    key: 'title',
+export const accumulationFundColumns = [{
+  title: "方案名称",
+  dataIndex: "title",
+  key: "title"
 }, {
-    title: '缴纳类型',
-    dataIndex: 'username',
-    key: 'username',
+  title: "缴纳类型",
+  dataIndex: "username",
+  key: "username"
 }, {
-    title: '缴纳范围',
-    dataIndex: 'projectName',
-    key: 'projectName',
+  title: "缴纳范围",
+  dataIndex: "projectName",
+  key: "projectName"
 }, {
-    title: '备注',
-    dataIndex: 'customer',
-    key: 'customer',
+  title: "备注",
+  dataIndex: "customer",
+  key: "customer"
 }, {
-    title: '操作',
-    dataIndex: 'customer',
-    key: 'customer',
-}]
+  title: "操作",
+  dataIndex: "customer",
+  key: "customer"
+}];
 
 // 企业年金及其他福利
 export const otherBenefitsColumns = [
-    {
-        title: "方案名称",
-        dataIndex: 'title',
-        key: 'title',
-        
-    },
-    {
-        title: "缴纳类型",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "缴纳范围",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "备注",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "操作",
-        dataIndex: 'title',
-        key: 'title',
-    }
-]
+  {
+    title: "方案名称",
+    dataIndex: "title",
+    key: "title"
+
+  },
+  {
+    title: "缴纳类型",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "缴纳范围",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "备注",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "操作",
+    dataIndex: "title",
+    key: "title"
+  }
+];
 
 export const CustomBenefitsColumns = [
-    {
-        title: "福利名称",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "启用",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "类型",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "缴纳对象",
-        dataIndex: 'title',
-        key: 'title',
-    },
-    {
-        title: "操作",
-        dataIndex: 'title',
-        key: 'title',
-    }
-]
+  {
+    title: "福利名称",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "启用",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "类型",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "缴纳对象",
+    dataIndex: "title",
+    key: "title"
+  },
+  {
+    title: "操作",
+    dataIndex: "title",
+    key: "title"
+  }
+];
 
 export const insertUpdateColumns = [
-    {
-        title: "类型名称",
-        dataIndex: "insuranceName",
-        key: "insuranceName"
-    },
-    {
-        title: "是否缴费",
-        dataIndex: "isPayment",
-        key: "isPayment"
-    },
-    {
-        title: "缴纳对象",
-        dataIndex: "paymentScope",
-        key: "paymentScope"
-    },
-    {
-        title: "缴纳比例%",
-        dataIndex: "paymentProportion",
-        key: "paymentProportion"
-    },
-    {
-        title: "固定费用",
-        dataIndex: "fixedCost",
-        key: "fixedCost"
-    },
-    {
-        title: "有效小数位",
-        dataIndex: "validNum",
-        key: "validNum"
-    },
-    {
-        title: "进位规则",
-        dataIndex: "rententionRule",
-        key: "rententionRule"
-    },
-]
+  {
+    title: "类型名称",
+    dataIndex: "insuranceName",
+    key: "insuranceName"
+  },
+  {
+    title: "是否缴费",
+    dataIndex: "isPayment",
+    key: "isPayment"
+  },
+  {
+    title: "缴纳对象",
+    dataIndex: "paymentScope",
+    key: "paymentScope"
+  },
+  {
+    title: "缴纳比例%",
+    dataIndex: "paymentProportion",
+    key: "paymentProportion"
+  },
+  {
+    title: "固定费用",
+    dataIndex: "fixedCost",
+    key: "fixedCost"
+  },
+  {
+    title: "基数上限",
+    dataIndex: "upperLimit",
+    key: "upperLimit"
+  },
+  {
+    title: "基数下限",
+    dataIndex: "lowerLimit",
+    key: "lowerLimit"
+  },
+  {
+    title: "有效小数位",
+    dataIndex: "validNum",
+    key: "validNum"
+  },
+  {
+    title: "进位规则",
+    dataIndex: "rententionRule",
+    key: "rententionRule"
+  }
+];
 
 
 export const dataSource = [];

pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { WeaSelect, WeaInput, WeaTable } from "ecCom";
-import { Table, Row, Col, Switch } from "antd";
+import { Row, Col, Switch } from "antd";
 import { insertUpdateColumns } from "./columns";
 import { inject, observer } from "mobx-react";
 import SmallTab from "../../../components/smallTab";
@@ -123,6 +123,28 @@ export default class DefaultSlideForm extends React.Component {
             />
           );
         };
+      } else if (item.dataIndex == "upperLimit") {
+        item.render = (text, record) => {
+          return (
+            <WeaInput
+              value={text}
+              onChange={v => {
+                this.updateDataSource(record, v, "upperLimit");
+              }}
+            />
+          );
+        };
+      } else if (item.dataIndex == "lowerLimit") {
+        item.render = (text, record) => {
+          return (
+            <WeaInput
+              value={text}
+              onChange={v => {
+                this.updateDataSource(record, v, "lowerLimit");
+              }}
+            />
+          );
+        };
       }
     });
   }

pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js

@@ -538,7 +538,7 @@ export default class Programme extends React.Component {
           className="slideOuterWrapper"
           visible={this.state.slideVisiable}
           top={0}
-          width={50}
+          width={60}
           height={100}
           direction={"right"}
           measure={"%"}