From c60ed4da78b31aa994dab4449c56e78def7afca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 1 Mar 2023 10:11:11 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendance/components/fieldMangComp.js | 38 ++++++++++++++++--- .../pages/dataAcquisition/attendance/index.js | 4 +- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js index aee44170..d71b2ca2 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js @@ -5,8 +5,9 @@ * Date: 2023/2/24 */ import React, { Component } from "react"; +import { toJS } from "mobx"; +import { WeaCheckbox, WeaTable } from "ecCom"; import { Col, Row } from "antd"; -import { WeaTable } from "ecCom"; import { getAttendanceFieldList } from "../../../../apis/attendance"; import TipLabel from "../../../../components/TipLabel"; @@ -32,24 +33,49 @@ class FieldMangComp extends Component { } getAttendanceFieldList = (extraPayload) => { + const { fieldTableStore } = this.props; const { loading, pageInfo } = this.state; const module = { ...pageInfo, ...extraPayload }; this.setState({ loading: { ...loading, query: true } }); getAttendanceFieldList(module).then(({ status, data }) => { this.setState({ loading: { ...loading, query: false } }); if (status) { - const { columns, list: dataSource, pageNum: current, pageSize, total } = data; + const { dataKey, pageInfo } = data; + const { datas } = dataKey; + const { list: dataSource, pageNum: current, pageSize, total } = pageInfo; + fieldTableStore.getDatas(datas); this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, - dataSource, - columns + dataSource }); } }).catch(() => this.setState({ loading: { ...loading, query: false } })); }; + getColumns = () => { + const { showOperateBtn } = this.props; + console.log(this.props.fieldTableStore, toJS(this.props.fieldTableStore.columns)); + return _.map(_.filter([], item => !!item.hide), child => ({ + ...child, + render: (text, record) => { + switch (child.dataIndex) { + case "enableStatus": + return ( + { + console.log(record, value); + }} + /> + ); + default: + return
; + } + } + })); + }; render() { - const { dataSource, columns, pageInfo, loading } = this.state; + const { dataSource, pageInfo, loading } = this.state; const { fieldName } = this.props; const pagination = { ...pageInfo, @@ -71,7 +97,7 @@ class FieldMangComp extends Component { : this.fieldMangRef = dom} + fieldTableStore={fieldTableStore} + showOperateBtn={showOperateBtn} fieldName={fieldName} /> }