From 2d981f72538eccad49c9e4aca55d97d5aef52f5d Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Fri, 11 Mar 2022 17:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E4=B8=93=E9=A1=B9=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/cumDeduct.js | 4 ++-- pc4mobx/hrmSalary/apis/cumSituation.js | 6 +++--- pc4mobx/hrmSalary/apis/otherDeduct.js | 4 ++-- .../hrmSalary/pages/dataAcquisition/cumDeduct/index.js | 9 ++++----- .../pages/dataAcquisition/cumSituation/index.js | 9 ++++----- .../hrmSalary/pages/dataAcquisition/otherDeduct/index.js | 8 ++++---- pc4mobx/hrmSalary/stores/cumDeduct.js | 4 ++-- pc4mobx/hrmSalary/stores/cumSituation.js | 4 ++-- pc4mobx/hrmSalary/stores/otherDeduct.js | 4 ++-- 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/cumDeduct.js b/pc4mobx/hrmSalary/apis/cumDeduct.js index d51c5f4a..8e5dd048 100644 --- a/pc4mobx/hrmSalary/apis/cumDeduct.js +++ b/pc4mobx/hrmSalary/apis/cumDeduct.js @@ -48,8 +48,8 @@ export const getCumDeductDetailList = params => { } //数据采集-累计专项附加扣除-导出明细 -export const exportCumDeductDetailList = ids => { - fetch('/api/bs/hrmsalary/addUpDeduction/exportDetail?ids=' + ids).then(res => res.blob().then(blob => { +export const exportCumDeductDetailList = (id, ids="") => { + fetch('/api/bs/hrmsalary/addUpDeduction/exportDetail?accumulatedSpecialAdditionalDeductionId='+id+'&ids=' + ids).then(res => res.blob().then(blob => { var filename=`累计专项附加扣除.xlsx` var a = document.createElement('a'); var url = window.URL.createObjectURL(blob); diff --git a/pc4mobx/hrmSalary/apis/cumSituation.js b/pc4mobx/hrmSalary/apis/cumSituation.js index 449b9724..5b475278 100644 --- a/pc4mobx/hrmSalary/apis/cumSituation.js +++ b/pc4mobx/hrmSalary/apis/cumSituation.js @@ -18,7 +18,7 @@ export const getCumSituationSaCondition = params => { } //数据采集-累计情况-导出 -export const exportCumSituationList = params => { +export const exportCumSituationList = ids => { fetch('/api/bs/hrmsalary/addUpSituation/export?ids=' + ids).then(res => res.blob().then(blob => { var filename=`往期累计情况（工资、薪金）.xlsx` var a = document.createElement('a'); @@ -48,8 +48,8 @@ export const getCumSituationDetailList = params => { } //数据采集-累计情况-导出明细 -export const exportCumSituationDetailList = ids => { - fetch('/api/bs/hrmsalary/addUpSituation/exportDetail?ids=' + ids).then(res => res.blob().then(blob => { +export const exportCumSituationDetailList = (id, ids="") => { + fetch('/api/bs/hrmsalary/addUpSituation/exportDetail?accumulatedSituationId='+id+'&ids=' + ids).then(res => res.blob().then(blob => { var filename=`往期累计情况（工资、薪金）.xlsx` var a = document.createElement('a'); var url = window.URL.createObjectURL(blob); diff --git a/pc4mobx/hrmSalary/apis/otherDeduct.js b/pc4mobx/hrmSalary/apis/otherDeduct.js index 0b82f652..346b6c72 100644 --- a/pc4mobx/hrmSalary/apis/otherDeduct.js +++ b/pc4mobx/hrmSalary/apis/otherDeduct.js @@ -50,8 +50,8 @@ export const getOtherDeductDetailList = params => { } //数据采集-其他免税扣除-导出明细 -export const exportOtherDeductDetailList = ids => { - fetch('/api/bs/hrmsalary/otherDeduction/exportDetail?ids=' + ids).then(res => res.blob().then(blob => { +export const exportOtherDeductDetailList = (id, ids) => { + fetch('/api/bs/hrmsalary/otherDeduction/exportDetail?otherTaxExemptDeductionId='+id+'&ids=' + ids).then(res => res.blob().then(blob => { var filename=`其他免税扣除.xlsx` var a = document.createElement('a'); var url = window.URL.createObjectURL(blob); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 04308038..e4889375 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -242,8 +242,8 @@ export default class CumDeduct extends React.Component { ] const handleExportAllDetailClick = () => { - const {cumDeductStore: {exportCumDeductDetailList} } =this.props; - exportCumDeductDetailList(); + const {cumDeductStore: {exportCumDeductDetailList, currentRecord} } =this.props; + exportCumDeductDetailList(currentRecord.id); } const handleExportSelectedDetailClick = () => { @@ -251,9 +251,8 @@ export default class CumDeduct extends React.Component { message.warning("未选择条目") return } - const { cumDeductStore: { exportCumDeductDetailList } } = this.props; - exportCumDeductList(detailSelectedRowKeys.join(",")) - + const { cumDeductStore: { exportCumDeductDetailList, currentRecord } } = this.props; + exportCumDeductDetailList(currentRecord.id, detailSelectedRowKeys.join(",")) } const renderBtns = () => { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 5d3e6514..0d09b014 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -228,8 +228,8 @@ export default class CumSituation extends React.Component { ] const handleExportAllDetailClick = () => { - const {cumSituationStore: {exportCumDeductDetailList} } =this.props; - exportCumDeductDetailList(); + const {cumSituationStore: {exportCumSituationDetailList, currentRecord} } =this.props; + exportCumSituationDetailList(currentRecord.id); } const handleExportSelectedDetailClick = () => { @@ -237,9 +237,8 @@ export default class CumSituation extends React.Component { message.warning("未选择条目") return } - const { cumSituationStore: { exportCumDeductDetailList } } = this.props; - exportCumDeductList(detailSelectedRowKeys.join(",")) - + const { cumSituationStore: { exportCumSituationDetailList, currentRecord } } = this.props; + exportCumSituationDetailList(currentRecord.id, detailSelectedRowKeys.join(",")) } const renderBtns = () => { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 494f12a9..1b2af297 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -229,8 +229,8 @@ export default class OtherDeduct extends React.Component { ] const handleExportAllDetailClick = () => { - const {otherDeductStore: {exportCumDeductDetailList} } =this.props; - exportCumDeductDetailList(); + const {otherDeductStore: {exportOtherDeductDetailList, currentRecord} } =this.props; + exportOtherDeductDetailList(currentRecord.id); } const handleExportSelectedDetailClick = () => { @@ -238,8 +238,8 @@ export default class OtherDeduct extends React.Component { message.warning("未选择条目") return } - const { otherDeductStore: { exportCumDeductDetailList } } = this.props; - exportCumDeductList(detailSelectedRowKeys.join(",")) + const { otherDeductStore: { exportOtherDeductDetailList } } = this.props; + exportOtherDeductDetailList(currentRecord.id, detailSelectedRowKeys.join(",")) } diff --git a/pc4mobx/hrmSalary/stores/cumDeduct.js b/pc4mobx/hrmSalary/stores/cumDeduct.js index 560e59b2..197fe913 100644 --- a/pc4mobx/hrmSalary/stores/cumDeduct.js +++ b/pc4mobx/hrmSalary/stores/cumDeduct.js @@ -123,8 +123,8 @@ export class CumDeductStore { } // 导出明细 - @action exportCumDeductDetailList = (ids = "") => { - API.exportCumDeductDetailList(ids) + @action exportCumDeductDetailList = (id, ids = "") => { + API.exportCumDeductDetailList(id, ids) } diff --git a/pc4mobx/hrmSalary/stores/cumSituation.js b/pc4mobx/hrmSalary/stores/cumSituation.js index 08d0fd93..f0e2259a 100644 --- a/pc4mobx/hrmSalary/stores/cumSituation.js +++ b/pc4mobx/hrmSalary/stores/cumSituation.js @@ -123,8 +123,8 @@ export class CumSituationStore { } // 导出明细 - @action exportCumDeductDetailList = (ids = "") => { - API.exportCumDeductDetailList(ids) + @action exportCumSituationDetailList = (id, ids = "") => { + API.exportCumSituationDetailList(id, ids) } diff --git a/pc4mobx/hrmSalary/stores/otherDeduct.js b/pc4mobx/hrmSalary/stores/otherDeduct.js index f522564c..9ac1cfc0 100644 --- a/pc4mobx/hrmSalary/stores/otherDeduct.js +++ b/pc4mobx/hrmSalary/stores/otherDeduct.js @@ -123,8 +123,8 @@ export class OtherDeductStore { } // 导出明细 - @action exportCumDeductDetailList = (ids = "") => { - API.exportCumDeductDetailList(ids) + @action exportOtherDeductDetailList = (id, ids = "") => { + API.exportOtherDeductDetailList(id, ids) }