From 32e01016c1e10ebf36b6801246583df73329650e 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, 27 Oct 2023 16:27:01 +0800 Subject: [PATCH 1/5] hotfix/2.9.42310.02 --- pc4mobx/hrmSalary/pages/salaryItem/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 77dcae48..e9d7cff0 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -226,8 +226,7 @@ export default class SalaryItem extends React.Component { const menu = ( - 系统薪资项 - 自定义薪资项 + {getLabel(111, "新增自定义薪资项")} ); @@ -236,7 +235,8 @@ export default class SalaryItem extends React.Component { return (
{ (showOperateBtn || showSalaryItemBtn) && - 新增 + handleMenuClick({ key: "1" })} + style={{ marginRight: "10px" }}>{getLabel(111, "新增系统薪资项")} } { (showOperateBtn || showSalaryItemBtn) && From 4acdff060c7a0af91ecf62ae7397e14108a63d13 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, 30 Oct 2023 08:55:15 +0800 Subject: [PATCH 2/5] hotfix/2.9.42310.02 --- .../doCalc/components/salaryEditCalc/editCalcTable.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 36198c34..5a3e2aa3 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -152,7 +152,10 @@ class EditCalcTable extends Component { const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : ""; this.postMessageToChild({ dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload, - columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false })) + columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({ + ...it, + fixed: idx < 2 ? "left" : false + })) : traverse(columns) }); }); } @@ -201,11 +204,12 @@ const traverse = (arr) => { if (!_.isEmpty(item.children)) { return { title: item.text, width: item.width + "px", ellipsis: true, - dataIndex: item.column, children: traverse(item.children) + dataIndex: item.column, children: traverse(item.children), + fixed: item.fixed || false }; } else { return { - title: item.text, width: item.width + "px", + title: item.text, width: item.width + "px", fixed: item.fixed || false, dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus }; } From e246e10af75a3534b5949fffd34f17d640c6de92 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, 30 Oct 2023 15:54:25 +0800 Subject: [PATCH 3/5] hotfix/2.9.42310.02 --- pc4mobx/hrmSalary/pages/payrollFiles/index.js | 5 +++-- pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js | 4 ++-- pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index db623a70..11312f3e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -634,7 +634,7 @@ class Index extends Component { }); }}>调薪); } - selectedKey !== "stop" && arrList.push(); + (showOperateBtn && selectedKey !== "stop") && arrList.push(); return arrList; }; //切换tab @@ -730,7 +730,7 @@ class Index extends Component { paysetParams, extEmpsWitch } = this.state; - const { payrollFilesStore: { tableStore } } = this.props; + const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props; const renderSearch = () => { const searchItems = [ { com: this.Input("姓名", "username") }, @@ -871,6 +871,7 @@ class Index extends Component { { diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js index 21b8042a..de239ae8 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js @@ -59,7 +59,7 @@ export default class SalaryItemChangeList extends React.Component { // 获取Columns getColumns = () => { - const { salaryFileStore: { singleSalaryItemList }, selectedKey } = this.props; + const { salaryFileStore: { singleSalaryItemList }, selectedKey, showOperateBtn } = this.props; let columns = []; if (singleSalaryItemList.columns) { columns = _.map([...singleSalaryItemList.columns], o => { @@ -83,7 +83,7 @@ export default class SalaryItemChangeList extends React.Component { } return { ...o, width, render: text => ({text}) }; }); - if (selectedKey === "fixed") { + if (showOperateBtn && selectedKey === "fixed") { columns = [...columns, { dataIndex: "operate", fixed: "right", width: 120, title: "操作", render: (text, record) => { diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js index 59428135..24a3d631 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js @@ -80,7 +80,8 @@ export default class SalaryFileViewSlide extends React.Component { salaryFileStore: { detailForm, adjustSalaryItems, setAdjustSalaryItems }, selectedKey, handleSetpay, - paysetParams + paysetParams, + showOperateBtn } = this.props; const { baseInfo } = detailForm; const items = [ @@ -189,7 +190,7 @@ export default class SalaryFileViewSlide extends React.Component { > { this.state.selectedTab === "0" ? - : + : } From 6aed11a4110ee6aef719b6a7389fba0df189d510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 31 Oct 2023 15:45:15 +0800 Subject: [PATCH 4/5] hotfix/2.9.42310.02 --- .../components/salaryEditCalcImport/index.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js index c41f294f..e0df44cb 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js @@ -88,7 +88,8 @@ class Index extends Component { if (!selectItems) { message.error(getLabel(111, "请选择表头字段")); } else { - window.open(exportTempUrl, "_blank"); + console.log(exportTempUrl); + // window.open(exportTempUrl, "_blank"); } }; handleSelectedField = () => { @@ -155,7 +156,20 @@ class Index extends Component { } }, () => { const { selectItems: salaryItems } = this.state.headerFieldsDialog; - cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] }).then(); + cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] }) + .then(({ status, errormsg }) => { + if (status) { + const payload = { + exportData: getURLParameters(exportTempUrl).exportData, + salaryAcctRecordId, salaryItemIds: salaryItems + }; + this.setState(({ + exportTempUrl: `/api/bs/hrmsalary/salaryacct/acctresult/importtemplate/export?${convertToUrlString(payload)}` + })); + } else { + message.error(errormsg); + } + }); })} /> From a21982bf623a2c291105bc9ee0dc05f7708be14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 31 Oct 2023 15:50:52 +0800 Subject: [PATCH 5/5] hotfix/2.9.42310.02 --- .../calculate/doCalc/components/salaryEditCalcImport/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js index e0df44cb..ed63d364 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js @@ -88,8 +88,7 @@ class Index extends Component { if (!selectItems) { message.error(getLabel(111, "请选择表头字段")); } else { - console.log(exportTempUrl); - // window.open(exportTempUrl, "_blank"); + window.open(exportTempUrl, "_blank"); } }; handleSelectedField = () => {