From e8d946a82907aa530ff086987d3ec7d2c04a90d2 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 15 十一月 2022 13:09:55 +0800
Subject: [PATCH] 默认更改列表
---
src/views/contractor/userManage/index.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/views/contractor/userManage/index.vue b/src/views/contractor/userManage/index.vue
index a919a0b..c08449a 100644
--- a/src/views/contractor/userManage/index.vue
+++ b/src/views/contractor/userManage/index.vue
@@ -565,7 +565,7 @@
return message
},
parseType(type){
- let typeList = [{id:1,name:'超级管理员'},{id:2,name:'管理员'},{id:3,name:'普通用户'}]
+ let typeList = [{id:2,name:'管理员'},{id:3,name:'普通用户'}]
if(type){
let a = typeList.find(item => item.id === type)
return a.name
@@ -676,6 +676,7 @@
idcard:'',
email:'',
company:'',
+ companyid:'',
department:'',
job:'',
type:'',
@@ -723,7 +724,7 @@
isanalysis: [{ required: true, message: '是否气体检测中心不能为空', trigger: 'change' }]
},
isList:[{id:1,name:'是'},{id:0,name:'否'}],
- typeList:[{id:1,name:'超级管理员'},{id:2,name:'管理员'},{id:3,name:'普通用户'}],
+ typeList:[{id:2,name:'管理员'},{id:3,name:'普通用户'}],
dialogUserRoleFormVisible: false,
userRoleDataForm: {
userRoles: [],
@@ -732,7 +733,6 @@
userRoleDataFormRules: {
userRoles: [{ type: 'array', required: true, message: '角色不能为空', trigger: 'change' }]
},
- typeList:[{id:1,name:'超级管理员'},{id:2,name:'管理员'},{id:3,name:'普通用户'}],
roleList: [],
passwordType: 'password',
confirmPasswordType: 'password',
@@ -764,6 +764,7 @@
},
companyChange(val){
this.dataForm.company = val.company
+ this.dataForm.companyid = val.id
if (val.ismain === 1) {
this.isMain = true;
}else{
@@ -780,7 +781,7 @@
params['pageSize'] = _this.pageSize
params['type'] = _this.userType
params['realname'] = _this.realname
- params['isMain'] = true
+ params['isMain'] = false
for (const i in _this.queryForm) {
if (_this.queryForm[i] != undefined && _this.queryForm[i].toString() != '') {
params[i] = _this.queryForm[i]
@@ -796,8 +797,13 @@
_this.pageTotal = computePageCount(result.totalCount, result.pageSize)
_this.currentPage = result.pageIndex
_this.userData = result.result
+ }else if(res.code === '100'){
+ this.$store.dispatch('LogOut').then(() => {
+ location.reload()// In order to re-instantiate the vue-router object to avoid bugs
+ parseError({ error: res.message, vm: _this })
+ })
} else {
- parseError({ error: res.data.message, vm: _this })
+ parseError({ error: res.message, vm: _this })
}
_this.listLoading = false
}).catch(error => {
@@ -830,7 +836,7 @@
})
_this.getUserList()
} else {
- parseError({ error: res.data.message, vm: _this })
+ parseError({ error: res.message, vm: _this })
}
}).catch(error => {
parseError({ error: error, vm: _this })
@@ -866,7 +872,7 @@
})
_this.getUserList()
} else {
- parseError({ error: res.data.message, vm: _this })
+ parseError({ error: res.message, vm: _this })
}
}).catch(error => {
parseError({ error: error, vm: _this })
@@ -954,7 +960,7 @@
})
_this.getUserList()
} else {
- parseError({ error: res.data.message, vm: _this })
+ parseError({ error: res.message, vm: _this })
}
}).catch(error => {
parseError({ error: error, vm: _this })
@@ -1012,7 +1018,7 @@
})
_this.getUserList()
} else {
- parseError({ error: res.data.message, vm: _this })
+ parseError({ error: res.message, vm: _this })
}
})
}
@@ -1021,6 +1027,7 @@
showEditHandle: function(row) {
this.resetDataForm()
this.dataForm = row
+ this.dataForm.companyid = row.companyInfo.id
this.dataForm.password = null
this.dialogStatus = 'update'
this.dialogFormVisible = true
--
Gitblit v1.9.2