WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_2nd_period_test' into fix_2nd_period

Browse Source 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/TaskList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
高嵩
2022-12-28 09:53:38 +08:00
parent 34359f65a5 de7bfab8d1
commit 4633d465f3
81 changed files with 3221 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/api/api.js
+2
View File
@@ -12,6 +12,7 @@ const queryall = (params)=>getAction("/sys/role/queryall",params);
const addUser = (params)=>postAction("/sys/user/add",params);
const editUser = (params)=>putAction("/sys/user/edit",params);
const queryUserRole = (params)=>getAction("/sys/user/queryUserRole",params);
const queryViewerInfo = (params)=>getAction("/sys/user/queryViewerInfo",params);
const getUserList = (params)=>getAction("/sys/user/page",params);
const frozenBatch = (params)=>putAction("/sys/user/frozenBatch",params);
//验证用户是否存在
@@ -106,6 +107,7 @@ export {
addUser,
editUser,
queryUserRole,
queryViewerInfo,
getUserList,
queryall,
frozenBatch,
jero-web/src/assets/feishu.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 529 B

jero-web/src/common/lang/en-us.js
+3
View File
@@ -1364,6 +1364,9 @@ module.exports = {
relatedProjectVersion:'Related project version',
Importfailure:'Import failure',
CuiBan:'CuiBan',
brand:'Brand',
allsubitemsitem:'Whether to delete all subitems under this item',
contactTheFounder:'Contact the founder',
certificationCategoryNumber: 'certification Category Number',
historicalrecord:'historical Record',
Referenceparametercolumn:'Reference Parameter Column',
jero-web/src/common/lang/zh-cn.js
+3
View File
@@ -1471,4 +1471,7 @@ module.exports = {
Updateparametercolumn:'更新参数列',
columnfirst:'请先引用参数列',
columnforced:'确认强制撤回?',
brand:'品牌',
allsubitemsitem:'该项目下拥有子项目，是否全部删除',
contactTheFounder:'联系创建人',
}
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+29
View File
@@ -100,6 +100,20 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text" :title="$t('brand')">
<span class="Required">*</span>
<span class="title-text-text">{{$t('brand')}}</span>
</div>
<a-form-model-item class="itemModel propbox" prop="brands">
<j-multi-select-tag class="box-input" v-model="formInline.brands"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
:triggerChange="false" :dictCode="'brand'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
<footerProcess
@@ -164,6 +178,13 @@
trigger: 'change'
}
],
brands: [
{
required: true,
message: this.$t('brand') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
taskExplain: [
{
max: 300,
@@ -326,6 +347,11 @@
this.$message.warning(this.$t('pleaseSelectStandard'))
} else {
this.JLoading = true
Object.keys(this.formInline).forEach(val => {
if (this.formInline[val] instanceof Array) {
this.formInline[val] = this.formInline[val].join(',')
}
})
let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
value.standId = value.id
value.taskAffirmDueDate = value.endTime
@@ -398,6 +424,9 @@
</script>
<style scoped>
/deep/.propbox .ant-form-explain{
margin-top: -17px !important;
}
.detail-box {
padding: 67px 0 0 0;
background: #ffffff;
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+18
View File
@@ -59,6 +59,17 @@
</a-select>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('brand')">
<span>{{$t('brand')}}</span>
</div>
<j-multi-select-tag class="box-input" v-model="queryParam.brand"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
:triggerChange="false" :dictCode="'brand'"/>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
@@ -200,6 +211,13 @@
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('brand'),
align: 'center',
ellipsis: true,
width: 140,
dataIndex: 'brand_text'
},
{
title: this.$t('dateOfInitiation'),
align: 'center',
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+22 -1
View File
@@ -109,6 +109,10 @@
</div>
</div>
<div class="content-box-button-right">
<div class="content-box-button-text" @click="pushJump(item)">
<img src="~/@assets/feishu.png" alt="" class="jumpicon">
{{$t('contactTheFounder')}}
</div>
<div class="content-box-button-text" @click="forwardClick(item)">
<a-icon type="logout"/>
{{$t('forward')}}
@@ -401,6 +405,20 @@
this.queryForm = row
this.$refs.SelectedByRef.getPush()
},
pushJump(row){
let query = {
userName: row.createBy,
}
postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
if (res.code === 200) {
let url = res.result
window.open(url, '_blank')
} else {
this.$message.warning(res.message)
this.$refs.SelectedByRef.submitLoading = false
}
})
},
SelectedByForm(userIds) {
let query = {
userIds: userIds,
@@ -436,7 +454,10 @@
overflow: hidden;
/*margin: 0 auto;*/
}
.jumpicon{
height: 13.72px;
width: 15.44px;
}
.box-title-text {
line-height: 1.4;
width: 360px;
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+22
View File
@@ -53,6 +53,10 @@
</div>
</div>
<div class="content-box-button-right">
<div class="content-box-button-text" @click="pushJump(queryForm)">
<img src="~/@assets/feishu.png" alt="" class="jumpicon">
{{$t('contactTheFounder')}}
</div>
<div class="content-box-button-text" @click="forwardClick(queryForm)">
<a-icon type="logout"/>
{{$t('forward')}}
@@ -449,6 +453,20 @@
this.queryForm = row
this.$refs.SelectedByRef.getPush()
},
pushJump(row){
let query = {
userName: row.createBy,
}
postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
if (res.code === 200) {
let url = res.result
window.open(url, '_blank')
} else {
this.$message.warning(res.message)
this.$refs.SelectedByRef.submitLoading = false
}
})
},
detailClick(item,key) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
@@ -481,6 +499,10 @@
</script>
<style scoped lang="less">
.jumpicon{
height: 13.72px;
width: 15.44px;
}
.content-box {
width: 100%;
height: auto;
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+27
View File
@@ -64,6 +64,23 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="8">
<div class="box-title-text" style="height: 60px">
<div class="title-text" :title="$t('brand')">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('brand')">{{$t('brand')}}</span>
</div>
<a-form-model-item class="itemModel propbox" prop="brands">
<j-multi-select-tag class="box-input" v-model="formInline.brands"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
style="width: 100%"
:triggerChange="false" :dictCode="'brand'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24" style="margin-bottom: 10px">
<a-col :span="16">
<div class="box-title-text">
@@ -281,6 +298,13 @@
trigger: 'change'
}
],
brands: [
{
required: true,
message: this.$t('brand') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
processBackground: [
{
max: 300,
@@ -676,6 +700,9 @@
}
</style>
<style scoped>
/deep/.propbox .ant-form-explain{
margin-top: -17px !important;
}
.detail-box {
padding: 67px 0 0 0;
background: #ffffff;
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+18
View File
@@ -60,6 +60,17 @@
</a-select>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('brand')">
<span>{{$t('brand')}}</span>
</div>
<j-multi-select-tag class="box-input" v-model="queryParam.brand"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
:triggerChange="false" :dictCode="'brand'"/>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
@@ -269,6 +280,13 @@
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('brand'),
align: 'center',
ellipsis: true,
width: 140,
dataIndex: 'brand_text'
},
{
title: this.$t('dateOfInitiation'),
align: 'center',
jero-web/src/views/projectManagement/components/TaskList.vue
+27 -8
View File
@@ -76,23 +76,23 @@
</a-form>
</div>
<div class="table-operator">
<div class="operator-text" @click="cuibanClick">
<div class="operator-text" @click="cuibanClick" v-if="isRoleSwitching">
<a-icon type="sound"/>
{{ $t('CuiBan') }}
</div>
<div @click="BatchMaintenanceProgress" class="operator-text">
<div @click="BatchMaintenanceProgress" class="operator-text" v-if="isRoleSwitching">
<a-icon type="setting"/>
{{$t('BatchMaintenanceProgress')}}
</div>
<div @click="BatchChangeStatus" class="operator-text">
<div @click="BatchChangeStatus" class="operator-text" v-if="isRoleSwitching">
<a-icon type="setting"/>
{{$t('BatchChangeStatus')}}
</div>
<div @click="CertificationDirectory" class="operator-text">
<div @click="CertificationDirectory" class="operator-text" v-if="isRoleSwitching">
<a-icon type="bulb"/>
{{$t('CertificationDirectory')}}
</div>
<div @click="handleExport" class="operator-text">
<div @click="handleExport" class="operator-text" v-if="isRoleSwitching">
<a-icon type="export" :rotate="-90"/>
{{$t('export')}}
</div>
@@ -221,8 +221,8 @@
import certificationDirectory from './certificationDirectory'
import batchChangeModel from './batchChangeModel'
import batchModel from './batchModel'
import cuibanModel from './cuibanModel'
import TaskListModel from './TaskListModel'
import cuibanModel from './cuibanModel'
import taskBatSetting from './taskBatSetting'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import { mapGetters } from 'vuex'
@@ -347,12 +347,14 @@
list: '/project/projectTaskInventoryEO/list',
exportXls: '/project/projectTaskInventoryEO/exportXls'
},
isRoleSwitching:true,
loading: false,
visibleoperationFailed: false,
NotSelectedNoEngineerValue: [],
dataSource: [],
selectionRowsArray: [],
roleCodes: [],
selectionRowsArray:[],
roleSwitchingList:[],
roleCodes:[],
long: ''
}
},
@@ -379,6 +381,7 @@
this.queryParam = { ...this.queryParam }
}
this.getList()
this.getRoleByUserId()
this.long = localStorage.getItem('language') || 'zh-cn'
},
methods: {
@@ -386,6 +389,22 @@
searchQuery() {
this.getList()
},
getRoleByUserId(callback) {
getAction('/project/projectLawsInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
if (res.success) {
this.roleSwitchingList = res.result || []
if(this.roleSwitchingList.length == 1){
if(this.roleSwitchingList[0].roleCode == '13'){
this.isRoleSwitching = false
}
}
} else {
this.roleSwitchingList = []
}
callback && callback()
})
},
searchReset() {
this.queryParam = {}
this.getList()
jero-web/src/views/projectManagement/components/batchModel.vue
+1 -1
View File
@@ -163,7 +163,7 @@ export default {
}
.itemModel {
width: calc(100% - 130px);
width: calc(80% - 130px);
display: inline-block;
margin-top: 2px;
}
jero-web/src/views/projectManagement/components/cuibanModel.vue
+1 -1
View File
@@ -172,7 +172,7 @@ export default {
}
.itemModel {
width: calc(100% - 130px);
width: calc(80% - 130px);
display: inline-block;
margin-top: 2px;
}
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+8 -5
View File
@@ -124,15 +124,15 @@
<a-icon type="export" :rotate="-90"/>
{{ $t('export') }}
</div>
<div @click="handleDel" class="operator-text-title">
<div @click="handleDel" class="operator-text-title">
<a-icon type="delete"/>
{{ $t('BatchDelete') }}
</div>
<div class="operator-text-title" @click="ExportReportClick">
<div class="operator-text-title" @click="ExportReportClick">
<a-icon type="export"/>
{{ $t('ExportReport') }}
</div>
<div class="operator-text-title" @click="batSettingClick">
<div class="operator-text-title" @click="batSettingClick">
<a-icon type="setting"/>
{{ $t('batchSettingInformation') }}
</div>
@@ -990,7 +990,8 @@
detailedWarningList: [],
rowKeysSuccessList: [],
selectedRowKeysList: [],
rowKeysWarningList: []
rowKeysWarningList: [],
rolecode:false,
}
},
@@ -1104,7 +1105,7 @@
} else {
this.isDisplay = false
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
this.formInlineRoleSwitching.roleSwitchingCode == '') {
this.formInlineRoleSwitching.roleSwitchingCode == '' || this.formInlineRoleSwitching.roleSwitchingCode == '13') {
this.isRoleSwitching = false
}
}
@@ -1498,6 +1499,8 @@
}
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
roleCode = 0
} else if(this.formInlineRoleSwitching.roleSwitchingCode == '13'){
roleCode = 13
}
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
jero-web/src/views/projectManagement/projectLibrary/index.vue
+1 -1
View File
@@ -349,7 +349,7 @@
deleteLib(val) {
let _this = this
this.$confirm({
content: _this.$t('ConfirmDelete'),
content: _this.$t(val.children ? 'allsubitemsitem' : 'ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
if (res.success) {
jero-web/src/views/system/UserList.vue
+1 -1
View File
@@ -132,7 +132,7 @@
</div>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)" style='margin-right: 10px' v-has="'sys:user:detail'">{{$t('See')}}</a>
<a @click="handleEdit(record)" style='margin-right: 10px' v-has="'sys:user:detail'">{{$t('edit')}}</a>
<!-- <a @click="resetPassword(record)" v-has="'sys:user:resetpass'">{{$t('resetPassword')}}</a>-->
</span>
jero-web/src/views/system/modules/RoleAssignment.vue
+72 -2
View File
@@ -12,7 +12,7 @@
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">
<a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('RoleAssignment')" v-model:value="selectedRole" @change='selectChange'>
<a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">
<span style="display: inline-block;width: 100%">
{{ role.roleName }}
@@ -22,6 +22,33 @@
</a-form-item>
</a-col>
</a-row>
<a-row :gutter='24' v-if='viewshow'>
<a-col :span='24'>
<a-form-item :label="$t('NareaOfResponsibility')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag class="box-input" v-model:value="dutyTerritories"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
<!-- <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')" v-model:value="dutyTerritories">-->
<!-- <a-select-option v-for="(role,roleindex) in dictOptions" :key="role.id" :value="role.id">-->
<!-- <span style="display: inline-block;width: 100%">-->
<!-- {{ role.roleName }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
</a-form-item>
</a-col>
</a-row>
<a-row :gutter='24' v-if='viewshow'>
<a-col :span='24'>
<a-form-item :label="$t('brand')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag class="box-input" v-model:value="brands"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
:triggerChange="false" :dictCode="'brand'"/>
</a-form-item>
</a-col>
</a-row>
</a-form-model>
</a-spin>
<div class='drawer-bootom-button'>
@@ -33,6 +60,7 @@
<script>
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -51,6 +79,8 @@ export default {
editId: '',
newVisible: false,
selectedRole: undefined,
dutyTerritories: undefined,
brands: undefined,
labelCol: {
xs: { span: 24 },
sm: { span: 7 }
@@ -65,8 +95,10 @@ export default {
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
viewshow: false,
selectedRowKeys: [],
roleList: [],
dictOptions: [],
defaultValue: undefined
}
},
@@ -79,8 +111,24 @@ export default {
},
mounted() {
this.loadData()
this.initDictData()
},
methods: {
initDictData() {
//优先从缓存中读取字典配置
if (getDictItemsFromCache(this.dictCode)) {
this.dictOptions = getDictItemsFromCache(this.dictCode)
return
}
//根据字典Code, 初始化字典数组
ajaxGetDictItems(this.dictCode, null).then((res) => {
if (res.success) {
// console.log(res.result);
this.dictOptions = res.result
}
})
},
loadData() {
this.loading = true
getAction(`sys/role/queryall`, {}).then(res => {
@@ -94,9 +142,31 @@ export default {
handleCancel() {
this.$emit('rolevisible', false)
},
selectChange(value){
value.map((item,index) => {
this.roleList.map((val,index) => {
if(val.roleCode == 'Viewer' && item == val.id){
this.$nextTick(() => {
this.viewshow = true
})
return
}else{
this.viewshow = false
}
})
})
// value.forEach((item,index) => {
// console.log(item)
// if(item == '1590600516943253506'){
// this.viewshow = true
// }else{
// this.viewshow = false
// }
// })
},
//保存
handleSubmit() {
let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}` }
let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}`, dutyTerritories: `${this.dutyTerritories}`, brands: `${this.brands}` }
postAction('/sys/user/setRole', param).then((res) => {
if (res.success) {
this.$emit('rolevisible', false)
jero-web/src/views/system/modules/UserModal.vue
+81 -3
View File
@@ -1,6 +1,6 @@
<template>
<a-drawer
:title="$t('See')"
:title="$t('edit')"
:maskClosable="true"
:width="drawerWidth"
placement="right"
@@ -66,6 +66,7 @@
:placeholder="$t('selectUserRole')"
optionFilterProp="children"
v-model="selectedRole"
@change='selectChange'
:disabled='false'
:getPopupContainer="(target) => target.parentNode">
<a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
@@ -73,6 +74,19 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item v-if='viewshow' :label="$t('NareaOfResponsibility')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag class="box-input" v-model="dutyTerritories"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-item>
<a-form-item v-if='viewshow' :label="$t('brand')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag v-model="brands"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
:triggerChange="false" :dictCode="'brand'"/>
</a-form-item>
<!--部门分配-->
<!-- v-show="!departDisabled && !disabled"-->
@@ -194,7 +208,7 @@
import departWindow from './DepartWindow'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import { getAction, postAction } from '@/api/manage'
import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
import { addUser, editUser, queryUserRole,queryViewerInfo, queryall,ajaxGetDictItems,getDictItemsFromCache } from '@/api/api'
import { disabledAuthFilter } from '@/utils/authFilter'
import { duplicateCheck } from '@/api/api'
import JImageUpload from '../../../components/jero/JImageUpload'
@@ -215,11 +229,13 @@
disabled: false,
modaltoggleFlag: true,
confirmDirty: false,
viewshow: false,
selectedDepartKeys: [], //保存用户选择部门id
checkedDepartKeys: [],
checkedDepartNames: [], // 保存部门的名称 =>title
checkedDepartNameString: '', // 保存部门的名称 =>title
resultDepartOptions: [],
dictOptions: [],
userId: '', //保存用户id
disableSubmit: false,
userDepartModel: { userId: '', departIdList: [] }, // 保存SysUserDepart的用户部门中间表数据需要的对象
@@ -276,6 +292,8 @@
model: {},
roleList: [],
selectedRole: [],
dutyTerritories: '',
brands: '',
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -343,20 +361,76 @@
})
},
loadUserRoles(userid) {
console.log(11)
queryUserRole({ userid: userid }).then((res) => {
if (res.success) {
this.selectedRole = res.result
this.selectedRole.map((item,index) => {
this.roleList.map((val,index) => {
if(val.roleCode == 'Viewer' && item == val.id){
this.$nextTick(() => {
this.viewshow = true
})
return
}else{
this.viewshow = false
}
})
})
} else {
console.log(res.message)
}
})
},
loadUserduty(userid) {
queryViewerInfo({ userId: userid }).then((res) => {
if(res.dutyTerritoryList){
this.dutyTerritories = res.dutyTerritoryList.join(',')
}
if(res.brandList){
this.brands = res.brandList.join(',')
}
})
},
selectChange(value){
value.map((item,index) => {
this.roleList.map((val,index) => {
if(val.roleCode == 'Viewer' && item == val.id){
this.$nextTick(() => {
this.viewshow = true
})
return
}else{
this.viewshow = false
}
})
})
},
initDictData() {
//优先从缓存中读取字典配置
if (getDictItemsFromCache(this.dictCode)) {
this.dictOptions = getDictItemsFromCache(this.dictCode)
return
}
//根据字典Code, 初始化字典数组
ajaxGetDictItems(this.dictCode, null).then((res) => {
if (res.success) {
// console.log(res.result);
this.dictOptions = res.result
}
})
},
handleSubmitOk() {
this.confirmLoading = true
let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories))
let brand = JSON.parse(JSON.stringify(this.brands))
let param = {
ids: this.userId,
selectedroles: selectedRole.join(',')
selectedroles: selectedRole.join(','),
dutyTerritories: dutyTerritorie,
brands: brand
}
postAction('/sys/user/setRole', param).then((res) => {
if (res.success) {
@@ -398,6 +472,7 @@
that.form.resetFields()
if (record.hasOwnProperty('id')) {
that.loadUserRoles(record.id)
that.loadUserduty(record.id)
setTimeout(() => {
this.fileList = record.avatar
}, 5)
@@ -760,6 +835,9 @@
background: #fff;
border-radius: 0 0 2px 2px;
}
/deep/.box-input .ant-select-selection--multiple{
height: 100px !important;
}
</style>
<style>
.selectUserRole .ant-select-selection--multiple {