From 9e81e8244a981aaf99dffd45a874051bd9120fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 09:16:57 +0800 Subject: [PATCH 01/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/index.js | 18 ++ .../components/logViewModal/config.js | 78 +++++++ .../components/logViewModal/index.js | 207 ++++++++++-------- .../components/logViewModal/index.less | 30 +++ pc4mobx/hrmSalary/pages/salaryItem/index.js | 32 ++- pc4mobx/hrmSalary/stores/baseForm.js | 10 +- 6 files changed, 269 insertions(+), 106 deletions(-) create mode 100644 pc4mobx/hrmSalary/components/logViewModal/config.js create mode 100644 pc4mobx/hrmSalary/components/logViewModal/index.less diff --git a/pc4mobx/hrmSalary/apis/index.js b/pc4mobx/hrmSalary/apis/index.js index 854c9bf6..6be981c4 100644 --- a/pc4mobx/hrmSalary/apis/index.js +++ b/pc4mobx/hrmSalary/apis/index.js @@ -1,4 +1,5 @@ import { WeaTools } from "ecCom"; +import { postFetch } from "../util/request"; // form基础数据 export const getBaseForm = (params) => { @@ -19,3 +20,20 @@ export const getCondition = (params) => { export const getTableDatas = (params) => { return WeaTools.callApi("/api/demo03/weatableDemo", "GET", params); }; +//获取日志列表 +export const getLogs = params => { + const payload = { + ...params, + module: "hrsa", dataset: "dataset", + filterConditions: "[]", transMethod: "hrsa", + authParams: "{}" + }; + return postFetch("/api/bs/hrmsalary/elog/getLogs", payload); +}; +//获取单条操作记录的更新明细 +export const getDetailChanges = params => { + const payload = { + ...params, module: "hrsa", detailTransMethod: "elogDemoDetail", + }; + return postFetch("/api/bs/hrmsalary/elog/getDetailChanges", payload); +}; diff --git a/pc4mobx/hrmSalary/components/logViewModal/config.js b/pc4mobx/hrmSalary/components/logViewModal/config.js new file mode 100644 index 00000000..872a90c0 --- /dev/null +++ b/pc4mobx/hrmSalary/components/logViewModal/config.js @@ -0,0 +1,78 @@ +import React from "react"; +import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom"; +import { WeaSwitch } from "comsMobx"; +import { Button } from "antd"; + +const getKey = WeaTools.getKey; +const getLabel = WeaLocaleProvider.getLabel; +export const logConditions = [ + { + items: [ + { + conditionType: "INPUT", + domkey: ["operator"], + fieldcol: 18, + label: "操作人", + lanId: 17482, + labelcol: 6, + value: "", + viewAttr: 2 + }, + { + conditionType: "INPUT", + domkey: ["targetname"], + fieldcol: 18, + label: "对象", + lanId: 106, + labelcol: 6, + value: "", + viewAttr: 2 + }, + { + conditionType: "INPUT", + domkey: ["operatetypename"], + fieldcol: 18, + label: "操作类型", + lanId: 111, + labelcol: 6, + value: "", + viewAttr: 2 + } + ], + defaultshow: true, + title: "" + } +]; + +export const renderLogSearchsForm = (form, condition, onSearch = () => void (0)) => { + const { isFormInit } = form; + const formParams = form.getFormParams(); + let group = []; + isFormInit && condition && condition.map(c => { + let items = []; + c.items.map(fields => { + items.push({ + com: ( + + + { + getKey(fields) === "operatetypename" && +
+ + +
+ } + ), + colSpan: 1 + }); + }); + group.push( + ); + }); + return group; +}; diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.js b/pc4mobx/hrmSalary/components/logViewModal/index.js index d95ceb25..aeab775a 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.js +++ b/pc4mobx/hrmSalary/components/logViewModal/index.js @@ -1,99 +1,116 @@ -import React from 'react' -import { Button, Modal } from 'antd'; -import { WeaInput, WeaRangePicker, WeaTable} from 'ecCom' -import { logColumns, dataSource } from "../../common/columns" +/* + * Author: 黎永顺 + * name: 薪酬日志查看 + * Description: + * Date: 2024/1/24 + */ +import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; +import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom"; +import { logConditions, renderLogSearchsForm } from "./config"; +import "./index.less"; -export default class LogViewModal extends React.Component { - constructor(props) { - super(props) - this.state ={ - value: "" - } +const getLabel = WeaLocaleProvider.getLabel; + +@inject("baseFormStore") +@observer +class Index extends Component { + constructor(props) { + super(props); + this.state = { + dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, + loading: false, conditions: [] + }; + } + + componentDidMount() { + const { baseFormStore: { form } } = this.props; + this.setState({ + conditions: _.map(logConditions, it => ({ + ...it, items: _.map(it.items, o => ({ ...o, label: getLabel(o.lanId, o.label) })) + })) + }, () => form.initFormFields(this.state.conditions)); + } + + componentWillReceiveProps(nextProps, nextContext) { + // if (nextProps.visible !== this.props.visible && nextProps.visible) this.getAdjustHistoryList(); + if (nextProps.visible !== this.props.visible && !nextProps.visible) { + this.setState({ + dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 }, + loading: false + }); } - render() { - return ( - alert("ok")} onCancel={this.props.onCancel} - className="logViewModal" - style={{ top: 150 }} - width={'80%'} height={'50%'} - > -
-
-
操作时间
-
- this.setState({ value: v })} - /> -
-
-
-
操作人
-
- { - console.log(value); - this.setState({ value }); - }} - customBlur={v => { - console.log("custom blur", v); - }} - onFocus={v => console.log("focus", v)} - onBlur={v => console.log("blur", v)} - /> -
-
+ } -
-
对象
-
- { - console.log(value); - this.setState({ value }); - }} - customBlur={v => { - console.log("custom blur", v); - }} - onFocus={v => console.log("focus", v)} - onBlur={v => console.log("blur", v)} - /> -
-
+ // getAdjustHistoryList = (extra = {}) => { + // const { pageInfo } = this.state; + // const { archivesStore: { logForm } } = this.props; + // const payload = { ...pageInfo, ...logForm.getFormParams(), ...extra }; + // this.setState({ loading: true }); + // getAdjustHistoryList(payload).then(({ status, data }) => { + // this.setState({ loading: false }); + // if (status) { + // const { columns, list: dataSource, pageNum: current, pageSize, total } = data; + // this.setState({ + // pageInfo: { ...pageInfo, current, pageSize, total }, + // dataSource, columns: _.map(columns, it => { + // if (it.dataIndex === "operateTime") { + // return { ...it, render: (text) => ({moment(text).format("YYYY-MM-DD")}) }; + // } + // return { ...it }; + // }) + // }); + // } + // }).catch(() => this.setState({ loading: false })); + // }; -
-
操作类型
-
- { - console.log(value); - this.setState({ value }); - }} - customBlur={v => { - console.log("custom blur", v); - }} - onFocus={v => console.log("focus", v)} - onBlur={v => console.log("blur", v)} - /> -
-
- -
- -
-
- - - ) - } -} \ No newline at end of file + render() { + const { loading, dataSource, columns, pageInfo, conditions } = this.state; + const { baseFormStore: { form } } = this.props; + const pagination = { + ...pageInfo, + showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, + showQuickJumper: true, + showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], + onShowSizeChange: (current, pageSize) => { + this.setState({ + pageInfo: { ...pageInfo, current, pageSize } + }, () => this.getAdjustHistoryList()); + }, + onChange: current => { + this.setState({ + pageInfo: { ...pageInfo, current } + }, () => this.getAdjustHistoryList()); + } + }; + const scrollHeight = this.logRef ? this.logRef.state.height - 210 : 606.6; + return ( + this.logRef = dom} className="logDialog" initLoadCss + style={{ + width: 1150, + height: 606.6, + minHeight: 200, + minWidth: 380, + maxHeight: "90%", + maxWidth: "90%", + overflow: "hidden", + transform: "translate(0px, 0px)" + }} + > +
+ {renderLogSearchsForm(form, conditions, () => this.getAdjustHistoryList({ current: 1 }))} + +
+ + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.less b/pc4mobx/hrmSalary/components/logViewModal/index.less new file mode 100644 index 00000000..6c10dc6f --- /dev/null +++ b/pc4mobx/hrmSalary/components/logViewModal/index.less @@ -0,0 +1,30 @@ +.logDialog { + .wea-dialog-body { + overflow-y: hidden; + } + + .logDialogContent { + background: #F6F6F6; + padding: 16px; + width: 100%; + height: 100%; + + .wea-search-group { + padding: 0; + margin-bottom: 10px; + background: #FFF; + + .wea-form-cell { + padding: 0; + + .wea-form-item { + padding: 10px; + } + } + } + + .logTable { + background: #FFFFFF; + } + } +} diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 921c9d2f..67a0f05e 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -11,6 +11,7 @@ import CustomSalaryItemSlide from "./customSalaryItemSlide"; import CustomPaginationTable from "../../components/customPaginationTable"; import SyncToSalaryAccountSetDialog from "./syncToSalaryAccountSetDialog"; import "../socialSecurityBenefits/programme/index.less"; +import LogDialog from "../../components/logViewModal"; const { getLabel } = WeaLocaleProvider; @inject("salaryItemStore", "taxAgentStore", "salaryFileStore") @@ -27,7 +28,8 @@ export default class SalaryItem extends React.Component { formalModalVisible: false, searchParams: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [], - syncSalarySetDialog: { visible: false, title: "", id: "" } + syncSalarySetDialog: { visible: false, title: "", id: "" }, + logDialogVisible: false }; columns.map(item => { if (item.dataIndex == "refere") { @@ -191,6 +193,16 @@ export default class SalaryItem extends React.Component { getTableDatas({ ...searchParams }); } + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; + render() { const { salaryItemStore, @@ -198,7 +210,7 @@ export default class SalaryItem extends React.Component { taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentOption } } = this.props; const { userStatusList } = salaryFileStore; - const { selectedRowKeys } = this.state; + const { selectedRowKeys, logDialogVisible } = this.state; const { loading, deleteItemRequest, getTableDatas } = salaryItemStore; const { tableDataSource, @@ -342,11 +354,14 @@ export default class SalaryItem extends React.Component { }; return (
- } - iconBgcolor="#F14A2D" - showDropIcon={false} + } iconBgcolor="#F14A2D" + showDropIcon onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ + { + key: "log", icon: , + content: getLabel(545781, "操作日志") + } + ]} >
@@ -387,7 +402,8 @@ export default class SalaryItem extends React.Component { } })} /> - + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/> { systemItemVisible && this.logVisible = bool - -} \ No newline at end of file + +} From 7cb1b157ebc0c7ba43c2909585be97670e55a097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 11:52:10 +0800 Subject: [PATCH 02/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/index.js | 7 +- .../components/detailLogView/index.js | 81 +++++++++++++++++++ .../components/logViewModal/config.js | 18 ++++- .../components/logViewModal/index.js | 74 ++++++++++------- .../components/logViewModal/index.less | 41 ++++++++++ pc4mobx/hrmSalary/pages/salaryItem/index.js | 3 +- 6 files changed, 185 insertions(+), 39 deletions(-) create mode 100644 pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js diff --git a/pc4mobx/hrmSalary/apis/index.js b/pc4mobx/hrmSalary/apis/index.js index 6be981c4..af60888f 100644 --- a/pc4mobx/hrmSalary/apis/index.js +++ b/pc4mobx/hrmSalary/apis/index.js @@ -23,17 +23,16 @@ export const getTableDatas = (params) => { //获取日志列表 export const getLogs = params => { const payload = { - ...params, - module: "hrsa", dataset: "dataset", + ...params, module: "hrsa", dataset: "dataset", authParams: "{}", filterConditions: "[]", transMethod: "hrsa", - authParams: "{}" + showColums: "[{\"columName\":\"操作时间\",\"columIndex\":\"createdate\",\"width\":\"5%\"},{\"columName\":\"操作人\",\"columIndex\":\"operatorname\",\"width\":\"2%\"},{\"columName\":\"操作类型\",\"columIndex\":\"operatetypename\",\"width\":\"5%\"},{\"columName\":\"项目\",\"columIndex\":\"modulenamespan\",\"width\":\"3%\"},{\"columName\":\"对象\",\"columIndex\":\"targetname\",\"width\":\"4%\"},{\"columName\":\"修改详情\",\"columIndex\":\"operatedesc\",\"width\":\"2%\"},{\"columName\":\"客户端IP\",\"columIndex\":\"clientip\",\"width\":\"5%\"}]" }; return postFetch("/api/bs/hrmsalary/elog/getLogs", payload); }; //获取单条操作记录的更新明细 export const getDetailChanges = params => { const payload = { - ...params, module: "hrsa", detailTransMethod: "elogDemoDetail", + ...params, module: "hrsa", detailTransMethod: "elogDemoDetail" }; return postFetch("/api/bs/hrmsalary/elog/getDetailChanges", payload); }; diff --git a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js new file mode 100644 index 00000000..a5c1a5cc --- /dev/null +++ b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js @@ -0,0 +1,81 @@ +/* + * Author: 黎永顺 + * name: 日志查看-详情 + * Description: + * Date: 2024/1/25 + */ +import React, { Component } from "react"; +import { WeaDialog, WeaLocaleProvider, WeaTransfer } from "ecCom"; +import * as API from "../../../../apis"; + +const getLabel = WeaLocaleProvider.getLabel; +const WeaTransferList = WeaTransfer.list; + +class Index extends Component { + constructor(props) { + super(props); + this.state = { + dataSource: [], loading: false + }; + } + + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getDetailChanges(nextProps); + if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ + dataSource: [], + loading: false + }); + } + + getDetailChanges = (props) => { + const { mainid, logFunction } = props; + const payload = { function: logFunction, mainid }; + this.setState({ loading: true }); + API.getDetailChanges(payload).then(({ status, data }) => { + this.setState({ loading: false }); + if (status) { + this.setState({ + dataSource: _.map(data, (o, i) => ({ + ...o, index: i + 1, + valueschanges: _.map(o.valueschanges, (g, gi) => ({ id: gi + 1, name: g })) + })) + }); + } + }).catch(() => this.setState({ loading: false })); + }; + + render() { + const { dataSource } = this.state; + const scrollHeight = this.logDetailRef ? this.logDetailRef.state.height - 32 : 606.6; + return ( + this.logDetailRef = dom} + style={{ + width: 750, + height: 606.6, + minHeight: 200, + minWidth: 380, + maxHeight: "90%", + maxWidth: "90%", + overflow: "hidden", + transform: "translate(0px, 0px)" + }} + > +
+ { + _.map(dataSource, item => ( (
+
{it.id}
+
{it.name}
+
)} + height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]} + />)) + } +
+ + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/components/logViewModal/config.js b/pc4mobx/hrmSalary/components/logViewModal/config.js index 872a90c0..f3b3189a 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/config.js +++ b/pc4mobx/hrmSalary/components/logViewModal/config.js @@ -8,6 +8,16 @@ const getLabel = WeaLocaleProvider.getLabel; export const logConditions = [ { items: [ + { + conditionType: "RANGEPICKER", + domkey: ["date"], + fieldcol: 18, + label: "操作时间", + lanId: 111, + labelcol: 6, + value: "", + viewAttr: 2 + }, { conditionType: "INPUT", domkey: ["operator"], @@ -44,7 +54,7 @@ export const logConditions = [ } ]; -export const renderLogSearchsForm = (form, condition, onSearch = () => void (0)) => { +export const renderLogSearchsForm = (form, condition, onSearch = () => void (0), onReset = () => void (0)) => { const { isFormInit } = form; const formParams = form.getFormParams(); let group = []; @@ -61,8 +71,8 @@ export const renderLogSearchsForm = (form, condition, onSearch = () => void (0)) { getKey(fields) === "operatetypename" && -
- +
+
} @@ -71,7 +81,7 @@ export const renderLogSearchsForm = (form, condition, onSearch = () => void (0)) }); }); group.push( - ); }); return group; diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.js b/pc4mobx/hrmSalary/components/logViewModal/index.js index aeab775a..857ed362 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.js +++ b/pc4mobx/hrmSalary/components/logViewModal/index.js @@ -7,7 +7,9 @@ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom"; +import DetailLogView from "./components/detailLogView"; import { logConditions, renderLogSearchsForm } from "./config"; +import * as API from "../../apis/index"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -19,7 +21,7 @@ class Index extends Component { super(props); this.state = { dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, - loading: false, conditions: [] + loading: false, conditions: [], logDetailDialog: { visible: false, title: "", logFunction: "", mainid: "" } }; } @@ -33,7 +35,7 @@ class Index extends Component { } componentWillReceiveProps(nextProps, nextContext) { - // if (nextProps.visible !== this.props.visible && nextProps.visible) this.getAdjustHistoryList(); + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getLogs(); if (nextProps.visible !== this.props.visible && !nextProps.visible) { this.setState({ dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 }, @@ -42,30 +44,38 @@ class Index extends Component { } } - // getAdjustHistoryList = (extra = {}) => { - // const { pageInfo } = this.state; - // const { archivesStore: { logForm } } = this.props; - // const payload = { ...pageInfo, ...logForm.getFormParams(), ...extra }; - // this.setState({ loading: true }); - // getAdjustHistoryList(payload).then(({ status, data }) => { - // this.setState({ loading: false }); - // if (status) { - // const { columns, list: dataSource, pageNum: current, pageSize, total } = data; - // this.setState({ - // pageInfo: { ...pageInfo, current, pageSize, total }, - // dataSource, columns: _.map(columns, it => { - // if (it.dataIndex === "operateTime") { - // return { ...it, render: (text) => ({moment(text).format("YYYY-MM-DD")}) }; - // } - // return { ...it }; - // }) - // }); - // } - // }).catch(() => this.setState({ loading: false })); - // }; + getLogs = (extra = {}) => { + const { pageInfo, logDetailDialog } = this.state; + const { baseFormStore: { form }, logFunction } = this.props; + const payload = { + ...pageInfo, ...extra, searchMap: { ...form.getFormParams() }, + function: logFunction, showColums: "" + }; + this.setState({ loading: true }); + API.getLogs(payload).then(({ status, data }) => { + this.setState({ loading: false }); + if (status) { + const { columns, list: dataSource, pageNum: current, pageSize, total } = data; + this.setState({ + pageInfo: { ...pageInfo, current, pageSize, total }, + dataSource, columns: _.map(columns, it => { + if (it.dataIndex === "operatedesc") { + return { + ...it, render: (__, record) => ( { + const { operatedesc: title, uuid: mainid } = record; + this.setState({ logDetailDialog: { visible: true, title, logFunction, mainid } }); + }}>{getLabel(33564, "查看")}) + }; + } + return { ...it }; + }) + }); + } + }).catch(() => this.setState({ loading: false })); + }; render() { - const { loading, dataSource, columns, pageInfo, conditions } = this.state; + const { loading, dataSource, columns, pageInfo, conditions, logDetailDialog } = this.state; const { baseFormStore: { form } } = this.props; const pagination = { ...pageInfo, @@ -76,15 +86,15 @@ class Index extends Component { onShowSizeChange: (current, pageSize) => { this.setState({ pageInfo: { ...pageInfo, current, pageSize } - }, () => this.getAdjustHistoryList()); + }, () => this.getLogs()); }, onChange: current => { this.setState({ pageInfo: { ...pageInfo, current } - }, () => this.getAdjustHistoryList()); + }, () => this.getLogs()); } }; - const scrollHeight = this.logRef ? this.logRef.state.height - 210 : 606.6; + const scrollHeight = this.logRef ? this.logRef.state.height - 254 : 606.6; return (
- {renderLogSearchsForm(form, conditions, () => this.getAdjustHistoryList({ current: 1 }))} + {renderLogSearchsForm(form, conditions, () => this.getLogs({ current: 1 }), () => { + form.resetForm(); + this.getLogs({ current: 1 }); + })} + this.setState({ logDetailDialog: { ...logDetailDialog, visible: false } })}/>
); diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.less b/pc4mobx/hrmSalary/components/logViewModal/index.less index 6c10dc6f..0d9e4d57 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.less +++ b/pc4mobx/hrmSalary/components/logViewModal/index.less @@ -26,5 +26,46 @@ .logTable { background: #FFFFFF; } + + .wea-transfer-list-wrapper { + border: none; + + .ant-tree-switcher { + display: none; + } + + .transfer-tree { + background: #FFF; + border: 1px solid #dadada; + + .treeitem { + margin: 0 !important; + } + } + } + + .detailBox { + display: flex; + align-items: center; + + .order { + width: 35px; + color: #999; + text-align: center; + } + + .content { + position: relative; + flex: 1; + min-height: 40px; + color: #000; + display: flex; + align-items: center; + justify-content: flex-start; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } } } diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 67a0f05e..d808d539 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -403,7 +403,8 @@ export default class SalaryItem extends React.Component { })} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> + this.setState({ logDialogVisible: false })}/> { systemItemVisible && Date: Thu, 25 Jan 2024 14:02:34 +0800 Subject: [PATCH 03/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detailLogView/index.js | 13 ++-- .../components/logViewModal/index.less | 62 ++++++++++++------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js index a5c1a5cc..7ca588a9 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js +++ b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js @@ -63,14 +63,13 @@ class Index extends Component { >
{ - _.map(dataSource, item => ( (
-
{it.id}
-
{it.name}
-
)} + _.map(dataSource, item => (!_.isEmpty(item.valueschanges) ? (
+
{it.id}
+
{it.name}
+
)} height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]} - />)) + /> :
{getLabel(111, "无数据变更记录")}
)) }
diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.less b/pc4mobx/hrmSalary/components/logViewModal/index.less index 0d9e4d57..79d0bee5 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.less +++ b/pc4mobx/hrmSalary/components/logViewModal/index.less @@ -9,6 +9,15 @@ width: 100%; height: 100%; + .empty { + width: 100%; + display: flex; + height: 100%; + justify-content: center; + align-items: center; + background: #ffff; + } + .wea-search-group { padding: 0; margin-bottom: 10px; @@ -37,34 +46,41 @@ .transfer-tree { background: #FFF; border: 1px solid #dadada; + padding: 0; - .treeitem { - margin: 0 !important; + & > li:not(:last-child) { + .detailBox .content { + border-bottom: 1px solid #dadada; + } } - } - } - .detailBox { - display: flex; - align-items: center; + & > li { + margin: 0 !important; - .order { - width: 35px; - color: #999; - text-align: center; - } + .detailBox { + display: flex; + align-items: center; - .content { - position: relative; - flex: 1; - min-height: 40px; - color: #000; - display: flex; - align-items: center; - justify-content: flex-start; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + .order { + width: 35px; + color: #999; + text-align: center; + } + + .content { + position: relative; + flex: 1; + min-height: 40px; + color: #000; + display: flex; + align-items: center; + justify-content: flex-start; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + } } } } From 0b3c97a53fc842550faa08a6427f202f876b115c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 30 Jan 2024 17:34:02 +0800 Subject: [PATCH 04/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/taxAgent/index.js | 39 +++++++++++++++++------ 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index 1010c090..a82f231c 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -1,13 +1,16 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { Button, Col, message, Modal, Row, Switch } from "antd"; -import { WeaFormItem, WeaInputSearch, WeaSearchGroup, WeaTable, WeaTop } from "ecCom"; +import { WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchGroup, WeaTable, WeaTop } from "ecCom"; import { renderNoright } from "../../util"; import EditModal from "./editModal"; import TipLabel from "../../components/TipLabel"; import { decentralizationConditions, editConditions } from "./editConditions"; +import LogDialog from "../../components/logViewModal"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; + @inject("taxAgentStore") @observer export default class TaxAgent extends React.Component { @@ -30,7 +33,8 @@ export default class TaxAgent extends React.Component { conditions: editConditions, decentralizationConditions: decentralizationConditions, permission: {}, - syncLoading: false + syncLoading: false, + logDialogVisible: false }; } @@ -282,6 +286,15 @@ export default class TaxAgent extends React.Component { } }); }; + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; render() { @@ -294,7 +307,8 @@ export default class TaxAgent extends React.Component { decentralizationConditions, permission, syncLoading, - name + name, + logDialogVisible } = this.state; const { loading, @@ -389,12 +403,15 @@ export default class TaxAgent extends React.Component { return (
- } // 左侧图标 - iconBgcolor="#F14A2D" // 左侧图标背景色 - buttons={showOperateBtn ? btns : btns.slice(1)} - showDropIcon={true}> + } iconBgcolor="#F14A2D" + buttons={showOperateBtn ? btns : btns.slice(1)} showDropIcon onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ + { + key: "log", icon: , + content: getLabel(545781, "操作日志") + } + ]} + > @@ -440,7 +457,9 @@ export default class TaxAgent extends React.Component { - + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/> {editModalProps.visible && Date: Wed, 31 Jan 2024 10:24:15 +0800 Subject: [PATCH 05/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/adjustSalaryManage/index.js | 28 ++++++++++++--- .../components/statisticsModal.js | 8 +++++ .../pages/analysisOfSalaryStatistics/index.js | 30 ++++++++++++++-- .../analysisOfSalaryStatistics/index.less | 9 ++--- .../hrmSalary/pages/calculate/calculate.js | 30 +++++++++++++--- pc4mobx/hrmSalary/pages/declare/declare.js | 28 ++++++++++++--- .../pages/externalPersonManage/index.js | 25 ++++++++++++-- .../hrmSalary/pages/fieldManagement/index.js | 34 ++++++++++++++----- pc4mobx/hrmSalary/pages/ledgerPage/index.js | 34 ++++++++++++++----- .../pages/payrollFiles/config/index.js | 4 +++ .../pages/payrollFiles/salaryFiles.js | 11 ++++-- .../updatePayrollTemplateSlide/index.js | 7 +++- .../hrmSalary/pages/payrollRelease/index.js | 28 ++++++++++++--- .../hrmSalary/pages/payrollRelease/index.less | 10 +++--- .../standingBook/standingBook.js | 28 +++++++++++++-- .../components/logDialog/index.js | 2 +- .../welfareArchive/config.js | 6 +++- .../welfareArchive/index.js | 15 +++++--- 18 files changed, 276 insertions(+), 61 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js index e57ffa58..4e05e6b9 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js @@ -12,9 +12,9 @@ import AdvanceInputBtn from "./components/advanceInputBtn"; import AdjustAdvanceSearchPannel from "./components/adjustAdvanceSearchPannel"; import cs from "classnames"; import { Button } from "antd"; -import "./index.less"; import { convertToUrlString } from "../../util/url"; - +import LogDialog from "../../components/logViewModal"; +import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -25,7 +25,7 @@ class Index extends Component { super(props); this.state = { loading: false, columns: [], dataSource: [], showSearchAd: false, - pageInfo: { current: 1, pageSize: 10, total: 0 } + pageInfo: { current: 1, pageSize: 10, total: 0 }, logDialogVisible: false }; } @@ -88,9 +88,18 @@ class Index extends Component { } this.handleDebounce(); }; + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; render() { - const { loading, dataSource, columns, pageInfo, showSearchAd } = this.state; + const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible } = this.state; const pagination = { ...pageInfo, showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, @@ -111,11 +120,17 @@ class Index extends Component { return ( } iconBgcolor="#F14A2D" + icon={} iconBgcolor="#F14A2D" showDropIcon buttons={[ , this.openAdvanceSearch()} onAdvanceSearch={this.adjustRecordItemList}/> + ]} onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ + { + key: "log", icon: , + content: getLabel(545781, "操作日志") + } ]} >
@@ -129,6 +144,9 @@ class Index extends Component { dataSource={dataSource} loading={loading} pagination={pagination} columns={columns} /> + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/> ); } diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js index 1f333b7c..d80b2877 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js @@ -20,6 +20,14 @@ class StatisticsModal extends Component { }; } + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.visible !== this.props.visible && nextProps.visible) { + document.querySelector(".xc_tj_fx_wrapper").classList.add("zIndex0-statistics"); + } else if (nextProps.visible !== this.props.visible && !nextProps.visible) { + document.querySelector(".xc_tj_fx_wrapper").classList.remove("zIndex0-statistics"); + } + } + handleSaveReportList = () => { const { form, id, onCancel } = this.props; form.validateForm().then(f => { diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js index f9a073e5..3461e431 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js @@ -19,6 +19,7 @@ import ReportList from "./components/reportList"; import ReportForm from "./components/reportForm"; import moment from "moment"; import "./index.less"; +import LogDialog from "../../components/logViewModal"; const { getLabel } = WeaLocaleProvider; @@ -41,7 +42,8 @@ class Index extends Component { modalReq: { title: "", visible: false, typeKey: "", id: "" - } + }, + logDialogVisible: false }; } @@ -243,10 +245,22 @@ class Index extends Component { initTable && this.dimensionTableRef.dimensionList(); }); }; + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; render() { const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props; - const { selectedKey, modalReq, slideReq, conditions, reportConditions, reportName, keyword, year } = this.state; + const { + selectedKey, modalReq, slideReq, conditions, reportConditions, + reportName, keyword, year, logDialogVisible + } = this.state; const buttons = selectedKey === "statistics" ? [ , , - ] : []; + ] : [ + , + 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} From 9697e5aa8103699b667f6cf7280624774d9da0ff 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, 31 Jan 2024 11:29:16 +0800 Subject: [PATCH 07/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less index 5d7d9bed..052f2e4b 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less @@ -15,7 +15,7 @@ flex: 1; overflow: hidden; background: #FFF; - padding: 0 16px; + margin: 0 16px; } .linkWapper { From 3093279f2932d6229a41b308d5736572d466c95b 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, 31 Jan 2024 11:31:14 +0800 Subject: [PATCH 08/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less index 052f2e4b..f6a0accb 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less @@ -15,7 +15,7 @@ flex: 1; overflow: hidden; background: #FFF; - margin: 0 16px; + margin: 16px; } .linkWapper { From e2898441cfc70fe711a3704f672b65839c602338 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, 31 Jan 2024 11:37:20 +0800 Subject: [PATCH 09/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendance/components/attendanceDataViewSlide.js | 7 ++++++- .../hrmSalary/pages/dataAcquisition/attendance/index.less | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js index 45fa6bfe..1011398c 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js @@ -29,7 +29,12 @@ class AttendanceDataViewSlide extends Component { } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible && nextProps.visible) this.viewAttendQuote({}, nextProps); + if (nextProps.visible !== this.props.visible && nextProps.visible) { + document.querySelector(".attendanceRefWrapper").classList.add("zIndex0-attendance"); + this.viewAttendQuote({}, nextProps); + } else if (nextProps.visible !== this.props.visible && !nextProps.visible) { + document.querySelector(".attendanceRefWrapper").classList.remove("zIndex0-attendance"); + } } viewAttendQuote = (extraPayload = {}, props) => { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less index f6a0accb..e4dae347 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less @@ -25,6 +25,12 @@ } } +.zIndex0-attendance { + .wea-new-top-req { + z-index: 0 !important; + } +} + .attendenceImportWrapper { .wea-dialog-body { From 3c57000afcb324ad20494e4ac35deb7ab80ce7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 1 Feb 2024 14:04:55 +0800 Subject: [PATCH 10/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/mySalaryBenefits/index.js | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index 89d25e4d..3a221393 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -11,6 +11,7 @@ import SalaryAdjustmentRecords from "./components/SalaryAdjustmentRecords"; import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide"; import moment from "moment"; import "./index.less"; +import LogDialog from "../../components/logViewModal"; const getLabel = WeaLocaleProvider.getLabel; @@ -18,9 +19,9 @@ class Index extends Component { constructor(props) { super(props); this.state = { - selectedKey: "1", + selectedKey: "1", logDialogVisible: false, salaryYearMonth: [ - moment().subtract(1, 'year').startOf("year").format("YYYY-MM"), + moment().subtract(1, "year").startOf("year").format("YYYY-MM"), moment().endOf("year").format("YYYY-MM") ] }; @@ -41,9 +42,18 @@ class Index extends Component { } return Dom; }; + onDropMenuClick = (key) => { + switch (key) { + case "log": + this.setState({ logDialogVisible: true }); + break; + default: + break; + } + }; render() { - const { selectedKey, salaryYearMonth } = this.state; + const { selectedKey, salaryYearMonth, logDialogVisible } = this.state; const tabs = [ { key: "1", title: getLabel(111, "工资单") }, { key: "2", title: getLabel(543150, "调薪记录") } @@ -61,8 +71,18 @@ class Index extends Component { iconBgcolor="#F14A2D" tabDatas={tabs} className="mySalary_wrapper" buttons={selectedKey === "1" ? btns : []} buttonSpace={10} selectedKey={selectedKey} onChange={selectedKey => this.setState({ selectedKey })} + showDropIcon onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ + { + key: "log", icon: , + content: getLabel(545781, "操作日志") + } + ]} > {this.renderContent()} + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/> ); } From 4b95f6811fdacca262467c5c5b030abff69a8be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 19 Feb 2024 09:03:40 +0800 Subject: [PATCH 11/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logViewModal/components/detailLogView/index.js | 2 +- pc4mobx/hrmSalary/components/logViewModal/index.less | 4 +--- pc4mobx/hrmSalary/pages/ledgerPage/index.less | 2 +- pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js | 5 +++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js index 7ca588a9..f19e1c05 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js +++ b/pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js @@ -66,7 +66,7 @@ class Index extends Component { _.map(dataSource, item => (!_.isEmpty(item.valueschanges) ? (
{it.id}
-
{it.name}
+
{it.name}
)} height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]} /> :
{getLabel(111, "无数据变更记录")}
)) diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.less b/pc4mobx/hrmSalary/components/logViewModal/index.less index 79d0bee5..1d54174f 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.less +++ b/pc4mobx/hrmSalary/components/logViewModal/index.less @@ -71,10 +71,8 @@ position: relative; flex: 1; min-height: 40px; + line-height: 40px; color: #000; - display: flex; - align-items: center; - justify-content: flex-start; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/index.less index 36f3ec2b..2fc10db7 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.less @@ -1,7 +1,7 @@ .ledgerOuter { .wea-new-top { .ant-col-10 { - span:nth-child(2) { + & > span:nth-child(2) { margin-top: -6px; } } diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index 3a221393..cef2bb12 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -9,9 +9,9 @@ import { WeaLocaleProvider, WeaReqTop } from "ecCom"; import Payroll from "./components/payrollTable"; import SalaryAdjustmentRecords from "./components/SalaryAdjustmentRecords"; import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide"; +import LogDialog from "../../components/logViewModal"; import moment from "moment"; import "./index.less"; -import LogDialog from "../../components/logViewModal"; const getLabel = WeaLocaleProvider.getLabel; @@ -65,6 +65,7 @@ class Index extends Component { onChange={v => this.setState({ salaryYearMonth: v })}/>
]; + const logFunction = selectedKey === "1" ? "mysalarybill" : "myadjustrecord"; return ( } @@ -81,7 +82,7 @@ class Index extends Component { > {this.renderContent()} {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> ); From 0e16bab13ce33d2ee46a8a19a418d32af9030d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 20 Feb 2024 17:03:51 +0800 Subject: [PATCH 12/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dataAcquisition/specialAddDeduction/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js index 5b4cd8f7..d743bfb7 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js @@ -457,7 +457,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="specialAddDeduction" form={advanceForm} condition={advanceCondition} onAdSearch={this.handleAdSearch} onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={importPayload} onImportFile={this.handleImportFile} From 7078b1c6c4bb83c5437f19780a7b673854ab4687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 23 Feb 2024 10:13:43 +0800 Subject: [PATCH 13/24] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/index.js | 5 ++-- pc4mobx/hrmSalary/apis/standingBook.js | 2 +- .../components/logViewModal/index.js | 18 ++++++------ .../pages/adjustSalaryManage/index.js | 22 ++++++++++----- .../components/conditions.js | 5 +++- .../components/employeeDetails.js | 10 +++++-- .../components/reportList.js | 3 ++ .../pages/analysisOfSalaryStatistics/index.js | 15 ++++++---- .../hrmSalary/pages/calculate/calculate.js | 15 +++++++--- .../components/calculateTablelist/index.js | 3 +- .../components/attendanceDataComp.js | 27 ++++++++++++++++-- .../attendance/components/fieldMangComp.js | 14 ++++++++-- .../pages/dataAcquisition/attendance/index.js | 15 ++++++---- .../pages/dataAcquisition/cumDeduct/index.js | 8 ++++-- .../dataAcquisition/cumSituation/index.js | 11 ++++---- .../pages/dataAcquisition/dataTables.js | 17 ++++++++++- .../hrmSalary/pages/dataAcquisition/layout.js | 26 ++++++++++++----- .../dataAcquisition/otherDeduct/index.js | 8 ++++-- .../specialAddDeduction/index.js | 8 ++++-- .../components/declareTablelist/index.js | 18 +++++++++++- pc4mobx/hrmSalary/pages/declare/declare.js | 16 +++++++---- .../pages/externalPersonManage/index.js | 15 ++++++---- .../fieldManagement/components/fieldTable.js | 17 +++++++++-- .../hrmSalary/pages/fieldManagement/index.js | 17 +++++++---- .../ledgerPage/components/ledgerTable.js | 8 +++++- pc4mobx/hrmSalary/pages/ledgerPage/index.js | 16 +++++++---- .../SalaryAdjustmentRecords/index.js | 7 ++++- .../components/payrollTable/index.js | 10 +++++-- .../hrmSalary/pages/mySalaryBenefits/index.js | 18 +++++++----- .../components/salaryFileList/index.js | 6 +++- .../pages/payrollFiles/salaryFiles.js | 14 ++++++---- .../components/grantTableList/index.js | 11 +++++++- .../payrollTemplateTableList/index.js | 4 +++ .../hrmSalary/pages/payrollRelease/index.js | 17 +++++++---- pc4mobx/hrmSalary/pages/salaryItem/index.js | 20 ++++++++----- .../components/welfareRecordList.js | 8 ++++-- .../standingBook/standingBook.js | 16 +++++++---- .../components/welfareTableList/index.js | 6 +++- .../welfareArchive/index.js | 14 ++++++---- .../components/welfarePlanList/index.js | 15 ++++++++++ .../welfarePlan/index.js | 18 +++++++----- pc4mobx/hrmSalary/pages/taxAgent/index.js | 28 +++++++++++++++---- 42 files changed, 399 insertions(+), 152 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/index.js b/pc4mobx/hrmSalary/apis/index.js index af60888f..eabea534 100644 --- a/pc4mobx/hrmSalary/apis/index.js +++ b/pc4mobx/hrmSalary/apis/index.js @@ -23,9 +23,8 @@ export const getTableDatas = (params) => { //获取日志列表 export const getLogs = params => { const payload = { - ...params, module: "hrsa", dataset: "dataset", authParams: "{}", - filterConditions: "[]", transMethod: "hrsa", - showColums: "[{\"columName\":\"操作时间\",\"columIndex\":\"createdate\",\"width\":\"5%\"},{\"columName\":\"操作人\",\"columIndex\":\"operatorname\",\"width\":\"2%\"},{\"columName\":\"操作类型\",\"columIndex\":\"operatetypename\",\"width\":\"5%\"},{\"columName\":\"项目\",\"columIndex\":\"modulenamespan\",\"width\":\"3%\"},{\"columName\":\"对象\",\"columIndex\":\"targetname\",\"width\":\"4%\"},{\"columName\":\"修改详情\",\"columIndex\":\"operatedesc\",\"width\":\"2%\"},{\"columName\":\"客户端IP\",\"columIndex\":\"clientip\",\"width\":\"5%\"}]" + ...params, module: "hrsa", dataset: "dataset", authParams: "{}", transMethod: "hrsa", + showColums: "[{\"columName\":\"操作时间\",\"columIndex\":\"createdate\",\"width\":\"5%\"},{\"columName\":\"操作人\",\"columIndex\":\"operatorname\",\"width\":\"2%\"},{\"columName\":\"操作类型\",\"columIndex\":\"operatetypename\",\"width\":\"5%\"},{\"columName\":\"对象\",\"columIndex\":\"targetname\",\"width\":\"4%\"},{\"columName\":\"修改详情\",\"columIndex\":\"operatedesc\",\"width\":\"2%\"},{\"columName\":\"客户端IP\",\"columIndex\":\"clientip\",\"width\":\"5%\"}]" }; return postFetch("/api/bs/hrmsalary/elog/getLogs", payload); }; diff --git a/pc4mobx/hrmSalary/apis/standingBook.js b/pc4mobx/hrmSalary/apis/standingBook.js index 8cf772a5..c4ae0be0 100644 --- a/pc4mobx/hrmSalary/apis/standingBook.js +++ b/pc4mobx/hrmSalary/apis/standingBook.js @@ -43,7 +43,7 @@ export const inspectList = (params) => { }; //社会福利台账-删除正常缴纳人员 export const siaccountCommonDelete = (params) => { - return postFetch("/api/bs/hrmsalary/siaccount/common/delete", params); + return postFetch("/api/bs/hrmsalary/siaccount/supplementary/delete", params); }; //社会福利台账-添加正常缴纳人员 export const siaccountCommonSave = (params) => { diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.js b/pc4mobx/hrmSalary/components/logViewModal/index.js index 857ed362..1867b765 100644 --- a/pc4mobx/hrmSalary/components/logViewModal/index.js +++ b/pc4mobx/hrmSalary/components/logViewModal/index.js @@ -35,7 +35,7 @@ class Index extends Component { } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible && nextProps.visible) this.getLogs(); + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getLogs({}, nextProps); if (nextProps.visible !== this.props.visible && !nextProps.visible) { this.setState({ dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 }, @@ -44,12 +44,12 @@ class Index extends Component { } } - getLogs = (extra = {}) => { - const { pageInfo, logDetailDialog } = this.state; - const { baseFormStore: { form }, logFunction } = this.props; + getLogs = (extra = {}, props) => { + const { pageInfo } = this.state; + const { baseFormStore: { form }, logFunction, filterConditions } = props; const payload = { ...pageInfo, ...extra, searchMap: { ...form.getFormParams() }, - function: logFunction, showColums: "" + function: logFunction, showColums: "", filterConditions }; this.setState({ loading: true }); API.getLogs(payload).then(({ status, data }) => { @@ -86,12 +86,12 @@ class Index extends Component { onShowSizeChange: (current, pageSize) => { this.setState({ pageInfo: { ...pageInfo, current, pageSize } - }, () => this.getLogs()); + }, () => this.getLogs({}, this.props)); }, onChange: current => { this.setState({ pageInfo: { ...pageInfo, current } - }, () => this.getLogs()); + }, () => this.getLogs({}, this.props)); } }; const scrollHeight = this.logRef ? this.logRef.state.height - 254 : 606.6; @@ -111,9 +111,9 @@ class Index extends Component { }} >
- {renderLogSearchsForm(form, conditions, () => this.getLogs({ current: 1 }), () => { + {renderLogSearchsForm(form, conditions, () => this.getLogs({ current: 1 }, this.props), () => { form.resetForm(); - this.getLogs({ current: 1 }); + this.getLogs({ current: 1 }, this.props); })} { + columns: [..._.map(columns, o => { if (o.dataIndex === "username") { return { ...o, width: 150, fixed: "left" }; } return { ...o, width: 150 }; - }) + }), { + dataIndex: "options", title: getLabel(30585, "操作"), + width: 120, render: (_, record) => ( this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}) + }] }); } }).catch(() => this.setState({ loading: false })); @@ -88,10 +93,13 @@ class Index extends Component { } this.handleDebounce(); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -99,7 +107,7 @@ class Index extends Component { }; render() { - const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible } = this.state; + const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible, filterConditions } = this.state; const pagination = { ...pageInfo, showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, @@ -145,7 +153,7 @@ class Index extends Component { pagination={pagination} columns={columns} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> ); diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js index fe2554e4..080dd0e4 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js @@ -27,7 +27,10 @@ export const condition = [ labelcol: 6, options: [], rules: "required|string", - viewAttr: 3 + viewAttr: 3, + otherParams: { + showSearch: true, optionFilterProp: "children" + } }, { colSpan: 1, diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js index dc89547d..17a73140 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js @@ -52,10 +52,14 @@ class EmployeeDetails extends Component { columns: [...columns, { title: "操作", dataIndex: "operate", - width: 80, + width: 120, render: (_, record) => { - return {getLabel(111, "查看")}; + return + {getLabel(111, "查看")} + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + ; } }] }); diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js index ba66eec2..dccae63f 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js @@ -44,6 +44,8 @@ class ReportList extends Component { message.error(errormsg); } }); + } else if (key === "log") { + this.props.onFilterLog(key, id); } }; reportStatisticsReportDelete = (payload) => { @@ -106,6 +108,7 @@ class ReportList extends Component { {getLabel(111, "编辑")} {getLabel(77, "复制")} {getLabel(111, "删除")} + {getLabel(545781, "操作日志")} }> diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js index 3461e431..3666ec39 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js @@ -43,7 +43,7 @@ class Index extends Component { title: "", visible: false, typeKey: "", id: "" }, - logDialogVisible: false + logDialogVisible: false, filterConditions: "[]" }; } @@ -245,10 +245,13 @@ class Index extends Component { initTable && this.dimensionTableRef.dimensionList(); }); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -259,7 +262,7 @@ class Index extends Component { const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props; const { selectedKey, modalReq, slideReq, conditions, reportConditions, - reportName, keyword, year, logDialogVisible + reportName, keyword, year, logDialogVisible, filterConditions } = this.state; const buttons = selectedKey === "statistics" ? [ , @@ -303,9 +306,11 @@ class Index extends Component { ref={dom => this.reportListRef = dom} reportName={reportName} onEdit={this.handleReqBtnsClick} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} /> : this.employeeListRef = dom} keyword={keyword} year={year} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} /> } {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> ); diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index 6045ec6f..e6207394 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -166,14 +166,21 @@ class Calculate extends Component { } }); break; + case "log": + //操作日志 + this.onDropMenuClick(key, record.id); + break; default: break; } }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -181,7 +188,7 @@ class Calculate extends Component { }; render() { - const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible } = this.state; + const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions } = this.state; return ( } iconBgcolor="#F14A2D" buttons={this.renderCalculateOpts()} className="calculate-main-layout" showDropIcon @@ -202,7 +209,7 @@ class Calculate extends Component { }, () => bool === "refresh" && window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/calculate/${id}`))} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> {/* 归档进度条*/} { diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js index 626eba5b..eecfa1db 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js @@ -72,7 +72,8 @@ class Index extends Component { /> , render: (__, record) => { - const { operate = [] } = record; + const { operate: opts = [] } = record; + const operate = [...opts, { index: "log", text: getLabel(30586, "查看日志") }]; return { _.map(operate.slice(0, 2), f => ( diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js index 2395f7f1..cd8ec31a 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js @@ -5,8 +5,8 @@ * Date: 2023/2/24 */ import React, { Component } from "react"; -import { WeaTable } from "ecCom"; -import { message, Modal } from "antd"; +import { WeaLocaleProvider, WeaTable } from "ecCom"; +import { Dropdown, Menu, message, Modal } from "antd"; import { deleteAttendance, getAttendanceFieldSettingList, @@ -28,6 +28,8 @@ import SelectItemsWrapper from "../../../../components/selectItemsModal/selectIt import AttendanceRefrenceDataModal from "./attendanceRefrenceDataModal"; import AttendanceDataViewSlide from "./attendanceDataViewSlide"; +const getLabel = WeaLocaleProvider.getLabel; + class AttendanceDataComp extends Component { constructor(props) { super(props); @@ -364,7 +366,26 @@ class AttendanceDataComp extends Component { ); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js index 687c6482..fd9f744e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js @@ -5,13 +5,15 @@ * Date: 2023/2/24 */ import React, { Component } from "react"; -import { WeaCheckbox, WeaTable } from "ecCom"; +import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom"; import { Col, message, Row } from "antd"; import AttendanceCustomFieldsModal from "./attendanceCustomFieldsModal"; import { getAttendanceFieldList, updateAttendanceFieldStatus } from "../../../../apis/attendance"; import TipLabel from "../../../../components/TipLabel"; import { fieldsColumns } from "../columns"; +const getLabel = WeaLocaleProvider.getLabel; + class FieldMangComp extends Component { constructor(props) { super(props); @@ -71,7 +73,7 @@ class FieldMangComp extends Component { getColumns = () => { const { columns } = this.state; const { showOperateBtn } = this.props; - return _.map(_.filter(columns, item => !!item.display), child => ({ + return [..._.map(_.filter(columns, item => !!item.display), child => ({ ...child, render: (text, record) => { switch (child.dataIndex) { @@ -86,7 +88,13 @@ class FieldMangComp extends Component { return
; } } - })); + })), { + dataIndex: "options", + title: getLabel(30585, "操作"), + width: 120, + render: (_, record) => ( this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}) + }]; }; render() { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index 6172f5e0..7f4c67c1 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -24,7 +24,7 @@ class Index extends Component { super(props); this.state = { fieldName: "", selectedKey: "DATA", salaryMonth: [], - logDialogVisible: false + logDialogVisible: false, filterConditions: "[]" }; } @@ -68,10 +68,13 @@ class Index extends Component { visible: true, title: "引用考勤数据" }); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -79,7 +82,7 @@ class Index extends Component { }; render() { - const { selectedKey, salaryMonth, fieldName, logDialogVisible } = this.state; + const { selectedKey, salaryMonth, fieldName, logDialogVisible, filterConditions } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; const topTab = [ { title: "考勤数据", key: "DATA" }, @@ -119,18 +122,20 @@ class Index extends Component { ref={dom => this.attendanceTableRef = dom} showOperateBtn={showOperateBtn} salaryYearMonth={salaryMonth} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} /> : this.fieldMangRef = dom} showOperateBtn={showOperateBtn} fieldName={fieldName} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} /> }
{/*操作日志*/} this.setState({ logDialogVisible: false })}/> + onCancel={() => this.setState({ logDialogVisible: false })} filterConditions={filterConditions}/>
); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 98d9f374..5c3658fb 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -66,7 +66,8 @@ class Index extends Component { }, exportPayloadUrl: "", exportPayloadType: false, - advanceCondition: null + advanceCondition: null, + targetid: "" }; this.tableRef = null; this.addItemRef = null; @@ -358,7 +359,7 @@ class Index extends Component { const { id } = record; key === "handleAddData" ? getAddUpDeduction({ id }).then(({ status, data }) => { if (status) this[key]("编辑", data); - }) : this[key](record); + }) : key === "log" ? this.setState({ targetid: id }) : this[key](record); }; handleCloseSlide = () => { const { slidePayload } = this.state; @@ -540,7 +541,7 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn }, cumDeductStore: { form } } = this.props; const { declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, - importPayload, exportPayloadType + importPayload, exportPayloadType, targetid } = this.state; const tablePayload = { declareMonth: [declareMonth], taxAgentId }; return ( @@ -553,6 +554,7 @@ class Index extends Component { onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={importPayload} onImportFile={this.handleImportFile} onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()} + targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })} columns={modalColumns} > { if (status) this[key]("编辑", data); - }) : this.deleteSelectAddUpSituation(record); + }) : key === "log" ? this.setState({ targetid: id }) : this.deleteSelectAddUpSituation(record); }; /* * Author: 黎永顺 @@ -544,7 +545,7 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn }, cumSituationStore: { form } } = this.props; const { declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, - importPayload, year, exportPayloadType + importPayload, year, exportPayloadType, targetid } = this.state; const tablePayload = { taxYearMonth: `${year}-${declareMonth}`, year, taxAgentId }; return ( @@ -556,9 +557,9 @@ class Index extends Component { form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch} onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={{ ...importPayload, importOpts: { taxYearMonth: importPayload.importOpts.declareMonth } }} - onImportFile={this.handleImportFile} + onImportFile={this.handleImportFile} columns={situationModalColumns} onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()} - columns={situationModalColumns} + targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })} > this.tableRef = dom} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js index de207b22..742c7894 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js @@ -8,6 +8,9 @@ import React, { Component } from "react"; import UnifiedTable from "../../components/UnifiedTable"; import { getTableDate } from "../../apis/cumDeduct"; import { Menu, Popover } from "antd"; +import { WeaLocaleProvider } from "ecCom"; + +const getLabel = WeaLocaleProvider.getLabel; class DataTables extends Component { constructor(props) { @@ -118,6 +121,7 @@ class DataTables extends Component { placement="bottomRight" content={ onTableOperate(e, record)}> 删除 + {getLabel(545781, "操作日志")} } title=""> @@ -132,8 +136,19 @@ class DataTables extends Component { onTableOperate({ key: "handleAddData" }, record)}>编辑 - onTableOperate({ key: "deleteSelectAddUpDeduction" }, record)}>删除 + { + showOperateBtn && + onTableOperate(e, record)}> + {getLabel(545781, "操作日志")} + } title=""> + + + } } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js index 1cee5ed6..587f2785 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js @@ -22,7 +22,7 @@ class Layout extends Component { constructor(props) { super(props); this.state = { - showSearchAd: false, logDialogVisible: false + showSearchAd: false, logDialogVisible: false, filterConditions: "[]" }; } @@ -42,6 +42,15 @@ class Layout extends Component { */ window.open(nextProps.exportPayloadUrl, "_self"); } + if (nextProps.targetid !== this.props.targetid && nextProps.targetid) { + /* + * Author: 黎永顺 + * Description:操作日志 + * Params: + * Date: 2023/2/20 + */ + this.onDropMenuClick("log", nextProps.targetid); + } } componentWillUnmount() { @@ -52,10 +61,13 @@ class Layout extends Component { const { onResizeWindowInnerWidth } = this.props; onResizeWindowInnerWidth(window.innerWidth); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -63,12 +75,12 @@ class Layout extends Component { }; render() { - const { showSearchAd, logDialogVisible } = this.state; + const { showSearchAd, logDialogVisible, filterConditions } = this.state; const { title, btns, leftComp, children, taxAgentStore: { showOperateBtn }, slidePayload, onClose, onSave, slideLoading, form, condition, onAdSearch, onCancel, importPayload, onImportSetStep, onImportFile, - onPreviewImport, detailOptBtns, columns, logFunction + onPreviewImport, detailOptBtns, columns, logFunction, onClearTargrtid } = this.props; const { visible, title: subtitle, children: slideChildren } = slidePayload; const { @@ -143,8 +155,8 @@ class Layout extends Component { onClose={onClose} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> + this.setState({ logDialogVisible: false }, () => onClearTargrtid())}/>
); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 2795207c..208534b0 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -64,7 +64,8 @@ class Index extends Component { }, exportPayloadUrl: "", exportPayloadType: false, - advanceCondition: null + advanceCondition: null, + targetid: "" }; this.tableRef = null; this.addItemRef = null; @@ -190,7 +191,7 @@ class Index extends Component { const { id } = record; key === "handleAddData" ? getData({ id }).then(({ status, data }) => { if (status) this[key]("编辑", data); - }) : this.deleteSelectData(record); + }) : key === "log" ? this.setState({ targetid: id }) : this.deleteSelectData(record); }; /* * Author: 黎永顺 @@ -538,7 +539,7 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn }, otherDeductStore: { form } } = this.props; const { declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, - importPayload, exportPayloadType + importPayload, exportPayloadType, targetid } = this.state; const tablePayload = { declareMonth: [declareMonth], taxAgentId }; return ( @@ -551,6 +552,7 @@ class Index extends Component { onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={importPayload} onImportFile={this.handleImportFile} onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()} + targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })} columns={otherModalColumns} > { if (status) this[key]("编辑", data); - }) : this.specialAddDeductionDeleteSelectData(record); + }) : key === "log" ? this.setState({ targetid: id }) : this.specialAddDeductionDeleteSelectData(record); }; handleCloseSlide = () => { const { slidePayload } = this.state; @@ -449,7 +450,7 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn }, specialAddStore: { advanceForm } } = this.props; const { taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, importPayload, - exportPayloadType + exportPayloadType, targetid } = this.state; const tablePayload = { taxAgentId }; return ( @@ -462,6 +463,7 @@ class Index extends Component { onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport} importPayload={importPayload} onImportFile={this.handleImportFile} onPreviewImport={this.handlePreviewImport} detailOptBtns={[]} + targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })} columns={specialModalColumns} > {getLabel(83110, "查看详情")} + { + !showWithDrawBtn && this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + } { showWithDrawBtn && } + { + showWithDrawBtn && + + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + + + }> + + + } ; } } diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js index 51910f80..dfdc681e 100644 --- a/pc4mobx/hrmSalary/pages/declare/declare.js +++ b/pc4mobx/hrmSalary/pages/declare/declare.js @@ -31,7 +31,7 @@ class Calculate extends Component { ] }, isRefresh: false, declareDaialog: { visible: false, title: "" }, - logDialogVisible: false + logDialogVisible: false, filterConditions: "[]" }; this.handleDebounce = null; } @@ -59,10 +59,13 @@ class Calculate extends Component { ]; return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts; }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -70,7 +73,7 @@ class Calculate extends Component { }; render() { - const { queryParams, isRefresh, declareDaialog, logDialogVisible } = this.state; + const { queryParams, isRefresh, declareDaialog, logDialogVisible, filterConditions } = this.state; return ( } iconBgcolor="#F14A2D" buttons={this.renderCalculateOpts()} className="declare-main-layout" showDropIcon @@ -80,7 +83,8 @@ class Calculate extends Component { } ]}>
- + this.onDropMenuClick(type, targetid)}/> this.setState({ declareDaialog: { ...declareDaialog, visible: false }, @@ -88,7 +92,7 @@ class Calculate extends Component { })} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/>
diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js index 49319217..7a99295c 100644 --- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js +++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js @@ -24,7 +24,7 @@ class Index extends Component { constructor(props) { super(props); this.state = { - loading: false, logDialogVisible: false, + loading: false, logDialogVisible: false, filterConditions: "[]", selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, showSearchAd: false, @@ -104,10 +104,13 @@ class Index extends Component { } })); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -116,7 +119,7 @@ class Index extends Component { render() { const { - showSearchAd, externalPersonManagePayload, loading, logDialogVisible, + showSearchAd, externalPersonManagePayload, loading, logDialogVisible, filterConditions, pageInfo, selectedRowKeys, dataSource, externalPersonImportPayload } = this.state; const { @@ -197,6 +200,8 @@ class Index extends Component { this.handleAdd(id)} style={{ paddingRight: 8 }}>编辑 + this.onDropMenuClick("log", id)} + style={{ paddingRight: 8 }}>{getLabel(545781, "操作日志")} {/* this.handleDelete(id)}>删除*/} ) @@ -239,7 +244,7 @@ class Index extends Component { }
{/*操作日志*/} - this.setState({ logDialogVisible: false })}/> diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js index 87af593d..ad3cd14a 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js @@ -5,11 +5,13 @@ * Date: 2023/1/19 */ import React, { Component } from "react"; -import { WeaTable } from "ecCom"; +import { WeaLocaleProvider, WeaTable } from "ecCom"; import { inject, observer } from "mobx-react"; -import { Switch } from "antd"; +import { Dropdown, Menu, Switch } from "antd"; import { salaryFieldList } from "../../../apis/fieldManage"; +const getLabel = WeaLocaleProvider.getLabel; + @inject("taxAgentStore") @observer class FieldTable extends Component { @@ -75,6 +77,17 @@ class FieldTable extends Component { record.canDelete && (showSalaryItemBtn || showOperateBtn) && onDeleteLedger(record)}>删除 } + + + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + + + }> + + ; }; } else { diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js index f74f1288..65da711e 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js @@ -22,7 +22,7 @@ class FieldManagement extends Component { constructor(props) { super(props); this.state = { - searchVal: "", doSearch: false, logDialogVisible: false, + searchVal: "", doSearch: false, logDialogVisible: false, filterConditions: "[]", slideparams: { visible: false, title: "新建字段", @@ -69,10 +69,13 @@ class FieldManagement extends Component { } }); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -80,7 +83,7 @@ class FieldManagement extends Component { }; render() { - const { searchVal, doSearch, slideparams, logDialogVisible } = this.state; + const { searchVal, doSearch, slideparams, logDialogVisible, filterConditions } = this.state; const { taxAgentStore } = this.props; const { showSalaryItemBtn, showOperateBtn } = taxAgentStore; const btns = [ @@ -108,7 +111,9 @@ class FieldManagement extends Component { >
this.handleDeleteField([record.id])}/> + onDeleteLedger={(record) => this.handleDeleteField([record.id])} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} + /> this.setState({ @@ -121,7 +126,7 @@ class FieldManagement extends Component { onRefreshList={() => this.setState({ doSearch: !doSearch })} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/>
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js index 9f842e24..68f24fde 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js @@ -5,13 +5,15 @@ * Date: 2022/12/7 */ import React, { Component } from "react"; -import { WeaCheckbox, WeaTable } from "ecCom"; +import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom"; import { inject, observer } from "mobx-react"; import { Menu, message, Modal, Popover } from "antd"; import { changeLedgerStatus, deleteLedger, getLedgerList } from "../../../apis/ledger"; import CopyLedgerModal from "./copyLedgerModal"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; + @inject("taxAgentStore", "ledgerStore") @observer class LedgerTable extends Component { @@ -91,6 +93,7 @@ class LedgerTable extends Component { placement="bottomRight" content={ this.handleMenuClick(e, record)}> 删除 + {getLabel(545781, "操作日志")} } title=""> @@ -161,6 +164,9 @@ class LedgerTable extends Component { } }); break; + case "log": + this.props.onFilterLog(key, id); + break; default: break; } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.js b/pc4mobx/hrmSalary/pages/ledgerPage/index.js index b172e312..d053ae3b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/index.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.js @@ -22,7 +22,7 @@ class Index extends Component { constructor(props) { super(props); this.state = { - searchVal: "", doSearch: false, logDialogVisible: false, + searchVal: "", doSearch: false, logDialogVisible: false, filterConditions: "[]", slideparams: { visible: false, title: "新建账套", @@ -53,10 +53,13 @@ class Index extends Component { } }); }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -64,7 +67,7 @@ class Index extends Component { }; render() { - const { logDialogVisible, doSearch, slideparams } = this.state; + const { logDialogVisible, filterConditions, doSearch, slideparams } = this.state; const { taxAgentStore } = this.props; const { showOperateBtn } = taxAgentStore; const btns = [ @@ -87,14 +90,15 @@ class Index extends Component { ]} >
- + this.onDropMenuClick(type, targetid)}/> this.setState({ doSearch: !doSearch })} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/>
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js index d13cd2fe..5defd410 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/SalaryAdjustmentRecords/index.js @@ -44,7 +44,12 @@ class Index extends Component { const { columns, list: dataSource, pageNum: current, pageSize, total } = data; this.setState({ dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, - columns: _.map(columns, it => ({ ...it, width: 150 })) + columns: [..._.map(columns, it => ({ ...it, width: 150 })), { + dataIndex: "options", + title: getLabel(30585, "操作"), + width: 120, render: (_, record) => ( this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}) + }] }); } }).catch(() => this.setState({ loading: false })); diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js index 4c882560..385cdf51 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js @@ -83,9 +83,13 @@ class Index extends Component { dataIndex: "options", title: getLabel(30585, "操作"), width: 120, - render: (_, record) => ({getLabel(33564, "查看")}) + render: (_, record) => ( + {getLabel(33564, "查看")} + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + ) }]} /> ); diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js index cef2bb12..f7323c48 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js @@ -19,7 +19,7 @@ class Index extends Component { constructor(props) { super(props); this.state = { - selectedKey: "1", logDialogVisible: false, + selectedKey: "1", logDialogVisible: false, filterConditions: "[]", salaryYearMonth: [ moment().subtract(1, "year").startOf("year").format("YYYY-MM"), moment().endOf("year").format("YYYY-MM") @@ -32,20 +32,24 @@ class Index extends Component { let Dom = null; switch (selectedKey) { case "1": - Dom = ; + Dom = this.onDropMenuClick(type, targetid)}/>; break; case "2": - Dom = ; + Dom = this.onDropMenuClick(type, targetid)}/>; break; default: break; } return Dom; }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -53,7 +57,7 @@ class Index extends Component { }; render() { - const { selectedKey, salaryYearMonth, logDialogVisible } = this.state; + const { selectedKey, salaryYearMonth, logDialogVisible, filterConditions } = this.state; const tabs = [ { key: "1", title: getLabel(111, "工资单") }, { key: "2", title: getLabel(543150, "调薪记录") } @@ -82,7 +86,7 @@ class Index extends Component { > {this.renderContent()} {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> ); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js index bf3cfc17..90c6938c 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js @@ -109,6 +109,9 @@ class Index extends Component { } }); break; + case "log": + this.props.onFilterLog(id, params.record.id); + break; default: break; } @@ -143,7 +146,8 @@ class Index extends Component { "删除待办": getLabel(543181, "删除待办"), "查看": getLabel(33564, "查看"), "取消停薪": getLabel(543309, "取消停薪"), "共": getLabel(18609, "共"), "条": getLabel(18256, "条"), "设为发薪人员": getLabel(543308, "设为发薪人员"), - "停薪": getLabel(542692, "停薪"), "编辑": getLabel(501169, "编辑") + "停薪": getLabel(542692, "停薪"), "编辑": getLabel(501169, "编辑"), + "操作日志": getLabel(545781, "操作日志") }; const childFrameObj = document.getElementById("atdTable"); childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js index eaaf5a24..3306e038 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js @@ -30,7 +30,7 @@ class SalaryFiles extends Component { selectedKey: "pending", showSearchAd: false, isQuery: false, showDelSalaryFileBtn: false, topTabCount: { PENDING: 0, FIXED: 0, SUSPEND: 0, STOP: 0, EXT: 0 }, showExtEmpsWitch: false, salaryFileImpDialog: { visible: false, title: getLabel(24023, "数据导入"), importType: "", isExtEmp: false }, - salaryImportTypes: [], logDialogVisible: false + salaryImportTypes: [], logDialogVisible: false, filterConditions: "" }; this.salaryFileListRef = null; } @@ -49,11 +49,14 @@ class SalaryFiles extends Component { handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true }); handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery }); onAdSearch = () => this.setState({ showSearchAd: false, isQuery: !this.state.isQuery }); - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { const { state, handleSalaryOpts } = this.salaryFileListRef.wrappedInstance || {}; switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; case "custom_cols": const { payrollFilesStore: { tableStore } } = this.props; @@ -229,7 +232,7 @@ class SalaryFiles extends Component { render() { const { selectedKey, topTabCount, showSearchAd, isQuery, showDelSalaryFileBtn, showExtEmpsWitch, - salaryFileImpDialog, salaryImportTypes, logDialogVisible + salaryFileImpDialog, salaryImportTypes, logDialogVisible, filterConditions } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; return ( @@ -260,9 +263,10 @@ class SalaryFiles extends Component { selectedKey={selectedKey} showOperateBtn={showOperateBtn} showDelSalaryFileBtn={showDelSalaryFileBtn} onChangeTopTabCount={this.queryInsuranceTabTotal} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> {/* 导入*/} { salaryAcctType === 1 && - 补发 + {getLabel(388064, "补发")} } {`${getLabel(15323, "第")}${acctTimes}${getLabel(18929, "次")}`} @@ -90,6 +90,9 @@ class Index extends Component { message.warning(getLabel(543602, "请设置默认模板")); } break; + case "log": + this.props.onFilterLog(key, id); + break; default: break; } @@ -140,11 +143,17 @@ class Index extends Component { style={{ marginRight: 10 }} target="_blank" >{getLabel(83110, "查看详情")} } + { + !canSeeDetail && + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + } { sendNum !== sendTotal && !showGrant && this.handleOpts(e, record)}> {getLabel(543603, "更新模板")} + {getLabel(545781, "操作日志")} } > diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js index cb9c2402..47fe8228 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js @@ -115,6 +115,9 @@ class Index extends Component { } }); break; + case "log": + this.props.onFilterLog(key, id); + break; default: break; } @@ -165,6 +168,7 @@ class Index extends Component { this.handleOpts(e, record)}> {getLabel(535052, "删除")} + {getLabel(545781, "操作日志")} } > diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/index.js index 362a621e..ebc36b4e 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.js @@ -32,7 +32,7 @@ class Index extends Component { moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).endOf("year").format("YYYY-MM") ] - }, logDialogVisible: false + }, logDialogVisible: false, filterConditions: "[]" }; this.templateRef = null; this.baseSetRef = null; @@ -93,11 +93,13 @@ class Index extends Component { onUpdateTemp={(id) => this.setState({ selectedKey: "template" }, () => { this.templateRef.wrappedInstance.handleOpts({ key: "edit" }, { id }); })} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} />; break; case "template": dom = this.templateRef = dom} queryParams={queryParams} - isRefresh={isRefresh} forceUpdate={() => this.forceUpdate()}/>; + isRefresh={isRefresh} forceUpdate={() => this.forceUpdate()} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>; break; case "watermark": dom = { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -121,7 +126,7 @@ class Index extends Component { }; render() { - const { selectedKey, queryParams, logDialogVisible } = this.state; + const { selectedKey, queryParams, logDialogVisible, filterConditions } = this.state; const tabs = [ { key: "grant", title: getLabel(538012, "工资单发放") }, { key: "template", title: getLabel(543575, "工资单模板设置") }, @@ -148,7 +153,7 @@ class Index extends Component {
{this.renderContent()}
{/*操作日志*/} this.setState({ logDialogVisible: false })}/> + onCancel={() => this.setState({ logDialogVisible: false })} filterConditions={filterConditions}/> ); diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index d808d539..edfebb4c 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -29,7 +29,7 @@ export default class SalaryItem extends React.Component { searchParams: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [], syncSalarySetDialog: { visible: false, title: "", id: "" }, - logDialogVisible: false + logDialogVisible: false, filterConditions: "[]" }; columns.map(item => { if (item.dataIndex == "refere") { @@ -136,8 +136,10 @@ export default class SalaryItem extends React.Component { render: (text, record) => { return ( - this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"} + this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"} + this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")} { (record.canDelete && (showSalaryItemBtn || showOperateBtn)) && { + + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -210,7 +216,7 @@ export default class SalaryItem extends React.Component { taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentOption } } = this.props; const { userStatusList } = salaryFileStore; - const { selectedRowKeys, logDialogVisible } = this.state; + const { selectedRowKeys, logDialogVisible, filterConditions } = this.state; const { loading, deleteItemRequest, getTableDatas } = salaryItemStore; const { tableDataSource, @@ -403,7 +409,7 @@ export default class SalaryItem extends React.Component { })} /> {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> { systemItemVisible && diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js index c5d90a68..550dd048 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js @@ -105,6 +105,9 @@ class WelfareRecordList extends Component { } }); break; + case "log": + this.props.onFilterLog(id, params.id); + break; default: break; } @@ -117,7 +120,7 @@ class WelfareRecordList extends Component { "未归档": getLabel(17999, "已归档"), "操作": getLabel(30585, "操作"), "核算": getLabel(538780, "核算"), "归档": getLabel(251, "归档"), "查看": getLabel(33564, "查看"), "重新核算": getLabel(542637, "重新核算"), - "删除": getLabel(535052, "删除") + "删除": getLabel(535052, "删除"), "操作日志": getLabel(545781, "操作日志") }; const childFrameObj = document.getElementById("unitTable"); childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); @@ -136,7 +139,8 @@ class WelfareRecordList extends Component { pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns }, () => this.postMessageToChild({ - scrollHeight: 108, dataSource, columns, pageInfo: this.state.pageInfo, showOperateBtn + scrollHeight: 108, dataSource, columns, pageInfo: this.state.pageInfo, showOperateBtn, + unitTableType: "welfareRecord" })); } }).catch(() => this.setState({ loading: false })); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js index d8fa8cc0..f4089c44 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js @@ -34,7 +34,7 @@ class StandingBook extends Component { taxAgents: "" }, progressVisible: false, progress: 0, accountDialog: { visible: false, title: "", loading: false, options: [] }, - logDialogVisible: false + logDialogVisible: false, filterConditions: "[]" }; this.wfListRef = null; this.timer = null; @@ -104,10 +104,13 @@ class StandingBook extends Component { }); } }; - onDropMenuClick = (key) => { + onDropMenuClick = (key, targetid = "") => { switch (key) { case "log": - this.setState({ logDialogVisible: true }); + this.setState({ + logDialogVisible: true, + filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]" + }); break; default: break; @@ -115,7 +118,7 @@ class StandingBook extends Component { }; render() { - const { accountDialog, queryForm, logDialogVisible } = this.state; + const { accountDialog, queryForm, logDialogVisible, filterConditions } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; const rightBtns = [, + + ]} + bottomLeft={ + + + + + } + > + { + + { + !_.isEmpty(dataSource) ? + _.map(dataSource, it => { + const { fieldId, salaryItemName, checked } = it; + return + this.setState({ itemsCheckeds: _.xorWith(itemsCheckeds, [fieldId], _.isEqual) })}/> + ; + }) : 暂无数据 + } + + } + + ); + } +} + +export default ImportHeaderSetDialog; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less index 2ceecea0..235eba25 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less @@ -290,3 +290,21 @@ } } } + +//导入头部设置 +.headerSetWrapper { + .ant-modal-body { + .ant-row { + padding: 16px 25px; + } + } + + .ant-col-8 { + padding: 0 8px !important; + } + + .wea-content { + padding: 8px 16px 0; + } +} + diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js index 057f8379..9ff5fb28 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js @@ -13,15 +13,23 @@ import * as API from "../../../../apis/standingBook"; import { calcPageNo } from "../../../../util"; import RegList from "./regList"; import RegEditDetial from "./regEditDetial"; -import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal"; import AddCompensationPersonnelDialog from "./addCompensationPersonnelDialog"; +import StandingBookCalcImportDialog from "./standingBookCalcImportDialog"; import "./index.less"; class MakeupDifference extends Component { constructor(props) { super(props); this.state = { - selectKey: [], fieldData: {}, loading: { save: false }, importDiffModal: { visible: false }, + selectKey: [], loading: { save: false }, + importDiffModal: { + visible: false, + fieldUrl: "getBalanceWelfareList", + tmpUrl: "exportSiaccountWelfarebalanceimporttemplatetetemplate", + cacheUrl: "cacheBalanceWelfareList", + importUrl: "importBalanceInsuranceDetail", + importparams: {} + }, returnEditPersonSlide: { title: "", editId: "", visible: false }, @@ -65,7 +73,12 @@ class MakeupDifference extends Component { }); break; case "import": - this.setState({ importDiffModal: { ...importDiffModal, visible: true } }); + this.setState({ + importDiffModal: { + ...importDiffModal, visible: true, + importparams: { billMonth: getQueryString("billMonth") } + } + }); break; case "export": const url = `${window.location.origin}/api/bs/hrmsalary/welfare/balance/export?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`; @@ -103,7 +116,7 @@ class MakeupDifference extends Component { render() { const billMonth = getQueryString("billMonth"); - const { selectKey, importDiffModal, fieldData, returnEditPersonSlide, addPersonalDialog } = this.state; + const { selectKey, importDiffModal, returnEditPersonSlide, addPersonalDialog } = this.state; return (
isRefresh && this.diffListRef.recessionList())} /> {/*导入补差*/} - { - importDiffModal.visible && - this.setState({ fieldData })} - onCancel={() => { - this.setState({ importDiffModal: { ...importDiffModal, visible: false }, fieldData: {} }, () => { - const name = this.regTopRef.state.name; - this.diffListRef.recessionList({ userName: name }); - }); - }} - isStandingBook - standingBookType="difference" - /> - } + this.setState({ + importDiffModal: { ...importDiffModal, visible: false } + }, () => isInit && this.diffListRef.recessionList())}/>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 2fe404a5..45f1a728 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -11,7 +11,7 @@ import { WeaFormItem, WeaInput, WeaSearchGroup, WeaTab } from "ecCom"; import { calcPageNo } from "../../../../util"; import { getQueryString } from "../../../../util/url"; import ProgressModal from "../../../../components/progressModal"; -import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal"; +import StandingBookCalcImportDialog from "./standingBookCalcImportDialog"; import AdjustmentSlide from "./adjustmentSlide"; import { getCalculateProgress } from "../../../../apis/calculate"; import RegEditDetial from "./regEditDetial"; @@ -48,7 +48,8 @@ export default class NormalIndex extends Component { progress: 0, fieldData: {}, //选中的表单头信息 importParams: { //导入信息的弹框表示 - visible: false + visible: false, fieldUrl: "getWelfareList", tmpUrl: "exportSiaccountWelfareImporttemplate", + cacheUrl: "cacheWelfareListField", importUrl: "importInsuranceAcctDetail", importparams: {} }, returnEditPersonSlide: { title: "", @@ -473,7 +474,12 @@ export default class NormalIndex extends Component { ]; const btn4 = [ + onClick={() => this.setState({ + importParams: { + ...importParams, visible: true, + tmpUrl: selectedKey === "1" ? "exportSiaccountWelfareImporttemplate" : "exportSiaccountWelfaresupplyimporttemplatetemplate" + } + })}>导入数据 ]; const btn5 = [ @@ -544,29 +550,10 @@ export default class NormalIndex extends Component { progress={this.state.progress} /> {/*导入弹框*/} - { - importParams.visible && - { - this.setState({ - fieldData - }); - }} - onCancel={() => { - this.setState({ importParams: { ...importParams, visible: false }, fieldData: {} }, () => { - const { billMonth, selectedKey, paymentOrganization } = this.props; - const { current } = this.state; - selectedKey === "1" - ? this.getNormalList({ billMonth, current, paymentOrganization }) - : this.getSupplementaryList({ billMonth, current, paymentOrganization }); - }); - }} - isStandingBook - standingBookTabKey={selectedKey} - /> - } + this.setState({ + importParams: { ...importParams, visible: false } + }, () => isInit && this.handleSearch())}/> {/* table */}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js new file mode 100644 index 00000000..0dc97e42 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js @@ -0,0 +1,136 @@ +/* + * Author: 黎永顺 + * name: 社保福利台账-核算-导入 + * Description: + * Date: 2024/3/5 + */ +import React, { Component } from "react"; +import { WeaLocaleProvider } from "ecCom"; +import { Badge, Button, message } from "antd"; +import ImportDialog from "../../../../components/importDialog"; +import ImportHeaderSetDialog from "./importHeaderSetDialog"; +import * as API from "../../../../apis/standingBook"; +import { getQueryString } from "../../../../util/url"; + +const getLabel = WeaLocaleProvider.getLabel; + +class StandingBookCalcImportDialog extends Component { + constructor(props) { + super(props); + this.state = { + headerFieldsDialog: { visible: false, itemsByGroup: [], selectItems: [] }, + importDialog: { + visible: false, title: "", nextloading: false, + link: null, importResult: {}, imageId: "", + previewUrl: "/api/bs/hrmsalary/siaccount/welfare/preview" + } + }; + } + + async componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.visible !== this.props.visible && nextProps.visible) { + const { fieldUrl } = nextProps; + const { data } = await API[fieldUrl](); + this.setState({ + importDialog: { + ...this.state.importDialog, link: this.handleExportTemp, title: getLabel(24023, "数据导入") + }, + headerFieldsDialog: { + ...this.state.headerFieldsDialog, itemsByGroup: data, + selectItems: _.map(_.filter(data, k => k.checked), o => o.fieldId) + } + }); + } + this.setState({ importDialog: { ...this.state.importDialog, visible: nextProps.visible } }); + } + + handleImport = (payload) => { + const { importDialog, headerFieldsDialog: { selectItems } } = this.state; + if (_.isEmpty(selectItems)) { + message.error(getLabel(111, "请选择表头字段")); + } else { + const { importUrl, importparams = {} } = this.props; + this.setState({ importDialog: { ...importDialog, nextloading: true } }); + API[importUrl]({ ...payload, ...importparams }).then(({ data, status, errormsg }) => { + this.setState({ importDialog: { ...importDialog, nextloading: false } }); + if (status) { + this.setState({ + importDialog: { ...importDialog, ...payload, importResult: data } + }); + } else { + message.warning(errormsg); + } + }).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } })); + } + }; + handleExportTemp = () => { + const { tmpUrl } = this.props; + const { headerFieldsDialog: { selectItems, itemsByGroup } } = this.state; + if (_.isEmpty(selectItems)) { + message.error(getLabel(111, "请选择表头字段")); + } else { + const billMonth = getQueryString("billMonth"); + const paymentOrganization = getQueryString("paymentOrganization"); + const payload = { + billMonth, + welfareNames: _.map(_.filter(itemsByGroup, k => selectItems.includes(k.fieldId)), o => o.salaryItemName), + paymentOrganization: Number(paymentOrganization) + }; + const promise = API[tmpUrl](payload); + } + }; + handleSelectedField = () => { + this.setState({ + headerFieldsDialog: { + ...this.state.headerFieldsDialog, visible: true + } + }); + }; + /* + * Author: 黎永顺 + * Description:表单选项 + * Params: + * Date: 2023/9/18 + */ + renderFormComponent = () => { + const { selectItems } = this.state.headerFieldsDialog; + return
+ + + +
; + }; + + render() { + const { importDialog, headerFieldsDialog } = this.state; + const { cacheUrl } = this.props; + return ( + + this.setState(({ + importDialog: { ...importDialog, importResult: {}, imageId: "" } + }))} + nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })} + nextUplaodCallback={imageId => this.handleImport({ imageId })} + /> + {/*表头设置*/} + this.setState({ + headerFieldsDialog: { ...headerFieldsDialog, visible: false } + })} + onAdd={selectItems => this.setState({ + headerFieldsDialog: { ...headerFieldsDialog, visible: false, selectItems } + }, () => { + const { selectItems: welfareNames } = this.state.headerFieldsDialog; + const promise = API[cacheUrl]({ welfareNames }); + })} + /> + + ); + } +} + +export default StandingBookCalcImportDialog; From 87d699c59de4322524ae708639e94b34a595cc61 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, 6 Mar 2024 14:04:47 +0800 Subject: [PATCH 23/24] =?UTF-8?q?feature/2.10.1.2402.01-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=85=A5=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standingBookDetail/components/importHeaderSetDialog.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/importHeaderSetDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/importHeaderSetDialog.js index 3dd17ed2..2fe7cb3d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/importHeaderSetDialog.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/importHeaderSetDialog.js @@ -22,6 +22,8 @@ class ImportHeaderSetDialog extends Component { componentWillReceiveProps(nextProps, nextContext) { if (nextProps.visible !== this.props.visible && nextProps.visible) { this.setState({ itemsCheckeds: nextProps.selectItems }); + } else { + this.setState({ itemsCheckeds: [], showOnlyChecked: false }); } } From fce72a71fce21b9d38bb54f15df7407380fbf651 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, 6 Mar 2024 14:33:28 +0800 Subject: [PATCH 24/24] hotfix/2.10.1.2402.01 --- .../hrmSalary/pages/payroll/templateBaseSettings.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index d8a1eeb2..ace92ee2 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -70,8 +70,15 @@ class TemplateBaseSettings extends Component { }; salaryBillBaseSetSave = () => { const { watermark, watermarkStatus, wmSetting, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; - const { feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting; - if (!feedBackUrl || !mobileFeedbackUrl) { + const { feedBackUrl, mobileFeedbackUrl, feedbackStatus, autoAckDays, ackStatus } = ackFeedbackSetting; + if (ackStatus === "1" && _.isNil(autoAckDays)) { + Modal.warning({ + title: getLabel(111, "信息确认"), + content: getLabel(111, "必要信息不完整，红色*为必填项！") + }); + return; + } + if (feedbackStatus === "1" && (!feedBackUrl || !mobileFeedbackUrl)) { Modal.warning({ title: getLabel(111, "信息确认"), content: getLabel(111, "必要信息不完整，红色*为必填项！")