From 7d07af3a22bcc9204650a6ee2f73f6bed899f306 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, 16 Jun 2023 11:30:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E6=B0=B4=E5=8D=B0=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/payroll/components/index.less | 6 ------ .../pages/payroll/components/waterMarkSetModal.js | 4 ++-- .../pages/payroll/components/wmContentSetModal.js | 4 ++-- pc4mobx/hrmSalary/stores/mySalary.js | 7 ++++--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/components/index.less b/pc4mobx/hrmSalary/pages/payroll/components/index.less index ee7666e9..51e742e6 100644 --- a/pc4mobx/hrmSalary/pages/payroll/components/index.less +++ b/pc4mobx/hrmSalary/pages/payroll/components/index.less @@ -47,12 +47,6 @@ } } -.waterMarkSetWrapper { - & > .rodal { - right: 25% !important; - } -} - .waterMarkSetWrapper, .wmContentWrapper { .rodal { .rodal-dialog { diff --git a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js index 48c6658d..baaafa6c 100644 --- a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js +++ b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js @@ -94,8 +94,8 @@ class WaterMarkSetModal extends Component { {getLabel(111, "水印设置")}} - 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={ diff --git a/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js index beea8bdd..d6fecd53 100644 --- a/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js +++ b/pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js @@ -127,8 +127,8 @@ class WmContentSetModal extends Component { this.props.onClose(this.props.textSet)} title={{getLabel(111, "水印内容设置")}} - 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={ { 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("获取失败"); From 55bdfa2c457e35473b802ed28301a6e0dfc6775d 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, 16 Jun 2023 17:36:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84=E8=AF=A6=E7=BB=86=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/payroll/SalarySendList.js | 4 ++-- pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js index 79752acc..2b98919b 100644 --- a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js +++ b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js @@ -92,7 +92,7 @@ export default class SalarySendList extends React.Component { title: "操作", key: "operate", render: (text, record) => { - const { sendNum, sendTotal, salaryAcctType, haveBackCalc } = record; + const { sendNum, sendTotal, salaryAcctType, haveBackCalc, canSeeDetail } = record; //显示发放 const showGrant = haveBackCalc === 1 && salaryAcctType === 0; return ( @@ -100,7 +100,7 @@ export default class SalarySendList extends React.Component { this.handleGrant(record)} style={{ marginRight: 10 }}>发放 { - !showGrant && + canSeeDetail && this.handleShowDetail(record)} style={{ marginRight: 10 }}>查看详情 } diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index aae01241..0be427d5 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -310,7 +310,7 @@ export default class PayrollGrant extends React.Component { dataIndex: "", display: true, render: (text, record) => { - if (record.sendStatus === "1" && !notShowGrantOrWithdraw) { + if (record.sendStatus === "1" && salarySendDetailBaseInfo.canSend) { return ( ); - } else if (!notShowGrantOrWithdraw) { + } else if (salarySendDetailBaseInfo.canSend) { return ( ]; - if (selectedKey === "0" && !notShowGrantOrWithdraw) { + if (selectedKey === "0" && salarySendDetailBaseInfo.canSend) { btnDom = [ , ...btnDom ]; - } else if (selectedKey === "1" && !notShowGrantOrWithdraw) { + } else if (selectedKey === "1" && salarySendDetailBaseInfo.canSend) { btnDom = [