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 ( +
+

开启后，可根据设置的部门编号规则自动生成部门编号，涉及场景如下：

+

1.手动新建和手动编辑部门时可选择重新生成编号和选择预留部门编号；

+

2.导入人员-添加时，新创建的部门可自动生成部门编号；

+

3.组织结构导入-添加新部门且部门编号列为空时可自动生成部门编号；

+

【注意】开启前请先确认部门编号字段已启用！

+
+ ); + }; + render() { + const { checkVal, isSingle, singleDate } = this.state; + const btns = []; + const dropMenuDatas = [ + { + key: "save", + disabled: false, + icon: , + content: "保存", + onClick: (key) => alert(`点击了搜索 key = ${key}`), + }, + ]; + const options = [ + { + key: "month", + selected: false, + showname: "月", + }, + { + key: "day", + selected: true, + showname: "日", + }, + ]; + return ( +
+ } + iconBgcolor="#217346" + buttons={btns} + showDropIcon={true} + dropMenuDatas={dropMenuDatas} + /> +
+
+ + this.setState({ checkVal })} + /> + +
+ {/* 内容区 */} + {checkVal === "1" && ( + +
+ + + +
+
+ +
+ +
+ this.setState({ isSingle })} + /> + {isSingle == "1" && ( + { + console.log("v", v, "showname", showname); + }} + /> + )} + +
+ +
+ +
+
+ + + +
+ + )} +
+
+ ); + } +} 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} /> + 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