From c2e4ed1a6e3a14406db471304360cd45ac8177d1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web_standard/src/components/common/Header.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/web_standard/src/components/common/Header.vue b/web_standard/src/components/common/Header.vue
index 86e9508..ebab123 100644
--- a/web_standard/src/components/common/Header.vue
+++ b/web_standard/src/components/common/Header.vue
@@ -12,9 +12,10 @@
<img src="@/assets/images/ic_help@2x.png" alt="" />
<span>甯姪鏂囨。</span>
</div>
+ <div style="margin-right: 10px;">浼佷笟浠ｇ爜锛� {{ tempId }}</div>
<el-dropdown trigger="click" style="margin-right: 20px;" v-userState @command="select">
<span class="el-dropdown-link">
- {{ tempC }}<i class="el-icon-arrow-down el-icon--right"></i>
+ {{ tempC }}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item, index) in cList" :key="index" :command='item.id'>{{ item.name }}</el-dropdown-item>
@@ -73,6 +74,7 @@
data () {
return {
tempC: '',
+ tempId: '',
cList: '',
visible: {
// 淇敼瀵嗙爜
@@ -127,7 +129,10 @@
}
},
created () {
- this.tempC = this.userInfo.curComDepartment ? this.userInfo.curComDepartment.name : ''
+ if (this.userInfo.curComDepartment) {
+ this.tempC = this.userInfo.curComDepartment.name
+ this.tempId = this.userInfo.curComDepartment.id
+ }
getDepartmentListByConditon({
type: 0
})
--
Gitblit v1.9.3