);
}
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
index 121e334a..f8ac8451 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@@ -275,7 +275,7 @@ class Index extends Component {
render() {
const {
- taxAgentStore: { statisticsReportBtn },
+ taxAgentStore: { statisticsReportBtn, PageAndOptAuth },
attendanceStore: { statisticsForm, reportForm, tableStore }
} = this.props;
const {
@@ -313,7 +313,7 @@ class Index extends Component {
];
- const dropMenuDatas = [
+ let dropMenuDatas = [
{
key: "log", icon: ,
content: getLabel(545781, "操作日志")
@@ -333,6 +333,11 @@ class Index extends Component {
{ key: "detail", title: getLabel(111, "员工明细") },
{ key: "salaryDetail", title: getLabel(111, "薪资明细") }
];
+ dropMenuDatas = selectedKey === "salaryDetail" ? dropMenuDatas.slice(-1) : dropMenuDatas.slice(0, 1);
+ (PageAndOptAuth.isChief && selectedKey === "salaryDetail") && (dropMenuDatas = [...dropMenuDatas, {
+ key: "DEF_COLUMN", icon: , content: getLabel(111, "默认显示列"),
+ onClick: () => this.salaryRef.wrappedInstance.handleSetDefCols()
+ }]);
return (
} selectedKey={selectedKey}
@@ -340,8 +345,7 @@ class Index extends Component {
buttons={(!statisticsReportBtn && selectedKey === "statistics") ? buttons.slice(-1) : buttons} buttonSpace={10}
onChange={selectedKey => this.setState({ selectedKey }, () => this.state.selectedKey === "statistics" && this.initReportFormCondition())}
showDropIcon={selectedKey !== "detail"} onDropMenuClick={this.onDropMenuClick}
- dropMenuDatas={selectedKey === "salaryDetail" ? dropMenuDatas.slice(-1) : dropMenuDatas.slice(0, 1)}
- >
+ dropMenuDatas={dropMenuDatas}>
this.setState({ showSearchAd: false })} onAdSearch={this.onAdSearch}/>
diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js
index ef5cfe2d..33b74a55 100644
--- a/pc4mobx/hrmSalary/stores/taxAgent.js
+++ b/pc4mobx/hrmSalary/stores/taxAgent.js
@@ -8,6 +8,15 @@ import { decentralizationConditions, editConditions } from "../pages/taxAgent/ed
const { TableStore } = WeaTableNew;
export class TaxAgentStore {
+ @observable advanceForm = new WeaForm(); //权限-角色高级搜索form表单
+ @observable roleForm = new WeaForm(); //权限-角色form表单
+ @action initRoleForm = () => this.roleForm = new WeaForm();
+ @observable roleOperatorForm = new WeaForm(); //权限-角色操作者form表单
+ @action initRoleOperatorForm = () => this.roleOperatorForm = new WeaForm();
+ @observable PageAndOptAuth = { able: false, opts: [] }; // 业务线页面权限
+ @action initPageAndOptAuth = () => this.PageAndOptAuth = { able: true, opts: ["query", "admin"] };// 设置业务线页面权限
+
+
@observable tableStore = new TableStore(); // new table
@observable form = new WeaForm(); //表单实体
@observable formDecentralization = new WeaForm(); //关闭分权表单
@@ -140,6 +149,7 @@ export class TaxAgentStore {
return new Promise((resolve, reject) => {
API.getPermission(params).then(({ status, data }) => {
if (status) {
+ this.PageAndOptAuth = data;
const { isAdminEnable, isChief, isOpenDevolution } = data;
this.setShowOperateBtn(
!isOpenDevolution ? true : isAdminEnable ? true : false
From 0754316e770568dcd0dc2c8ddfa96ffab1c6af84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 11 Oct 2024 17:13:19 +0800
Subject: [PATCH 21/27] =?UTF-8?q?feature/2.15.2.2409.01-=E8=96=AA=E9=85=AC?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/salaryDetails.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index aeafccb6..ef85c253 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -30,8 +30,7 @@ class SalaryDetails extends Component {
showTotalCell: false, updateSum: true,
transferDialog: {
visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" },
- completeURL: "/api/bs/hrmsalary/common/pageList/get/setting"
- // convertDatasource: null
+ completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", convertDatasource: null
}
};
}
@@ -137,7 +136,12 @@ class SalaryDetails extends Component {
return [];
};
handleSetDefCols = () => {
- this.setState({ transferDialog: { ...this.state.transferDialog, visible: true } });
+ this.setState({
+ transferDialog: {
+ ...this.state.transferDialog, visible: true,
+ convertDatasource: datas => _.map(datas.setting, o => ({ id: o.id, name: o.name }))
+ }
+ });
};
render() {
From 591f29d934f805fed6951c7112148bf9a3c1ccf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 11 Oct 2024 17:15:11 +0800
Subject: [PATCH 22/27] release/2.15.2.2409.01
---
.../calculate/doCalc/components/salaryEditCalcImport/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
index accd461f..901cb803 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
@@ -156,7 +156,7 @@ class Index extends Component {
}
}, () => {
const { selectItems: salaryItems } = this.state.headerFieldsDialog;
- cacheImportField({ salaryAcctRecordId, salaryItems: salaryItems ? salaryItems.split(",") : [] })
+ cacheImportField({ salaryAcctRecordId, salaryItemIds: salaryItems ? salaryItems.split(",") : [] })
.then(({ status, errormsg }) => {
if (status) {
const payload = {
From 5b3a645dfc69dbf498c285751a2de503fe425e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sat, 12 Oct 2024 10:07:36 +0800
Subject: [PATCH 23/27] release/2.15.2.2409.01
---
pc4mobx/hrmSalary/apis/statistics.js | 4 ++
.../components/customTransferDialog.js | 52 ++++++-------------
.../components/salaryDetails.js | 47 ++++++++++++-----
3 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/statistics.js b/pc4mobx/hrmSalary/apis/statistics.js
index 76056002..17323093 100644
--- a/pc4mobx/hrmSalary/apis/statistics.js
+++ b/pc4mobx/hrmSalary/apis/statistics.js
@@ -134,3 +134,7 @@ export const getSalaryListSum = (params) => {
export const exportSalaryList = (params) => {
return postExportFetch("/api/bs/hrmsalary/report/statistics/employee/exportSalaryList", params);
};
+//薪酬统计报表-保存全局自定义列配置
+export const savePageListSetting = (params) => {
+ return postFetch("/api/bs/hrmsalary/common/pageList/save/setting", params);
+};
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
index 25ed3916..919ec05c 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
@@ -22,8 +22,8 @@ class CustomTransferDialog extends Component {
constructor(props) {
super(props);
this.state = {
- loading: false, listDatas: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [],
- query: { [props.searchParamsKey]: "" }, singleFilterVal: "",
+ loading: false, listDatas: [],
+ query: { [props.searchParamsKey]: "" },
leftListSelectedKeys: [], // 左侧table选择的keys
leftListSelectedData: [], // 左侧table选择的数据
rightCheckedKeys: [], //右侧选择的keys
@@ -40,9 +40,9 @@ class CustomTransferDialog extends Component {
leftListSelectedData: _.values(nextProps.datas), rightDatas: _.values(nextProps.datas)
});
}
- } else {
+ } else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
this.setState({
- pageInfo: { current: 1, pageSize: 10, total: 0 }, query: { [this.props.searchParamsKey]: "" },
+ query: { [this.props.searchParamsKey]: "" },
rightDatas: [], rightCheckedKeys: [], leftListSelectedData: [], leftListSelectedKeys: []
});
this.selectedData = {};
@@ -50,7 +50,7 @@ class CustomTransferDialog extends Component {
}
getData = (init = false) => {
- const { pageInfo, query } = this.state;
+ const { query } = this.state;
const { completeURL, convertDatasource, dataParams = {} } = this.props;
let payload = { ...dataParams, ...query };
this.setState({ loading: true });
@@ -59,37 +59,20 @@ class CustomTransferDialog extends Component {
if (status && data.list) {
const { pageNum: current, pageSize, total } = data;
this.setState({
- listDatas: convertDatasource ? convertDatasource(data.list) : data.list,
- pageInfo: { ...pageInfo, current, pageSize, total }
+ listDatas: convertDatasource ? convertDatasource(data.list) : data.list
});
} else {
- console.log(64, data);
this.setState({
- listDatas: convertDatasource ? convertDatasource(data) : [],
- leftListSelectedData: init ? _.values(nextProps.datas) : [],
- rightDatas: init ? _.values(nextProps.datas) : []
+ listDatas: convertDatasource ? convertDatasource(data).listDatas : [],
+ leftListSelectedData: (init && convertDatasource) ? convertDatasource(data).checked : this.state.leftListSelectedData,
+ rightDatas: (init && convertDatasource) ? convertDatasource(data).checked : this.state.rightDatas
});
}
});
};
handleOk = () => {
- const { selectedRowKeys, rightDatas } = this.state, { dialogType } = this.props;
- const convertSelectedRowKeys = dialogType !== "table" ? rightDatas.map((v) => v.id) : selectedRowKeys;
- convertSelectedRowKeys.forEach((v) => {
- let item = this.getItemById(v);
- if (item) this.selectedData[v] = item;
- });
- this.props.onChange && this.props.onChange(convertSelectedRowKeys, this.selectedData);
- this.props.onCancel && this.props.onCancel();
- };
- getItemById = (id) => {
- const { listDatas } = this.state;
- if (this.selectedData[id]) return this.selectedData[id];
- if (!_.isEmpty(listDatas)) {
- for (let i = 0; i < listDatas.length; i++) {
- if (String(id) === String(listDatas[i].id)) return listDatas[i];
- }
- }
+ const { rightDatas } = this.state;
+ this.props.onChange && this.props.onChange(rightDatas);
};
onLeftListCheck = (keys, datas) => {
const { leftListSelectedData } = this.state;
@@ -155,14 +138,11 @@ class CustomTransferDialog extends Component {
};
render() {
- const {
- loading, listDatas, query, leftListSelectedKeys, rightDatas, rightCheckedKeys,
- singleFilterVal
- } = this.state;
- const { dialogType, isSingle, searchParamsKey } = this.props;
+ const { loading, listDatas, query, leftListSelectedKeys, rightDatas, rightCheckedKeys } = this.state;
+ const { searchParamsKey, saveLoading } = this.props;
const buttons = [
- ,
+ ,
];
let rightActive = false, leftActive = false, rightAllActive = false;
if (leftListSelectedKeys && leftListSelectedKeys.length > 0) rightActive = true;
@@ -173,7 +153,7 @@ class CustomTransferDialog extends Component {
- this.getData()}
onChange={value => this.setState({ query: { ...query, [searchParamsKey]: value } })}
/>
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index ef85c253..59995acd 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -29,8 +29,13 @@ class SalaryDetails extends Component {
pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {},
showTotalCell: false, updateSum: true,
transferDialog: {
- visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" },
- completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", convertDatasource: null
+ visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" }, saveLoading: false,
+ completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", convertDatasource: datas => {
+ return {
+ listDatas: _.map(datas.setting, o => ({ id: o.id, name: o.name })),
+ checked: this.converCheckedCol(datas)
+ };
+ }
}
};
}
@@ -78,10 +83,10 @@ class SalaryDetails extends Component {
childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
};
getSalaryList = (props) => {
- const { attendanceStore: { salaryDetailSearchForm, tableStore }, dateRange } = props;
+ const { attendanceStore: { salaryDetailSearchForm, tableStore }, dateRange } = props || this.props;
const [startDateStr, endDateStr] = dateRange;
const { taxAgentIds, subcompanyIds, departmentIds, ...extra } = salaryDetailSearchForm.getFormParams();
- const { pageInfo } = this.state;
+ const { pageInfo, transferDialog } = this.state;
const payload = {
taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [],
departmentIds: departmentIds ? departmentIds.split(",") : [],
@@ -98,7 +103,7 @@ class SalaryDetails extends Component {
const { list: dataSource, pageNum: current, total, pageSize } = pageparams;
this.setState({
dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload,
- showTotalCell: confCode === "1"
+ showTotalCell: confCode === "1", transferDialog: { ...transferDialog, cancel: false }
}, () => tableStore.getDatas(dataKey.datas));
}
}).catch(() => this.setState({ loading: false }));
@@ -121,7 +126,7 @@ class SalaryDetails extends Component {
const { dataSource, pageInfo, selectedRowKeys, showTotalCell, payload, updateSum, transferDialog } = this.state;
const columns = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
const sumRowlistUrl = showTotalCell ? "/api/bs/hrmsalary/report/statistics/employee/salaryListSum" : "";
- if (!_.isEmpty(columns) && !transferDialog.visible) {
+ if (!_.isEmpty(columns) && !transferDialog.visible && !transferDialog.cancel) {
this.postMessageToChild({
dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154,
sumRowlistUrl, payload: { ...payload, updateSum },
@@ -135,11 +140,27 @@ class SalaryDetails extends Component {
}
return [];
};
- handleSetDefCols = () => {
- this.setState({
- transferDialog: {
- ...this.state.transferDialog, visible: true,
- convertDatasource: datas => _.map(datas.setting, o => ({ id: o.id, name: o.name }))
+ handleSetDefCols = () => this.setState({ transferDialog: { ...this.state.transferDialog, visible: true } });
+ converCheckedCol = (data) => {
+ return _.reduce(data.checked, (pre, cur) => {
+ const item = _.find(data.setting, k => k.id === cur);
+ if (!_.isEmpty(item)) return [...pre, item];
+ return pre;
+ }, []);
+ };
+ savePageListSetting = (values) => {
+ const payload = {
+ page: "salary_details_report",
+ setting: _.map(values, o => o.id)
+ };
+ this.setState({ transferDialog: { ...this.state.transferDialog, saveLoading: true } });
+ API.savePageListSetting(payload).then(({ status, errormsg }) => {
+ this.setState({ transferDialog: { ...this.state.transferDialog, saveLoading: false } });
+ if (status) {
+ message.success(getLabel(111, "操作成功！"));
+ this.setState({ transferDialog: { ...this.state.transferDialog, visible: false } }, () => this.getSalaryList());
+ } else {
+ message.error(errormsg);
}
});
};
@@ -165,9 +186,9 @@ class SalaryDetails extends Component {
columns={this.getColumns()}
/>
{/*默认显示列*/}
- this.setState({
- transferDialog: { ...transferDialog, visible: false }
+ transferDialog: { ...transferDialog, visible: false, cancel: true }
})}/>
);
From 7980acc6c253864d8167cf5d6ffb0d7737f39338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 14 Oct 2024 14:20:02 +0800
Subject: [PATCH 24/27] release/2.15.2.2409.01
---
.../components/salaryFileDialog/index.js | 15 ++--
.../salaryFileImportDialog/index.js | 22 +++---
.../components/salaryFileList/index.js | 26 ++++---
.../components/searchPannel/index.js | 16 ++++-
.../pages/variableSalary/conditions.js | 26 ++++++-
.../hrmSalary/pages/variableSalary/index.js | 72 ++++++++-----------
.../hrmSalary/pages/variableSalary/index.less | 6 +-
7 files changed, 107 insertions(+), 76 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index 1635c3a4..d0b0d7f4 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -38,8 +38,9 @@ class Index extends Component {
}
}
- initForm = (props) => {
- const { baseTableStore: { VSSalaryFileForm }, detail, taxAgentOption } = props;
+ initForm = async (props) => {
+ const { baseTableStore: { VSSalaryFileForm }, detail } = props;
+ const { data: taxAgentOption } = await API.getAdminTaxAgentList();
API.getCreateForm().then(({ data }) => {
this.setState({
conditions: [
@@ -48,7 +49,8 @@ class Index extends Component {
if (getKey(o) === "taxAgentIds") {
return {
...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
- options: taxAgentOption, value: detail[getKey(o)] || ""
+ value: detail[getKey(o)] || "",
+ options: _.map(taxAgentOption, (o, i) => ({ key: o.id, showname: o.content }))
};
}
return {
@@ -65,7 +67,7 @@ class Index extends Component {
label: o.name,
labelcol: 6,
value: detail[`${String(o.id)}_variableItem`] || "",
- viewAttr: !_.isEmpty(detail) ? 1 : 2
+ viewAttr: 2
})),
title: "", col: 2,
defaultshow: true
@@ -124,10 +126,7 @@ class Index extends Component {
{title}