diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index b01facf1c..fd713d057 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -5,7 +5,7 @@ :visible.sync="isVisible2" :wrapperClosable="false" @close="handleTreeDrawerCancel" - size="400px"> + size="460px"> { + arr.push(item) + }) + this.$refs.tree.setCheckedKeys(arr); + for (let b = 0; b < this.nodeList2.length; b++) { + if (tag.id === this.nodeList2[b]) { + this.nodeList2.splice(b, 1) } } }, @@ -166,7 +172,8 @@ cancelButtonText: '取消', }).then(() => { this.delList = [] - this.nodeList = [] + this.nodeList2 = [] + this.$refs.tree.setCheckedKeys([]); }).catch(() => { this.$message({ type: 'info', @@ -191,13 +198,20 @@ }), checkChange2 (row, type, c) { if (this.checkBox) { + } else { if (type) { - this.nodeList.push(row.id) + this.nodeList2.push(row.id) + this.delList.push(row) } else { - for (let a = 0; a < this.nodeList.length; a ++) { - if (row.id === this.nodeList[a]) { - this.nodeList.splice(a, 1) + for (let a = 0; a < this.nodeList2.length; a ++) { + if (row.id === this.nodeList2[a]) { + this.nodeList2.splice(a, 1) + } + } + for (let b = 0; b < this.delList.length; b++) { + if (row.id === this.delList[b].id) { + this.delList.splice(b, 1) } } } @@ -205,18 +219,24 @@ }, checkChange (row, type, c) { if (this.checkBox) { + } else { if (type) { - this.nodeList.push(row.id) + this.nodeList2.push(row.id) + this.delList.push(row) } else { - for (let a = 0; a < this.nodeList.length; a ++) { - if (row.id === this.nodeList[a]) { - this.nodeList.splice(a, 1) + for (let a = 0; a < this.nodeList2.length; a++) { + if (row.id === this.nodeList2[a]) { + this.nodeList2.splice(a, 1) + } + } + for (let b = 0; b < this.delList.length; b++) { + if (row.id === this.delList[b].id) { + this.delList.splice(b, 1) } } } } - }, handleTreeDrawerCancel () { this.filterText = '' @@ -228,9 +248,9 @@ this.isVisible2 = false this.$emit('checkedRole', this.roleList) } else { - if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) { + if (this.nodeList2.length > 0 && this.nodeList2[0].length !== 0) { let ids = '' - this.nodeList.forEach(item => { + this.nodeList2.forEach(item => { if (ids.length > 0) { ids += ',' ids += item @@ -295,10 +315,11 @@ watch: { isVisible (val) { this.isVisible2 = val + this.nodeList2 = this.nodeList if (val) { - if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) { + if (this.nodeList2.length > 0 && this.nodeList2[0].length !== 0) { let ids = '' - this.nodeList.forEach(item => { + this.nodeList2.forEach(item => { if (ids.length > 0) { ids += ',' ids += item diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index ac4fd65f9..77d27dd58 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -169,14 +169,14 @@ show-overflow-tooltip align="center"> - - + + + + + + + + 比对条款: {{ plForm.itemsNum }}
相似度: {{ similarityDegree }}
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 2e7c9371a..3e3076bfc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -220,14 +220,14 @@ show-overflow-tooltip align="center">
- - + + + + + + + + - - + + + + + + + + 比对条款: {{ plForm.itemsNum }}
相似度: {{ similarityDegree }}
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index dfc5bf555..6ed7eec7b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -154,14 +154,14 @@ show-overflow-tooltip align="center">
- - + + + + + + + + - - + + + + + + + + 比对条款: {{ editForm.itemsNum }}
相似度: {{ similarityDegree }}
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index d45519668..b5bf367d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -163,14 +163,14 @@ show-overflow-tooltip align="center">
- - + + + + + + + + - - + + + + + + + + - - + + + + + + + +