From f3d34173074df5589fd577d03e272948853ebfb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 十月 2024 10:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/index.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 70d5505..ff4cb7f 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -341,6 +341,11 @@
this.tabs.push({ name: '2', label: '鐞嗚禂鎻愰啋' })
// this.handleCurrentChange2(0);
}
+ //鏂板鍒嗙被
+ if (pemissons.includes('business:notice:settle')) {
+ this.tabs.push({ name: '3', label: '鍚堝悓绛剧讲鎻愰啋' })
+ // this.handleCurrentChange2(0);
+ }
/* if (pemissons.includes('business:notice:insurance')) {
this.getNoticeList(0, this.page0)
}
@@ -544,22 +549,25 @@
}
.home_content {
width: 100%;
- height: calc(100% - 170px);
+ /*height: calc(100% - 170px);*/
margin-top: 10px;
display: flex;
- align-items: center;
- justify-content: space-between;
+ /*align-items: center;*/
+ /*justify-content: space-between;*/
.home_content_left {
width: 350px;
- height: 100%;
+ /*height: 100%;*/
+ height: auto;
flex-shrink: 0;
display: flex;
flex-direction: column;
justify-content: space-between;
.home_content_left_item {
width: 100%;
- height: 32%;
+ /*height: 32%;*/
+ height: 200px;
background: #ffffff;
+ margin-bottom: 10px;
}
}
.home_content_right {
@@ -584,6 +592,7 @@
box-sizing: border-box;
width: 100%;
display: flex;
+ align-items: center;
justify-content: space-between;
border: 1px solid #ececec;
margin-bottom: 15px;
@@ -619,6 +628,7 @@
}
}
.list_item_right {
+ flex-shrink: 0;
height: 100%;
display: flex;
align-items: center;
--
Gitblit v1.9.3