diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index fca6e52a..6172f5e0 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -7,12 +7,14 @@ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; import { Button, DatePicker } from "antd"; -import { WeaFormItem, WeaNewScroll, WeaTab } from "ecCom"; +import { WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaReqTop } from "ecCom"; import AttendanceDataComp from "./components/attendanceDataComp"; import FieldMangComp from "./components/fieldMangComp"; +import LogDialog from "../../../components/logViewModal"; import moment from "moment"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; const { MonthPicker } = DatePicker; @inject("taxAgentStore") @@ -21,9 +23,8 @@ class Index extends Component { constructor(props) { super(props); this.state = { - fieldName: "", - selectedKey: "DATA", - salaryMonth: [] + fieldName: "", selectedKey: "DATA", salaryMonth: [], + logDialogVisible: false }; } @@ -67,47 +68,70 @@ class Index extends Component { visible: true, title: "引用考勤数据" }); }; + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; render() { - const { selectedKey, salaryMonth, fieldName } = this.state; + const { selectedKey, salaryMonth, fieldName, logDialogVisible } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; const topTab = [ - { title: "考勤数据", viewcondition: "DATA" }, - { title: "字段管理", viewcondition: "FIELD" } + { title: "考勤数据", key: "DATA" }, + { title: "字段管理", key: "FIELD" } ]; const buttons = selectedKey === "DATA" ? [ , - ] : []; + ] : [ + , + this.setState({ fieldName })} + onSearch={() => this.fieldMangRef.getAttendanceFieldList({ fieldName, current: 1 })}/> + ]; return (
- this.setState({ selectedKey: v })} - searchsBaseValue={fieldName} onSearchChange={fieldName => this.setState({ fieldName })} - onSearch={() => this.fieldMangRef.getAttendanceFieldList({ fieldName, current: 1 })} - /> - { - selectedKey === "DATA" && this.getAttendanceDataScreen() - } -
- + } iconBgcolor="#F14A2D" + tabDatas={topTab} selectedKey={selectedKey} buttons={showOperateBtn ? buttons : []} + onChange={v => this.setState({ selectedKey: v })} title={getLabel(525196, "考勤数据")} + showDropIcon onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ { - selectedKey === "DATA" ? - this.attendanceTableRef = dom} - showOperateBtn={showOperateBtn} - salaryYearMonth={salaryMonth} - /> : - this.fieldMangRef = dom} - showOperateBtn={showOperateBtn} - fieldName={fieldName} - /> + key: "log", icon: , + content: getLabel(545781, "操作日志") } - -
+ ]} + > + { + selectedKey === "DATA" && this.getAttendanceDataScreen() + } +
+ + { + selectedKey === "DATA" ? + this.attendanceTableRef = dom} + showOperateBtn={showOperateBtn} + salaryYearMonth={salaryMonth} + /> : + this.fieldMangRef = dom} + showOperateBtn={showOperateBtn} + fieldName={fieldName} + /> + } + +
+ {/*操作日志*/} + this.setState({ logDialogVisible: false })}/> +
); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less index 6e4af33c..5d7d9bed 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less @@ -14,6 +14,8 @@ .tableWrapper { flex: 1; overflow: hidden; + background: #FFF; + padding: 0 16px; } .linkWapper { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 085f5756..98d9f374 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -548,7 +548,7 @@ class Index extends Component { onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload} onClose={this.handleCloseSlide} onSave={this.handleSaveData} slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl} - exportPayloadType={exportPayloadType} + exportPayloadType={exportPayloadType} logFunction="addupdeduction" form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch} onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={importPayload} onImportFile={this.handleImportFile} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 6a781d4b..ecf016bc 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -552,7 +552,7 @@ class Index extends Component { onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload} onClose={this.handleCloseSlide} onSave={this.handleSaveData} slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl} - exportPayloadType={exportPayloadType} + exportPayloadType={exportPayloadType} logFunction="addupsituation" form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch} onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={{ ...importPayload, importOpts: { taxYearMonth: importPayload.importOpts.declareMonth } }} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js index 4c421d60..1cee5ed6 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js @@ -7,11 +7,14 @@ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; import { toJS } from "mobx"; -import { WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom"; +import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom"; import ImportModal from "../../components/importModal"; import SlideModalTitle from "../../components/slideModalTitle"; import { getSearchs } from "../../util"; import "./index.less"; +import LogDialog from "../../components/logViewModal"; + +const getLabel = WeaLocaleProvider.getLabel; @inject("taxAgentStore") @observer @@ -19,7 +22,7 @@ class Layout extends Component { constructor(props) { super(props); this.state = { - showSearchAd: false + showSearchAd: false, logDialogVisible: false }; } @@ -49,14 +52,23 @@ class Layout extends Component { const { onResizeWindowInnerWidth } = this.props; onResizeWindowInnerWidth(window.innerWidth); }; + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; render() { - const { showSearchAd } = this.state; + const { showSearchAd, logDialogVisible } = this.state; const { title, btns, leftComp, children, taxAgentStore: { showOperateBtn }, slidePayload, onClose, onSave, slideLoading, form, condition, onAdSearch, onCancel, importPayload, onImportSetStep, onImportFile, - onPreviewImport, detailOptBtns, columns + onPreviewImport, detailOptBtns, columns, logFunction } = this.props; const { visible, title: subtitle, children: slideChildren } = slidePayload; const { @@ -66,8 +78,14 @@ class Layout extends Component { return (
} - iconBgcolor="#F14A2D" showDropIcon={false} + icon={} iconBgcolor="#F14A2D" + showDropIcon onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ + { + key: "log", icon: , + content: getLabel(545781, "操作日志") + } + ]} /> + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/>
); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 7f843623..2795207c 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -546,7 +546,7 @@ class Index extends Component { onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload} onClose={this.handleCloseSlide} onSave={this.handleSaveData} slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl} - exportPayloadType={exportPayloadType} + exportPayloadType={exportPayloadType} logFunction="otherdeduction" form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch} onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={importPayload} onImportFile={this.handleImportFile}