合并代码
This commit is contained in:
zyx.net
@@ -103,104 +103,105 @@ import DynamicNotice from '../../components/tools/DynamicNotice'
|
||||
import Vue from 'vue'
|
||||
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||
|
||||
export default {
|
||||
name: 'UserAnnouncementList',
|
||||
mixins: [JeroListMixin],
|
||||
components: {
|
||||
DynamicNotice,
|
||||
ShowAnnouncement
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
description: '系统通告表管理页面',
|
||||
queryParam: {},
|
||||
selectedRowKeys: [],
|
||||
// '5': this.$t('taskRegulationComplianceTask'),
|
||||
msgCategoryQuery: {
|
||||
'1': this.$t('SubscriptionNotification'),
|
||||
'2': this.$t('warningInformation'),
|
||||
'3': this.$t('ForwardPush')
|
||||
// '4': this.$t('CollectinguthenticationParameters'),
|
||||
// '6':this.$t('RegulationListConfirmationTask'),
|
||||
// '7':this.$t('RegulationListConfirmationNotification'),
|
||||
// '8':this.$t('RegulationTaskConfirmation'),
|
||||
// '9':this.$t('DesignComplianceTask'),
|
||||
// '10':this.$t('PreHomoTask'),
|
||||
// '11':this.$t('ValidationTask'),
|
||||
// '12':this.$t('DesignComplianceNotification'),
|
||||
// '13':this.$t('PreHomoNotification'),
|
||||
// '14':this.$t('ValidationComplianceNotification'),
|
||||
// '15':this.$t('RegulationTaskConfirmationNotification'),
|
||||
// '17':this.$t('listConfirmation'),
|
||||
// '18':this.$t('taskAffirm'),
|
||||
// '19':this.$t('complianceConfirmation'),
|
||||
// '20':this.$t('collectionLegislativeComments'),
|
||||
// '21':this.$t('regulatoryAndTechnicalAssessment'),
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('MessageContent'),
|
||||
align: 'left',
|
||||
dataIndex: 'msgContent',
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: 'msgTitile' }
|
||||
export default {
|
||||
name: 'UserAnnouncementList',
|
||||
mixins: [JeroListMixin],
|
||||
components: {
|
||||
DynamicNotice,
|
||||
ShowAnnouncement
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
description: '系统通告表管理页面',
|
||||
queryParam: {},
|
||||
selectedRowKeys: [],
|
||||
// '5': this.$t('taskRegulationComplianceTask'),
|
||||
msgCategoryQuery: {
|
||||
'1': this.$t('SubscriptionNotification'),
|
||||
'2': this.$t('warningInformation'),
|
||||
'3': this.$t('ForwardPush')
|
||||
// '4': this.$t('CollectinguthenticationParameters'),
|
||||
// '6':this.$t('RegulationListConfirmationTask'),
|
||||
// '7':this.$t('RegulationListConfirmationNotification'),
|
||||
// '8':this.$t('RegulationTaskConfirmation'),
|
||||
// '9':this.$t('DesignComplianceTask'),
|
||||
// '10':this.$t('PreHomoTask'),
|
||||
// '11':this.$t('ValidationTask'),
|
||||
// '12':this.$t('DesignComplianceNotification'),
|
||||
// '13':this.$t('PreHomoNotification'),
|
||||
// '14':this.$t('ValidationComplianceNotification'),
|
||||
// '15':this.$t('RegulationTaskConfirmationNotification'),
|
||||
// '17':this.$t('listConfirmation'),
|
||||
// '18':this.$t('taskAffirm'),
|
||||
// '19':this.$t('complianceConfirmation'),
|
||||
// '20':this.$t('collectionLegislativeComments'),
|
||||
// '21':this.$t('regulatoryAndTechnicalAssessment'),
|
||||
},
|
||||
{
|
||||
title: this.$t('Sponsor'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
dataIndex: 'initiator',
|
||||
width: 200
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('MessageContent'),
|
||||
align: 'left',
|
||||
dataIndex: 'msgContent',
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: 'msgTitile' }
|
||||
},
|
||||
{
|
||||
title: this.$t('Sponsor'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
dataIndex: 'initiator',
|
||||
width: 200
|
||||
},
|
||||
{
|
||||
title: this.$t('MessageType'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
dataIndex: 'msgCategory',
|
||||
width: 200,
|
||||
scopedSlots: { customRender: 'msgCategory' }
|
||||
},
|
||||
{
|
||||
title: this.$t('NotificationTime'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 200,
|
||||
dataIndex: 'sendTime'
|
||||
},
|
||||
{
|
||||
title: '',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 50
|
||||
}
|
||||
],
|
||||
url: {
|
||||
list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
|
||||
editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
|
||||
readAllMsg: 'sys/sysAnnouncementSend/read',
|
||||
deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
|
||||
},
|
||||
{
|
||||
title: this.$t('MessageType'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
dataIndex: 'msgCategory',
|
||||
width: 200,
|
||||
scopedSlots: { customRender: 'msgCategory' }
|
||||
},
|
||||
{
|
||||
title: this.$t('NotificationTime'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 200,
|
||||
dataIndex: 'sendTime'
|
||||
},
|
||||
{
|
||||
title: '',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 50
|
||||
}
|
||||
],
|
||||
url: {
|
||||
list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
|
||||
editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
|
||||
readAllMsg: 'sys/sysAnnouncementSend/read',
|
||||
deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
|
||||
},
|
||||
loading: false,
|
||||
openPath: '',
|
||||
formData: '',
|
||||
language: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
$route: function(res) {
|
||||
console.log(res)
|
||||
this.loadData()
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.language = localStorage.getItem('language') || ''
|
||||
},
|
||||
methods: {
|
||||
expandIcon(props) {
|
||||
if (props.expanded) {
|
||||
return <a-icon type="down" onClick={e => {
|
||||
props.onExpand(props.record, e)
|
||||
}
|
||||
loading: false,
|
||||
openPath: '',
|
||||
formData: '',
|
||||
language: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
$route: function(res) {
|
||||
console.log(res)
|
||||
this.loadData()
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.language = localStorage.getItem('language') || ''
|
||||
},
|
||||
methods: {
|
||||
expandIcon(props) {
|
||||
if (props.expanded) {
|
||||
return <a-icon type = 'down'onClick = { e=>
|
||||
{
|
||||
props.onExpand(props.record, e)
|
||||
}
|
||||
}
|
||||
/>
|
||||
} else {
|
||||
|
||||
@@ -80,11 +80,19 @@
|
||||
: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-if='viewshowbrand' :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-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
|
||||
v-model="brands">
|
||||
<a-select-option v-for="(item, key) in brandsList" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
|
||||
{{ item.text || item.label }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user