From e93b1dddf4f99f83d05688baceeb59cacdd82ec8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 十月 2024 17:29:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/relativeMember.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index aa872cc..31248aa 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -102,7 +102,7 @@
<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
- <span v-else >闈炲厷鍛�</span>
+ <span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
</el-table-column>
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
@@ -228,7 +228,7 @@
name: '',
status: '',
hkStatus: '',
- includeChild: false,
+ includeChild: true,
canVisit: '',
keyword: '',
type: 2,
@@ -244,8 +244,8 @@
working: false,
canvisiting: false,
companyTree: [],
- department: [],
positionList: [],
+ department: []
}
},
created () {
--
Gitblit v1.9.3