From 7dc2b1d33e2dc03e6f0187fd0540f0756e0776ec Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Thu, 12 May 2022 17:04:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A1=86=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/components/importModal/index.js | 2 + .../importModal/acctResultImportModal.js | 11 +++++ .../compareDetailImportModal.js | 11 +++++ .../hrmSalary/pages/calculateDetail/index.js | 3 +- .../pages/dataAcquisition/attendance/index.js | 48 ++++++++++++------- .../pages/dataAcquisition/cumDeduct/index.js | 43 +++++++++++------ .../dataAcquisition/cumSituation/index.js | 40 ++++++++++------ .../dataAcquisition/otherDeduct/index.js | 42 ++++++++++------ pc4mobx/hrmSalary/pages/payroll/index.js | 2 +- pc4mobx/hrmSalary/pages/salaryFile/index.js | 12 +++++ .../pages/salaryItem/systemSalaryItemModal.js | 3 +- .../socialSecurityBenefits/archives/index.js | 11 +++++ pc4mobx/hrmSalary/stores/archives.js | 17 +++++++ pc4mobx/hrmSalary/stores/attendanceStore.js | 18 +++++++ pc4mobx/hrmSalary/stores/calculate.js | 32 +++++++++++++ pc4mobx/hrmSalary/stores/cumDeduct.js | 12 +++++ pc4mobx/hrmSalary/stores/cumSituation.js | 18 +++++-- pc4mobx/hrmSalary/stores/otherDeduct.js | 11 +++++ pc4mobx/hrmSalary/stores/salaryFile.js | 7 ++- 19 files changed, 272 insertions(+), 71 deletions(-) diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js index dfa301c9..de237445 100644 --- a/pc4mobx/hrmSalary/components/importModal/index.js +++ b/pc4mobx/hrmSalary/components/importModal/index.js @@ -20,6 +20,8 @@ export default class ImportModal extends React.Component { this.state = { fileId: "" } + + this.props.init && this.props.init() } componentWillMount() { // 初始化渲染页面 diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js index fb80c4a8..36e13d9e 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js @@ -98,6 +98,14 @@ export default class AcctResultImportModal extends React.Component { this.props.onAdd(fieldDate) } + // 初始化Import数据 + handleImportModalInit() { + const { calculateStore: {setPreviewAcctResultColumns, setPreviewAcctResultDataSource, setImportAcctResult}} = this.props; + setPreviewAcctResultColumns([]) + setPreviewAcctResultDataSource([]) + setImportAcctResult({}) + } + render() { const { calculateStore } = this.props; const { fetchPreviewAcctResult, previewAcctResultColumns, previewAcctResultDataSource, importAcctResult, fetchImportAcctResult } = calculateStore @@ -107,6 +115,9 @@ export default class AcctResultImportModal extends React.Component {
{ visiable && { + this.handleImportModalInit(); + }} params={modalParam} columns={previewAcctResultColumns} step={step} diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js index c875f1ac..9ad9bd1f 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js @@ -34,6 +34,14 @@ export default class CompareDetailImportModal extends React.Component { exportImportTemplate(this.props.id) } + // 初始化导入参数 + handleInitImportModal() { + const { calculateStore: {setComparisonPreviewColumns, setComparisonPreviewDataSource, setComparisonImportAcctResult}} = this.props; + setComparisonPreviewColumns([]) + setComparisonPreviewDataSource([]) + setComparisonImportAcctResult({}) + } + render() { const { visiable } = this.props; const { step, modalParam } = this.state; @@ -43,6 +51,9 @@ export default class CompareDetailImportModal extends React.Component {
{ visiable && { + this.handleInitImportModal() + }} params={modalParam} columns={comparisonPreviewColumns} step={step} diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index 43add5ff..3652d7f7 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -53,7 +53,6 @@ export default class CalculateDetail extends React.Component { this.timer = setInterval(() => { getCalculateProgress(this.id).then(data => { let progress = data.progress - console.log("progress: " + progress) if(progress == 1 && this.timer) { clearInterval(this.timer) this.timer = null @@ -72,7 +71,7 @@ export default class CalculateDetail extends React.Component { } this.setState({progress: Number(progress) * 100}) }) - }, 300) + }, 1000) }) }, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index fd763d86..738cd374 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -189,6 +189,15 @@ export default class Attendance extends React.Component { getSalaryCycleAndAttendCycle(month, sob) } + + // 初始导入参数 + handleInitImportModal() { + const { attendanceStore: {setPreviewAttendQuoteColumns, setPreviewAttendQuoteDataSource, setImportResult}} = this.props; + setPreviewAttendQuoteColumns([]) + setPreviewAttendQuoteDataSource([]) + setImportResult({}) + } + render() { const { attendanceStore } = this.props; const { modalParam } = this.state; @@ -571,23 +580,28 @@ export default class Attendance extends React.Component { - - {this.handleFinish()}} - previewImport={(params) => {this.handlePreviewImport(params)}} - importFile={(params) => {this.handleImport(params)}} - headerSetCompoent={renderHeaderSetCompoent()} - templateLink={() => {this.handleTemplateLinkClick()}} - renderFormComponent={() => renderFormComponent()} - visiable={this.state.modalVisiable} - onCancel={() => { this.setState({modalVisiable: false})}} - /> + { + this.state.modalVisiable && { + this.handleInitImportModal() + }} + params={this.state.modalParam} + columns={previewAttendQuoteColumns} + step={step} + setStep={setStep} + slideDataSource={previewAttendQuoteDataSource} + importResult={importResult} + onFinish={() => {this.handleFinish()}} + previewImport={(params) => {this.handlePreviewImport(params)}} + importFile={(params) => {this.handleImport(params)}} + headerSetCompoent={renderHeaderSetCompoent()} + templateLink={() => {this.handleTemplateLinkClick()}} + renderFormComponent={() => renderFormComponent()} + visiable={this.state.modalVisiable} + onCancel={() => { this.setState({modalVisiable: false})}} + /> + } + {handleonRestoreDefault()}} onSetDefault={() => {handleSetDefault()}} onSave={() => {saveAttendanceFieldSetting()}} onShowChecked={(value) => {handleShowChecked(value)}} onSearch={(value) => {searchFieldSettingList(value)}} visible={this.state.selectItemVisible} onCancel={() => this.setState({selectItemVisible: false})}>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 32f56850..1a48fe18 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -183,6 +183,13 @@ export default class CumDeduct extends React.Component { tableStore.tableColSet(true); } + // 初始化导入参数 + handleInitModal() { + const { cumDeductStore: { setSlideDataSource, setImportResult }} = this.props; + setSlideDataSource([]) + setImportResult({}) + } + render() { const { modalParam } = this.state; const { cumDeductStore, taxAgentStore } = this.props; @@ -313,21 +320,27 @@ export default class CumDeduct extends React.Component { /> - {setModalVisiable(false); setStep(0); doSearch();}} - previewImport={(params) => {previewImport(params)}} - importFile={(params) => {importFile(params)}} - templateLink={"/api/bs/hrmsalary/addUpDeduction/downloadTemplate"} - renderFormComponent={() => this.renderFormComponent()} - visiable={modalVisiable} - onCancel={() => { this.handleCancel() }} - /> + { + modalVisiable && { + this.handleInitModal() + }} + params={modalParam} + columns={modalColumns} + step={step} + setStep={setStep} + slideDataSource={slideDataSource} + importResult={importResult} + onFinish={() => {setModalVisiable(false); setStep(0); doSearch();}} + previewImport={(params) => {previewImport(params)}} + importFile={(params) => {importFile(params)}} + templateLink={"/api/bs/hrmsalary/addUpDeduction/downloadTemplate"} + renderFormComponent={() => this.renderFormComponent()} + visiable={modalVisiable} + onCancel={() => { this.handleCancel() }} + /> + } + { slideVisiable && { + const { cumSituationStore: { setSlideDataSource, setImportResult } } = this.props; + setSlideDataSource([]) + setImportResult({}) + } + render() { const { cumSituationStore, taxAgentStore } = this.props; const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd, previewImport, importFile } = cumSituationStore; @@ -310,20 +317,25 @@ export default class CumSituation extends React.Component { /> - {setModalVisiable(false); setStep(0); doSearch();}} - slideDataSource={slideDataSource} - importResult={importResult} - previewImport={(params) => {previewImport(params)}} - importFile={(params) => {importFile(params)}} - renderFormComponent={() => this.renderFormComponent()} - visiable={modalVisiable} - onCancel={() => { this.handleCancel() }} /> + { + modalVisiable && { + this.handleInitImport() + }} + templateLink={"/api/bs/hrmsalary/addUpSituation/downloadTemplate"} + params={modalParam} + columns={modalColumns} + step={step} + setStep={setStep} + onFinish={() => {setModalVisiable(false); setStep(0); doSearch();}} + slideDataSource={slideDataSource} + importResult={importResult} + previewImport={(params) => {previewImport(params)}} + importFile={(params) => {importFile(params)}} + renderFormComponent={() => this.renderFormComponent()} + visiable={modalVisiable} + onCancel={() => { this.handleCancel() }} /> + } { slideVisiable && - {setModalVisiable(false); setStep(0); doSearch();}} - importResult={importResult} - slideDataSource={slideDataSource} - previewImport={(params) => {previewImport(params)}} - importFile={(params) => {importFile(params)}} - renderFormComponent={() => this.renderFormComponent()} - visiable={modalVisiable} - onCancel={() => { this.handleCancel() }} - /> + { + modalVisiable && { + this.handleInitImport() + }} + templateLink={"/api/bs/hrmsalary/otherDeduction/downloadTemplate"} + params={modalParam} + columns={modalColumns} + step={step} + setStep={setStep} + onFinish={() => {setModalVisiable(false); setStep(0); doSearch();}} + importResult={importResult} + slideDataSource={slideDataSource} + previewImport={(params) => {previewImport(params)}} + importFile={(params) => {importFile(params)}} + renderFormComponent={() => this.renderFormComponent()} + visiable={modalVisiable} + onCancel={() => { this.handleCancel() }} + /> + } { slideVisiable && { this.setState({ - editSlideVisi1le: false, + editSlideVisible: false, selectedTab: 0 }) }) diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js index 388c93cf..7483d9e4 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/index.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js @@ -172,6 +172,15 @@ export default class SalaryFile extends React.Component { getTableDatas() } + // 初始化导入参数 + handleInitModal() { + const { salaryFileStore: { setPreviewDataSource } } = this.props; + setPreviewDataSource([]) + this.setState({ + importResult: {} + }) + } + render() { const { salaryFileStore } = this.props; const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = salaryFileStore; @@ -329,6 +338,9 @@ export default class SalaryFile extends React.Component { { this.state.modalVisiable && { + this.handleInitModal() + }} params={{}} columns={previewColumns} step={step} diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js index 7146b8b8..dadcff76 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js @@ -49,12 +49,11 @@ export default class SystemSalaryItemModal extends React.Component { }}/>
-
+
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index 65558437..c1592df5 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -122,6 +122,14 @@ export default class Archives extends React.Component { this.setState({importVisible: false}) } + // 初始化导入参数 + handleInitModal() { + const { archivesStore: { setPreviewCurDataColumns, setPreviewCurDataDataSource, setImportResult }} = this.props; + setPreviewCurDataColumns([]) + setPreviewCurDataDataSource([]) + setImportResult({}) + } + render() { const { archivesStore } = this.props; const { selectedTab } = this.state; @@ -267,6 +275,9 @@ export default class Archives extends React.Component { } { this.state.importVisible && { + this.handleInitModal() + }} params={this.state.modalParam} columns={previewCurDataColumns} step={this.state.step} diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js index 96ea65c9..7fe65466 100644 --- a/pc4mobx/hrmSalary/stores/archives.js +++ b/pc4mobx/hrmSalary/stores/archives.js @@ -39,6 +39,23 @@ export class ArchivesStore { @observable importResult = {} + // ** 设置导入参数 start ** + @action + setPreviewCurDataColumns = (previewCurDataColumns) => { + this.previewCurDataColumns = previewCurDataColumns + } + + @action + setPreviewCurDataDataSource = (previewCurDataDataSource) => { + this.previewCurDataDataSource = previewCurDataDataSource + } + + @action + setImportResult = (importResult) => { + this.importResult = importResult + } + // ** 设置导入参数 end ** + // 社保表单 @action setSocialSecurityForm = socialSecurityForm => this.socialSecurityForm = socialSecurityForm; diff --git a/pc4mobx/hrmSalary/stores/attendanceStore.js b/pc4mobx/hrmSalary/stores/attendanceStore.js index 7d624060..bd9f9427 100644 --- a/pc4mobx/hrmSalary/stores/attendanceStore.js +++ b/pc4mobx/hrmSalary/stores/attendanceStore.js @@ -48,6 +48,24 @@ export class AttendanceStore { @observable cycle = {}; + // ** 设置导入参数 start ** + @action + setPreviewAttendQuoteColumns = (previewAttendQuoteColumns) => { + this.previewAttendQuoteColumns = previewAttendQuoteColumns; + } + + @action + setPreviewAttendQuoteDataSource = (previewAttendQuoteDataSource) => { + this.previewAttendQuoteDataSource = previewAttendQuoteDataSource + } + + @action + setImportResult = (importResult) => { + this.importResult = importResult + } + // ** 设置导入参数 end ** + + @action searchFieldSettingList = (value) => { if(value != "") { diff --git a/pc4mobx/hrmSalary/stores/calculate.js b/pc4mobx/hrmSalary/stores/calculate.js index 60ebb464..302a6dff 100644 --- a/pc4mobx/hrmSalary/stores/calculate.js +++ b/pc4mobx/hrmSalary/stores/calculate.js @@ -59,6 +59,38 @@ export class calculateStore { @observable calculateProgress = 0; + // ** 设置导入参数 ** + @action + setPreviewAcctResultColumns = (previewAcctResultColumns) => { + this.previewAcctResultColumns = previewAcctResultColumns + } + + @action + setPreviewAcctResultDataSource = previewAcctResultDataSource => { + this.previewAcctResultDataSource = previewAcctResultDataSource; + } + + @action + setImportAcctResult = importAcctResult => { + this.importAcctResult = importAcctResult; + } + + @action + setComparisonPreviewColumns = comparisonPreviewColumns => { + this.comparisonPreviewColumns = comparisonPreviewColumns; + } + + @action + setComparisonPreviewDataSource = comparisonPreviewDataSource => { + this.comparisonPreviewDataSource = comparisonPreviewDataSource + } + + @action + setComparisonImportAcctResult = comparisonImportAcctResult => { + this.comparisonImportAcctResult = comparisonImportAcctResult + } + + // 编辑薪资表单数据 @action setAcctresultDetailForm = (acctresultDetailForm) => {this.acctresultDetailForm = acctresultDetailForm} diff --git a/pc4mobx/hrmSalary/stores/cumDeduct.js b/pc4mobx/hrmSalary/stores/cumDeduct.js index bd477794..68066ee9 100644 --- a/pc4mobx/hrmSalary/stores/cumDeduct.js +++ b/pc4mobx/hrmSalary/stores/cumDeduct.js @@ -25,6 +25,18 @@ export class CumDeductStore { @observable currentRecord = {}; // 当前record + // ** 设置导入参数 start ** + @action + setSlideDataSource = (slideDataSource) => { + this.slideDataSource = slideDataSource + } + + @action + setImportResult = (importResult) => { + this.importResult = importResult + } + // ** 设置导入参数 end ** + @action setCurrentRecord = currentRecord => this.currentRecord = currentRecord; diff --git a/pc4mobx/hrmSalary/stores/cumSituation.js b/pc4mobx/hrmSalary/stores/cumSituation.js index 8acf3602..a697731d 100644 --- a/pc4mobx/hrmSalary/stores/cumSituation.js +++ b/pc4mobx/hrmSalary/stores/cumSituation.js @@ -17,14 +17,24 @@ export class CumSituationStore { @observable loading = true; // 数据加载状态 @observable step = 0; // 当前所在第几步 @observable slideVisiable = false; // slide 是否隐藏 - @observable slideDataSource = []; - @observable importResult = {} @observable modalVisiable = false; // 模态框显示 - @observable currentRecord = {}; // 当前record + + // ** 设置导入参数 start ** + @action + setSlideDataSource = (slideDataSource) => { + this.slideDataSource = slideDataSource + } + + @action + setImportResult = (importResult) => { + this.importResult = importResult + } + // ** 设置导入参数 end ** + @action setCurrentRecord = currentRecord => this.currentRecord = currentRecord; @@ -84,7 +94,7 @@ export class CumSituationStore { this.showSearchAd = false; } - // 导入 +// 导入 @action importFile = (params) => { API.importCumSituationParam(params).then(action(res => { if(res.status) { diff --git a/pc4mobx/hrmSalary/stores/otherDeduct.js b/pc4mobx/hrmSalary/stores/otherDeduct.js index 81b7ff44..43610d1f 100644 --- a/pc4mobx/hrmSalary/stores/otherDeduct.js +++ b/pc4mobx/hrmSalary/stores/otherDeduct.js @@ -25,6 +25,17 @@ export class OtherDeductStore { @observable currentRecord = {}; // 当前record + // ** 设置导入参数 start ** + @action + setSlideDataSource = (slideDataSource) => { + this.slideDataSource = slideDataSource + } + @action + setImportResult = (importResult) => { + this.importResult = importResult + } + // ** 设置导入参数 end ** + @action setCurrentRecord = currentRecord => this.currentRecord = currentRecord; diff --git a/pc4mobx/hrmSalary/stores/salaryFile.js b/pc4mobx/hrmSalary/stores/salaryFile.js index f4f0dd0e..846b391c 100644 --- a/pc4mobx/hrmSalary/stores/salaryFile.js +++ b/pc4mobx/hrmSalary/stores/salaryFile.js @@ -33,7 +33,12 @@ export class salaryFileStore { @observable editAgentVisible = false - + // ** 设置导入参数 start ** + @action + setPreviewDataSource = (previewDataSource) => { + this.previewDataSource = previewDataSource + } + // ** 设置导入参数 end ** // 初始化操作 @action