From 2666fc40e5048b2f14390cb54ae51fb6504bb0e7 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Wed, 27 Sep 2023 15:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC=E4=BA=BA=E5=91=98=E7=94=BB=E5=83=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/workflow.scss        |  2 +-
 src/components/NameSplit/index.vue  |  4 ++--
 src/components/PopHomeTip/index.vue |  4 ++--
 src/components/PopTips/index.vue    | 11 ++++++++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/assets/css/workflow.scss b/src/assets/css/workflow.scss
index f4080c43e..5d97a467c 100644
--- a/src/assets/css/workflow.scss
+++ b/src/assets/css/workflow.scss
@@ -534,7 +534,7 @@ html {
     -webkit-box-direction: normal;
     -ms-flex-direction: column;
     flex-direction: column;
-    height: 100%
+    // height: 100%
 }
 
 @font-face {
diff --git a/src/components/NameSplit/index.vue b/src/components/NameSplit/index.vue
index 649ad5d5b..b9669249c 100644
--- a/src/components/NameSplit/index.vue
+++ b/src/components/NameSplit/index.vue
@@ -3,8 +3,8 @@
     <div v-if="!flag" :title="getAllName(item[areaName])">{{ spliceNameFun(item[areaName], 8) }}</div>
     <div class="name_more" v-if="item[peopleName] && !item[peopleName].includes(',')" @click="gotoPersonnel(item.resiId)" :title="getAllName(item[peopleName])">{{ spliceNameFun(item[peopleName], 12) }}</div>
     <div class="name_more" v-if="item[peopleName] && item[peopleName].includes(',')">
-      <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>
-      <popTips :item="item" />
+      <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId.split(',')[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>
+      <popTips :item="item" :pageName="pageName" />
     </div>
   </div>
 </template>
diff --git a/src/components/PopHomeTip/index.vue b/src/components/PopHomeTip/index.vue
index 08228223e..c28053408 100644
--- a/src/components/PopHomeTip/index.vue
+++ b/src/components/PopHomeTip/index.vue
@@ -83,8 +83,8 @@ export default {
     },
 
     gotoPersonnel(id) {
-      if (id) {
-        this.$router.push({ path: "/organizational/orgPersonnel", query: { user_id: id } });
+      if (id && id !== "") {
+        this.$router.push({ path: `/organizational/orgPersonnel/${this.pageName}`, query: { user_id: id } });
       } else {
         this.$message.error("无法跳转！");
       }
diff --git a/src/components/PopTips/index.vue b/src/components/PopTips/index.vue
index c326e2ef4..5fe7f5e2a 100644
--- a/src/components/PopTips/index.vue
+++ b/src/components/PopTips/index.vue
@@ -3,7 +3,7 @@
     <div class="popperList">
       <div style="margin-bottom: 13px">所有人员</div>
       <div v-for="(itm, idx) in getItemNameArr(item.name)" :key="itm">
-        <span style="cursor: pointer" @click="gotoPersonnel(item.resiId[idx])">{{ itm }}</span>
+        <span style="cursor: pointer" @click="gotoPersonnel(item.resiId.split(',')[idx])">{{ itm }}</span>
       </div>
     </div>
     <i slot="reference" style="margin-left: 2px" class="el-icon-more"></i>
@@ -18,14 +18,19 @@ export default {
       type: Object,
       default: () => {},
     },
+    pageName: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {};
   },
   methods: {
     gotoPersonnel(id) {
-      if (id) {
-        this.$router.push("/organizational/orgPersonnel");
+      console.log(id);
+      if (id && id !== "") {
+        this.$router.push({ path: `/organizational/orgPersonnel/${this.pageName}`, query: { user_id: id } });
       } else {
         this.$message({
           message: "无法跳转",