From 611e8f7f1986e96980712a083d06b7cfe45f928c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 16 十月 2024 11:03:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/relativeMember.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 9e0e35e..d2c0841 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -100,11 +100,12 @@
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="postionName" label="宀椾綅" min-width="100px"></el-table-column>
<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
- <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
- <span v-if="row.status == 0" style="color: green">鏄�</span>
- <span v-else >鍚�</span>
+ <template slot-scope="{row}">
+ <span v-if="row.statusisDangyuan == 0" style="color: green">鏄�</span>
+ <span v-else >鍚�</span>
+ </template>
</el-table-column>
- <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
+ <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
@@ -213,7 +214,7 @@
import OperaTrainTimeImportWindow from '@/components/business/OperaTrainTimeImportWindow'
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import { fetchList } from '@/api/business/company'
-import { fetchList as positionList } from '@/api/business/position'
+import { allList as positionList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
--
Gitblit v1.9.3