diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js index aefde83f..2fe3a637 100644 --- a/src/common/lang/system/zh.js +++ b/src/common/lang/system/zh.js @@ -70,7 +70,8 @@ module.exports = { user: '用户', pleaseSelectASystem: '请选择左侧体系', leader: '领导', - member: '成员' + member: '成员', + job: '职务' }, // 企标级别映射 enterpriseLevelMap: { diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue index 64a796a4..c129a7bd 100644 --- a/src/views/system/internalWorkGroup/WorkingGroupList.vue +++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue @@ -199,6 +199,8 @@ + + @@ -213,10 +215,11 @@ import TreeNodeWorkGroupModal from './modules/TreeNodeWorkGroupModal' import Vue from 'vue' import { USER_INFO } from '../../../store/mutation-types' import { isHasPermission } from '@/utils/hasPermission' +import WorkingGroupLeaderModal from './modules/WorkingGroupLeaderModal' export default { name: 'WorkingGroupList', - components: { TreeNodeWorkGroupModal, WorkingGroupModal, TreeNodeModal, JTable }, + components: { TreeNodeWorkGroupModal, WorkingGroupModal, TreeNodeModal, JTable, WorkingGroupLeaderModal }, mixins: [JeroListMixin], computed: { yScrollHeight () { @@ -346,6 +349,13 @@ export default { dataIndex: 'userPostName', scopedSlots: { customRender: 'text' } }, + { // 职务 + title: this.$t('system.internalWorkGroup.job'), + align: 'center', + width: 180, + dataIndex: 'job', + scopedSlots: { customRender: 'text' } + }, { title: this.$t('operation'), scopedSlots: { customRender: 'leaderAction' }, @@ -570,8 +580,14 @@ export default { this.$message.warning(this.$t('system.internalWorkGroup.pleaseSelectASystem')) return } - this.$refs.modalForm.add(this.currentTreeNode[0], type) - this.$refs.modalForm.title = this.$t('newlyAdded') + if (type === 'leader') { + // 是领导的新增 + this.$refs.modalFormLeader.add(this.currentTreeNode[0], type) + this.$refs.modalFormLeader.title = this.$t('newlyAdded') + } else { + this.$refs.modalForm.add(this.currentTreeNode[0], type) + this.$refs.modalForm.title = this.$t('newlyAdded') + } }, handleDelete: function (id, type) { if (!this.url.delete) { diff --git a/src/views/system/internalWorkGroup/modules/WorkingGroupLeaderModal.vue b/src/views/system/internalWorkGroup/modules/WorkingGroupLeaderModal.vue new file mode 100644 index 00000000..8547a5c5 --- /dev/null +++ b/src/views/system/internalWorkGroup/modules/WorkingGroupLeaderModal.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue b/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue index dc686be0..c9306517 100644 --- a/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue +++ b/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue @@ -59,21 +59,14 @@ export default { add: '/sys/lawsWorkingGroupUser/add' }, nameStr: '', - treeNodeKey: '', // 传入的树节点key值 - searchType: '' // 1的时候表示领导的新增,没有值说明是成员,新增时需要传给后端 + treeNodeKey: '' // 传入的树节点key值 } }, methods: { - add (treeNodeKey, type) { + add (treeNodeKey) { this.visible = true this.form.resetFields() this.treeNodeKey = treeNodeKey - if (type === 'leader') { - // 是领导的新增 - this.searchType = '1' - } else { - this.searchType = '' - } }, userSelectNameChange (value) { this.nameStr = value @@ -92,9 +85,6 @@ export default { this.confirmLoading = true const param = Object.assign({}, values) param.workingGroupId = this.treeNodeKey - if (this.searchType === '1') { - param.searchType = this.searchType - } console.log(param) let url = '' url = this.url.add