From 5360e693c70acfbd71c111aec0b9b7151bfd6cc4 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 11 五月 2022 14:08:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/contractor/userManage/index.vue | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/views/contractor/userManage/index.vue b/src/views/contractor/userManage/index.vue
index e949659..f2d7c39 100644
--- a/src/views/contractor/userManage/index.vue
+++ b/src/views/contractor/userManage/index.vue
@@ -229,6 +229,7 @@
<el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="showEditHandle(scope.row)">编辑</el-button>
+ <el-button v-show="userType != 3" :disabled="disableRole(scope.row)" type="text" align="center" @click="showAssignRole(scope.row)">分配角色</el-button>
<el-button type="text" @click="showWorkLicense(scope.row)">查看工作证</el-button>
<el-button v-show="userType != 3" :disabled="scope.row.type==1" type="text" style="color:red;" @click="deleteHandle(scope.row)">删除</el-button>
</template>
@@ -667,6 +668,7 @@
params['pageIndex'] = _this.currentPage
params['pageSize'] = _this.pageSize
params['type'] = _this.userType
+ params['isMain'] = false
for (const i in _this.queryForm) {
if (_this.queryForm[i] != undefined && _this.queryForm[i].toString() != '') {
params[i] = _this.queryForm[i]
--
Gitblit v1.9.2