diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 6777112..23289e6 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -461,7 +461,7 @@ export default { phonenumber: undefined, status: undefined, deptId: undefined, - userType: "00" + typeList: "00,03" }, // 列信息 columns: [ @@ -576,6 +576,8 @@ export default { role = '2'; }else if(roleKey == "leader" || roleKey == "admin"){ role = '9'; + }else if(roleKey == "partner"){ + role = '4'; } } console.log("role",role) diff --git a/src/views/system/withdrawAudit/index.vue b/src/views/system/withdrawAudit/index.vue index ea6fda9..04f6b35 100644 --- a/src/views/system/withdrawAudit/index.vue +++ b/src/views/system/withdrawAudit/index.vue @@ -211,6 +211,7 @@ import { listFlow, getFlow, delFlow, updateFlow, withdraw, rejectWithdraw } from '@/api/system/flow' import { optionselect as getAreaOptionselect } from '@/api/system/area' import { getDept, getDeptByToken, listDept, listDept2 } from '@/api/system/dept' + import { getUser } from '@/api/system/user' export default { name: "Flow", @@ -361,12 +362,19 @@ export default { }, /** 审核 */ handleEdit(row) { - getDept(row.ownerId).then(response => { - this.collectionCode = response.data.collectionCode; - this.open3 = true; - this.form3 = row; - this.view = false; - }); + console.log("合伙人类型:"+row.ownerType) + if(row.ownerType == '2'){ + getUser(row.ownerId).then(response => { + this.collectionCode = response.data.collectionCode; + }); + }else{ + getDept(row.ownerId).then(response => { + this.collectionCode = response.data.collectionCode; + }); + } + this.open3 = true; + this.form3 = row; + this.view = false; }, /** 通过 */ pass(){