From 8da3d30a6986a642cd27945d35c221485fcd8927 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Thu, 29 Sep 2022 16:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=BA=BF=E4=B8=8B=E5=AF=B9=E6=AF=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/standingBook.js | 12 ++++++ .../compareDetailImportModal.js | 37 ++++++++++++------- .../standingBookDetail/components/normal.js | 16 ++++---- .../standingBookOfflineComparison/index.js | 9 ++--- pc4mobx/hrmSalary/stores/StandingBook.js | 13 ++++++- 5 files changed, 60 insertions(+), 27 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/standingBook.js b/pc4mobx/hrmSalary/apis/standingBook.js index 323e1818..4c9e41a7 100644 --- a/pc4mobx/hrmSalary/apis/standingBook.js +++ b/pc4mobx/hrmSalary/apis/standingBook.js @@ -225,3 +225,15 @@ export const importInsuranceAcctDetail = (params) => { body: JSON.stringify(params), }).then((res) => res.json()); } + +// 社保福利台账-线下对比数据导入 +export const importExcelInsuranceDetail = (params) => { + return fetch("/api/bs/hrmsalary/siaccount/comparisonwelfare/importExcelInsuranceDetail", { + method: "post", + mode: "cors", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(params), + }).then((res) => res.json()); +} diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js index 1db577b1..28b01f42 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js @@ -1,8 +1,9 @@ import React from "react"; import ImportModal from "../../components/importModal"; import { inject, observer } from "mobx-react"; +import { getQueryString } from "../../util/url"; -@inject("calculateStore") +@inject("calculateStore", "StandingBookStore") @observer export default class CompareDetailImportModal extends React.Component { constructor(props) { @@ -30,11 +31,11 @@ export default class CompareDetailImportModal extends React.Component { } handleTemplateLink() { - let url=""; - if(this.props.id){ - url= "/api/bs/hrmsalary/salaryacct/comparisonresult/importtemplate/export?salaryAcctRecordId=" + this.props.id - }else{ - url=`/api/bs/hrmsalary/siaccount/comparisonwelfare/importtemplate/export` + let url = ""; + if (this.props.id) { + url = "/api/bs/hrmsalary/salaryacct/comparisonresult/importtemplate/export?salaryAcctRecordId=" + this.props.id; + } else { + url = `/api/bs/hrmsalary/siaccount/comparisonwelfare/importtemplate/export`; } window.open(url); } @@ -54,9 +55,8 @@ export default class CompareDetailImportModal extends React.Component { } render() { - const { visiable } = this.props; const { step, modalParam } = this.state; - const { calculateStore } = this.props; + const { visiable, id, calculateStore, standingBookStore } = this.props; const { previewComparisonResult, comparisonPreviewColumns, @@ -64,6 +64,13 @@ export default class CompareDetailImportModal extends React.Component { importComparisonExcelAcctResult, comparisonImportAcctResult } = calculateStore; + const { + welfarePreview, + previewStandingBookAcctResultColumns, + previewStandingBookAcctResultDataSource, + importComparisonExcelStandingBookResult, + importOCStandingBookAcctResult + } = standingBookStore; return (
{ @@ -72,20 +79,24 @@ export default class CompareDetailImportModal extends React.Component { this.handleInitImportModal(); }} params={modalParam} - columns={comparisonPreviewColumns} + columns={id ? comparisonPreviewColumns : previewStandingBookAcctResultColumns} step={step} setStep={this.setStep.bind(this)} - slideDataSource={comparisonPreviewDataSource} - importResult={comparisonImportAcctResult} + slideDataSource={id ? comparisonPreviewDataSource : previewStandingBookAcctResultDataSource} + importResult={id ? comparisonImportAcctResult : importOCStandingBookAcctResult} onFinish={() => { this.props.onCancel(); this.props.onFinish(); }} previewImport={(params) => { - previewComparisonResult(params); + id ? previewComparisonResult(params) : welfarePreview(params); }} importFile={(params) => { - importComparisonExcelAcctResult(params); + //id: 有值代表薪资核算页面的线下对比页面， 无值代表社保福利台账页面的线下对比页面 + id ? importComparisonExcelAcctResult(params) : importComparisonExcelStandingBookResult({ + ...params, + billMonth: getQueryString("billMonth") + }); }} templateLink={() => { this.handleTemplateLink(); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 42967bcd..f16b06a9 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -489,14 +489,14 @@ export default class NormalIndex extends Component { }}>核算 } - {/*{*/} - {/* selectedKey === "1" &&*/} - {/* */} - {/* */} - {/* */} - {/*}*/} + { + selectedKey === "1" && + + + + } {/*核算进度条*/} ({ + columns: _.map(columns, (it, idx) => ({ ...it, width: 150, + fixed: idx < 5 ? "left" : false, render: (text, record) => { if (Object.prototype.toString.call(text) === "[object Object]") { return @@ -148,9 +149,7 @@ class StandingBookOfflineComparison extends Component { importVisible && { - // this.handleComparisonFinish(); - }} + onFinish={() => this.comparisonwelfareList()} onCancel={() => this.setState({ importVisible: false })} /> } diff --git a/pc4mobx/hrmSalary/stores/StandingBook.js b/pc4mobx/hrmSalary/stores/StandingBook.js index d2dbf768..083914f8 100644 --- a/pc4mobx/hrmSalary/stores/StandingBook.js +++ b/pc4mobx/hrmSalary/stores/StandingBook.js @@ -5,7 +5,7 @@ import { removePropertyCondition } from "../util/response"; import _ from "lodash"; import * as API from "../apis/standingBook"; -import { importInsuranceAcctDetail } from "../apis/standingBook"; +import { importExcelInsuranceDetail } from "../apis/standingBook"; const { TableStore } = WeaTableNew; @@ -24,6 +24,7 @@ export class StandingBookStore { @observable previewStandingBookAcctResultColumns = []; // 预览列表 @observable previewStandingBookAcctResultDataSource = []; // 预览DataSource @observable importStandingBookAcctResult = {}; // 导入结果 + @observable importOCStandingBookAcctResult = {}; // 导入结果 // 初始化操作 @action @@ -461,4 +462,14 @@ export class StandingBookStore { } }); }; + @action("社保福利台账-线下对比数据导入") + importComparisonExcelStandingBookResult = (params) => { + API.importExcelInsuranceDetail(params).then(res => { + if (res.status) { + this.importOCStandingBookAcctResult = res.data; + } else { + message.error(res.errormsg || "导入失败"); + } + }); + }; }