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/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 c3e9d6e7..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: {
@@ -66,10 +66,9 @@ class ReportContent extends Component {
const { record } = params;
const { dimension: dimensionValue } = record;
const { id: pivotId, dimensionId, isShare } = this.props.report;
- if (isShare) return;
this.setState({
povitView: {
- visible: true, id: pivotId, dimensionId, dimensionValue
+ visible: true, id: pivotId, dimensionId, dimensionValue, isShare
}
});
}
@@ -262,7 +261,8 @@ class ReportContent extends Component {
{...povitView}
onCancel={() => this.setState({
povitView: {
- visible: false, id: "", dimensionId: "", dimensionValue: ""
+ visible: false, id: "", dimensionId: "", dimensionValue: "",
+ isShare: false
}
})}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 65668107..32f074d1 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -49,7 +49,7 @@ class StatisticalMicroSettingsSlide extends Component {
salaryMonth: [],
statisticalItemPayload: {
visible: false, id: "", dimension: "",
- statisticsItemId: ""
+ statisticsItemId: "", isShare: false
}
};
}
@@ -67,7 +67,7 @@ class StatisticalMicroSettingsSlide extends Component {
}
getTaxAgentSelectList = (props) => {
- getTaxAgentSelectList(true).then(({ status, data }) => {
+ getTaxAgentSelectList(props.isShare).then(({ status, data }) => {
if (status) {
const conditions = _.map(condition, item => {
return {
@@ -221,7 +221,7 @@ class StatisticalMicroSettingsSlide extends Component {
onClick={() => this.setState({
statisticalItemPayload: {
visible: true, id, dimension,
- statisticsItemId: ""
+ statisticsItemId: "", isShare
}
})}
/>
@@ -243,9 +243,8 @@ class StatisticalMicroSettingsSlide extends Component {
render: (txt, record) => {
return (
{
- if (isShare) return;
this.setState({
- statisticalItemPayload: { visible: true, id, dimension, statisticsItemId: record.id }
+ statisticalItemPayload: { visible: true, id, dimension, statisticsItemId: record.id, isShare }
});
}}>{txt}
);
@@ -315,10 +314,8 @@ class StatisticalMicroSettingsSlide extends Component {
{...statisticalItemPayload}
onCancel={(isRefresh) => this.setState({
statisticalItemPayload: {
- visible: false,
- id: "",
- dimension: "",
- statisticsItemId: ""
+ visible: false, id: "", dimension: "",
+ statisticsItemId: "", isShare: false
}
}, () => isRefresh && this.statisticsItemList(this.props.id))}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.less b/pc4mobx/hrmSalary/pages/reportView/index.less
index 99d4d917..ecf9b997 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.less
+++ b/pc4mobx/hrmSalary/pages/reportView/index.less
@@ -204,6 +204,18 @@
.microSlideWrapper {
z-index: 999;
+ .wea-form-item-wrapper {
+ display: flex !important;
+
+ .wea-browser {
+ width: 100%;
+ }
+ }
+
+ .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
+ white-space: pre-wrap !important;
+ }
+
.wea-slide-modal-title {
height: auto !important;
line-height: normal !important;