Merge branch 'feature/0612-工资单水印设置' into develop

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 {
                 <a href="javascript:void(0);" onClick={() => this.handleGrant(record)}
                    style={{ marginRight: 10 }}>发放</a>
                 {
-                  !showGrant &&
+                  canSeeDetail &&
                   <a href="javascript:void(0);" onClick={() => this.handleShowDetail(record)}
                      style={{ marginRight: 10 }}>查看详情</a>
                 }

pc4mobx/hrmSalary/pages/payroll/components/index.less

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

pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js

@@ -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">

pc4mobx/hrmSalary/pages/payroll/components/wmContentSetModal.js

@@ -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

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 (
               <a
                 href="javascript:void(0);"
@@ -318,7 +318,7 @@ export default class PayrollGrant extends React.Component {
                 撤回
               </a>
             );
-          } else if (!notShowGrantOrWithdraw) {
+          } else if (salarySendDetailBaseInfo.canSend) {
             return (
               <a
                 href="javascript:void(0);"
@@ -370,7 +370,7 @@ export default class PayrollGrant extends React.Component {
         更多
       </Dropdown.Button>
     ];
-    if (selectedKey === "0" && !notShowGrantOrWithdraw) {
+    if (selectedKey === "0" && salarySendDetailBaseInfo.canSend) {
       btnDom = [
         <ButtonSelect
           datas={[
@@ -384,7 +384,7 @@ export default class PayrollGrant extends React.Component {
         />,
         ...btnDom
       ];
-    } else if (selectedKey === "1" && !notShowGrantOrWithdraw) {
+    } else if (selectedKey === "1" && salarySendDetailBaseInfo.canSend) {
       btnDom = [
         <ButtonSelect
           datas={[

pc4mobx/hrmSalary/stores/mySalary.js

@@ -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("获取失败");