odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 角色替换' (#688) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/688
This commit is contained in:
odjbin
2024-08-11 10:38:11 +00:00
parent 09b1c86ceb a1fa0dab6a
commit 420605436c
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/views/system/user/add.vue
View File

@@ -124,22 +124,30 @@ const schame = computed(() => {
change: async (val) => { change: async (val) => {
const {code, data} = await judgeIsSameRole(form.value.getValues().userId) const {code, data} = await judgeIsSameRole(form.value.getValues().userId)
if (code === 1000) { if (code === 1000) {
console.log('currentRoleArray.value',data) console.log('currentRoleArray.value', currentRoleArray.value)
if (currentRoleArray.value.length !== 0) { console.log('data,val', data, val)
if (currentRoleArray.value.length !== 0) {//当前用户存在角色
val.forEach(selectItem => { val.forEach(selectItem => {
currentRoleArray.value.forEach(currentItem => { currentRoleArray.value?.forEach(currentItem => {
if (data[selectItem]?.length > 0 && selectItem != currentItem) { if (selectItem != currentItem) {
ElMessageBox.confirm(`此角色存在对应人员：${data[selectItem][0].nickName}，您确定要替换该人员?`, "提示", { console.log('currentItem', currentItem,data[currentItem],form.value.getValues().userId)
confirmButtonText: "确定", if (currentItem &&data[currentItem]&& data[currentItem].length > 0&& data[currentItem][0].userId==form.value.getValues().userId) {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
}).catch((action) => { }else{
if (action == 'cancel') { if (data[selectItem]?.length > 0 ) {
form.value.getValues().roleIds = form.value.getValues().roleIds.filter(roleItem => roleItem != selectItem); ElMessageBox.confirm(`${getRoleName(selectItem)}角色存在对应人员：${data[selectItem][0].nickName}，您确定要替换为 ${form.value.getValues().nickName}?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
}).catch((action) => {
if (action == 'cancel') {
form.value.getValues().roleIds = form.value.getValues().roleIds.filter(roleItem => roleItem != selectItem);
}
})
} }
}) }
} }
}) })
}) })
@@ -226,7 +234,10 @@ const rules = reactive({
sex: [{required: true, message: '请选择', trigger: 'change'}], sex: [{required: true, message: '请选择', trigger: 'change'}],
state: [{required: true, message: '请选择', trigger: 'change'}], state: [{required: true, message: '请选择', trigger: 'change'}],
}) })
const getRoleName=(roleId)=>{
console.log('roleId',roleId,localData.roleOpt,localData.roleOpt.filter(item=>item.value==roleId))
return localData.roleOpt.filter(item=>item.value==roleId)[0].label
}
const getInstance = (e) => { const getInstance = (e) => {
form.value = e form.value = e
} }