From 88bf00cc8d5cec794617bae8c5ca324abff4a60d Mon Sep 17 00:00:00 2001 From: liyongshun <971387674@qq.com> Date: Wed, 8 Jun 2022 09:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=AE=BE=E7=BD=AE=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/organization/apis/numberSet.js | 41 ++++++++++++++++++- .../components/numberComposition.js | 2 +- .../branchNumSetting/components/preview.js | 0 .../components/startNumberSetting.js | 0 .../components/startReservedNumberSet.js | 2 +- .../branchNumSetting/index.js | 2 +- .../branchNumSetting/index.less | 0 .../deptNumberSet/index.js | 4 +- .../postNumberSet/index.js | 4 +- .../resourceNumberSet/index.js | 4 +- pc4mobx/organization/index.js | 8 ++-- 11 files changed, 53 insertions(+), 14 deletions(-) rename pc4mobx/organization/components/{ => numberSetting}/branchNumSetting/components/numberComposition.js (99%) rename pc4mobx/organization/components/{ => numberSetting}/branchNumSetting/components/preview.js (100%) rename pc4mobx/organization/components/{ => numberSetting}/branchNumSetting/components/startNumberSetting.js (100%) rename pc4mobx/organization/components/{ => numberSetting}/branchNumSetting/components/startReservedNumberSet.js (98%) rename pc4mobx/organization/components/{ => numberSetting}/branchNumSetting/index.js (99%) rename pc4mobx/organization/components/{ => numberSetting}/branchNumSetting/index.less (100%) rename pc4mobx/organization/components/{ => numberSetting}/deptNumberSet/index.js (99%) rename pc4mobx/organization/components/{ => numberSetting}/postNumberSet/index.js (99%) rename pc4mobx/organization/components/{ => numberSetting}/resourceNumberSet/index.js (99%) diff --git a/pc4mobx/organization/apis/numberSet.js b/pc4mobx/organization/apis/numberSet.js index d300660..f3820f6 100644 --- a/pc4mobx/organization/apis/numberSet.js +++ b/pc4mobx/organization/apis/numberSet.js @@ -2,7 +2,7 @@ * Author: 黎永顺 * Description: * Date: 2022-06-07 09:52:01 - * LastEditTime: 2022-06-07 17:00:34 + * LastEditTime: 2022-06-08 09:37:41 */ import { WeaTools } from "ecCom"; @@ -48,3 +48,42 @@ export const getStartNumForm = (params) => { params ); }; + +/** + * name: 高级搜索条件 + * param {*} params + * return {*} + */ +export const getAdvanceSearchCondition = (params) => { + return WeaTools.callApi( + "/api/hrm/codeSetting/getAdvanceSearchCondition", + "GET", + params + ); +}; + +/** + * name: 预留编号设置列表查询 + * param {*} params + * return {*} + */ +export const getSearchReservedCodeList = (params) => { + return WeaTools.callApi( + "/api/hrm/codeSetting/getSearchReservedCodeList", + "POST", + params + ); +}; + +/** + * name: 新增预留编号表单查询 + * param {*} params + * return {*} + */ +export const getReservedCodeFrom = (params) => { + return WeaTools.callApi( + "/api/hrm/codeSetting/getReservedCodeFrom", + "GET", + params + ); +}; diff --git a/pc4mobx/organization/components/branchNumSetting/components/numberComposition.js b/pc4mobx/organization/components/numberSetting/branchNumSetting/components/numberComposition.js similarity index 99% rename from pc4mobx/organization/components/branchNumSetting/components/numberComposition.js rename to pc4mobx/organization/components/numberSetting/branchNumSetting/components/numberComposition.js index 4bf954b..f7b1f2a 100644 --- a/pc4mobx/organization/components/branchNumSetting/components/numberComposition.js +++ b/pc4mobx/organization/components/numberSetting/branchNumSetting/components/numberComposition.js @@ -16,7 +16,7 @@ import { WeaInputNumber, } from "ecCom"; import Preview from "./preview"; -import { i18n } from "../../../public/i18n"; +import { i18n } from "../../../../public/i18n"; import _ from "lodash"; import "../index.less"; diff --git a/pc4mobx/organization/components/branchNumSetting/components/preview.js b/pc4mobx/organization/components/numberSetting/branchNumSetting/components/preview.js similarity index 100% rename from pc4mobx/organization/components/branchNumSetting/components/preview.js rename to pc4mobx/organization/components/numberSetting/branchNumSetting/components/preview.js diff --git a/pc4mobx/organization/components/branchNumSetting/components/startNumberSetting.js b/pc4mobx/organization/components/numberSetting/branchNumSetting/components/startNumberSetting.js similarity index 100% rename from pc4mobx/organization/components/branchNumSetting/components/startNumberSetting.js rename to pc4mobx/organization/components/numberSetting/branchNumSetting/components/startNumberSetting.js diff --git a/pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js b/pc4mobx/organization/components/numberSetting/branchNumSetting/components/startReservedNumberSet.js similarity index 98% rename from pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js rename to pc4mobx/organization/components/numberSetting/branchNumSetting/components/startReservedNumberSet.js index b39d4a0..762dc6d 100644 --- a/pc4mobx/organization/components/branchNumSetting/components/startReservedNumberSet.js +++ b/pc4mobx/organization/components/numberSetting/branchNumSetting/components/startReservedNumberSet.js @@ -8,7 +8,7 @@ import React, { Component, Fragment } from "react"; import { Button, Modal } from "antd"; import StartNumberSetting from "./startNumberSetting"; import { WeaFormItem, WeaDialog, WeaMoreButton } from "ecCom"; -import { i18n } from "../../../public/i18n"; +import { i18n } from "../../../../public/i18n"; class StartReservedNumberSet extends Component { constructor() { diff --git a/pc4mobx/organization/components/branchNumSetting/index.js b/pc4mobx/organization/components/numberSetting/branchNumSetting/index.js similarity index 99% rename from pc4mobx/organization/components/branchNumSetting/index.js rename to pc4mobx/organization/components/numberSetting/branchNumSetting/index.js index e8743e7..344521c 100644 --- a/pc4mobx/organization/components/branchNumSetting/index.js +++ b/pc4mobx/organization/components/numberSetting/branchNumSetting/index.js @@ -17,7 +17,7 @@ import { } from "ecCom"; import StartReservedNumberSet from "./components/startReservedNumberSet"; import NumberComposition from "./components/numberComposition"; -import { i18n } from "../../public/i18n"; +import { i18n } from "../../../public/i18n"; import moment from "moment"; import "./index.less"; diff --git a/pc4mobx/organization/components/branchNumSetting/index.less b/pc4mobx/organization/components/numberSetting/branchNumSetting/index.less similarity index 100% rename from pc4mobx/organization/components/branchNumSetting/index.less rename to pc4mobx/organization/components/numberSetting/branchNumSetting/index.less diff --git a/pc4mobx/organization/components/deptNumberSet/index.js b/pc4mobx/organization/components/numberSetting/deptNumberSet/index.js similarity index 99% rename from pc4mobx/organization/components/deptNumberSet/index.js rename to pc4mobx/organization/components/numberSetting/deptNumberSet/index.js index 4a384a2..44bc55b 100644 --- a/pc4mobx/organization/components/deptNumberSet/index.js +++ b/pc4mobx/organization/components/numberSetting/deptNumberSet/index.js @@ -2,7 +2,7 @@ * Author: 黎永顺 * Description: 部门编号设置 * Date: 2022-06-06 09:37:39 - * LastEditTime: 2022-06-07 17:44:30 + * LastEditTime: 2022-06-08 09:32:09 */ import React, { Component, Fragment } from "react"; import { inject, observer } from "mobx-react"; @@ -17,7 +17,7 @@ import { } from "ecCom"; import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet"; import NumberComposition from "../branchNumSetting/components/numberComposition"; -import { i18n } from "../../public/i18n"; +import { i18n } from "../../../public/i18n"; import moment from 'moment'; import "../branchNumSetting/index.less"; diff --git a/pc4mobx/organization/components/postNumberSet/index.js b/pc4mobx/organization/components/numberSetting/postNumberSet/index.js similarity index 99% rename from pc4mobx/organization/components/postNumberSet/index.js rename to pc4mobx/organization/components/numberSetting/postNumberSet/index.js index 9164bb2..4f66049 100644 --- a/pc4mobx/organization/components/postNumberSet/index.js +++ b/pc4mobx/organization/components/numberSetting/postNumberSet/index.js @@ -2,7 +2,7 @@ * Author: 黎永顺 * Description: 岗位编号设置 * Date: 2022-06-06 09:37:39 - * LastEditTime: 2022-06-07 17:49:19 + * LastEditTime: 2022-06-08 09:32:24 */ import React, { Component, Fragment } from "react"; import { inject, observer } from "mobx-react"; @@ -17,7 +17,7 @@ import { } from "ecCom"; import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet"; import NumberComposition from "../branchNumSetting/components/numberComposition"; -import { i18n } from "../../public/i18n"; +import { i18n } from "../../../public/i18n"; import moment from "moment"; import "../branchNumSetting/index.less"; diff --git a/pc4mobx/organization/components/resourceNumberSet/index.js b/pc4mobx/organization/components/numberSetting/resourceNumberSet/index.js similarity index 99% rename from pc4mobx/organization/components/resourceNumberSet/index.js rename to pc4mobx/organization/components/numberSetting/resourceNumberSet/index.js index 702528b..1505038 100644 --- a/pc4mobx/organization/components/resourceNumberSet/index.js +++ b/pc4mobx/organization/components/numberSetting/resourceNumberSet/index.js @@ -2,7 +2,7 @@ * Author: 黎永顺 * Description: 岗位编号设置 * Date: 2022-06-06 09:37:39 - * LastEditTime: 2022-06-07 17:56:42 + * LastEditTime: 2022-06-08 09:32:33 */ import React, { Component, Fragment } from "react"; import { inject, observer } from "mobx-react"; @@ -17,7 +17,7 @@ import { } from "ecCom"; import StartReservedNumberSet from "../branchNumSetting/components/startReservedNumberSet"; import NumberComposition from "../branchNumSetting/components/numberComposition"; -import { i18n } from "../../public/i18n"; +import { i18n } from "../../../public/i18n"; import moment from "moment"; import "../branchNumSetting/index.less"; diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js index f234ebc..4b1308e 100644 --- a/pc4mobx/organization/index.js +++ b/pc4mobx/organization/index.js @@ -11,10 +11,10 @@ import Sequence from "./components/sequence/Sequence"; 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 PostNumberSet from "./components/postNumberSet"; -import ResourceNumberSet from "./components/resourceNumberSet"; +import BranchNumSetting from "./components/numberSetting/branchNumSetting"; +import DeptNumberSet from "./components/numberSetting/deptNumberSet"; +import PostNumberSet from "./components/numberSetting/postNumberSet"; +import ResourceNumberSet from "./components/numberSetting/resourceNumberSet"; import Company from "./components/company/company"; import DepartmentManage from "./components/department/department"; import StaffScheme from "./components/staff/StaffScheme";