diff --git a/pc4mobx/hrmSalary/apis/archive.js b/pc4mobx/hrmSalary/apis/archive.js
index 5ce04a25..9ea65461 100644
--- a/pc4mobx/hrmSalary/apis/archive.js
+++ b/pc4mobx/hrmSalary/apis/archive.js
@@ -1,4 +1,5 @@
-import { WeaTools } from 'ecCom';
+import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
/**
* 薪资档案api
@@ -7,120 +8,120 @@ import { WeaTools } from 'ecCom';
//薪资档案-薪资档案列表
export const getArchiveList = params => {
- return fetch('/api/bs/hrmsalary/salaryArchive/list', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/list", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
//薪资档案的高级搜索
export const getSaCondition = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/archives/getSearchCondition', 'get', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/archives/getSearchCondition", "get", params);
+};
//薪资档案-导出薪资档案
export const exportArchiveList = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/exportList', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/exportList", "POST", params);
+};
//薪资档案-获取导入参数
export const getImportArchiveParam = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getImportParams', 'get', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getImportParams", "get", params);
+};
//薪资档案-获取薪资档案详情表单
export const getArchiveForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getForm', 'get', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getForm", "get", params);
+};
//薪资档案-获取薪资项目调整表单
export const getSalaryItemForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getSalaryItemForm', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getSalaryItemForm", "GET", params);
+};
//薪资档案-保存薪资项目调整
export const saveSalaryItem = params => {
- return fetch('/api/bs/hrmsalary/salaryArchive/saveSalaryItem', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/saveSalaryItem", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
//薪资档案-获取个税扣缴义务人调整表单
export const getTaxAgentForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getTaxAgentForm', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getTaxAgentForm", "GET", params);
+};
//薪资档案-保存个税扣缴义务人调整
export const saveTaxAgent = params => {
- return fetch('/api/bs/hrmsalary/salaryArchive/saveTaxAgent', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/saveTaxAgent", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
//薪资档案-删除个税扣缴义务人调整
export const deleteTaxAgent = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/deleteTaxAgent', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/deleteTaxAgent", "GET", params);
+};
//薪资档案操作记录-薪资项目操作记录列表
export const getItemAdjustList = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchiveOperateLog/salaryItemList', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchiveOperateLog/salaryItemList", "POST", params);
+};
//薪资档案操作记录-薪资项目操作记录列表的高级搜索
export const getItemAdjustSaCondition = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchiveOperateLog/getSalaryItemSearchCondition', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchiveOperateLog/getSalaryItemSearchCondition", "GET", params);
+};
//薪资档案操作记录-导出-薪资项目操作记录列表
export const exportItemAdjust = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchiveOperateLog/exportSalaryItemList', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchiveOperateLog/exportSalaryItemList", "POST", params);
+};
//薪资档案操作记录-个税扣缴义务人操作记录列表
export const getPersonAdjustList = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchiveOperateLog/salaryItemList', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchiveOperateLog/salaryItemList", "POST", params);
+};
//薪资档案操作记录-个税扣缴义务人操作记录列表的高级搜索
export const getPersonAdjustSaCondition = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchiveOperateLog/getTaxAgentSearchCondition', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchiveOperateLog/getTaxAgentSearchCondition", "GET", params);
+};
//薪资档案操作记录-导出-个税扣缴义务人操作记录列表
export const exportPersonAdjust = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchiveOperateLog/exportTaxAgentList', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchiveOperateLog/exportTaxAgentList", "POST", params);
+};
//薪资档案-获取设置表单
export const getSettingForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getDimissionSetForm', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getDimissionSetForm", "GET", params);
+};
//薪资档案-保存离职时段设置
export const saveSetting = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/saveDimissionSet', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/saveDimissionSet", "POST", params);
+};
//薪资档案-模版下载链接(无数据)
@@ -128,166 +129,170 @@ export const downloadSalaryArchiveTemplateurl = `/api/bs/hrmsalary/salaryArchive
// 薪资档案- 模版下载 (有之前数据)
export const downloadsalaryArchiveDetail = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/exportList', 'POST', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/exportList", "POST", params);
+};
// 获取导入类型
export const getImportTypes = () => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getImportTypes', 'GET', {});
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getImportTypes", "GET", {});
+};
// 获取档案和人员状态类型
export const commonEnumList = (params) => {
- return WeaTools.callApi('/api/bs/hrmsalary/common/enum/list', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/common/enum/list", "GET", params);
+};
// 发起调薪地址
export const salaryAdjustmentInfo = (params) => {
- return WeaTools.callApi('/api/bs/hrmsalary/process/salaryAdjustmentInfo', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/process/salaryAdjustmentInfo", "GET", params);
+};
// 导入预览
export const importPreview = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/preview', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/preview", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 导入档案
export const importSalaryArchive = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/importSalaryArchive', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/importSalaryArchive", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 导出档案
export const exportSalaryArchive = (ids = "") => {
- fetch('/api/bs/hrmsalary/salaryArchive/exportList?ids=' + ids).then(res => res.blob().then(blob => {
- var filename=`薪资档案.xlsx`
- var a = document.createElement('a');
- var url = window.URL.createObjectURL(blob);
- a.href = url;
- a.download = filename;
- a.click();
- window.URL.revokeObjectURL(url);
- }))
-}
+ fetch("/api/bs/hrmsalary/salaryArchive/exportList?ids=" + ids).then(res => res.blob().then(blob => {
+ var filename = `薪资档案.xlsx`;
+ var a = document.createElement("a");
+ var url = window.URL.createObjectURL(blob);
+ a.href = url;
+ a.download = filename;
+ a.click();
+ window.URL.revokeObjectURL(url);
+ }));
+};
// 调整记录-个税扣缴义务人列表
export const adjustRecordTaxAgentList = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/adjustRecord/taxAgentList', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/taxAgentList", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 调整记录-薪资项目-列表
export const adjustRecordSalaryItemList = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/adjustRecord/salaryItemList', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/salaryItemList", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 调整记录-薪资项目-单个
export const singleSalaryItemList = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/adjustRecord/singleSalaryItemList', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/singleSalaryItemList", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 调整记录-个税扣缴义务人-单个
export const singleTaxAgentList = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/adjustRecord/singleTaxAgentList', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/singleTaxAgentList", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 调整-义务扣缴人-通过薪资档案的个税扣缴义务人id获取个税扣缴义务人调整表单
export const getTaxAgentFormBySalaryArchiveTaxAgentId = (params) => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getTaxAgentFormBySalaryArchiveTaxAgentId', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getTaxAgentFormBySalaryArchiveTaxAgentId", "GET", params);
+};
// 调整-薪资项目-获取调整前的值
export const getSalaryItemAdjustBeforeValue = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/getSalaryItemAdjustBeforeValue', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/getSalaryItemAdjustBeforeValue", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 停薪
export const stopSalary = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/stopSalary', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/stopSalary", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 调整-薪资项目-通过薪资档案的薪资项目id获取薪资项目调整表单
export const getSalaryItemFormByItemId = (params) => {
- return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getSalaryItemFormBySalaryArchiveItemId', 'GET', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getSalaryItemFormBySalaryArchiveItemId", "GET", params);
+};
// 删除薪资项目调薪
export const deleteSalaryItem = (params) => {
- return fetch(`/api/bs/hrmsalary/salaryArchive/deleteSalaryItem?salaryArchiveItemId=${params.salaryArchiveItemId}`, {
- method: 'GET',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- }).then(res => res.json())
-}
+ return fetch(`/api/bs/hrmsalary/salaryArchive/deleteSalaryItem?salaryArchiveItemId=${params.salaryArchiveItemId}`, {
+ method: "GET",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => res.json());
+};
export const getSingleSalaryItemInfo = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/adjustRecord/getSingleSalaryItemInfo', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/getSingleSalaryItemInfo", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
export const editSingleSalaryItem = (params) => {
- return fetch('/api/bs/hrmsalary/salaryArchive/adjustRecord/editSingleSalaryItem', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/editSingleSalaryItem", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
+// 基数调整记录列表
+export const getAdjustHistoryList = (params) => {
+ return postFetch("/api/bs/hrmsalary/archives/getAdjustHistoryList", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
index 84bcb6ff..e4e94622 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
@@ -1,3 +1,10 @@
+import { WeaSwitch } from "comsMobx";
+import { Button } from "antd";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
export const tabCondition = [
{
color: "#000000",
@@ -33,5 +40,99 @@ export const tabCondition = [
showcount: true,
title: "非系统人员",
viewcondition: "ext"
- },
+ }
];
+export const logConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "BROWSER",
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: true,
+ linkUrl: "/hrm/resource/HrmResource.jsp?id=",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "1"
+ },
+ domkey: ["employeeId"],
+ fieldcol: 17,
+ label: "对象",
+ lanId: 106,
+ labelcol: 7,
+ value: ""
+ },
+ {
+ colSpan: 1,
+ conditionType: "BROWSER",
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: true,
+ linkUrl: "/hrm/resource/HrmResource.jsp?id=",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "1"
+ },
+ domkey: ["operator"],
+ fieldcol: 17,
+ label: "操作人",
+ lanId: 111,
+ labelcol: 7,
+ value: ""
+ }
+ ],
+ defaultshow: true
+ }
+];
+export const getLogSearchsForm = (form, condition, onSearch = () => void (0)) => {
+ const { isFormInit } = form;
+ const formParams = form.getFormParams();
+ let group = [];
+ isFormInit && condition && condition.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ items.push({
+ com: (
+