diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
index c9d85ff8..5b2ca302 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
@@ -11,15 +11,16 @@ class AllWithoutPay extends Component {
message.warning("未选择条目");
return;
}
- API.gotoStop(selectedRowKeys).then(({ status, errormsg }) => {
+ API.gotoStop(selectedRowKeys).then(({ status, data, errormsg }) => {
if (status) {
- message.success("操作成功!");
+ const { msg } = data;
+ message.info(msg || "操作成功!");
refreshList();
} else {
message.error(errormsg || "操作失败!");
}
});
- }else{
+ } else {
const { pageInfo } = this.props;
if (pageInfo.total === 0) {
message.warning("您没有需要处理的待停薪人员！");
@@ -31,7 +32,7 @@ class AllWithoutPay extends Component {
onOk: () => {
API.allGotoStop({}).then(({ status, data, errormsg }) => {
if (status) {
- const { msg }= data;
+ const { msg } = data;
message.info(msg || "操作成功!");
refreshList();
} else {
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
index 103793c3..9d141953 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
@@ -152,6 +152,195 @@ export const condition = [
defaultshow: true
}
];
+export const shareCondition = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ checkbox: false,
+ checkboxValue: false,
+ conditionType: "SELECT",
+ domkey: ["reportIds"],
+ fieldcol: 12,
+ label: "分享报表",
+ lanId: 111,
+ labelcol: 6,
+ options: [],
+ multiple: true,
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ checkbox: false,
+ checkboxValue: false,
+ conditionType: "INPUT",
+ domkey: ["pushTitle"],
+ fieldcol: 18,
+ label: "主题",
+ lanId: 111,
+ labelcol: 6,
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ type: "17",
+ viewAttr: 3
+ },
+ colSpan: 1,
+ conditionType: "BROWSER",
+ domkey: ["sharedBy"],
+ fieldcol: 14,
+ isQuickSearch: false,
+ label: "被分享人",
+ lanId: 111,
+ labelcol: 6,
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ colSpan: 2,
+ conditionType: "DATEPICKER",
+ domkey: ["startTime"],
+ fieldcol: 12,
+ label: "报表查看有效开始时间",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 2,
+ conditionType: "DATEPICKER",
+ domkey: ["endTime"],
+ fieldcol: 12,
+ label: "报表查看有效结束时间",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ checkbox: false,
+ checkboxValue: false,
+ conditionType: "INPUT",
+ domkey: ["mark"],
+ fieldcol: 18,
+ label: "分享说明",
+ lanId: 111,
+ labelcol: 6,
+ viewAttr: 2
+ }
+ // {
+ // colSpan: 1,
+ // conditionType: "SWITCH",
+ // domkey: ["remind"],
+ // fieldcol: 12,
+ // isQuickSearch: false,
+ // label: "已查看提醒",
+ // lanId: 111,
+ // labelcol: 6,
+ // viewAttr: 2
+ // }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
+export const sharePersonCondition = [
+ {
+ items: [
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ type: "17",
+ viewAttr: 3
+ },
+ colSpan: 1,
+ conditionType: "BROWSER",
+ domkey: ["sharedBy"],
+ fieldcol: 14,
+ isQuickSearch: false,
+ label: "被分享人",
+ lanId: 111,
+ labelcol: 6,
+ rules: "required|string",
+ viewAttr: 3
+ }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
+export const shareLogCondition = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["reportName"],
+ fieldcol: 12,
+ label: "分享报表",
+ lanId: 111,
+ labelcol: 6,
+ viewAttr: 1
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["effectiveTime"],
+ fieldcol: 12,
+ label: "报表查看有效时间",
+ lanId: 111,
+ labelcol: 6,
+ viewAttr: 1
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["remark"],
+ fieldcol: 12,
+ label: "分享说明",
+ lanId: 111,
+ labelcol: 6,
+ viewAttr: 1
+ }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
const colorList = ["#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81"];
export const mapBarOptions = (params) => ({
@@ -292,7 +481,7 @@ export const mapBarOptions = (params) => ({
{
type: "slider",
show: true,
- bottom: 20,
+ bottom: 20
}
]
});
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
index f87d7912..49f5a462 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
@@ -269,7 +269,7 @@ class CustomStatisticsItemsModal extends Component {
render() {
const { loading, columns, dataSource, formData } = this.state;
const { itemName, itemValue, itemValueSpan } = formData;
- const { statisticsItemId } = this.props;
+ const { statisticsItemId, isShare } = this.props;
const cols = _.map(columns, it => {
const { text, column } = it;
if (column === "ruleName" || column === "ratio" || column === "m2m" || column === "y2y") {
@@ -278,6 +278,7 @@ class CustomStatisticsItemsModal extends Component {
...it,
title:
!!child[`${key}Value`])}
onChange={val => this.handleChangeColumnAllChecked(`${key}Value`, val)}
/>
@@ -286,6 +287,7 @@ class CustomStatisticsItemsModal extends Component {
render: (txt, record) => {
return
this.handleChangeColumnCheckBox(`${key}Value`, val, record.id)}
/>
@@ -305,6 +307,7 @@ class CustomStatisticsItemsModal extends Component {
,
render: (txt, record) => {
return !!record["m2mValue"] && this.handleChangeColumnM2MValue(`${column.replace("Limit", "")}${type === "min" ? "LowerLimit" : "UpperLimit"}`, val, record.id)}
@@ -321,6 +324,7 @@ class CustomStatisticsItemsModal extends Component {
,
render: (txt, record) => {
return !!record["y2yValue"] &&
this.handleChangeColumnM2MValue(`${column.replace("Limit", "")}${type === "min" ? "LowerLimit" : "UpperLimit"}`, val, record.id)}
@@ -335,8 +339,10 @@ class CustomStatisticsItemsModal extends Component {
title={
{statisticsItemId ? getLabel(111, "编辑自定义统计项目") : getLabel(111, "新建自定义统计项目")}
-
+ {
+ !isShare &&
+ }
}
style={{ width: 900, height: 450 }}
@@ -348,7 +354,7 @@ class CustomStatisticsItemsModal extends Component {
({
@@ -381,7 +387,7 @@ class CustomStatisticsItemsModal extends Component {
- this.setState({ formData: { ...formData, itemName } })}/>
@@ -406,11 +412,11 @@ export default CustomStatisticsItemsModal;
* Date: 2023/4/23
*/
const IntervalSettingsComp = (props) => {
- const { LowerLimit, UpperLimit, onChange } = props;
+ const { LowerLimit, UpperLimit, onChange, isShare } = props;
return
- onChange("min", val)}/>
+ onChange("min", val)} disabled={isShare}/>
{`% <${getLabel(111, "增幅")}<`}
- onChange("max", val)}/>
+ onChange("max", val)} disabled={isShare}/>
%
;
};
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/index.less b/pc4mobx/hrmSalary/pages/reportView/components/index.less
index 322df827..d77aab7f 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/index.less
+++ b/pc4mobx/hrmSalary/pages/reportView/components/index.less
@@ -63,3 +63,134 @@
height: 100%;
}
}
+
+.shareDialogWrapper {
+ .wea-dialog-body {
+ background: #f6f6f6;
+ overflow-y: hidden;
+ }
+
+ .wea-search-group {
+ border: 1px solid #e5e5e5;
+ border-bottom: none;
+ background: #FFF;
+ }
+
+ .wea-search-group, .wea-content, .wea-form-cell {
+ padding: 0;
+ }
+
+ .wea-form-item {
+ padding: 8px 16px;
+ border-bottom: 1px solid #e5e5e5;
+ }
+
+ .wea-select, .ant-select, .ant-select-selection {
+ width: 100%;
+ }
+
+ .wea-select .wea-select-input .arrow {
+ position: absolute;
+ right: 4px;
+ top: 8px;
+ color: #666;
+ }
+
+ .wea-select .wdb {
+ word-break: break-all !important;
+ word-wrap: break-word !important;
+ }
+
+ .wea-select .wea-select-input {
+ height: 30px;
+ white-space: nowrap;
+ min-width: 100px;
+ max-width: 345px;
+ width: 100%;
+ display: inline-block;
+ padding: 4px 17px 4px 4px;
+ position: relative;
+ min-height: 30px;
+ border: 1px solid #d9d9d9;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ -o-text-overflow: ellipsis;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
+ .shareLogGroupWrapper {
+ margin-top: 16px;
+
+ .logtitleHeader {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .right {
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+}
+
+.shareRecordWrapper {
+ z-index: 111;
+
+ .wea-slide-modal-title {
+ height: auto !important;
+ line-height: normal !important;
+ }
+
+ .titleDialog {
+ display: flex;
+ padding: 10px 16px 10px 0;
+ position: relative;
+ background-color: #FFF;
+ border-bottom: 1px solid #e5e5e5;
+
+ .titleCol {
+ flex: 1;
+
+ .titleLeftBox {
+ display: flex;
+ height: 100%;
+ align-items: center;
+ padding-left: 16px;
+
+ .titleIcon {
+ color: #fff;
+ margin: 0;
+ width: 40px;
+ height: 40px;
+ line-height: 40px;
+ font-size: 22px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #F14A2D;
+ border-radius: 50%;
+ }
+
+ .title {
+ font-size: 14px;
+ color: #333;
+ padding-left: 6px;
+ }
+ }
+ }
+ }
+
+ .ant-table-tbody {
+ & > tr {
+ & > td {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
index 4af04328..801bb99e 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
@@ -35,8 +35,8 @@ class PovitpivotChartModal extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
- const { id, dimensionId, dimensionValue } = nextProps;
- this.getDataPerspective({ id, dimensionId, dimensionValue });
+ const { id, dimensionId, dimensionValue, isShare } = nextProps;
+ this.getDataPerspective({ id, dimensionId, dimensionValue, isShare });
} else {
this.setState({
dataSource: [],
@@ -63,13 +63,11 @@ class PovitpivotChartModal extends Component {
});
} else if (type === "turn") {
if (id === "PAGEINFO") {
- const { id, dimensionId, dimensionValue } = this.props;
+ const { id, dimensionId, dimensionValue, isShare } = this.props;
const { pageNum: current, size: pageSize } = params;
this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () =>
this.getDataPerspective({
- id,
- dimensionId,
- dimensionValue
+ id, dimensionId, dimensionValue, isShare
}));
}
}
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index e87e1eed..70980238 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -26,7 +26,7 @@ class ReportContent extends Component {
chartsType: "0",
chartsInfo: {},
povitView: {
- visible: false, id: "",
+ visible: false, id: "", isShare: false,
dimensionId: "", dimensionValue: ""
},
rangSet: {
@@ -43,7 +43,7 @@ class ReportContent extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.report !== this.props.report && nextProps.report.dimensionId) {
- this.reportStatisticsReportGetData(nextProps.report.id, nextProps.report.dimensionId);
+ this.reportStatisticsReportGetData(nextProps.report.id, nextProps.report.dimensionId, nextProps.report.isShare);
this.setState({ viewType: "dataView", chartsInfo: {} });
}
}
@@ -65,10 +65,10 @@ class ReportContent extends Component {
if (id === "PIVOTCHART") {
const { record } = params;
const { dimension: dimensionValue } = record;
- const { id: pivotId, dimensionId } = this.props.report;
+ const { id: pivotId, dimensionId, isShare } = this.props.report;
this.setState({
povitView: {
- visible: true, id: pivotId, dimensionId, dimensionValue
+ visible: true, id: pivotId, dimensionId, dimensionValue, isShare
}
});
}
@@ -81,8 +81,8 @@ class ReportContent extends Component {
dataSource, columns, showSum, countResult
}), "*");
};
- reportStatisticsReportGetData = (id, dimensionId) => {
- const payload = { id, dimensionId };
+ reportStatisticsReportGetData = (id, dimensionId, isShare) => {
+ const payload = { id, dimensionId, isShare };
this.setState({ loading: true });
reportStatisticsReportGetData(payload).then(({ status, data }) => {
this.setState({ loading: false });
@@ -191,13 +191,13 @@ class ReportContent extends Component {
handleChangeChartOpts = (chartsType, viewType) => {
this.setState({ chartsInfo: {} });
if (this.refs.chart && viewType !== "setting" && viewType !== "dataView" && !this.state.rangSet.visible) this.refs.chart.clear();
- const { report: { id: reportId, dimensionId } } = this.props;
+ const { report: { id: reportId, dimensionId, isShare } } = this.props;
const { rangSet } = this.state;
viewType !== "setting" && this.setState({ chartsType, viewType }, () => {
const { viewType, chartsType } = this.state;
viewType !== "dataView" ?
this.queryRangeSetting({ reportId, chartsType }, true) :
- this.reportStatisticsReportGetData(reportId, dimensionId);
+ this.reportStatisticsReportGetData(reportId, dimensionId, isShare);
});
viewType === "setting" && this.setState({ rangSet: { ...rangSet, visible: true, reportId } }, () => {
this.queryRangeSetting({ reportId, chartsType });
@@ -213,8 +213,8 @@ class ReportContent extends Component {
};
handleGetData = () => {
const { report } = this.props;
- const { id, dimensionId } = report;
- this.setState({ viewType: "dataView" }, () => this.reportStatisticsReportGetData(id, dimensionId));
+ const { id, dimensionId, isShare } = report;
+ this.setState({ viewType: "dataView" }, () => this.reportStatisticsReportGetData(id, dimensionId, isShare));
};
renderCharts = () => {
const { chartsInfo, viewType } = this.state;
@@ -229,6 +229,8 @@ class ReportContent extends Component {
render() {
const { loading, viewType, rangSet, columns, povitView } = this.state;
+ const { report } = this.props;
+ const { isShare } = report;
return (
@@ -245,7 +247,7 @@ class ReportContent extends Component {
{/*侧边栏*/}
-
+
{/* 图表范围数据设置框 */}
this.setState({
povitView: {
- visible: false, id: "", dimensionId: "", dimensionValue: ""
+ visible: false, id: "", dimensionId: "", dimensionValue: "",
+ isShare: false
}
})}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js b/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
index 1cb4a075..ea77424f 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
@@ -19,7 +19,7 @@ class RightOptions extends Component {
}
render() {
- const { onChange } = this.props;
+ const { onChange, isShare } = this.props;
const { show } = this.state;
return (
@@ -32,8 +32,11 @@ class RightOptions extends Component {
onClick={() => onChange("1", "bar")}/>
onChange("2", "line")}/>
onChange("0", "pie")}/>
- onChange("1", "setting")}/>
+ {
+ !isShare &&
+ onChange("1", "setting")}/>
+ }
{
+ const { attendanceStore: { shareForm } } = props;
+ salaryStatisticsPushGetForm().then(({ status, data }) => {
+ if (status) {
+ const { reportOptions } = data;
+ this.setState({
+ conditions: _.map(shareCondition, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => {
+ if (getKey(o) === "sharedBy") {
+ return {
+ ...o,
+ helpfulTitle: getLabel(111, "被分享人收到您分享的报表后，会默认赋予您的数据权限，但还需要有【薪酬统计分析】的菜单权限才可以查看报表。菜单权限设置路径：后台管理中心-【权限管理中心】-【角色设置】，建议创建一个仅查看报表的角色，这个角色只有薪酬管理模块的【薪酬统计分析】菜单权限。\n" +
+ "为了避免所选的人同名导致选错人，可在后台管理中心-【组织架构设置】-【浏览框显示字段定义】中人员浏览框的显示字段多勾选几个能区别人员的字段")
+ };
+ } else if (getKey(o) === "startTime__endTime") {
+ return {
+ ...o,
+ helpfulTitle: getLabel(111, "有效时间之外，被分享人无法查看您分享的报表")
+ };
+ } else if (getKey(o) === "remind") {
+ return {
+ ...o,
+ helpfulTitle: getLabel(111, "开启后，被分享人查看报表时，系统自动通过系统消息提醒分享人。")
+ };
+ } else if (getKey(o) === "reportIds") {
+ return {
+ ...o,
+ options: _.map(reportOptions, it => ({ key: it.id, showname: it.reportName }))
+ };
+ }
+ return { ...o };
+ })
+ };
+ })
+ }, () => {
+ shareForm.initFormFields(this.state.conditions);
+ shareForm.updateFields({ pushTitle: data["pushTitle"] || "" });
+ shareForm.updateFields({ mark: data["mark"] || "" });
+ });
+ }
+ });
+ };
+ salaryStatisticsPushSendMsg = () => {
+ const { attendanceStore: { shareForm } } = this.props;
+ shareForm.validateForm().then(f => {
+ if (f.isValid) {
+ const { sharedBy, reportIds, ...extraFormparams } = shareForm.getFormParams();
+ const payload = {
+ sharedBy: sharedBy.split(","),
+ reportIds: reportIds.split(","),
+ ...extraFormparams
+ };
+ this.setState({ loading: true });
+ salaryStatisticsPushSendMsg(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(111, "分享成功"));
+ this.props.onCancel();
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: false }));
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+
+ render() {
+ const { attendanceStore: { shareForm } } = this.props;
+ const { conditions, loading } = this.state;
+ return (
+ {getLabel(111, "确认分享")}
+ ]}
+ className="shareDialogWrapper"
+ style={{
+ width: 750,
+ height: 375.6,
+ minHeight: 200,
+ minWidth: 380,
+ maxHeight: "60%",
+ maxWidth: "60%",
+ overflow: "hidden",
+ transform: "translate(0px, 0px)"
+ }}
+ >
+
+ {getSearchs(shareForm, conditions, 1, false)}
+
+
+ );
+ }
+}
+
+export default SalaryStatisticsDetailShareDialog;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
new file mode 100644
index 00000000..51fdc5d0
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
@@ -0,0 +1,189 @@
+/*
+ * Author: 黎永顺
+ * name: 分享记录-查看分享记录详情
+ * Description:
+ * Date: 2023/9/19
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import {
+ WeaButtonIcon,
+ WeaDialog,
+ WeaHelpfulTip,
+ WeaInputSearch,
+ WeaLocaleProvider,
+ WeaSearchGroup,
+ WeaTable,
+ WeaTools
+} from "ecCom";
+import { message, Modal } from "antd";
+import { shareLogCondition } from "./condition";
+import { getConditionDomkeys, getSearchs } from "../../../util";
+import { salaryStatisticsPushcancel, salaryStatisticsPushGetDetail } from "../../../apis/statistics";
+import SalaryStatisticsDetailSharePersonDialog from "./salaryStatisticsDetailSharePersonDialog";
+import "./index.less";
+
+const getKey = WeaTools.getKey;
+const { getLabel } = WeaLocaleProvider;
+
+@inject("attendanceStore")
+@observer
+class SalaryStatisticsDetailShareLogDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ conditions: [], loading: false, dataSource: [], columns: [],
+ userNameSearch: "", sharePerDialog: { visible: false, id: "" }
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ const { attendanceStore: { initShareLogForm } } = nextProps;
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ this.salaryStatisticsPushGetDetail(nextProps);
+ } else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+ initShareLogForm();
+ }
+ }
+
+ renderShareLogTitle = () => {
+ return
+
+ {getLabel(111, "被分享人")}
+
+
+
+ this.setState({
+ sharePerDialog: {
+ ...this.state.sharePerDialog,
+ visible: true, id: this.props.id
+ }
+ })}/>
+ this.setState({ userNameSearch: v })}
+ onSearch={() => this.salaryStatisticsPushGetDetail(this.props)}
+ />
+
+
+ {getSearchs(shareLogForm, conditions, 1, false)}
+
+
+ {getLabel(30585, "操作")}
+
+ {getLabel(111, "1、分享状态为成功且撤回状态为空时，可操作撤回；")}
+ {/*{getLabel(111, "2、撤回后不可重新分享；")}
*/}
+ {/*{getLabel(111, "3、分享状态为失败，可操作重新分享；")}
*/}
+ {/*{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}
*/}
+
+
+ );
+ }
+}
+
+export default SalaryStatisticsDetailShareLogDialog;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailSharePersonDialog.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailSharePersonDialog.js
new file mode 100644
index 00000000..b0f8073e
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailSharePersonDialog.js
@@ -0,0 +1,74 @@
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { Button, message } from "antd";
+import { salaryStatisticsPushAddSharedSendMsg } from "../../../apis/statistics";
+import { sharePersonCondition } from "./condition";
+import { getSearchs } from "../../../util";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+@inject("attendanceStore")
+@observer
+class SalaryStatisticsDetailSharePersonDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ conditions: [], loading: false
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ const { attendanceStore: { initSharePerForm, sharePerForm } } = nextProps;
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ sharePerForm.initFormFields(sharePersonCondition);
+ } else {
+ initSharePerForm();
+ }
+ }
+
+ save = () => {
+ const { attendanceStore: { sharePerForm }, id } = this.props;
+ sharePerForm.validateForm().then(f => {
+ if (f.isValid) {
+ const { sharedBy } = sharePerForm.getFormParams();
+ const payload = {
+ id, sharedBy: sharedBy.split(",")
+ };
+ salaryStatisticsPushAddSharedSendMsg(payload)
+ .then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(30700, "操作成功！"));
+ this.props.onCancel();
+ this.props.onGetTable();
+ } else {
+ message.error(errormsg);
+ }
+ })
+ .catch(() => this.setState({ loading: false }));
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+
+ render() {
+ const { attendanceStore: { sharePerForm }, loading } = this.props;
+ return (
+
+ );
+ }
+}
+
+export default SalaryStatisticsDetailSharePersonDialog;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareRecord.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareRecord.js
new file mode 100644
index 00000000..3e35f626
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareRecord.js
@@ -0,0 +1,132 @@
+/*
+ * Author: 黎永顺
+ * name: 统计报表-分享记录
+ * Description:
+ * Date: 2023/9/19
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaSlideModal, WeaTable } from "ecCom";
+import { message, Modal } from "antd";
+import { salaryStatisticsPushcancelAll, salaryStatisticsPushGetTable } from "../../../apis/statistics";
+import SalaryStatisticsDetailShareLogDialog from "./salaryStatisticsDetailShareLogDialog";
+
+const { getLabel } = WeaLocaleProvider;
+
+class SalaryStatisticsDetailShareRecord extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: false, dataSource: [], columns: [],
+ pageInfo: { current: 1, pageSize: 10, total: 0 },
+ shareLogDialog: {
+ visible: false, id: ""
+ }
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.salaryStatisticsPushGetTable();
+ }
+
+ salaryStatisticsPushGetTable = () => {
+ this.setState({ loading: true });
+ salaryStatisticsPushGetTable({ ...this.state.pageInfo })
+ .then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+ this.setState({
+ columns, dataSource,
+ pageInfo: { ...this.state.pageInfo, current, pageSize, total }
+ });
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
+ handleWithdrawAll = (id) => {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(111, "确定要全部撤回吗？"),
+ onOk: () => {
+ salaryStatisticsPushcancelAll({ id }).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(30700, "操作成功！"));
+ this.salaryStatisticsPushGetTable();
+ } else {
+ message.error(errormsg);
+ }
+ });
+ }
+ });
+ };
+
+ render() {
+ const { dataSource, columns, loading, pageInfo, shareLogDialog } = this.state;
+ 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.salaryStatisticsPushGetTable();
+ });
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => {
+ this.salaryStatisticsPushGetTable();
+ });
+ }
+ };
+ return (
+