From 4edd6223009798c9a8f54e0a8b55314bd8ca1692 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 7 Dec 2022 16:10:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=20=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E7=A1=AE=E8=AE=A4-=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 5f960aa29..28234689a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -1169,6 +1169,7 @@ export default { }, QYBZcloseDrawer () { this.clearQYBZ() + this.QYBZmodal = false;//关闭弹窗 }, QYBZenterDrawer () { console.log(this.QYBZformSelect); From b642ce05249c80d1115fa8386b6df282566a2a52 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 7 Dec 2022 16:46:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-=E7=AB=8B?= =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4=E8=8A=82=E7=82=B9-=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbzxdlx/step2.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 28234689a..6e4cbcd1b 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" } From 1c599c327a62d7f5a4262b591938497049d60177 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 7 Dec 2022 18:01:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-=E7=AB=8B?= =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4=E8=8A=82=E7=82=B9-=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step2.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 6e4cbcd1b..be2e84b1c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -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 => { From bb755b71ecf0ac7f97a9d61e6cb41e77e1833b15 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 8 Dec 2022 14:39:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=80=89=E6=8B=A9tree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/roleTree/index.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 5bf1d07fc..a12c91af1 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -70,7 +70,8 @@ show-checkbox ref="tree" :lazy="false" - :key="treeKey"> + :key="treeKey" + > {{ node.label }} @@ -159,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) { @@ -214,6 +221,7 @@ this.treeData1.forEach(item => { this.defaultKey.push(item.id) }) + this.nameJoinAccount(this.treeData1) this.treeLoading = false }) // this.treeKey++ @@ -333,7 +341,8 @@ } this.open1 = true }, - drawerCheck (data) {//当复选框被点击的时候触发 + drawerCheck (data) { + //当复选框被点击的时候触发 //共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性 if (this.checkBox) { // 单选 // 单选判断