diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index 1011398c..4e2735aa 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -5,26 +5,19 @@
* Date: 2023/3/7
*/
import React, { Component } from "react";
-import { WeaFormItem, WeaInput, WeaInputSearch, WeaSlideModal } from "ecCom";
+import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
import { Button } from "antd";
-import SlideModalTitle from "../../../../components/slideModalTitle";
import { viewAttendQuote } from "../../../../apis/attendance";
-import UnifiedTable from "../../../../components/UnifiedTable";
import "./index.less";
+const { getLabel } = WeaLocaleProvider;
+
class AttendanceDataViewSlide extends Component {
constructor(props) {
super(props);
this.state = {
- loading: {
- query: false
- },
- keyword: "",
- dataSource: [],
- columns: [],
- pageInfo: {
- current: 1, pageSize: 10, total: 0
- }
+ loading: { query: false }, keyword: "", dataSource: [], columns: [],
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
};
}
@@ -46,29 +39,12 @@ class AttendanceDataViewSlide extends Component {
if (status) {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
this.setState({
- pageInfo: { ...pageInfo, current, pageSize, total },
- dataSource,
- columns
+ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
+ columns: _.map(columns, o => ({ ...o, width: 150, fixed: o.dataIndex === "username" ? "left" : null }))
});
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
};
- renderCustomOperate = () => {
- const { keyword } = this.state;
- const { showOperateBtn } = this.props;
- return ([
-
- {showOperateBtn && }
- this.setState({ keyword })}
- onSearch={() => this.viewAttendQuote({ current: 1 }, this.props)}
- />
-
- ]);
- };
handleExportAttendQuote = () => {
if (!this.handleDebounce) {
this.handleDebounce = _.debounce(() => {
@@ -83,7 +59,7 @@ class AttendanceDataViewSlide extends Component {
render() {
const { showOperateBtn, salaryYearMonth, ...extra } = this.props;
- const { columns, dataSource, loading, pageInfo } = this.state;
+ const { columns, dataSource, loading, pageInfo, keyword } = this.state;
const pagination = {
...pageInfo,
showTotal: (total) => `共 ${total} 条`,
@@ -101,45 +77,33 @@ class AttendanceDataViewSlide extends Component {
}, () => this.viewAttendQuote({}, this.props));
}
};
+ const btns = [
+ ,
+ this.setState({ keyword })}
+ onSearch={() => this.viewAttendQuote({ current: 1 }, this.props)}
+ />
+ ];
return (
-
- }
- content={
-
-
-
-
- ({
- ...item,
- render: (text) => {
- return {text} ;
- }
- }))}
- dataSource={dataSource}
- pagination={pagination}
- loading={loading.query}
- xWidth={columns.length * 180}
- />
-
- }
+ }
+ iconBgcolor="#F14A2D"
+ buttons={showOperateBtn ? btns : btns.slice(1)}/>
+ }
+ content={
+
+
+
{getLabel(543376, "考勤周期")}:{salaryYearMonth}
+
+
+
+
+ }
/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
index 640d1b83..51316cab 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
@@ -19,10 +19,18 @@
}
.attendanceSlideWrapper {
+ .wea-slide-modal-content {
+ height: 100%;
+ }
+
.wea-slide-modal-title {
height: initial;
line-height: initial;
text-align: left;
+
+ .wea-new-top > div:last-child {
+ padding-right: 50px !important;
+ }
}
.rodal-close {
@@ -30,6 +38,28 @@
top: 10px !important;
}
+ .attendance-slide-body {
+ background: #f6f6f6;
+ height: 100%;
+ overflow-y: auto;
+ padding: 16px;
+
+ .attendance-tb-tip {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 4px 0;
+ min-height: 32px;
+ line-height: 18px;
+ margin-bottom: 8px;
+ }
+
+ .wea-new-table {
+ background: #FFF;
+ }
+ }
+
+
}
@media (min-width: 1260px) {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
index ea717c4f..2c0a760d 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
@@ -825,7 +825,7 @@ const BenefitBaseComponent = (props) => {
customComponent={
{getLabel(543195, "各项福利基数一致")}
onSameChange(items, v)}
- disabled={runStatuses === "4,5" || !showOperateBtn}/>
+ disabled={runStatuses === "4,5" || !showOperateBtn} precision={2}/>
}
title={title} col={2} showGroup className="twoColumns-welfare-info-wrapper"
/>;