From b77aad0e42e0a2a2caa726f0b748191fcce86bbb 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 Jun 2023 18:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payroll/components/waterMarkSetModal.js   | 21 +++++++++------
 pc4mobx/hrmSalary/pages/payroll/index.js      |  8 +++---
 pc4mobx/hrmSalary/pages/ruleConfig/index.js   | 27 ++++++++++++-------
 pc4mobx/hrmSalary/stores/payroll.js           |  2 +-
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
index aeaee2aa..927e1fbd 100644
--- a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
+++ b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
@@ -8,6 +8,7 @@ import React, { Component } from "react";
 import {
   WeaError,
   WeaFormItem,
+  WeaHelpfulTip,
   WeaInputNumber,
   WeaLocaleProvider,
   WeaSearchGroup,
@@ -100,14 +101,18 @@ class WaterMarkSetModal extends Component {
           <React.Fragment>
             <WeaSearchGroup showGroup needTigger={false} className="waterMarkWrapper">
               <WeaFormItem label={getLabel(111, "水印类型")} labelCol={{ span: 5 }} wrapperCol={{ span: 10 }}>
-                <WeaSelect
-                  value={wmClassify} detailtype={3}
-                  options={[
-                    { key: "text", showname: getLabel(111, "文本") },
-                    { key: "image", showname: getLabel(111, "图片") }
-                  ]}
-                  onChange={wmClassify => this.setState({ wmClassify })}
-                />
+                <div style={{ display: "flex", alignItems: "center" }}>
+                  <WeaSelect
+                    value={wmClassify} detailtype={3}
+                    options={[
+                      { key: "text", showname: getLabel(111, "文本") },
+                      { key: "image", showname: getLabel(111, "图片") }
+                    ]}
+                    onChange={wmClassify => this.setState({ wmClassify })}
+                  />
+                  <WeaHelpfulTip title={getLabel(111, "邮件发送不支持图片水印")} placement="topLeft"
+                                 style={{ marginLeft: 10 }}/>
+                </div>
               </WeaFormItem>
               <WeaFormItem label={getLabel(111, "水印类型")} labelCol={{ span: 5 }} wrapperCol={{ span: 10 }}>
                 {
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index 75fe7f6f..c974b699 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -351,9 +351,11 @@ export default class Payroll extends React.Component {
             <WeaInputSearch style={{ marginleft: "10px" }} placeholder="请输入工资单名称" value={templateSearchValue}
                             onChange={(value) => {
                               this.setState({ templateSearchValue: value });
-                            }} onSearch={(value) => {
-              this.handleTemplateSearch(value);
-            }}/>
+                            }}
+                            onSearch={(value) => {
+                              this.handleTemplateSearch(value);
+                            }}
+            />
           </div>
         );
       } else if (this.state.selectedKey === "2") {
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index 675273ea..6f088528 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -244,7 +244,14 @@ export default class Index extends Component {
   };
 
   render() {
-    const { saveParams, matchRuleOptions, orderOptions, ascOptions, employeeOptions } = this.state;
+    const {
+      saveParams,
+      matchRuleOptions,
+      orderOptions,
+      ascOptions,
+      employeeOptions,
+      showEncryptOperationButton
+    } = this.state;
     const { orderRule, ascOrDesc, rule, enctry, operateTaxDeclaration, matchRule } = saveParams;
     return (
       <div className="ruleWrapper">
@@ -274,15 +281,15 @@ export default class Index extends Component {
               />
             </WeaFormItem>
           </WeaSearchGroup>
-          {/*{*/}
-          {/*  !_.isEmpty(enctryItems) &&*/}
-          <WeaSearchGroup title={getLabel(543358, "加密规则")} showGroup center>
-            <WeaFormItem label={getLabel(526997, "加密设置")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
-              <WeaCheckbox display="switch" value={enctry}
-                           onChange={val => this.handleChange("enctry", val)}/>
-            </WeaFormItem>
-          </WeaSearchGroup>
-          {/*}*/}
+          {
+            showEncryptOperationButton === "true" &&
+            <WeaSearchGroup title={getLabel(543358, "加密规则")} showGroup center>
+              <WeaFormItem label={getLabel(526997, "加密设置")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+                <WeaCheckbox display="switch" value={enctry}
+                             onChange={val => this.handleChange("enctry", val)}/>
+              </WeaFormItem>
+            </WeaSearchGroup>
+          }
           <WeaSearchGroup title={getLabel(543359, "报税规则")} showGroup center>
             <WeaFormItem label={getLabel(543353, "个税申报")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
               <WeaCheckbox display="switch" value={operateTaxDeclaration}
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js
index 7a2e18d7..e42cdba0 100644
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@@ -152,7 +152,7 @@ export class payrollStore {
   @action
   getPayrollTemplateList = (params = {}) => {
     this.loading = true;
-    API.getPayrollTemplateList({ ...params, ...this.templateTablePageInfo }).then(res => {
+    API.getPayrollTemplateList({ ...this.templateTablePageInfo, ...params }).then(res => {
       if (res.status) {
         this.templateTableColumns = res.data.columns;
         this.templateTableDataSource = res.data.list;