From f2a9d202775438089ef6a11e3934a86a2301aa5a Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 29 三月 2022 14:15:16 +0800
Subject: [PATCH] 1.单位管理区分（承包商和系统管理，条件为单位名称唯一） 2.用户管理区分（承包商和系统管理）
---
src/views/systemManage/unitManage/index.vue | 3 ++-
src/views/systemManage/userManage/index.vue | 1 +
src/views/contractor/unitManage/index.vue | 3 ++-
src/views/contractor/userManage/index.vue | 1 +
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/contractor/unitManage/index.vue b/src/views/contractor/unitManage/index.vue
index 28654bb..1aafcc0 100644
--- a/src/views/contractor/unitManage/index.vue
+++ b/src/views/contractor/unitManage/index.vue
@@ -56,7 +56,7 @@
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="showUnitForm(scope.row,'编辑')">编辑</el-button>
- <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>
+<!-- <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>-->
<el-button type="text" style="color: red" @click="addBlack(scope.row)">黑名单</el-button>
</template>
</el-table-column>
@@ -243,6 +243,7 @@
params['pageIndex'] = this.currentPage
params['pageSize'] = this.pageSize
params['company'] = this.company
+ params['isMain'] = false
let res = await getUnitList(params)
if(res.data.code === '200'){
this.recordTotal = res.data.result.totalCount
diff --git a/src/views/contractor/userManage/index.vue b/src/views/contractor/userManage/index.vue
index e949659..e13e152 100644
--- a/src/views/contractor/userManage/index.vue
+++ b/src/views/contractor/userManage/index.vue
@@ -667,6 +667,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]
diff --git a/src/views/systemManage/unitManage/index.vue b/src/views/systemManage/unitManage/index.vue
index 1d44e38..859d841 100644
--- a/src/views/systemManage/unitManage/index.vue
+++ b/src/views/systemManage/unitManage/index.vue
@@ -51,7 +51,7 @@
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="showUnitForm(scope.row,'编辑')">编辑</el-button>
- <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>
+<!-- <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -229,6 +229,7 @@
params['pageIndex'] = this.currentPage
params['pageSize'] = this.pageSize
params['company'] = this.company
+ params['isMain'] = true
let res = await getUnitList(params)
if(res.data.code === '200'){
this.recordTotal = res.data.result.totalCount
diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
index 8d50985..3d292cc 100644
--- a/src/views/systemManage/userManage/index.vue
+++ b/src/views/systemManage/userManage/index.vue
@@ -747,6 +747,7 @@
params['pageIndex'] = _this.currentPage
params['pageSize'] = _this.pageSize
params['type'] = _this.userType
+ params['isMain'] = true
for (const i in _this.queryForm) {
if (_this.queryForm[i] != undefined && _this.queryForm[i].toString() != '') {
params[i] = _this.queryForm[i]
--
Gitblit v1.9.2