From 9a6344dae14340890b5cfdc763cc7a4e3790d02e Mon Sep 17 00:00:00 2001 From: liyongshun <971387674@qq.com> Date: Thu, 23 Jun 2022 16:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/calculateDetail/salaryDetail.js | 5 +- .../attendance/editSlideContent.js | 157 +++++++++++------- .../pages/dataAcquisition/attendance/index.js | 11 +- .../pages/dataAcquisition/cumDeduct/index.js | 3 +- .../dataAcquisition/cumDeduct/index.less | 12 +- .../dataAcquisition/cumSituation/index.js | 1 + .../dataAcquisition/otherDeduct/index.js | 1 + pc4mobx/hrmSalary/pages/ledger/index.js | 1 + .../pages/payroll/payrollDetail/index.js | 13 +- .../standingBook/index.js | 9 +- pc4mobx/hrmSalary/pages/taxAgent/index.js | 1 + 11 files changed, 141 insertions(+), 73 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index 858e2d90..390841ad 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -13,7 +13,7 @@ import { inject, observer } from 'mobx-react'; import CustomTable from '../../components/customTable' import CustomPaginationTable from '../../components/customPaginationTable' -@inject('calculateStore') +@inject('calculateStore', 'taxAgentStore') @observer export default class SalaryDetail extends React.Component { constructor(props) { @@ -128,7 +128,7 @@ export default class SalaryDetail extends React.Component { render() { const { slideVisiable } = this.state; - const { calculateStore } = this.props; + const { calculateStore, taxAgentStore: { showOperateBtn } } = this.props; const { acctResultListDateSource, acctResultListColumns, baseSalarySobCycle, acctResultListPageInfo, loading } = calculateStore return (
@@ -181,6 +181,7 @@ export default class SalaryDetail extends React.Component { this.handleEditSlideSave()} /> } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js index 8fb10562..95bb437e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/editSlideContent.js @@ -1,72 +1,115 @@ -import React from 'react'; -import { Row, Col, Table, DatePicker } from "antd" -import { inject, observer } from 'mobx-react'; -import { WeaInput, WeaTextarea, WeaSearchGroup, WeaSelect, WeaCheckbox, WeaTable } from "ecCom"; -import { slideColumns, slideDataSource, columns } from './columns'; -import "./editSlideContent.less" +import React from "react"; +import { Row, Col, Table, DatePicker } from "antd"; +import { inject, observer } from "mobx-react"; +import { + WeaInput, + WeaTextarea, + WeaSearchGroup, + WeaSelect, + WeaCheckbox, + WeaTable +} from "ecCom"; +import { slideColumns, slideDataSource, columns } from "./columns"; +import "./editSlideContent.less"; // import { WeaTableNew } from "comsMobx" // const WeaTable = WeaTableNew.WeaTable; -import moment from 'moment' +import moment from "moment"; const { MonthPicker } = DatePicker; - let emptyItem = { - incomeLowerLimit: "0.00", - incomeUpperLimit: "0.00", - dutyFreeValue: "0.00", - dutyFreeRate: "0.00", - taxableIncomeLl: "0.00", - taxableIncomeUl: "0.00", - taxRate: "0.00", - taxDeduction: "0.00" -} + incomeLowerLimit: "0.00", + incomeUpperLimit: "0.00", + dutyFreeValue: "0.00", + dutyFreeRate: "0.00", + taxableIncomeLl: "0.00", + taxableIncomeUl: "0.00", + taxRate: "0.00", + taxDeduction: "0.00" +}; -@inject('attendanceStore') +@inject("attendanceStore") @observer export default class EditSlideContent extends React.Component { + constructor(props) { + super(props); + } - constructor(props) { - super(props); - } + componentWillMount() { + // 初始化渲染页面 + const { attendanceStore: { viewAttendQuote } } = this.props; + viewAttendQuote({ attendQuoteId: this.props.id }); + } - componentWillMount() { // 初始化渲染页面 - const {attendanceStore: {viewAttendQuote}} = this.props; - viewAttendQuote({attendQuoteId: this.props.id}) - } + getColumns(columns) { + let result = [...columns]; + return result.filter(item => item.hide == "false"); + } - getColumns(columns) { - let result = [...columns] - return result.filter(item => item.hide == "false") - } + getScrollWidth() { + const { attendanceStore } = this.props; + const { attendQuoteDetailTableStore } = attendanceStore; + return ( + this.getColumns( + attendQuoteDetailTableStore.columns + ? attendQuoteDetailTableStore.columns + : [] + ).length * 150 + ); + } - getScrollWidth() { - const { attendanceStore } = this.props; - const { attendQuoteDetailTableStore} = attendanceStore; - return this.getColumns(attendQuoteDetailTableStore.columns ? attendQuoteDetailTableStore.columns : []).length * 150 - } + render() { + const { + attendanceStore, + attendanceStore: { viewAttendQuote } + } = this.props; + const { + attendQuoteDetailPageInfo, + attendQuoteDetailTableStore + } = attendanceStore; - - render() { - const { attendanceStore } = this.props; - const { attendQuoteDetailPageInfo, attendQuoteDetailTableStore} = attendanceStore; - return ( -
-
- { - this.props.salaryYearMonth != "" && -
考勤周期： {this.props.salaryYearMonth}
- } -
-
- -
-
- ) - } -} \ No newline at end of file + const pagination = { + total: attendQuoteDetailPageInfo.total, + showTotal: total => `共 ${total} 条`, + showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], + onShowSizeChange: (current, pageSize) => { + viewAttendQuote({ attendQuoteId: this.props.id, current, pageSize }); + }, + onChange: current => { + viewAttendQuote({ + attendQuoteId: this.props.id, + current, + pageSize: attendQuoteDetailPageInfo.pageSize + }); + } + }; + return ( +
+
+ {this.props.salaryYearMonth != "" && +
+ 考勤周期： {this.props.salaryYearMonth} +
} +
+
+ +
+
+ ); + } +} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index e6e3927b..40c9dca3 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -223,6 +223,11 @@ export default class Attendance extends React.Component { viewAttendQuote(request) } + handleExportAttendQuote= ()=>{ + const url= `${window.location.origin}/api/bs/hrmsalary/attendQuote/export?attendQuoteId=${this.recordId}` + window.open(url, '_self'); + } + render() { const { attendanceStore, taxAgentStore: {showOperateBtn} } = this.props; const { modalParam } = this.state; @@ -354,9 +359,11 @@ export default class Attendance extends React.Component {
{ showOperateBtn && - 导出 + + // 导出全部 } {this.setState({searchValue: v})}} onSearch={(v) => {this.handleSearch({keyword: v})}} @@ -394,7 +401,7 @@ export default class Attendance extends React.Component { const menu = ( - 导出全部 + 导出选中 ); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 40af681a..94b7c438 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -429,6 +429,7 @@ export default class CumDeduct extends React.Component { const pagination = { total: pageObj.total, showTotal: (total) => `共 ${total} 条`, + pageSizeOptions: ["10", "20", "50", "100"], showSizeChanger: true, onShowSizeChange(current, pageSize) { setPageObj({ ...pageObj, current, pageSize }); @@ -487,7 +488,7 @@ export default class CumDeduct extends React.Component { ), }; } else { - return { ...item }; + return { ...item, width: 150 }; } }); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less index ef51e77f..ca63e917 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less @@ -43,5 +43,15 @@ text-decoration: none; } } +} -} \ No newline at end of file +.wea-new-table { + .ant-table-tbody { + tr { + td { + height: 41px !important; + border-bottom: 1px solid #e2e2e2 !important; + } + } + } +} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 06d09be7..8d0a954f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -436,6 +436,7 @@ export default class CumSituation extends React.Component { total: pageObj.total, showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], onShowSizeChange(current, pageSize) { setPageObj({ ...pageObj, current, pageSize }); getTableDatas({ diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 9d7b5a15..e7bf3332 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -432,6 +432,7 @@ export default class OtherDeduct extends React.Component { total: pageObj.total, showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], onShowSizeChange(current, pageSize) { setPageObj({ ...pageObj, current, pageSize }); getTableDatas({ diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index 26e5104f..eb1a61b1 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -363,6 +363,7 @@ export default class Ledger extends React.Component { total: pageObj.total, showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], onShowSizeChange: (current, pageSize) => { setPageObj({ ...pageObj, current, pageSize }); getTableDatas({ current, pageSize, name: this.state.searchValue }); diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js index be353c75..e64933e2 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js @@ -92,10 +92,12 @@ export default class PayrollDetail extends React.Component { } // 导出全部 - handleExportAll() { - const { payrollStore } = this.props; - const { exportDetailList } = payrollStore - exportDetailList({salarySendId: this.state.currentId}) + handleExportAll=()=> { + // const { payrollStore } = this.props; + // const { exportDetailList } = payrollStore + // exportDetailList({salarySendId: this.state.currentId}) + const url= `${window.location.origin}/api/bs/hrmsalary/salaryBill/send/exportDetailList?salarySendId=${this.state.currentId}` + window.open(url, '_self'); } getSearchsAdQuick() { @@ -112,7 +114,8 @@ export default class PayrollDetail extends React.Component { ); return ( - {this.handleExportAll()}}>导出全部 + // {this.handleExportAll()}}>导出全部 + ) // return (
) } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index f8580d31..3862e5a1 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -62,7 +62,6 @@ export default class StandingBook extends React.Component { const { taxAgentStore: {getPermission}, standingBookStore: {getAdminTaxAgentList}} = this.props getPermission().then(({status, data}) => { if(status) { - console.log("data:", data); this.setState({adminData : data}) if(data.isAdminEnable) { getAdminTaxAgentList().then((data) => { @@ -328,7 +327,7 @@ export default class StandingBook extends React.Component { } render() { - const { standingBookStore } = this.props; + const { standingBookStore, taxAgentStore: { showOperateBtn } } = this.props; const { inspectLoading, loading, @@ -353,7 +352,7 @@ export default class StandingBook extends React.Component { return renderNoright(); } - const rightBtns = (!this.state.adminData.isDefaultOpen || this.state.adminData.isDefaultOpen && this.state.adminData.isAdminEnable) ? [ + const rightBtns = [ // 右键菜单 - ] : []; + ]; const rightMenu = [ // 右键菜单 { @@ -428,7 +427,7 @@ export default class StandingBook extends React.Component { title="社保福利台账" // 文字 icon={} // 左侧图标 iconBgcolor="#F14A2D" // 左侧图标背景色 - buttons={rightBtns} + buttons={showOperateBtn ? rightBtns : []} // showDropIcon={true} // 是否显示下拉按钮 // dropMenuDatas={rightMenu} // 下拉菜单（和页面的右键菜单相同） // dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index 85012f8e..c7c34293 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -305,6 +305,7 @@ export default class TaxAgent extends React.Component { total: pageObj.total, showTotal: total => `共 ${total} 条`, showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], onShowSizeChange(current, pageSize) { doInit({ current, pageSize }); },