From 5c2268f4f9715fdf2fe6e0eb856660fecb2a1684 Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Mon, 30 May 2022 10:25:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/branchNumSetting/index.js      | 189 ++++++++----------
 1 file changed, 83 insertions(+), 106 deletions(-)

diff --git a/pc4mobx/organization/components/branchNumSetting/index.js b/pc4mobx/organization/components/branchNumSetting/index.js
index 6ab1d7d..05f4148 100644
--- a/pc4mobx/organization/components/branchNumSetting/index.js
+++ b/pc4mobx/organization/components/branchNumSetting/index.js
@@ -1,124 +1,101 @@
-const { inject, observer } = mobxReact;
-const ProductItem = ecodeSDK.imp(ProductItem);
-const ProductDialog = ecodeSDK.imp(ProductDialog);
-const { toJS } = mobx;
-// const { product } = ecodeSDK.imp(productDataSource);
-const { WeaDialog } = ecCom;
-const { createRef } = React;
+/*
+ * Author: 黎永顺
+ * Description: 分部编号设置
+ * Date: 2022-05-17 14:30:57
+ * LastEditTime: 2022-05-30 10:23:18
+ */
+import React, { Component, Fragment } from "react";
+import { Button } from "antd";
+import { WeaTop, WeaFormItem, WeaCheckbox, WeaSearchGroup } from "ecCom";
+import StartReservedNumberSet from "./components/startReservedNumberSet";
+import NumberComposition from "./components/numberComposition";
+import { i18n } from "../../public/i18n";
+import "./index.less";
 
-@inject("projectStore")
-@observer
-class ProductIndex extends React.Component {
+const btns = [<Button type="primary">保存</Button>];
+const dropMenuDatas = [
+  {
+    key: "save",
+    disabled: false,
+    icon: <i className="icon-coms-Preservation" />,
+    content: "保存",
+    onClick: (key) => alert(`点击了搜索 key = ${key}`),
+  },
+];
+export default class BranchNumSetting extends Component {
   constructor() {
     super();
     this.state = {
-      dialogParams: {
-        visible: false,
-        productId: "",
-      },
-      dialogWidth: 1200,
-      dialogHeight: 100,
+      checkVal: "0",
     };
-    this.productRef = createRef();
-  }
-  componentDidMount() {
-    window.addEventListener("resize", this.resizeWidthHeight);
-    this.resizeWidthHeight();
-    this.init();
-  }
-  conponentWillUnmount() {
-    window.removeEventListener("resize", this.resizeWidthHeight);
   }
 
-  resizeWidthHeight = () => {
-    requestAnimationFrame(() => {
-      if (!this.productRef.current) {
-        return;
-      }
-      const { offsetWidth, offsetHeight } = this.productRef.current;
-      this.setState({
-        dialogWidth: offsetWidth - 100,
-        // offsetHeight / 2
-        dialogHeight: 80,
-      });
-    });
-  };
+  componentDidMount() {}
 
-  init = () => {
-    const {
-      projectStore: { init },
-    } = this.props;
-    init();
-  };
-
-  handlePickProduct = async (productId) => {
-    const {
-      projectStore: { viewProject, init },
-    } = this.props;
-    const { api_status } = await viewProject(productId);
-    if (api_status) init();
-    this.setState({
-      dialogParams: { ...this.state.dialogParams, visible: true, productId },
-    });
+  /**
+   * name:提示文本
+   * return {*}
+   */
+  helpContent = () => {
+    return (
+      <div>
+        <p>开启后，可根据设置的分部编号规则自动生成分部编号，涉及场景如下：</p>
+        <p>1.手动新建和手动编辑分部时可选择重新生成编号和选择预留分部编号；</p>
+        <p>2.组织结构导入-添加新分部且分部编号列为空时，会自动生成分部编号；</p>
+        <p>3.导入人员-添加时，新创建的分部可自动生成分部编号；</p>
+        <p>【注意】开启前请先确认分部编号字段已启用！</p>
+      </div>
+    );
   };
 
   render() {
-    const { dialogParams, dialogHeight, dialogWidth } = this.state;
-    const {
-      projectStore: { product },
-    } = this.props;
+    const { checkVal } = this.state;
     return (
-      <div className="product-demo-wapper" ref={this.productRef}>
-        <div className="product-container">
-          {_.map(toJS(product), (item, index) => {
-            const { id, title, subTitle, products } = item;
-            return (
-              <div className="product-box" key={id}>
-                {/* <h2 className="product-title">{title}</h2>
-                <p className="product-subtitle">{subTitle}</p> */}
-                <ProductItem
-                  products={products}
-                  onPickProduct={this.handlePickProduct}
-                />
+      <div className="branch-wapper">
+        <WeaTop
+          title={i18n.label.branchNumSetting()}
+          icon={<i className="icon-coms-hrm" />}
+          iconBgcolor="#217346"
+          buttons={btns}
+          showDropIcon={true}
+          dropMenuDatas={dropMenuDatas}
+        />
+        <div className="branch-content">
+          <div className="switch-wrapper">
+            <WeaFormItem
+              label="分部编号自动生成"
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}>
+              <WeaCheckbox
+                value={checkVal}
+                helpfulTip={this.helpContent}
+                helpfulTipProps={{ placement: "top" }}
+                display="switch"
+                id="num-set-switch"
+                onChange={(checkVal) => this.setState({ checkVal })}
+              />
+            </WeaFormItem>
+          </div>
+          {/* 内容区 */}
+          {checkVal === "1" && (
+            <Fragment>
+              <div className="numberComposition">
+                <WeaSearchGroup title={"编号组成"} showGroup>
+                  <NumberComposition />
+                </WeaSearchGroup>
               </div>
-            );
-          })}
-          {/* <a
-            href="https://www.e-cology.com.cn/spa/document/index.jsp?id=7258131&router=1#/main/document/detail"
-            target="_blank"
-            className="product-link">
-            <span>
-              演示
-              <br />
-              脚本
-            </span>
-          </a> */}
+              <div className="startReservedNumberSet">
+                <WeaSearchGroup
+                  title={"起始编号及预留编号设置"}
+                  showGroup
+                  center>
+                  <StartReservedNumberSet />
+                </WeaSearchGroup>
+              </div>
+            </Fragment>
+          )}
         </div>
-        {/* 弹框 */}
-        {dialogParams.visible && (
-          <WeaDialog
-            onCancel={() => {
-              this.resizeWidthHeight();
-              this.setState({
-                dialogParams: {
-                  ...this.state.dialogParams,
-                  visible: false,
-                  productId: "",
-                },
-              });
-            }}
-            visible={dialogParams.visible}
-            style={{ width: dialogWidth }}>
-            <div
-              className="product-dialog"
-              style={{ height: dialogHeight + "vh" }}>
-              <ProductDialog productId={dialogParams.productId} />
-            </div>
-          </WeaDialog>
-        )}
       </div>
     );
   }
 }
-
-ecodeSDK.exp(ProductIndex);

From 204613099aa2fc5787a6751b9e520e51b21c00df Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Mon, 6 Jun 2022 14:01:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/branchNumSetting/index.js      |   2 +-
 .../components/branchNumSetting/index.less    |  23 ++-
 .../components/deptNumberSet/index.js         | 154 ++++++++++++++++++
 pc4mobx/organization/index.js                 |   8 +-
 pc4mobx/organization/public/i18n.js           |   2 +
 pc4mobx/organization/style/index.less         |  20 +--
 6 files changed, 194 insertions(+), 15 deletions(-)
 create mode 100644 pc4mobx/organization/components/deptNumberSet/index.js

diff --git a/pc4mobx/organization/components/branchNumSetting/index.js b/pc4mobx/organization/components/branchNumSetting/index.js
index 05f4148..960e39c 100644
--- a/pc4mobx/organization/components/branchNumSetting/index.js
+++ b/pc4mobx/organization/components/branchNumSetting/index.js
@@ -2,7 +2,7 @@
  * Author: 黎永顺
  * Description: 分部编号设置
  * Date: 2022-05-17 14:30:57
- * LastEditTime: 2022-05-30 10:23:18
+ * LastEditTime: 2022-06-06 09:42:23
  */
 import React, { Component, Fragment } from "react";
 import { Button } from "antd";
diff --git a/pc4mobx/organization/components/branchNumSetting/index.less b/pc4mobx/organization/components/branchNumSetting/index.less
index 7ae8a45..727212b 100644
--- a/pc4mobx/organization/components/branchNumSetting/index.less
+++ b/pc4mobx/organization/components/branchNumSetting/index.less
@@ -1,9 +1,11 @@
-.branch-wapper {
+.branch-wapper,
+.dept-number-set {
   height: 100%;
   display: flex;
   flex-direction: column;
 
-  .branch-content {
+  .branch-content,
+  .dept-content {
     flex: 1;
     overflow: hidden auto;
 
@@ -16,6 +18,23 @@
       background: #f7fbfe;
     }
 
+    .codeNumbering {
+      .codeNumbering-operateWapper {
+        display: flex;
+        align-items: center;
+
+        .wea-select {
+          width: inherit !important;
+          margin-left: 8px;
+        }
+
+        .wea-helpful-tip {
+          margin-left: 8px;
+          margin-top: 3px;
+        }
+      }
+    }
+
     .numberComposition {
       .preview {
         margin-top: 20px;
diff --git a/pc4mobx/organization/components/deptNumberSet/index.js b/pc4mobx/organization/components/deptNumberSet/index.js
new file mode 100644
index 0000000..17ce04c
--- /dev/null
+++ b/pc4mobx/organization/components/deptNumberSet/index.js
@@ -0,0 +1,154 @@
+/*
+ * Author: 黎永顺
+ * Description: 部门编号设
+ * Date: 2022-06-06 09:37:39
+ * LastEditTime: 2022-06-06 10:26:35
+ */
+import React, { Component, Fragment } from "react";
+import { Button } from "antd";
+import {
+  WeaTop,
+  WeaFormItem,
+  WeaCheckbox,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaHelpfulTip,
+} from "ecCom";
+import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet";
+import NumberComposition from "../branchNumSetting/components/numberComposition";
+import { i18n } from "../../public/i18n";
+import "../branchNumSetting/index.less";
+
+export default class DeptNumberSet extends Component {
+  constructor() {
+    super();
+    this.state = {
+      checkVal: "0",
+      isSingle: "0", //是否单独流水
+      singleDate: "month", //日期单独流水
+    };
+  }
+
+  /**
+   * name:提示文本
+   * return {*}
+   */
+  helpContent = () => {
+    return (
+      <div>
+        <p>开启后，可根据设置的部门编号规则自动生成部门编号，涉及场景如下：</p>
+        <p>1.手动新建和手动编辑部门时可选择重新生成编号和选择预留部门编号；</p>
+        <p>2.导入人员-添加时，新创建的部门可自动生成部门编号；</p>
+        <p>3.组织结构导入-添加新部门且部门编号列为空时可自动生成部门编号；</p>
+        <p>【注意】开启前请先确认部门编号字段已启用！</p>
+      </div>
+    );
+  };
+  render() {
+    const { checkVal, isSingle, singleDate } = this.state;
+    const btns = [<Button type="primary">保存</Button>];
+    const dropMenuDatas = [
+      {
+        key: "save",
+        disabled: false,
+        icon: <i className="icon-coms-Preservation" />,
+        content: "保存",
+        onClick: (key) => alert(`点击了搜索 key = ${key}`),
+      },
+    ];
+    const options = [
+      {
+        key: "month",
+        selected: false,
+        showname: "月",
+      },
+      {
+        key: "day",
+        selected: true,
+        showname: "日",
+      },
+    ];
+    return (
+      <div className="dept-number-set">
+        <WeaTop
+          title={i18n.label.deptNumSetting()}
+          icon={<i className="icon-coms-hrm" />}
+          iconBgcolor="#217346"
+          buttons={btns}
+          showDropIcon={true}
+          dropMenuDatas={dropMenuDatas}
+        />
+        <div className="dept-content">
+          <div className="switch-wrapper">
+            <WeaFormItem
+              label="部门编号自动生成"
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}>
+              <WeaCheckbox
+                value={checkVal}
+                helpfulTip={this.helpContent}
+                helpfulTipProps={{ placement: "top" }}
+                display="switch"
+                id="num-set-switch"
+                onChange={(checkVal) => this.setState({ checkVal })}
+              />
+            </WeaFormItem>
+          </div>
+          {/* 内容区 */}
+          {checkVal === "1" && (
+            <Fragment>
+              <div className="numberComposition">
+                <WeaSearchGroup title={"编号组成"} showGroup>
+                  <NumberComposition />
+                </WeaSearchGroup>
+              </div>
+              <div className="codeNumbering">
+                <WeaSearchGroup title={"编号流水规则"} showGroup>
+                  <div className="switch-wrapper">
+                    <WeaFormItem
+                      label="日期单独流水"
+                      labelCol={{ span: 8 }}
+                      wrapperCol={{ span: 16 }}>
+                      <div className="codeNumbering-operateWapper">
+                        <WeaCheckbox
+                          value={isSingle}
+                          display="switch"
+                          id="dept-date-set-switch"
+                          onChange={(isSingle) => this.setState({ isSingle })}
+                        />
+                        {isSingle == "1" && (
+                          <WeaSelect
+                            options={options}
+                            value={singleDate}
+                            detailtype={3}
+                            supportCancel
+                            onChange={(v, showname) => {
+                              console.log("v", v, "showname", showname);
+                            }}
+                          />
+                        )}
+                        <WeaHelpfulTip
+                          width={200}
+                          title="开启后可设置按年、按月或按天单独流水，如设置按年单独流水，那每年的1月1日开始流水号从001开始重新流水。"
+                          placement="topLeft"
+                        />
+                      </div>
+                    </WeaFormItem>
+                  </div>
+                </WeaSearchGroup>
+              </div>
+              <div className="startReservedNumberSet">
+                <WeaSearchGroup
+                  title={"起始编号及预留编号设置"}
+                  showGroup
+                  center>
+                  <StartReservedNumberSet />
+                </WeaSearchGroup>
+              </div>
+            </Fragment>
+          )}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index a97b765..d0ca84f 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -12,8 +12,9 @@ import Group from "./components/group/Group";
 import OfficeManage from "./components/office/officeManage";
 import CompanyExtend from "./components/company/CompanyExtend";
 import BranchNumSetting from "./components/branchNumSetting";
+import DeptNumberSet from "./components/deptNumberSet";
 import Company from "./components/company/company";
-import DepartmentManage from "./components/deptment";
+import DepartmentManage from "./components/department/department";
 import StaffScheme from "./components/staff/StaffScheme";
 import Staff from "./components/staff/Staff";
 import Job from "./components/job/Job";
@@ -57,6 +58,11 @@ const Routes = (
       path="branchNumSetting"
       component={BranchNumSetting}
     />
+    <Route
+      key="deptNumberSet"
+      path="deptNumberSet"
+      component={DeptNumberSet}
+    />
     <Route key="company" path="company" component={Company} />
     <Route key="department" path="department" component={Department} />
     <Route key="departmentExtend" path="departmentExtend/:id" component={DepartmentExtendStore} />
diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js
index b322bdf..7f7137a 100644
--- a/pc4mobx/organization/public/i18n.js
+++ b/pc4mobx/organization/public/i18n.js
@@ -129,6 +129,8 @@ export const i18n = {
 		editOfficeName: () => getLabel(386247, '编辑职务信息'),
 		newOfficeClassifyName: () => getLabel(386246, '新建职务分类信息'),
 		branchNumSetting: () => getLabel(386246, '分部编号设置'),
+		deptNumSetting: () => getLabel(386246, '部门编号设置'),
+		posiNumSetting: () => getLabel(386246, '岗位编号设置'),
 		companyName: () => getLabel(385937, '分部'),
 		staffSchemeName: () => getLabel(385936, '编制方案'),
 		newStaffScheme: () => getLabel(386246, '新建编制方案'),
diff --git a/pc4mobx/organization/style/index.less b/pc4mobx/organization/style/index.less
index 2915a1e..f661c00 100644
--- a/pc4mobx/organization/style/index.less
+++ b/pc4mobx/organization/style/index.less
@@ -1,16 +1,16 @@
-
-
 // loading 效果
 .wea-demo-loading {
   height: 100%;
   text-align: center;
+
   >div {
     position: absolute;
     top: 50%;
   }
 }
 
-html,body {
+html,
+body {
   height: 100%;
   margin: 0;
   padding: 0;
@@ -22,7 +22,9 @@ body {
   color: #333333;
 }
 
-#container, body, html {
+#container,
+body,
+html {
   height: 100%;
   overflow: scroll !important
 }
@@ -40,7 +42,7 @@ body {
   height: 100%;
 }
 
-.quickOperate{
+.quickOperate {
   position: fixed;
   width: 45px;
   height: 250px;
@@ -48,7 +50,7 @@ body {
   top: 20px;
   // border: 1px solid #8b4513;
 
-  img{
+  img {
     cursor: pointer;
     width: 30px;
     height: 30px;
@@ -60,8 +62,4 @@ body {
     display: block;
     margin-top: 10px;
   }
-}
-
-
-
-
+}
\ No newline at end of file

From 76051adc16ec5dc2461290ee05de98749f15fbc1 Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Tue, 7 Jun 2022 18:01:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E5=AE=8C=E6=88=9080%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/apis/numberSet.js        |  50 +++
 .../components/numberComposition.js           | 345 ++++++++++++------
 .../components/startNumberSetting.js          |  40 ++
 .../components/startReservedNumberSet.js      |  98 ++++-
 .../components/branchNumSetting/index.js      | 254 +++++++++++--
 .../components/deptNumberSet/index.js         | 278 +++++++++++---
 .../components/postNumberSet/index.js         | 312 ++++++++++++++++
 .../components/resourceNumberSet/index.js     | 312 ++++++++++++++++
 pc4mobx/organization/index.js                 |  16 +-
 pc4mobx/organization/public/i18n.js           |   3 +-
 pc4mobx/organization/stores/index.js          |  19 +-
 pc4mobx/organization/stores/numberSet.js      |  30 ++
 12 files changed, 1539 insertions(+), 218 deletions(-)
 create mode 100644 pc4mobx/organization/apis/numberSet.js
 create mode 100644 pc4mobx/organization/components/branchNumSetting/components/startNumberSetting.js
 create mode 100644 pc4mobx/organization/components/postNumberSet/index.js
 create mode 100644 pc4mobx/organization/components/resourceNumberSet/index.js
 create mode 100644 pc4mobx/organization/stores/numberSet.js

diff --git a/pc4mobx/organization/apis/numberSet.js b/pc4mobx/organization/apis/numberSet.js
new file mode 100644
index 0000000..d300660
--- /dev/null
+++ b/pc4mobx/organization/apis/numberSet.js
@@ -0,0 +1,50 @@
+/*
+ * Author: 黎永顺
+ * Description:
+ * Date: 2022-06-07 09:52:01
+ * LastEditTime: 2022-06-07 17:00:34
+ */
+import { WeaTools } from "ecCom";
+
+/**
+ * name:获取编号设置
+ * param {*} params  serialtype， SUBCOMPANY：分部
+ * return {*}
+ */
+export const getCodeSetting = (params) => {
+  return WeaTools.callApi("/api/hrm/codeSetting/getCodeSetting", "GET", params);
+};
+
+/**
+ * name: 保存编号设置
+ * param {*} params
+ * return {*}
+ */
+export const saveOrUpdateCodeSetting = (params) => {
+  return WeaTools.callApi(
+    "/api/hrm/codeSetting/saveOrUpdateCodeSetting",
+    "POST",
+    params
+  );
+};
+/**
+ * name: 保存起始编号设置
+ * param {*} params
+ * return {*}
+ */
+export const saveStartNum = (params) => {
+  return WeaTools.callApi("/api/hrm/codeSetting/saveStartNum", "POST", params);
+};
+
+/**
+ * name: 起始编号设置
+ * param {*} params
+ * return {*}
+ */
+export const getStartNumForm = (params) => {
+  return WeaTools.callApi(
+    "/api/hrm/codeSetting/getStartNumForm",
+    "GET",
+    params
+  );
+};
diff --git a/pc4mobx/organization/components/branchNumSetting/components/numberComposition.js b/pc4mobx/organization/components/branchNumSetting/components/numberComposition.js
index 25f9140..4bf954b 100644
--- a/pc4mobx/organization/components/branchNumSetting/components/numberComposition.js
+++ b/pc4mobx/organization/components/branchNumSetting/components/numberComposition.js
@@ -2,7 +2,7 @@
  * Author: 黎永顺
  * Description:
  * Date: 2022-05-17 16:02:56
- * LastEditTime: 2022-05-18 18:03:07
+ * LastEditTime: 2022-06-07 15:30:43
  */
 import React, { Component, Fragment } from "react";
 import { Button, Modal } from "antd";
@@ -13,21 +13,13 @@ import {
   WeaFormItem,
   WeaSelect,
   WeaInput,
+  WeaInputNumber,
 } from "ecCom";
 import Preview from "./preview";
 import { i18n } from "../../../public/i18n";
 import _ from "lodash";
 import "../index.less";
 
-const dataSource = [
-  {
-    value: "",
-    numFieldName: "字符串",
-    numField: "string",
-  },
-  { value: "3", numFieldName: "流水号位数", numField: "number" },
-];
-
 const options = [
   {
     key: "string",
@@ -51,12 +43,69 @@ class NumberComposition extends Component {
     super();
     this.state = {
       visible: false,
-      numField: "string",
-      numFieldName: "字符串",
-      dataSource,
+      objectData: {
+        numField: "string",
+        numFieldName: "字符串",
+      },
+      dataSource: [],
     };
   }
 
+  componentDidMount() {
+    const enums = {
+      STRING: "字符串",
+      NUMBER: "流水号位数",
+      YEAR: "当前年份",
+      MONTH: "当前月份",
+      DAY: "当前日期",
+    };
+    let num = 0;
+    const { dataSource: details, onChange } = this.props;
+    for (let i in details) {
+      if (details[i].ruletype === "STRING") {
+        details[i].showorder = num;
+        num++;
+      }
+    }
+    const tmpV = _.map(details, (it, index) => {
+      const { ruletype, rulevalue, showorder } = it;
+      return {
+        id: index,
+        value: rulevalue,
+        strLogo: Number(showorder) + 1,
+        numFieldName:
+          ruletype === "STRING"
+            ? `${enums[ruletype]}${Number(showorder) + 1}`
+            : enums[ruletype],
+        numField: _.toLower(ruletype),
+      };
+    });
+    this.setState(
+      {
+        dataSource: !_.isEmpty(tmpV)
+          ? tmpV
+          : [
+              {
+                id: 1,
+                value: "",
+                strLogo: 1,
+                numFieldName: "字符串1",
+                numField: "string",
+              },
+              {
+                id: 2,
+                value: 3,
+                numFieldName: "流水号位数",
+                numField: "number",
+              },
+            ],
+      },
+      () => {
+        onChange && onChange(this.state.dataSource);
+      }
+    );
+  }
+
   /**
    * name:复选框禁用
    * param undefined
@@ -82,20 +131,26 @@ class NumberComposition extends Component {
    * return {*}
    */
   handleSave = () => {
-    const { numField, numFieldName, dataSource } = this.state;
-    const objWrite = {
-      value: "",
-      numFieldName,
-      numField,
-    };
-    const objView = {
-      com: {
-        value: [{ key: numField, label: "", type: "TEXT" }],
-      },
-      [numField]: "",
-      numFieldName,
-      numField,
-    };
+    let newDataSource = [];
+    const { objectData, dataSource } = this.state;
+    const { onChange } = this.props;
+    const { numField, numFieldName } = objectData;
+    const stringRow = _.filter(dataSource, (it) => it.numField === "string"); //字符串列表
+    const maxStrLen = !_.isEmpty(stringRow)
+      ? _.sortBy(stringRow, function (o) {
+          return -o.strLogo;
+        })[0].strLogo
+      : 0; //字符串列表
+    const maxIdLen = _.sortBy(dataSource, function (o) {
+      return -o.id;
+    })[0].id; //字符串列表
+
+    const index = _.findIndex(dataSource, (item) => item.numField !== "string");
+    const lastStrindex = _.findLastIndex(
+      dataSource,
+      (item) => item.numField === "string"
+    );
+
     if (numField === "year" || numField === "month" || numField === "day") {
       const hasYearOrMonthOrDay = _.some(
         dataSource,
@@ -122,87 +177,158 @@ class NumberComposition extends Component {
           });
           return;
         }
-        this.setState({
-          visible: false,
-          numField: "string",
-          numFieldName: "字符串",
-          dataSource: [...dataSource, objView],
-        });
       } else {
         this.showConfirm();
+        return;
       }
-    } else {
-      this.setState({
-        visible: false,
-        numField: "string",
-        numFieldName: "字符串",
-        dataSource: [...dataSource, objWrite],
-      });
     }
+
+    // 如果前n项为空或者当中包含非字符串项，则
+    if (index > lastStrindex) {
+      if (numField === "month") {
+        const tmpVLastYearindex = _.findLastIndex(
+          dataSource,
+          (item) => item.numField === "year"
+        );
+        dataSource.splice(tmpVLastYearindex + 1, 0, {
+          id: maxIdLen + 1,
+          value: "",
+          numFieldName:
+            numField === "string"
+              ? `${numFieldName}${stringRow.length + 1}`
+              : numFieldName,
+          numField,
+        });
+      } else if (numField === "day") {
+        const tmpVLastMonthindex = _.findLastIndex(
+          dataSource,
+          (item) => item.numField === "month"
+        );
+        dataSource.splice(tmpVLastMonthindex + 1, 0, {
+          id: maxIdLen + 1,
+          value: "",
+          numFieldName:
+            numField === "string"
+              ? `${numFieldName}${stringRow.length + 1}`
+              : numFieldName,
+          numField,
+        });
+      } else {
+        const tmpVLastStrindex = _.findLastIndex(
+          dataSource,
+          (item) => item.numField === "string"
+        );
+        dataSource.splice(tmpVLastStrindex + 1, 0, {
+          id: maxIdLen + 1,
+          value: "",
+          strLogo: maxStrLen + 1,
+          numFieldName:
+            numField === "string"
+              ? `${numFieldName}${maxStrLen + 1}`
+              : numFieldName,
+          numField,
+        });
+      }
+      newDataSource = [...dataSource];
+    } else {
+      if (numField === "month") {
+        const tmpVLastYearindex = _.findLastIndex(
+          dataSource,
+          (item) => item.numField === "year"
+        );
+        dataSource.splice(tmpVLastYearindex + 1, 0, {
+          id: maxIdLen + 1,
+          value: "",
+          numFieldName:
+            numField === "string"
+              ? `${numFieldName}${stringRow.length + 1}`
+              : numFieldName,
+          numField,
+        });
+      } else if (numField === "day") {
+        const tmpVLastMonthindex = _.findLastIndex(
+          dataSource,
+          (item) => item.numField === "month"
+        );
+        dataSource.splice(tmpVLastMonthindex + 1, 0, {
+          id: maxIdLen + 1,
+          value: "",
+          numFieldName:
+            numField === "string"
+              ? `${numFieldName}${stringRow.length + 1}`
+              : numFieldName,
+          numField,
+        });
+      } else {
+        const tmpVLastStrindex = _.findLastIndex(
+          dataSource,
+          (item) => item.numField === "string"
+        );
+        dataSource.splice(tmpVLastStrindex, 0, {
+          id: maxIdLen + 1,
+          value: "",
+          strLogo: maxStrLen + 1,
+          numFieldName:
+            numField === "string"
+              ? `${numFieldName}${maxStrLen + 1}`
+              : numFieldName,
+          numField,
+        });
+      }
+      newDataSource = [...dataSource];
+    }
+    this.setState({
+      visible: false,
+      objectData: { numField: "string", numFieldName: "字符串" },
+      dataSource: newDataSource,
+    });
+    onChange && onChange(newDataSource);
   };
   /**
    * name:年月日字段重复提示
    * return {*}
    */
   showConfirm = () => {
-    const { numFieldName } = this.state;
+    const { objectData } = this.state;
     Modal.warning({
       title: "信息确认",
-      content: `已经添加过一个${numFieldName}，请选择其他编号字段！`,
+      content: `已经添加过一个${objectData.numFieldName}，请选择其他编号字段！`,
       footer: [],
       onOk() {},
       okText: "确认",
     });
   };
-  /**
-   * name: 编号字段删除
-   * return {*}
-   */
-  handleDeleteTable = (keys, datas) => {
+
+  handleChangeInput = (value, index, record) => {
     const { dataSource } = this.state;
-    const stringRow = _.filter(dataSource, (it) => it.numField === "string");
-    const yearRow = _.filter(dataSource, (it) => it.numField === "year");
-    const monthRow = _.filter(dataSource, (it) => it.numField === "month");
-    const dayRow = _.filter(dataSource, (it) => it.numField === "day");
-    const disableRow = _.filter(dataSource, (it) => it.numField === "number");
-    const tmpV = [
-      ...stringRow,
-      ...yearRow,
-      ...monthRow,
-      ...dayRow,
-      ...disableRow,
-    ];
-    this.setState({
-      dataSource: _.filter(tmpV, (it, idx) => !keys.includes(idx)),
-    });
+    const { onChange } = this.props;
+    this.setState(
+      {
+        dataSource: _.map(dataSource, (it) => {
+          if (it.id === record.id) {
+            return {
+              ...it,
+              value,
+            };
+          }
+          return { ...it };
+        }),
+      },
+      () => {
+        onChange && onChange(this.state.dataSource);
+      }
+    );
   };
 
-  handleChangeInput = (value, index) => {
-    const { dataSource } = this.state;
-    const stringRow = _.filter(dataSource, (it) => it.numField === "string");
-    const yearRow = _.filter(dataSource, (it) => it.numField === "year");
-    const monthRow = _.filter(dataSource, (it) => it.numField === "month");
-    const dayRow = _.filter(dataSource, (it) => it.numField === "day");
-    const disableRow = _.filter(dataSource, (it) => it.numField === "number");
-    const tmpV = _.map(
-      [...stringRow, ...yearRow, ...monthRow, ...dayRow, ...disableRow],
-      (it, idx) => ({ ...it, key: idx })
-    );
-    this.setState({
-      dataSource: _.map(tmpV, (it) => {
-        if (it.key === index) {
-          return {
-            ...it,
-            value,
-          };
-        }
-        return { ...it };
-      }),
-    });
+  handleDragChange = (dataSource) => {
+    const { onChange } = this.props;
+    this.setState({ dataSource });
+    onChange && onChange(dataSource);
   };
 
   render() {
-    const { visible, numField, dataSource } = this.state;
+    const { visible, objectData, dataSource } = this.state;
+    const { numField, numFieldName } = objectData;
     const columns = [
       {
         title: "",
@@ -230,6 +356,17 @@ class NumberComposition extends Component {
               ) {
                 return <span></span>;
               }
+              if (numField === "number") {
+                return (
+                  <WeaInputNumber
+                    id="customNumberInput"
+                    value={record.value}
+                    onChange={(value) =>
+                      this.handleChangeInput(value, index, record)
+                    }
+                  />
+                );
+              }
               return (
                 <WeaInput
                   id="custom"
@@ -242,9 +379,6 @@ class NumberComposition extends Component {
             },
           },
         ],
-        // dataIndex: "value",
-        // key: "value",
-        // com: [{ label: "", type: "INPUT", viewAttr: 2, key: "value" }],
         colSpan: 1,
         width: "70%",
       },
@@ -262,32 +396,13 @@ class NumberComposition extends Component {
         }_WeaMoreButton@e4f4n1`}
       />,
     ];
-    const stringRow = _.map(
-      _.filter(dataSource, (it) => it.numField === "string"),
-      (item, index) => {
-        return {
-          ...item,
-          numFieldName: `${item.numFieldName}${index + 1}`,
-        };
-      }
-    );
-    const yearRow = _.filter(dataSource, (it) => it.numField === "year");
-    const monthRow = _.filter(dataSource, (it) => it.numField === "month");
-    const dayRow = _.filter(dataSource, (it) => it.numField === "day");
-    const disableRow = _.filter(dataSource, (it) => it.numField === "number");
 
     return (
       <Fragment>
         <WeaTableEdit
           draggable={true}
           columns={columns}
-          datas={[
-            ...stringRow,
-            ...yearRow,
-            ...monthRow,
-            ...dayRow,
-            ...disableRow,
-          ]}
+          datas={dataSource}
           getRowSelection={this.getRowSelection}
           pushTitleIntoHeader
           showCopy={false}
@@ -299,18 +414,10 @@ class NumberComposition extends Component {
               visible: true,
             })
           }
-          onDelete={this.handleDeleteTable}
+          onChange={this.handleDragChange}
         />
         {/* 预览 */}
-        <Preview
-          dataSource={[
-            ...stringRow,
-            ...yearRow,
-            ...monthRow,
-            ...dayRow,
-            ...disableRow,
-          ]}
-        />
+        <Preview dataSource={dataSource} />
         {/* 新增弹框 */}
         <WeaDialog
           onCancel={() =>
@@ -335,7 +442,7 @@ class NumberComposition extends Component {
                 value={numField}
                 viewAttr={2}
                 onChange={(numField, numFieldName) => {
-                  this.setState({ numField, numFieldName });
+                  this.setState({ objectData: { numField, numFieldName } });
                 }}
               />
             </WeaFormItem>
diff --git a/pc4mobx/organization/components/branchNumSetting/components/startNumberSetting.js b/pc4mobx/organization/components/branchNumSetting/components/startNumberSetting.js
new file mode 100644
index 0000000..2fb2365
--- /dev/null
+++ b/pc4mobx/organization/components/branchNumSetting/components/startNumberSetting.js
@@ -0,0 +1,40 @@
+/*
+ * Author: 黎永顺
+ * Description: 起始编号设置
+ * Date: 2022-06-07 15:27:43
+ * LastEditTime: 2022-06-07 17:21:03
+ */
+import React, { Component } from "react";
+import { WeaTableEdit, WeaInputNumber } from "ecCom";
+
+class StartNumberSetting extends Component {
+  handleChangeTable = (datas) => {
+    const { onChange, startNumberInfo } = this.props;
+    const newColumns = _.map(startNumberInfo.columns, (it) => ({
+      ...it,
+      com: [{ type: "INPUTNUMBER", key: it.dataIndex, viewAttr: 3, min: 0 }],
+    }));
+    onChange && onChange(newColumns, datas);
+  };
+  render() {
+    const { startNumberInfo } = this.props;
+    const newColumns = _.map(startNumberInfo.columns, (it) => ({
+      ...it,
+      com: [{ type: "INPUTNUMBER", key: it.dataIndex, viewAttr: 3, min: 0 }],
+    }));
+    return (
+      <WeaTableEdit
+        draggable={false}
+        showAdd={false}
+        showDelete={false}
+        showCopy={false}
+        tableProps={{ rowSelection: {} }}
+        columns={newColumns}
+        datas={startNumberInfo.dataSource}
+        onChange={this.handleChangeTable}
+      />
+    );
+  }
+}
+
+export default StartNumberSetting;
diff --git a/pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js b/pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js
index b5cd812..b39d4a0 100644
--- a/pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js
+++ b/pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js
@@ -2,27 +2,117 @@
  * Author: 黎永顺
  * Description: 起始编号及预留编号设置
  * Date: 2022-05-17 15:51:41
- * LastEditTime: 2022-05-17 16:01:33
+ * LastEditTime: 2022-06-07 17:40:30
  */
 import React, { Component, Fragment } from "react";
-import { WeaFormItem } from "ecCom";
+import { Button, Modal } from "antd";
+import StartNumberSetting from "./startNumberSetting";
+import { WeaFormItem, WeaDialog, WeaMoreButton } from "ecCom";
+import { i18n } from "../../../public/i18n";
 
 class StartReservedNumberSet extends Component {
+  constructor() {
+    super();
+    this.state = {
+      dialogProps: {
+        type: "start",
+        visible: false,
+        title: "",
+      },
+    };
+  }
+  handleClickStartNumber = (type) => {
+    const { onSet } = this.props;
+    const { dialogProps } = this.state;
+    onSet && onSet(type);
+    this.setState({
+      dialogProps: {
+        ...dialogProps,
+        type,
+        visible: true,
+        title: type === "start" ? "起始编号" : "预留编号",
+      },
+    });
+  };
+  handleChangeTable = (newColumns, datas) => {
+    const { onChange } = this.props;
+    onChange && onChange(newColumns, datas);
+  };
+  handleSave = () => {
+    const { onSaveStartNumber } = this.props;
+    onSaveStartNumber && onSaveStartNumber();
+  };
+  handleClose = () => {
+    this.setState({
+      dialogProps: {
+        ...this.state.dialogProps,
+        visible: false,
+      },
+    });
+  };
   render() {
+    const { dialogProps } = this.state;
+    const { type } = dialogProps;
+    const { startNumberInfo } = this.props;
     return (
       <Fragment>
         <WeaFormItem
           label="起始编号"
           labelCol={{ span: 8 }}
           wrapperCol={{ span: 16 }}>
-          <i className="icon-coms-Flow-setting"></i>
+          <i
+            className="icon-coms-Flow-setting"
+            onClick={() => this.handleClickStartNumber("start")}></i>
         </WeaFormItem>
         <WeaFormItem
           label="预留编号"
           labelCol={{ span: 8 }}
           wrapperCol={{ span: 16 }}>
-          <i className="icon-coms-Flow-setting"></i>
+          <i
+            className="icon-coms-Flow-setting"
+            onClick={() => this.handleClickStartNumber("reserved")}></i>
         </WeaFormItem>
+        {/* 起始/预留编号设置 */}
+        <WeaDialog
+          onCancel={this.handleClose}
+          icon="icon-coms-hrm"
+          iconBgcolor="#217346"
+          {...dialogProps}
+          hasScroll
+          style={{ width: 900 }}
+          maxHeight={150}
+          buttons={
+            type === "start"
+              ? [
+                  <Button
+                    ecId={`${
+                      (this && this.props && this.props.ecId) || ""
+                    }_Button@jd6baw`}
+                    onClick={this.handleSave}
+                    type="primary">
+                    {i18n.button.save()}
+                  </Button>,
+                  <WeaMoreButton
+                    ecId={`${
+                      (this && this.props && this.props.ecId) || ""
+                    }_WeaMoreButton@e4f4n1`}
+                  />,
+                ]
+              : [
+                  <WeaMoreButton
+                    ecId={`${
+                      (this && this.props && this.props.ecId) || ""
+                    }_WeaMoreButton@e4f4n1`}
+                  />,
+                ]
+          }>
+          {type === "start" && (
+            <StartNumberSetting
+              startNumberInfo={startNumberInfo}
+              onChange={this.handleChangeTable}
+            />
+          )}
+        </WeaDialog>
       </Fragment>
     );
   }
diff --git a/pc4mobx/organization/components/branchNumSetting/index.js b/pc4mobx/organization/components/branchNumSetting/index.js
index 960e39c..e8743e7 100644
--- a/pc4mobx/organization/components/branchNumSetting/index.js
+++ b/pc4mobx/organization/components/branchNumSetting/index.js
@@ -2,35 +2,161 @@
  * Author: 黎永顺
  * Description: 分部编号设置
  * Date: 2022-05-17 14:30:57
- * LastEditTime: 2022-06-06 09:42:23
+ * LastEditTime: 2022-06-07 17:49:14
  */
 import React, { Component, Fragment } from "react";
-import { Button } from "antd";
-import { WeaTop, WeaFormItem, WeaCheckbox, WeaSearchGroup } from "ecCom";
+import { inject, observer } from "mobx-react";
+import { Button, message } from "antd";
+import {
+  WeaTop,
+  WeaFormItem,
+  WeaCheckbox,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaHelpfulTip,
+} from "ecCom";
 import StartReservedNumberSet from "./components/startReservedNumberSet";
 import NumberComposition from "./components/numberComposition";
 import { i18n } from "../../public/i18n";
+import moment from "moment";
 import "./index.less";
 
-const btns = [<Button type="primary">保存</Button>];
-const dropMenuDatas = [
-  {
-    key: "save",
-    disabled: false,
-    icon: <i className="icon-coms-Preservation" />,
-    content: "保存",
-    onClick: (key) => alert(`点击了搜索 key = ${key}`),
-  },
-];
+@inject("numberSet")
+@observer
 export default class BranchNumSetting extends Component {
   constructor() {
     super();
     this.state = {
-      checkVal: "0",
+      options: [],
+      loading: false,
+      dataSource: [],
+      startNumberInfo: {
+        columns: [],
+        dataSource: [],
+      },
+      subCompanyInfo: {
+        details: [],
+        serialenable: "0",
+        dateSerial: {
+          enable: "0",
+          key: "",
+        },
+      },
     };
   }
 
-  componentDidMount() {}
+  componentDidMount() {
+    this.getCodeSetting();
+  }
+
+  getCodeSetting = () => {
+    const { numberSet } = this.props;
+    numberSet
+      .getCodeSetting({ serialtype: "SUBCOMPANY" })
+      .then(({ api_status, details, serialenable, dateSerial = {} }) => {
+        if (api_status && !_.isEmpty(details)) {
+          this.setState({
+            subCompanyInfo: { details, serialenable, dateSerial },
+          });
+        }
+      });
+  };
+
+  handleSubmit = () => {
+    const { numberSet } = this.props;
+    const { dataSource, subCompanyInfo } = this.state;
+    const { serialenable, dateSerial } = subCompanyInfo;
+    const details = _.map(dataSource, (it, showorder) => {
+      const { numField, value: rulevalue } = it;
+      return {
+        ruletype: _.upperCase(numField),
+        rulevalue,
+        showorder,
+      };
+    });
+    const payload = {
+      datas: JSON.stringify({
+        serialenable,
+        details,
+        dateSerial,
+        serialtype: "SUBCOMPANY",
+      }),
+    };
+    this.setState({ loading: true });
+    numberSet.saveOrUpdateCodeSetting(payload).then(({ api_status }) => {
+      this.setState({ loading: false });
+      if (api_status) {
+        message.success("保存成功");
+      }
+    });
+  };
+
+  handleChangeCode = (data) => {
+    const tmpV = _.filter(
+      data,
+      (it) =>
+        it.numField === "year" ||
+        it.numField === "month" ||
+        it.numField === "day"
+    );
+    this.setState({
+      dataSource: _.cloneDeep(data),
+      options: _.map(tmpV, (it) => {
+        const { numFieldName: showname, numField: key } = it;
+        return { key: _.upperCase(key), showname };
+      }),
+    });
+  };
+
+  handleSetNumber = (type) => {
+    this.handleSubmit();
+    const { numberSet } = this.props;
+    if (type === "start") {
+      const payload = {
+        coderuleid: 1,
+        type: "",
+        dateStart: moment().format("YYYY"),
+        dateEnd: moment().format("YYYY"),
+        subCompanyId: "",
+        deptId: "",
+        jobtitlesId: "",
+      };
+      numberSet
+        .getStartNumForm(payload)
+        .then(({ api_status, columns, dataSource }) => {
+          if (api_status) {
+            this.setState({
+              startNumberInfo: { columns, dataSource },
+            });
+          }
+        });
+    }
+  };
+  handleChangeTable = (newColumns, datas) => {
+    this.setState({
+      startNumberInfo: {
+        ...this.state.startNumberInfo,
+        columns: newColumns,
+        dataSource: datas,
+      },
+    });
+  };
+
+  handleSubmitStartNumber = () => {
+    const { numberSet } = this.props;
+    const payload = {
+      datas: JSON.stringify({
+        coderuleid: 1,
+        ...this.state.startNumberInfo,
+      }),
+    };
+    numberSet.saveStartNum(payload).then(({ api_status }) => {
+      if (api_status) {
+        message.success("保存成功");
+        this.numberSetRef.handleClose();
+      }
+    });
+  };
 
   /**
    * name:提示文本
@@ -49,7 +175,22 @@ export default class BranchNumSetting extends Component {
   };
 
   render() {
-    const { checkVal } = this.state;
+    const { options, subCompanyInfo, loading, startNumberInfo } = this.state;
+    const { details, serialenable, dateSerial } = subCompanyInfo;
+    const btns = [
+      <Button type="primary" onClick={this.handleSubmit} loading={loading}>
+        保存
+      </Button>,
+    ];
+    const dropMenuDatas = [
+      {
+        key: "save",
+        disabled: false,
+        icon: <i className="icon-coms-Preservation" />,
+        content: "保存",
+        onClick: (key) => this.handleSubmit(),
+      },
+    ];
     return (
       <div className="branch-wapper">
         <WeaTop
@@ -67,29 +208,100 @@ export default class BranchNumSetting extends Component {
               labelCol={{ span: 8 }}
               wrapperCol={{ span: 16 }}>
               <WeaCheckbox
-                value={checkVal}
+                value={serialenable}
                 helpfulTip={this.helpContent}
                 helpfulTipProps={{ placement: "top" }}
                 display="switch"
                 id="num-set-switch"
-                onChange={(checkVal) => this.setState({ checkVal })}
+                onChange={(checkVal) =>
+                  this.setState({
+                    subCompanyInfo: {
+                      ...subCompanyInfo,
+                      serialenable: checkVal,
+                    },
+                  })
+                }
               />
             </WeaFormItem>
           </div>
           {/* 内容区 */}
-          {checkVal === "1" && (
+          {serialenable === "1" && (
             <Fragment>
               <div className="numberComposition">
                 <WeaSearchGroup title={"编号组成"} showGroup>
-                  <NumberComposition />
+                  <NumberComposition
+                    onChange={this.handleChangeCode}
+                    dataSource={details}
+                  />
                 </WeaSearchGroup>
               </div>
+              {!_.isEmpty(options) && (
+                <div className="codeNumbering">
+                  <WeaSearchGroup title={"编号流水规则"} showGroup>
+                    <div className="switch-wrapper">
+                      <WeaFormItem
+                        label="日期单独流水"
+                        labelCol={{ span: 8 }}
+                        wrapperCol={{ span: 16 }}>
+                        <div className="codeNumbering-operateWapper">
+                          <WeaCheckbox
+                            value={dateSerial.enable ? dateSerial.enable : "0"}
+                            display="switch"
+                            id="dept-date-set-switch"
+                            onChange={(isSingle) =>
+                              this.setState({
+                                subCompanyInfo: {
+                                  ...subCompanyInfo,
+                                  dateSerial: {
+                                    ...dateSerial,
+                                    enable: isSingle,
+                                  },
+                                },
+                              })
+                            }
+                          />
+                          {dateSerial.enable == "1" && (
+                            <WeaSelect
+                              options={options}
+                              value={dateSerial.key}
+                              detailtype={3}
+                              supportCancel
+                              onChange={(key) =>
+                                this.setState({
+                                  subCompanyInfo: {
+                                    ...subCompanyInfo,
+                                    dateSerial: {
+                                      ...dateSerial,
+                                      key,
+                                    },
+                                  },
+                                })
+                              }
+                            />
+                          )}
+                          <WeaHelpfulTip
+                            width={200}
+                            title="开启后可设置按年、按月或按天单独流水，如设置按年单独流水，那每年的1月1日开始流水号从001开始重新流水。"
+                            placement="topLeft"
+                          />
+                        </div>
+                      </WeaFormItem>
+                    </div>
+                  </WeaSearchGroup>
+                </div>
+              )}
               <div className="startReservedNumberSet">
                 <WeaSearchGroup
                   title={"起始编号及预留编号设置"}
                   showGroup
                   center>
-                  <StartReservedNumberSet />
+                  <StartReservedNumberSet
+                    ref={(dom) => (this.numberSetRef = dom)}
+                    onSet={this.handleSetNumber}
+                    startNumberInfo={startNumberInfo}
+                    onChange={this.handleChangeTable}
+                    onSaveStartNumber={this.handleSubmitStartNumber}
+                  />
                 </WeaSearchGroup>
               </div>
             </Fragment>
diff --git a/pc4mobx/organization/components/deptNumberSet/index.js b/pc4mobx/organization/components/deptNumberSet/index.js
index 17ce04c..4a384a2 100644
--- a/pc4mobx/organization/components/deptNumberSet/index.js
+++ b/pc4mobx/organization/components/deptNumberSet/index.js
@@ -1,11 +1,12 @@
 /*
  * Author: 黎永顺
- * Description: 部门编号设
+ * Description: 部门编号设置
  * Date: 2022-06-06 09:37:39
- * LastEditTime: 2022-06-06 10:26:35
+ * LastEditTime: 2022-06-07 17:44:30
  */
 import React, { Component, Fragment } from "react";
-import { Button } from "antd";
+import { inject, observer } from "mobx-react";
+import { Button, message } from "antd";
 import {
   WeaTop,
   WeaFormItem,
@@ -17,18 +18,146 @@ import {
 import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet";
 import NumberComposition from "../branchNumSetting/components/numberComposition";
 import { i18n } from "../../public/i18n";
+import moment from 'moment';
 import "../branchNumSetting/index.less";
 
+@inject("numberSet")
+@observer
 export default class DeptNumberSet extends Component {
   constructor() {
     super();
     this.state = {
-      checkVal: "0",
-      isSingle: "0", //是否单独流水
-      singleDate: "month", //日期单独流水
+      options: [],
+      loading: false,
+      dataSource: [],
+      startNumberInfo: {
+        columns: [],
+        dataSource: [],
+      },
+      subCompanyInfo: {
+        details: [],
+        serialenable: "0",
+        dateSerial: {
+          enable: "0",
+          key: "",
+        },
+      },
     };
   }
 
+  componentDidMount() {
+    this.getCodeSetting();
+  }
+
+  getCodeSetting = () => {
+    const { numberSet } = this.props;
+    numberSet
+      .getCodeSetting({ serialtype: "DEPARTMENT" })
+      .then(({ api_status, details, serialenable, dateSerial = {} }) => {
+        if (api_status && !_.isEmpty(details)) {
+          this.setState({
+            subCompanyInfo: { details, serialenable, dateSerial },
+          });
+        }
+      });
+  };
+
+  handleSubmit = () => {
+    const { numberSet } = this.props;
+    const { dataSource, subCompanyInfo } = this.state;
+    const { serialenable, dateSerial } = subCompanyInfo;
+    const details = _.map(dataSource, (it, showorder) => {
+      const { numField, value: rulevalue } = it;
+      return {
+        ruletype: _.upperCase(numField),
+        rulevalue,
+        showorder,
+      };
+    });
+    const payload = {
+      datas: JSON.stringify({
+        serialenable,
+        details,
+        dateSerial,
+        serialtype: "DEPARTMENT",
+      }),
+    };
+    this.setState({ loading: true });
+    numberSet.saveOrUpdateCodeSetting(payload).then(({ api_status }) => {
+      this.setState({ loading: false });
+      if (api_status) {
+        message.success("保存成功");
+      }
+    });
+  };
+
+  handleChangeCode = (data) => {
+    const tmpV = _.filter(
+      data,
+      (it) =>
+        it.numField === "year" ||
+        it.numField === "month" ||
+        it.numField === "day"
+    );
+    this.setState({
+      dataSource: _.cloneDeep(data),
+      options: _.map(tmpV, (it) => {
+        const { numFieldName: showname, numField: key } = it;
+        return { key: _.upperCase(key), showname };
+      }),
+    });
+  };
+
+  handleSetNumber = (type) => {
+    this.handleSubmit();
+    const { numberSet } = this.props;
+    if (type === "start") {
+      const payload = {
+        coderuleid: 2,
+        type: "",
+        dateStart: moment().format("YYYY"),
+        dateEnd: moment().format("YYYY"),
+        subCompanyId: "",
+        deptId: "",
+        jobtitlesId: "",
+      };
+      numberSet
+        .getStartNumForm(payload)
+        .then(({ api_status, columns, dataSource }) => {
+          if (api_status) {
+            this.setState({
+              startNumberInfo: { columns, dataSource },
+            });
+          }
+        });
+    }
+  };
+  handleChangeTable = (newColumns, datas) => {
+    this.setState({
+      startNumberInfo: {
+        ...this.state.startNumberInfo,
+        columns: newColumns,
+        dataSource: datas,
+      },
+    });
+  };
+
+  handleSubmitStartNumber = () => {
+    const { numberSet } = this.props;
+    const payload = {
+      datas: JSON.stringify({
+        coderuleid: 2,
+        ...this.state.startNumberInfo,
+      }),
+    };
+    numberSet.saveStartNum(payload).then(({ api_status }) => {
+      if (api_status) {
+        message.success("保存成功");
+        this.numberSetRef.handleClose();
+      }
+    });
+  };
+
   /**
    * name:提示文本
    * return {*}
@@ -45,27 +174,20 @@ export default class DeptNumberSet extends Component {
     );
   };
   render() {
-    const { checkVal, isSingle, singleDate } = this.state;
-    const btns = [<Button type="primary">保存</Button>];
+    const { options, subCompanyInfo, loading, startNumberInfo } = this.state;
+    const { details, serialenable, dateSerial } = subCompanyInfo;
+    const btns = [
+      <Button type="primary" onClick={this.handleSubmit} loading={loading}>
+        保存
+      </Button>,
+    ];
     const dropMenuDatas = [
       {
         key: "save",
         disabled: false,
         icon: <i className="icon-coms-Preservation" />,
         content: "保存",
-        onClick: (key) => alert(`点击了搜索 key = ${key}`),
-      },
-    ];
-    const options = [
-      {
-        key: "month",
-        selected: false,
-        showname: "月",
-      },
-      {
-        key: "day",
-        selected: true,
-        showname: "日",
+        onClick: (key) => this.handleSubmit(),
       },
     ];
     return (
@@ -85,64 +207,100 @@ export default class DeptNumberSet extends Component {
               labelCol={{ span: 8 }}
               wrapperCol={{ span: 16 }}>
               <WeaCheckbox
-                value={checkVal}
+                value={serialenable}
                 helpfulTip={this.helpContent}
                 helpfulTipProps={{ placement: "top" }}
                 display="switch"
                 id="num-set-switch"
-                onChange={(checkVal) => this.setState({ checkVal })}
+                onChange={(checkVal) =>
+                  this.setState({
+                    subCompanyInfo: {
+                      ...subCompanyInfo,
+                      serialenable: checkVal,
+                    },
+                  })
+                }
               />
             </WeaFormItem>
           </div>
           {/* 内容区 */}
-          {checkVal === "1" && (
+          {serialenable === "1" && (
             <Fragment>
               <div className="numberComposition">
                 <WeaSearchGroup title={"编号组成"} showGroup>
-                  <NumberComposition />
+                  <NumberComposition
+                    onChange={this.handleChangeCode}
+                    dataSource={details}
+                  />
                 </WeaSearchGroup>
               </div>
-              <div className="codeNumbering">
-                <WeaSearchGroup title={"编号流水规则"} showGroup>
-                  <div className="switch-wrapper">
-                    <WeaFormItem
-                      label="日期单独流水"
-                      labelCol={{ span: 8 }}
-                      wrapperCol={{ span: 16 }}>
-                      <div className="codeNumbering-operateWapper">
-                        <WeaCheckbox
-                          value={isSingle}
-                          display="switch"
-                          id="dept-date-set-switch"
-                          onChange={(isSingle) => this.setState({ isSingle })}
-                        />
-                        {isSingle == "1" && (
-                          <WeaSelect
-                            options={options}
-                            value={singleDate}
-                            detailtype={3}
-                            supportCancel
-                            onChange={(v, showname) => {
-                              console.log("v", v, "showname", showname);
-                            }}
+              {!_.isEmpty(options) && (
+                <div className="codeNumbering">
+                  <WeaSearchGroup title={"编号流水规则"} showGroup>
+                    <div className="switch-wrapper">
+                      <WeaFormItem
+                        label="日期单独流水"
+                        labelCol={{ span: 8 }}
+                        wrapperCol={{ span: 16 }}>
+                        <div className="codeNumbering-operateWapper">
+                          <WeaCheckbox
+                            value={dateSerial.enable ? dateSerial.enable : "0"}
+                            display="switch"
+                            id="dept-date-set-switch"
+                            onChange={(isSingle) =>
+                              this.setState({
+                                subCompanyInfo: {
+                                  ...subCompanyInfo,
+                                  dateSerial: {
+                                    ...dateSerial,
+                                    enable: isSingle,
+                                  },
+                                },
+                              })
+                            }
                           />
-                        )}
-                        <WeaHelpfulTip
-                          width={200}
-                          title="开启后可设置按年、按月或按天单独流水，如设置按年单独流水，那每年的1月1日开始流水号从001开始重新流水。"
-                          placement="topLeft"
-                        />
-                      </div>
-                    </WeaFormItem>
-                  </div>
-                </WeaSearchGroup>
-              </div>
+                          {dateSerial.enable == "1" && (
+                            <WeaSelect
+                              options={options}
+                              value={dateSerial.key}
+                              detailtype={3}
+                              supportCancel
+                              onChange={(key) =>
+                                this.setState({
+                                  subCompanyInfo: {
+                                    ...subCompanyInfo,
+                                    dateSerial: {
+                                      ...dateSerial,
+                                      key,
+                                    },
+                                  },
+                                })
+                              }
+                            />
+                          )}
+                          <WeaHelpfulTip
+                            width={200}
+                            title="开启后可设置按年、按月或按天单独流水，如设置按年单独流水，那每年的1月1日开始流水号从001开始重新流水。"
+                            placement="topLeft"
+                          />
+                        </div>
+                      </WeaFormItem>
+                    </div>
+                  </WeaSearchGroup>
+                </div>
+              )}
               <div className="startReservedNumberSet">
                 <WeaSearchGroup
                   title={"起始编号及预留编号设置"}
                   showGroup
                   center>
-                  <StartReservedNumberSet />
+                  <StartReservedNumberSet
+                    ref={(dom) => (this.numberSetRef = dom)}
+                    onSet={this.handleSetNumber}
+                    startNumberInfo={startNumberInfo}
+                    onChange={this.handleChangeTable}
+                    onSaveStartNumber={this.handleSubmitStartNumber}
+                  />
                 </WeaSearchGroup>
               </div>
             </Fragment>
diff --git a/pc4mobx/organization/components/postNumberSet/index.js b/pc4mobx/organization/components/postNumberSet/index.js
new file mode 100644
index 0000000..9164bb2
--- /dev/null
+++ b/pc4mobx/organization/components/postNumberSet/index.js
@@ -0,0 +1,312 @@
+/*
+ * Author: 黎永顺
+ * Description: 岗位编号设置
+ * Date: 2022-06-06 09:37:39
+ * LastEditTime: 2022-06-07 17:49:19
+ */
+import React, { Component, Fragment } from "react";
+import { inject, observer } from "mobx-react";
+import { Button, message } from "antd";
+import {
+  WeaTop,
+  WeaFormItem,
+  WeaCheckbox,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaHelpfulTip,
+} from "ecCom";
+import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet";
+import NumberComposition from "../branchNumSetting/components/numberComposition";
+import { i18n } from "../../public/i18n";
+import moment from "moment";
+import "../branchNumSetting/index.less";
+
+@inject("numberSet")
+@observer
+export default class PostNumberSet extends Component {
+  constructor() {
+    super();
+    this.state = {
+      options: [],
+      loading: false,
+      dataSource: [],
+      startNumberInfo: {
+        columns: [],
+        dataSource: [],
+      },
+      subCompanyInfo: {
+        details: [],
+        serialenable: "0",
+        dateSerial: {
+          enable: "0",
+          key: "",
+        },
+      },
+    };
+  }
+
+  componentDidMount() {
+    this.getCodeSetting();
+  }
+
+  getCodeSetting = () => {
+    const { numberSet } = this.props;
+    numberSet
+      .getCodeSetting({ serialtype: "JOBTITLES" })
+      .then(({ api_status, details, serialenable, dateSerial = {} }) => {
+        if (api_status && !_.isEmpty(details)) {
+          this.setState({
+            subCompanyInfo: { details, serialenable, dateSerial },
+          });
+        }
+      });
+  };
+
+  handleSubmit = () => {
+    const { numberSet } = this.props;
+    const { dataSource, subCompanyInfo } = this.state;
+    const { serialenable, dateSerial } = subCompanyInfo;
+    const details = _.map(dataSource, (it, showorder) => {
+      const { numField, value: rulevalue } = it;
+      return {
+        ruletype: _.upperCase(numField),
+        rulevalue,
+        showorder,
+      };
+    });
+    const payload = {
+      datas: JSON.stringify({
+        serialenable,
+        details,
+        dateSerial,
+        serialtype: "JOBTITLES",
+      }),
+    };
+    this.setState({ loading: true });
+    numberSet.saveOrUpdateCodeSetting(payload).then(({ api_status }) => {
+      this.setState({ loading: false });
+      if (api_status) {
+        message.success("保存成功");
+      }
+    });
+  };
+
+  handleChangeCode = (data) => {
+    const tmpV = _.filter(
+      data,
+      (it) =>
+        it.numField === "year" ||
+        it.numField === "month" ||
+        it.numField === "day"
+    );
+    this.setState({
+      dataSource: _.cloneDeep(data),
+      options: _.map(tmpV, (it) => {
+        const { numFieldName: showname, numField: key } = it;
+        return { key: _.upperCase(key), showname };
+      }),
+    });
+  };
+
+  handleSetNumber = (type) => {
+    this.handleSubmit();
+    const { numberSet } = this.props;
+    if (type === "start") {
+      const payload = {
+        coderuleid: 3,
+        type: "",
+        dateStart: moment().format("YYYY"),
+        dateEnd: moment().format("YYYY"),
+        subCompanyId: "",
+        deptId: "",
+        jobtitlesId: "",
+      };
+      numberSet
+        .getStartNumForm(payload)
+        .then(({ api_status, columns, dataSource }) => {
+          if (api_status) {
+            this.setState({
+              startNumberInfo: { columns, dataSource },
+            });
+          }
+        });
+    }
+  };
+  handleChangeTable = (newColumns, datas) => {
+    this.setState({
+      startNumberInfo: {
+        ...this.state.startNumberInfo,
+        columns: newColumns,
+        dataSource: datas,
+      },
+    });
+  };
+
+  handleSubmitStartNumber = () => {
+    const { numberSet } = this.props;
+    const payload = {
+      datas: JSON.stringify({
+        coderuleid: 3,
+        ...this.state.startNumberInfo,
+      }),
+    };
+    numberSet.saveStartNum(payload).then(({ api_status }) => {
+      if (api_status) {
+        message.success("保存成功");
+        this.numberSetRef.handleClose();
+      }
+    });
+  };
+
+  /**
+   * name:提示文本
+   * return {*}
+   */
+  helpContent = () => {
+    return (
+      <div>
+        <p>开启后，可根据设置的部门编号规则自动生成部门编号，涉及场景如下：</p>
+        <p>1.手动新建和手动编辑部门时可选择重新生成编号和选择预留部门编号；</p>
+        <p>2.导入人员-添加时，新创建的部门可自动生成部门编号；</p>
+        <p>3.组织结构导入-添加新部门且部门编号列为空时可自动生成部门编号；</p>
+        <p>【注意】开启前请先确认部门编号字段已启用！</p>
+      </div>
+    );
+  };
+  render() {
+    const { options, subCompanyInfo, loading, startNumberInfo } = this.state;
+    const { details, serialenable, dateSerial } = subCompanyInfo;
+    const btns = [
+      <Button type="primary" onClick={this.handleSubmit} loading={loading}>
+        保存
+      </Button>,
+    ];
+    const dropMenuDatas = [
+      {
+        key: "save",
+        disabled: false,
+        icon: <i className="icon-coms-Preservation" />,
+        content: "保存",
+        onClick: (key) => this.handleSubmit(),
+      },
+    ];
+    return (
+      <div className="dept-number-set">
+        <WeaTop
+          title={i18n.label.postNumSetting()}
+          icon={<i className="icon-coms-hrm" />}
+          iconBgcolor="#217346"
+          buttons={btns}
+          showDropIcon={true}
+          dropMenuDatas={dropMenuDatas}
+        />
+        <div className="dept-content">
+          <div className="switch-wrapper">
+            <WeaFormItem
+              label="岗位编号自动生成"
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}>
+              <WeaCheckbox
+                value={serialenable}
+                helpfulTip={this.helpContent}
+                helpfulTipProps={{ placement: "top" }}
+                display="switch"
+                id="num-set-switch"
+                onChange={(checkVal) =>
+                  this.setState({
+                    subCompanyInfo: {
+                      ...subCompanyInfo,
+                      serialenable: checkVal,
+                    },
+                  })
+                }
+              />
+            </WeaFormItem>
+          </div>
+          {/* 内容区 */}
+          {serialenable === "1" && (
+            <Fragment>
+              <div className="numberComposition">
+                <WeaSearchGroup title={"编号组成"} showGroup>
+                  <NumberComposition
+                    onChange={this.handleChangeCode}
+                    dataSource={details}
+                  />
+                </WeaSearchGroup>
+              </div>
+              {!_.isEmpty(options) && (
+                <div className="codeNumbering">
+                  <WeaSearchGroup title={"编号流水规则"} showGroup>
+                    <div className="switch-wrapper">
+                      <WeaFormItem
+                        label="日期单独流水"
+                        labelCol={{ span: 8 }}
+                        wrapperCol={{ span: 16 }}>
+                        <div className="codeNumbering-operateWapper">
+                          <WeaCheckbox
+                            value={dateSerial.enable ? dateSerial.enable : "0"}
+                            display="switch"
+                            id="dept-date-set-switch"
+                            onChange={(isSingle) =>
+                              this.setState({
+                                subCompanyInfo: {
+                                  ...subCompanyInfo,
+                                  dateSerial: {
+                                    ...dateSerial,
+                                    enable: isSingle,
+                                  },
+                                },
+                              })
+                            }
+                          />
+                          {dateSerial.enable == "1" && (
+                            <WeaSelect
+                              options={options}
+                              value={dateSerial.key}
+                              detailtype={3}
+                              supportCancel
+                              onChange={(key) =>
+                                this.setState({
+                                  subCompanyInfo: {
+                                    ...subCompanyInfo,
+                                    dateSerial: {
+                                      ...dateSerial,
+                                      key,
+                                    },
+                                  },
+                                })
+                              }
+                            />
+                          )}
+                          <WeaHelpfulTip
+                            width={200}
+                            title="开启后可设置按年、按月或按天单独流水，如设置按年单独流水，那每年的1月1日开始流水号从001开始重新流水。"
+                            placement="topLeft"
+                          />
+                        </div>
+                      </WeaFormItem>
+                    </div>
+                  </WeaSearchGroup>
+                </div>
+              )}
+              <div className="startReservedNumberSet">
+                <WeaSearchGroup
+                  title={"起始编号及预留编号设置"}
+                  showGroup
+                  center>
+                  <StartReservedNumberSet
+                    ref={(dom) => (this.numberSetRef = dom)}
+                    onSet={this.handleSetNumber}
+                    startNumberInfo={startNumberInfo}
+                    onChange={this.handleChangeTable}
+                    onSaveStartNumber={this.handleSubmitStartNumber}
+                  />
+                </WeaSearchGroup>
+              </div>
+            </Fragment>
+          )}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/pc4mobx/organization/components/resourceNumberSet/index.js b/pc4mobx/organization/components/resourceNumberSet/index.js
new file mode 100644
index 0000000..702528b
--- /dev/null
+++ b/pc4mobx/organization/components/resourceNumberSet/index.js
@@ -0,0 +1,312 @@
+/*
+ * Author: 黎永顺
+ * Description: 岗位编号设置
+ * Date: 2022-06-06 09:37:39
+ * LastEditTime: 2022-06-07 17:56:42
+ */
+import React, { Component, Fragment } from "react";
+import { inject, observer } from "mobx-react";
+import { Button, message } from "antd";
+import {
+  WeaTop,
+  WeaFormItem,
+  WeaCheckbox,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaHelpfulTip,
+} from "ecCom";
+import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet";
+import NumberComposition from "../branchNumSetting/components/numberComposition";
+import { i18n } from "../../public/i18n";
+import moment from "moment";
+import "../branchNumSetting/index.less";
+
+@inject("numberSet")
+@observer
+export default class ResourceNumberSet extends Component {
+  constructor() {
+    super();
+    this.state = {
+      options: [],
+      loading: false,
+      dataSource: [],
+      startNumberInfo: {
+        columns: [],
+        dataSource: [],
+      },
+      subCompanyInfo: {
+        details: [],
+        serialenable: "0",
+        dateSerial: {
+          enable: "0",
+          key: "",
+        },
+      },
+    };
+  }
+
+  componentDidMount() {
+    this.getCodeSetting();
+  }
+
+  getCodeSetting = () => {
+    const { numberSet } = this.props;
+    numberSet
+      .getCodeSetting({ serialtype: "USER" })
+      .then(({ api_status, details, serialenable, dateSerial = {} }) => {
+        if (api_status && !_.isEmpty(details)) {
+          this.setState({
+            subCompanyInfo: { details, serialenable, dateSerial },
+          });
+        }
+      });
+  };
+
+  handleSubmit = () => {
+    const { numberSet } = this.props;
+    const { dataSource, subCompanyInfo } = this.state;
+    const { serialenable, dateSerial } = subCompanyInfo;
+    const details = _.map(dataSource, (it, showorder) => {
+      const { numField, value: rulevalue } = it;
+      return {
+        ruletype: _.upperCase(numField),
+        rulevalue,
+        showorder,
+      };
+    });
+    const payload = {
+      datas: JSON.stringify({
+        serialenable,
+        details,
+        dateSerial,
+        serialtype: "USER",
+      }),
+    };
+    this.setState({ loading: true });
+    numberSet.saveOrUpdateCodeSetting(payload).then(({ api_status }) => {
+      this.setState({ loading: false });
+      if (api_status) {
+        message.success("保存成功");
+      }
+    });
+  };
+
+  handleChangeCode = (data) => {
+    const tmpV = _.filter(
+      data,
+      (it) =>
+        it.numField === "year" ||
+        it.numField === "month" ||
+        it.numField === "day"
+    );
+    this.setState({
+      dataSource: _.cloneDeep(data),
+      options: _.map(tmpV, (it) => {
+        const { numFieldName: showname, numField: key } = it;
+        return { key: _.upperCase(key), showname };
+      }),
+    });
+  };
+
+  handleSetNumber = (type) => {
+    this.handleSubmit();
+    const { numberSet } = this.props;
+    if (type === "start") {
+      const payload = {
+        coderuleid: 4,
+        type: "",
+        dateStart: moment().format("YYYY"),
+        dateEnd: moment().format("YYYY"),
+        subCompanyId: "",
+        deptId: "",
+        jobtitlesId: "",
+      };
+      numberSet
+        .getStartNumForm(payload)
+        .then(({ api_status, columns, dataSource }) => {
+          if (api_status) {
+            this.setState({
+              startNumberInfo: { columns, dataSource },
+            });
+          }
+        });
+    }
+  };
+  handleChangeTable = (newColumns, datas) => {
+    this.setState({
+      startNumberInfo: {
+        ...this.state.startNumberInfo,
+        columns: newColumns,
+        dataSource: datas,
+      },
+    });
+  };
+
+  handleSubmitStartNumber = () => {
+    const { numberSet } = this.props;
+    const payload = {
+      datas: JSON.stringify({
+        coderuleid: 4,
+        ...this.state.startNumberInfo,
+      }),
+    };
+    numberSet.saveStartNum(payload).then(({ api_status }) => {
+      if (api_status) {
+        message.success("保存成功");
+        this.numberSetRef.handleClose();
+      }
+    });
+  };
+
+  /**
+   * name:提示文本
+   * return {*}
+   */
+  helpContent = () => {
+    return (
+      <div>
+        <p>开启后，可根据设置的部门编号规则自动生成部门编号，涉及场景如下：</p>
+        <p>1.手动新建和手动编辑部门时可选择重新生成编号和选择预留部门编号；</p>
+        <p>2.导入人员-添加时，新创建的部门可自动生成部门编号；</p>
+        <p>3.组织结构导入-添加新部门且部门编号列为空时可自动生成部门编号；</p>
+        <p>【注意】开启前请先确认部门编号字段已启用！</p>
+      </div>
+    );
+  };
+  render() {
+    const { options, subCompanyInfo, loading, startNumberInfo } = this.state;
+    const { details, serialenable, dateSerial } = subCompanyInfo;
+    const btns = [
+      <Button type="primary" onClick={this.handleSubmit} loading={loading}>
+        保存
+      </Button>,
+    ];
+    const dropMenuDatas = [
+      {
+        key: "save",
+        disabled: false,
+        icon: <i className="icon-coms-Preservation" />,
+        content: "保存",
+        onClick: (key) => this.handleSubmit(),
+      },
+    ];
+    return (
+      <div className="dept-number-set">
+        <WeaTop
+          title={i18n.label.userNumSetting()}
+          icon={<i className="icon-coms-hrm" />}
+          iconBgcolor="#217346"
+          buttons={btns}
+          showDropIcon={true}
+          dropMenuDatas={dropMenuDatas}
+        />
+        <div className="dept-content">
+          <div className="switch-wrapper">
+            <WeaFormItem
+              label="人员编号自动生成"
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}>
+              <WeaCheckbox
+                value={serialenable}
+                helpfulTip={this.helpContent}
+                helpfulTipProps={{ placement: "top" }}
+                display="switch"
+                id="num-set-switch"
+                onChange={(checkVal) =>
+                  this.setState({
+                    subCompanyInfo: {
+                      ...subCompanyInfo,
+                      serialenable: checkVal,
+                    },
+                  })
+                }
+              />
+            </WeaFormItem>
+          </div>
+          {/* 内容区 */}
+          {serialenable === "1" && (
+            <Fragment>
+              <div className="numberComposition">
+                <WeaSearchGroup title={"编号组成"} showGroup>
+                  <NumberComposition
+                    onChange={this.handleChangeCode}
+                    dataSource={details}
+                  />
+                </WeaSearchGroup>
+              </div>
+              {!_.isEmpty(options) && (
+                <div className="codeNumbering">
+                  <WeaSearchGroup title={"编号流水规则"} showGroup>
+                    <div className="switch-wrapper">
+                      <WeaFormItem
+                        label="日期单独流水"
+                        labelCol={{ span: 8 }}
+                        wrapperCol={{ span: 16 }}>
+                        <div className="codeNumbering-operateWapper">
+                          <WeaCheckbox
+                            value={dateSerial.enable ? dateSerial.enable : "0"}
+                            display="switch"
+                            id="dept-date-set-switch"
+                            onChange={(isSingle) =>
+                              this.setState({
+                                subCompanyInfo: {
+                                  ...subCompanyInfo,
+                                  dateSerial: {
+                                    ...dateSerial,
+                                    enable: isSingle,
+                                  },
+                                },
+                              })
+                            }
+                          />
+                          {dateSerial.enable == "1" && (
+                            <WeaSelect
+                              options={options}
+                              value={dateSerial.key}
+                              detailtype={3}
+                              supportCancel
+                              onChange={(key) =>
+                                this.setState({
+                                  subCompanyInfo: {
+                                    ...subCompanyInfo,
+                                    dateSerial: {
+                                      ...dateSerial,
+                                      key,
+                                    },
+                                  },
+                                })
+                              }
+                            />
+                          )}
+                          <WeaHelpfulTip
+                            width={200}
+                            title="开启后可设置按年、按月或按天单独流水，如设置按年单独流水，那每年的1月1日开始流水号从001开始重新流水。"
+                            placement="topLeft"
+                          />
+                        </div>
+                      </WeaFormItem>
+                    </div>
+                  </WeaSearchGroup>
+                </div>
+              )}
+              <div className="startReservedNumberSet">
+                <WeaSearchGroup
+                  title={"起始编号及预留编号设置"}
+                  showGroup
+                  center>
+                  <StartReservedNumberSet
+                    ref={(dom) => (this.numberSetRef = dom)}
+                    onSet={this.handleSetNumber}
+                    startNumberInfo={startNumberInfo}
+                    onChange={this.handleChangeTable}
+                    onSaveStartNumber={this.handleSubmitStartNumber}
+                  />
+                </WeaSearchGroup>
+              </div>
+            </Fragment>
+          )}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index d0ca84f..f234ebc 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -13,6 +13,8 @@ import OfficeManage from "./components/office/officeManage";
 import CompanyExtend from "./components/company/CompanyExtend";
 import BranchNumSetting from "./components/branchNumSetting";
 import DeptNumberSet from "./components/deptNumberSet";
+import PostNumberSet from "./components/postNumberSet";
+import ResourceNumberSet from "./components/resourceNumberSet";
 import Company from "./components/company/company";
 import DepartmentManage from "./components/department/department";
 import StaffScheme from "./components/staff/StaffScheme";
@@ -58,14 +60,20 @@ const Routes = (
       path="branchNumSetting"
       component={BranchNumSetting}
     />
+    <Route key="deptNumberSet" path="deptNumberSet" component={DeptNumberSet} />
+    <Route key="postNumberSet" path="postNumberSet" component={PostNumberSet} />
     <Route
-      key="deptNumberSet"
-      path="deptNumberSet"
-      component={DeptNumberSet}
+      key="resourceNumberSet"
+      path="resourceNumberSet"
+      component={ResourceNumberSet}
     />
     <Route key="company" path="company" component={Company} />
     <Route key="department" path="department" component={Department} />
-    <Route key="departmentExtend" path="departmentExtend/:id" component={DepartmentExtendStore} />
+    <Route
+      key="departmentExtend"
+      path="departmentExtend/:id"
+      component={DepartmentExtendStore}
+    />
     <Route key="staffscheme" path="staffscheme" component={StaffScheme} />
     <Route key="staff" path="staff" component={Staff} />
     <Route key="job" path="job" component={Job} />
diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js
index 7f7137a..aa401a4 100644
--- a/pc4mobx/organization/public/i18n.js
+++ b/pc4mobx/organization/public/i18n.js
@@ -130,7 +130,8 @@ export const i18n = {
 		newOfficeClassifyName: () => getLabel(386246, '新建职务分类信息'),
 		branchNumSetting: () => getLabel(386246, '分部编号设置'),
 		deptNumSetting: () => getLabel(386246, '部门编号设置'),
-		posiNumSetting: () => getLabel(386246, '岗位编号设置'),
+		postNumSetting: () => getLabel(386246, '岗位编号设置'),
+		userNumSetting: () => getLabel(386246, '人员编号设置'),
 		companyName: () => getLabel(385937, '分部'),
 		staffSchemeName: () => getLabel(385936, '编制方案'),
 		newStaffScheme: () => getLabel(386246, '新建编制方案'),
diff --git a/pc4mobx/organization/stores/index.js b/pc4mobx/organization/stores/index.js
index ca257b8..d42be77 100644
--- a/pc4mobx/organization/stores/index.js
+++ b/pc4mobx/organization/stores/index.js
@@ -6,15 +6,15 @@ import { JobGradeStore } from "./jobgrade";
 import { OfficeManageStore } from "./officeManage";
 import { SequenceStore } from "./sequence";
 import { GroupStore } from "./group";
-import {CompanyExtendStore} from "./companyextend";
-import {CompanyStore} from "./company";
-import {DepartmentStore} from "./department";
-import {DepartmentExtendStore} from "./departmentextend";
-import {StaffSchemeStore} from "./staffscheme";
-import {StaffStore} from "./staff";
-import {JobStore} from "./job";
-import {JobExtendStore} from "./jobextend";
-
+import { CompanyExtendStore } from "./companyextend";
+import { CompanyStore } from "./company";
+import { DepartmentStore } from "./department";
+import { DepartmentExtendStore } from "./departmentextend";
+import { StaffSchemeStore } from "./staffscheme";
+import { StaffStore } from "./staff";
+import { JobStore } from "./job";
+import { JobExtendStore } from "./jobextend";
+import { NumberSetStore } from "./numberSet";
 
 module.exports = {
   simpleOrgStore: new SimpleOrgStore(),
@@ -33,4 +33,5 @@ module.exports = {
   staff: new StaffStore(),
   job: new JobStore(),
   jobExtend: new JobExtendStore(),
+  numberSet: new NumberSetStore(),
 };
diff --git a/pc4mobx/organization/stores/numberSet.js b/pc4mobx/organization/stores/numberSet.js
new file mode 100644
index 0000000..55917a5
--- /dev/null
+++ b/pc4mobx/organization/stores/numberSet.js
@@ -0,0 +1,30 @@
+/*
+ * Author: 黎永顺
+ * Description: 编号设置
+ * Date: 2022-06-07 09:54:46
+ * LastEditTime: 2022-06-07 17:00:49
+ */
+import { observable, action } from "mobx";
+import * as mobx from "mobx";
+import * as API from "../apis/numberSet"; // 引入API接口文件
+
+export class NumberSetStore {
+  @action
+  getCodeSetting(params) {
+    return API.getCodeSetting(params);
+  }
+
+  @action
+  saveOrUpdateCodeSetting(params) {
+    return API.saveOrUpdateCodeSetting(params);
+  }
+
+  @action
+  getStartNumForm(params) {
+    return API.getStartNumForm(params);
+  }
+  @action
+  saveStartNum(params) {
+    return API.saveStartNum(params);
+  }
+}