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 @@
{{ spliceNameFun(item[areaName], 8) }}
{{ spliceNameFun(item[peopleName], 12) }}
-
{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}
-
+
{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}
+
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 @@
所有人员
- {{ itm }}
+ {{ itm }}
@@ -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: "无法跳转",