diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index bb5347590..a12c91af1 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -69,7 +69,9 @@ @check="drawerCheck" show-checkbox ref="tree" - :lazy="false"> + :lazy="false" + :key="treeKey" + > {{ node.label }} @@ -158,7 +160,13 @@ } }, methods: { - handleClose (tag) { + nameJoinAccount(treeData1){ + treeData1.forEach(item=>{ + if(item.account) item.name = `${item.name}(${item.account})` + if(item.children) this.nameJoinAccount(item.children) + }) + }, + handleClose (tag) { let arr = [] for (let a = 0; a < this.delList.length; a++) { if (tag.id === this.delList[a].id) { @@ -213,6 +221,7 @@ this.treeData1.forEach(item => { this.defaultKey.push(item.id) }) + this.nameJoinAccount(this.treeData1) this.treeLoading = false }) // this.treeKey++ @@ -332,7 +341,8 @@ } this.open1 = true }, - drawerCheck (data) {//当复选框被点击的时候触发 + drawerCheck (data) { + //当复选框被点击的时候触发 //共两个参数,依次为:传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象,包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性 if (this.checkBox) { // 单选 // 单选判断 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 5f960aa29..be2e84b1c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -755,10 +755,10 @@ export default { { required: true, message: "请输入工作组组长", trigger: "blur" } ], draftTime: [ - { required: true, message: "请选择计划标准初稿完成时间", trigger: "change" } + { required: true, message: "请选择计划标准初稿完成时间", trigger: "blur" } ], releaseTime: [ - { required: true, message: "请选择计划标准发布时间", trigger: "change" } + { required: true, message: "请选择计划标准发布时间", trigger: "blur" } ], endTime: [ { required: true, message: "请选择立项完成时间", trigger: "change" } @@ -767,10 +767,10 @@ export default { { required: true, message: "请选择体系结构", trigger: "change" } ], area: [ - { required: true, message: "请选择适用车型", trigger: "change" } + { required: true, message: "请选择适用车型", trigger: "blur" } ], isRelate: [ - { required: true, message: "请选择是否采用标准", trigger: "change" } + { required: true, message: "请选择是否采用标准", trigger: "blur" } ], technologic: [ { required: true, message: "请输入指标依据", trigger: "blur" } @@ -1135,6 +1135,17 @@ export default { }, TXJGenterDrawer () { let list = this.$refs.TXJGTree.getCheckedNodes() + if (this.$refs.TXJGTree.getCheckedNodes().length > 1) { + this.$message.warning('仅能选择一个体系结构') + return; + } + if(list.length > 0){ + let parenList = list.filter ( item => item.parentId === null || item.parentId === ''); + if (parenList.length > 0) { + this.$message.error('请选择二级及以下目录') + return + } + } let id = '' let name = '' list.map(item => { @@ -1169,6 +1180,7 @@ export default { }, QYBZcloseDrawer () { this.clearQYBZ() + this.QYBZmodal = false;//关闭弹窗 }, QYBZenterDrawer () { console.log(this.QYBZformSelect);