From 63747f027dae973326970afeef696a382b45affd Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 11 五月 2022 13:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/systemManage/userManage/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
index 24ddb6e..defbcb7 100644
--- a/src/views/systemManage/userManage/index.vue
+++ b/src/views/systemManage/userManage/index.vue
@@ -200,7 +200,7 @@
<span>{{ scope.row.roles | parseRoles }}</span>
</template>
</el-table-column>
- <el-table-column label="人员MAC地址" prop="deviceNo" align="center" width="100px">
+ <!-- <el-table-column label="人员MAC地址" prop="deviceNo" align="center" width="100px">
<template slot-scope="scope">
<span>{{ scope.row.deviceNo}}</span>
</template>
@@ -226,7 +226,7 @@
<span>{{ scope.row.endtime}}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="是否单位负责人" prop="iscompany" align="center" width="100px">
<template slot-scope="scope">
<div v-for="item in isList">
@@ -1172,7 +1172,7 @@
})
_this.getUserList()
} else {
- parseError({ error: res.data.message, vm: _this })
+ parseError({ error: res.message, vm: _this })
}
})
.catch((error) => {
--
Gitblit v1.9.2