From 76276fc50b16c01c13c61d7ed9bfb806c60f7054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 9 Mar 2022 14:05:35 +0800 Subject: [PATCH 01/63] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B=E6=92=A4=E5=9B=9E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=8F=91=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 04fa73d4e..b8247fcd3 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -436,9 +436,9 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes); - this.dataList = mes.dataList; - this.roleForm = mes.roleForm; - this.commentText = mes.commentText; + this.dataList = mes.dataList || mes.json.standardInfoList; + this.roleForm = mes.roleForm || mes.json.roleForm; + this.commentText = mes.commentText || mes.json.commentText; }); }, //点击新增事件 @@ -609,6 +609,7 @@ export default { this.$message.warning('请完善人员信息') } else { if(!this.submitFlag){ + console.log('第一次提交'); this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true @@ -647,6 +648,7 @@ export default { } }) }else{ + console.log('修改后提交'); this.$refs["roleForm"].validate((valid) => { if (valid) { let specialJson = { From e6e01768af037938c419605b1d0e30a6801c475c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 9 Mar 2022 16:40:13 +0800 Subject: [PATCH 02/63] commit --- src/components/roleTree/index.vue | 61 +++++++++++++------ .../pages/creatProcess/bzjd/step1-1.vue | 20 +++--- .../pages/creatProcess/bzjd/step1-6.vue | 16 ++--- .../pages/creatProcess/bzjd/step1.vue | 20 +++--- .../pages/creatProcess/bzjd/step2.vue | 16 ++--- .../pages/creatProcess/bzjd/step3.vue | 20 +++--- .../pages/creatProcess/bzjd/step4.vue | 16 ++--- .../pages/creatProcess/bzjd/step5.vue | 16 ++--- .../pages/creatProcess/bzjd/step6.vue | 16 ++--- 9 files changed, 111 insertions(+), 90 deletions(-) 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">
- - + + + + + + + + - - + + + + + + + + - - + + + + + + + + Date: Thu, 10 Mar 2022 13:58:42 +0800 Subject: [PATCH 03/63] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=9B=B4=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=20=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-4.vue | 25 ++- .../pages/creatProcess/xmqdqr/step1.vue | 167 ++---------------- .../pages/creatProcess/xmqdqr/step2.vue | 25 ++- .../pages/creatProcess/xmqdqr/step3.vue | 25 ++- .../pages/creatProcess/xmqdqr/step4.vue | 25 ++- 5 files changed, 52 insertions(+), 215 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue index 56ff32641..3dcb6b64c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -38,14 +38,6 @@ clearable > - - -
@@ -105,6 +97,16 @@ {{ scope.row.standEnName }} + + + - -
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index f870ace4b..6153db5a6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -42,15 +42,6 @@ clearable > - - - - 选择清单 {{ scope.row.standEnName }} + + + - - @@ -326,141 +320,6 @@ 带入
- - -
-
-
-
- - - - - - - - - - - - - 查询 - - - - 清空 - - - -
- - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
- - - @@ -111,6 +103,16 @@ {{ scope.row.standEnName }} + + + - -
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index d79b0540f..59ed78827 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -38,14 +38,6 @@ clearable > - - - @@ -111,6 +103,16 @@ {{ scope.row.standEnName }} + + + - -
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 40dbca3fd..26f79189d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -38,14 +38,6 @@ clearable > - - - @@ -105,6 +97,16 @@ {{ scope.row.standEnName }} + + + - -
From 88e12bc479b97880dde1278d034cd3f3f81965eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 10 Mar 2022 14:15:37 +0800 Subject: [PATCH 04/63] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E7=9A=84=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step4.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzpg/step5.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzpg/step6.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzpg/step7.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzpg/step8.vue | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index b36091c4b..4dcc3d587 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -148,12 +148,14 @@ Date: Thu, 10 Mar 2022 15:14:34 +0800 Subject: [PATCH 05/63] commit --- src/components/roleTree/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index fd713d057..dc6514e3e 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -78,7 +78,7 @@ closable> {{tag.name}} - 全部删除 + 全部删除