diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 1a5bf7a42..ad4a6cc24 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -59,6 +59,13 @@ @click="urlClick(queryForm.ipdInfo)" >{{queryForm.ipdInfo}} +
+ {{$t('brand')}} + {{queryForm.brand}} +
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 2e7a8b3f8..5dbe689bd 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -224,6 +224,20 @@
+ +
+
+ {{$t('brand')}} +
+ + + +
+
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 57feeb8b8..8615a0fe6 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -88,6 +88,17 @@
+ +
+
+ {{$t('brand')}} +
+ +
+
@@ -230,6 +241,13 @@ ellipsis: true, dataIndex: 'studioEngineerName' }, + { + title: this.$t('brand'), + align: 'center', + width: 180, + ellipsis: true, + dataIndex: 'brand' + }, { title: this.$t('explain'), align: 'center', diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 0492867a4..ccb35f2d4 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -23,6 +23,17 @@ :triggerChange="false" :dictCode="'region'"/> + +
+
+ {{$t('brand')}} +
+ +
+
{{$t('query')}} diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index 9cf300277..7a36a6149 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -80,11 +80,19 @@ :type="'select'" :triggerChange="false" :dictCode="'duty_territory'"/> - - + + + + + + + + + {{ item.text || item.label }} + + + @@ -230,7 +238,9 @@ modaltoggleFlag: true, confirmDirty: false, viewshow: false, + viewshowbrand: false, selectedDepartKeys: [], //保存用户选择部门id + brandsList: [], //保存用户选择部门id checkedDepartKeys: [], checkedDepartNames: [], // 保存部门的名称 =>title checkedDepartNameString: '', // 保存部门的名称 =>title @@ -360,8 +370,16 @@ } }) }, + barndslist(){ + getAction('/sys/dict/getBrandDict', {}).then((res) => { + if (res.success) { + this.brandsList = res.result + } else { + this.brandsList = [] + } + }) + }, loadUserRoles(userid) { - console.log(11) queryUserRole({ userid: userid }).then((res) => { if (res.success) { this.selectedRole = res.result @@ -370,10 +388,17 @@ if(val.roleCode == 'Viewer' && item == val.id){ this.$nextTick(() => { this.viewshow = true + this.viewshowbrand = true + }) + return + } else if(val.roleCode == 'BrandAdministrator' && item == val.id) { + this.$nextTick(() => { + this.viewshowbrand = true }) return }else{ this.viewshow = false + this.viewshowbrand = false } }) }) @@ -398,10 +423,17 @@ if(val.roleCode == 'Viewer' && item == val.id){ this.$nextTick(() => { this.viewshow = true + this.viewshowbrand = true + }) + return + } else if(val.roleCode == 'BrandAdministrator' && item == val.id) { + this.$nextTick(() => { + this.viewshowbrand = true }) return }else{ this.viewshow = false + this.viewshowbrand = false } }) }) @@ -465,6 +497,7 @@ let that = this this.disabled = false that.initialRoleList() + that.barndslist() if (record.activitiSync) { this.disabled = true }