产品-工资单水印设置修改弹框

This commit is contained in:
黎永顺 2023-06-16 11:30:11 +08:00
parent 92c73b846a
commit 7d07af3a22
4 changed files with 8 additions and 13 deletions

View File

@ -47,12 +47,6 @@
}
}
.waterMarkSetWrapper {
& > .rodal {
right: 25% !important;
}
}
.waterMarkSetWrapper, .wmContentWrapper {
.rodal {
.rodal-dialog {

View File

@ -94,8 +94,8 @@ class WaterMarkSetModal extends Component {
<WeaSlideModal
{...this.props} className="waterMarkSetWrapper"
title={<span className="wmTitle">{getLabel(111, "水印设置")}</span>}
direction="right" top={20} width={800} height={400}
measureT={"%"} measureX="px" measureY="px"
direction="right" top={0} width={800} height={100}
measureT="%" measureX="px" measureY="%"
content={
<React.Fragment>
<WeaSearchGroup showGroup needTigger={false} className="waterMarkWrapper">

View File

@ -127,8 +127,8 @@ class WmContentSetModal extends Component {
<WeaSlideModal
{...this.props} className="wmContentWrapper" onClose={() => this.props.onClose(this.props.textSet)}
title={<span className="wmTitle">{getLabel(111, "水印内容设置")}</span>}
direction="right" top={-10} width={800} height={480}
measureT={"%"} measureX="px" measureY="px"
direction="right" top={0} width={800} height={100}
measureT="%" measureX="px" measureY="%"
content={
<React.Fragment>
<WeaSearchGroup

View File

@ -166,10 +166,13 @@ export class MySalaryStore {
return new Promise((resolve, reject) => {
API.mySalaryBill(payload).then(res => {
if (res.status) {
this.mySalaryBill = res.data;
resolve(res.data);
const { salaryTemplate } = res.data;
const { salaryWatermark } = salaryTemplate;
if (watermark && salaryWatermark) {
const { wmSetting } = JSON.parse(salaryWatermark);
const { wmSetting, watermarkStatus } = JSON.parse(salaryWatermark);
if (!watermarkStatus) return;
const {
wmText,
wmHeight: height,
@ -205,8 +208,6 @@ export class MySalaryStore {
});
}
}
this.mySalaryBill = res.data;
resolve(res.data);
} else {
message.error(res.errormsg || "获取失败");
reject("获取失败");