From 61637e6de7065768f5758234f9b4c9b227a08bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 18:18:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/reportList.js                  |  7 ++++
 .../analysisOfSalaryStatistics/index.less     | 41 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
index 30b8a474..af813553 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
@@ -97,6 +97,13 @@ class ReportList extends Component {
                       </Dropdown>
                     }
                   </div>
+                  {
+                    isShare &&
+                    <div className="ant-ribbon ant-ribbon-placement-end">
+                      <span className="ant-ribbon-text">{getLabel(111, "被分享")}</span>
+                      <div className="ant-ribbon-corner"></div>
+                    </div>
+                  }
                 </div>
               </Col>;
             })
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
index e0326f2a..5a3c335e 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
@@ -31,6 +31,47 @@
           justify-content: space-between;
           padding: 22px 0 22px 16px;
           border: 1px solid #e5e5e5;
+          position: relative;
+
+          .ant-ribbon {
+            padding: 0 8px;
+            color: #1677ff;
+            font-size: 12px;
+            line-height: 22px;
+            list-style: none;
+            position: absolute;
+            top: 0;
+            white-space: nowrap;
+            background-color: #1677ff;
+            border-radius: 4px;
+
+            .ant-ribbon-text {
+              color: #FFF;
+            }
+
+            .ant-ribbon-corner {
+              position: absolute;
+              top: 100%;
+              width: 8px;
+              height: 8px;
+              color: currentcolor;
+              border: 4px solid;
+              transform: scaleY(.75);
+              transform-origin: top;
+              filter: brightness(75%);
+            }
+          }
+
+          .ant-ribbon-placement-end {
+            inset-inline-end: -8px;
+            border-end-end-radius: 0;
+
+            .ant-ribbon-corner {
+              inset-inline-end: 0;
+              border-inline-end-color: transparent;
+              border-block-end-color: transparent;
+            }
+          }
 
           .cardLeft {
             display: flex;

From d9a6f3907ca1d15a4277462f97a43d3778160d33 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, 25 Sep 2023 16:20:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?hotfix/2.9.42310.01=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/analysisOfSalaryStatistics/components/conditions.js   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index a622aefb..7bcac916 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -50,7 +50,6 @@ export const condition = [
         options: [],
         viewAttr: 2,
         helpfulTip: "",
-        hide: true
       },
       {
         colSpan: 1,
@@ -92,7 +91,6 @@ export const reportCondition = [
         rules: "required|string",
         viewAttr: 3,
         helpfulTip: "",
-        hide: true
       }
     ],
     title: "",