From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
company/src/assets/style/style.scss | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index 2ea5ee6..e3d4276 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -74,23 +74,57 @@
::v-deep .el-table__fixed-right {
height: 100% !important;
}
+ .el-select-dropdown__item,.el-input--small {
+ font-size: 12px !important;
+}
::v-deep .el-table__cell {
height: 100% !important;
}
-.apply-status0, .apply-status2 , .apply-status3, .apply-status10,
-.change-status0,.change-status1,.change-status2,
+
+.union-change-status0,.union-change-status1,
+.apply-status0, .apply-status26,,.apply-status20,.apply-status28,
+.apply-status21,.apply-status22,
+.apply-status23,.apply-status2 , .apply-status3, .apply-status10,
+.change-status0,.change-status1,.change-status9,
.settle-status0,.settle-status2,.settle-status3,
-.tax-status0,
+.tax-status0,.change-status7,
+.union-apply-status0,.union-apply-status1,.union-apply-status2,
.du-status0 {
- color: #216EEE;
+ color: #216EEE !important;
}
- .apply-status1 , .apply-status4, .apply-status6, .apply-status7, .apply-status8,
+.union-change-status3,
+.apply-status1 ,.apply-status24,.apply-status25, .apply-status4, .apply-status6,
+.apply-status7, .apply-status9, .apply-status8, .apply-status11,
.change-status3,.change-status4,.change-status5,.change-status8,
-.settle-status1,
-.tax-status2,
+.settle-status1,.change-status6,
+.tax-status2,.union-apply-status4,
.du-status2 {
- color: #F95601;
+ color: #f95601 !important;
}
- .apply-status5,.change-status7,.settle-status7,.tax-status1,.du-status1 {
- color: #00BA92;
+
+.change-status6 {
+ color: #999 !important;
+}
+
+.change-status5, .change-status8 {
+ color: red !important;
+}
+
+.tip-warn {
+ margin: 4px 0 25px 0;
+ font-size: 12px;
+ color: #999;
+ line-height: 25px;
+ i {
+ color: orange;
+ margin-right: 4px;
+ font-size: 14px;
+ position: relative;
+ top: 1px;
+ }
+}
+.union-change-status2,
+ .apply-status5,.apply-status27,.settle-status7,.change-status2,
+ .tax-status1,.du-status1,.settle-status4 ,.union-apply-status3 {
+ color: #00BA92 !important;
}
--
Gitblit v1.9.3