diff --git a/src/components/index.js b/src/components/index.js index e5167f1b8..50327d085 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -21,6 +21,7 @@ import AdvancedQuery from './advancedQuery' // 高级查询 import GenerationNumber from './generationNumber' // 生成企标编号组件 import RoleUserTree from './roleUserTree' // 根据部门和角色查询人员 import DeptRoleTree from './deptRoleTree' // 根据部门查询角色 +import RoleTree from './roleTree' // 查询所有机构及人员 import SQTree from './SQTree' import OrgTable from './OrgTable' @@ -46,6 +47,7 @@ const install = function (Vue) { Vue.component('DeptRoleTree', DeptRoleTree) Vue.component('SQTree', SQTree) Vue.component('OrgTable', OrgTable) + Vue.component('RoleTree', RoleTree) } export default { diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue new file mode 100644 index 000000000..fa5a0597e --- /dev/null +++ b/src/components/roleTree/index.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 178d7f8c3..5b24794bb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -154,57 +154,19 @@ @submit="handleSubmit" > - - - - - - - - - - + + 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') - } - this.modalshowflag2 = true - }, - saveUserInfo2 () { + checkedRole2 (data) { var idList = '' var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { + data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -342,10 +290,35 @@ }) this.roleForm.dockUserList = idList this.roleForm.dockUserName = nameList - this.modalshowflag2 = false }, - cancleUserInfo2 () { - this.modalshowflag2 = false + checkedRole (data) { + if (this.type === 'dockUser') { + this.roleForm.dockUser = data[0].id + this.roleForm.dockUserName = data[0].name + } else if (this.type === 'ministerUser') { + this.roleForm.ministerUser = data[0].id + this.roleForm.ministerUserName = data[0].name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = data[0].id + this.roleForm.directorUserName = data[0].name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = data[0].id + this.roleForm.presidentUserName = data[0].name + } + }, + choiceZRRS () { + this.nodeList2 = [] + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + this.modalshowflag2 = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -388,46 +361,6 @@ fileUpload () { this.fileMadel = true }, - saveUserInfo () { - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } - this.modalshowflag = false - }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, handleTabs(name) { this.active = name }, @@ -490,7 +423,6 @@ }, mounted () { this.getData() - this.getTree() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index be0700a43..f9ba573ed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -154,116 +154,19 @@ @submit="handleSubmit" > - - - - - - - - - - - - 导入中... - - - - - - - - - - - - - 导入中... - + + { - this.treeData1 = res.data - this.treeLoading = false - }) - } else { - this.open1 = true - } - }, - filterText2 (val) { - if (val.length) { - this.open2 = false - this.treeLoading = true - this.$http.get('SarInstitution/institution/institutionAndUser', { - userName: val - }, {}, res => { - this.treeData2 = res.data - this.treeLoading = false - }) - } else { - this.open2 = true - } - }, - }, methods: { - loadNode(node, resolve) { - if (node.level === 0) { - return resolve(this.treeData); - } - this.getChildren(node, resolve) - }, - getChildren (node, resolve) { - this.$http.get('SarInstitution/institution/getNext', { - institutionId: node.key - }, {}, res => { - resolve(res) - }) - }, - choiceZRRS () { - this.nodeList2 = [] - if ( this.roleForm.dockUserList.length > 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') - } - this.filterText2 = '' - this.modalshowflag2 = true - }, - saveUserInfo2 () { + checkedRole2 (data) { var idList = '' var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { + data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -441,10 +280,35 @@ export default { }) this.roleForm.dockUserList = idList this.roleForm.dockUserName = nameList - this.modalshowflag2 = false }, - cancleUserInfo2 () { - this.modalshowflag2 = false + checkedRole (data) { + if (this.type === 'dockUser') { + this.roleForm.dockUser = data[0].id + this.roleForm.dockUserName = data[0].name + } else if (this.type === 'ministerUser') { + this.roleForm.ministerUser = data[0].id + this.roleForm.ministerUserName = data[0].name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = data[0].id + this.roleForm.directorUserName = data[0].name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = data[0].id + this.roleForm.presidentUserName = data[0].name + } + }, + choiceZRRS () { + this.nodeList2 = [] + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + this.modalshowflag2 = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -487,49 +351,6 @@ export default { fileUpload () { this.fileMadel = true }, - saveUserInfo () { - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } - this.modalshowflag = false - }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.filterText1 = '' - this.modalshowflag = true - }, - getTree () { - this.treeLoading = true - this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res=> { - this.treeData = res - this.treeLoading = false - }) - }, handleTabs(name) { this.active = name }, @@ -591,9 +412,7 @@ export default { }) } }, - mounted () { - this.getTree() - } + mounted () {} } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 1169ad9bf..299d6dbe8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -82,31 +82,12 @@ @submit="handleSubmit" > - - - - - + @@ -123,15 +104,9 @@ commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - roleRow: {}, - nodeList: [], + nodeList2: [], type: '', - defaultProps: { - children: 'children', - label: 'name' - }, - treeData: [], // 人员数据 - modalshowflag: false, // drawer开关 + modalshowflag2: false, // drawer开关 drawerTitle: '', //drawer标题 textarea: '', // 意见 ListModel: false, // 新增编辑抽屉开关 @@ -159,13 +134,10 @@ ProcessTitle }, methods: { - updateFile () { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model - }, - saveUserInfo () { + checkedRole2 (data) { var idList = '' var nameList = '' - this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => { + data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -175,22 +147,16 @@ }) this.form.responUserList = idList this.form.responUserListName = nameList - this.modalshowflag = false }, - cancleUserInfo () { - this.modalshowflag = false + updateFile () { + window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model }, choiceZRR () { - this.nodeList = [] - if (this.form.responUserList.length > 0) { - this.nodeList = this.form.responUserList.split(',') + this.nodeList2 = [] + if ( this.form.responUserList.length > 0) { + this.nodeList2 = this.form.responUserList.split(',') } - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) + this.modalshowflag2 = true }, handleTabs(name) { this.active = name @@ -238,7 +204,6 @@ }, }, mounted () { - this.getTree() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 70146884e..22b171a3f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -505,6 +505,13 @@ export default { this.showColumn = true; }); this.modalshowflag2 = false; + //不要删除 By 宋伟佳 + console.log(this.$refs.multipleTable.clearSelection()) + this.$nextTick(() => { + for(var i=0;i + - + @@ -498,6 +507,87 @@ + + + + + {{ editRowData.standSortShow }} {{ editRowData.standNumber }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 提交 + 取消 +
+