From e220e9c1f4ff32486fc5a725ae9f3475fe5b107e 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, 21 Jul 2021 15:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=8F=8A=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 9 +- .../pages/creatProcess/xmpg/step2.vue | 2 +- .../pages/creatProcess/xmpg/step3.vue | 132 ++++++++++++++---- .../pages/creatProcess/xmpg/step4.vue | 4 +- .../pages/creatProcess/xmpg/step5.vue | 2 +- .../pages/creatProcess/xmpg/step6.vue | 2 +- .../pages/creatProcess/xmpg/step7.vue | 2 +- .../nonConfomity/pages/historicalData.vue | 24 +++- .../pages/rectificationDatabase.vue | 19 ++- 9 files changed, 153 insertions(+), 43 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 4a1f06106..cdf384538 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1064,6 +1064,7 @@ export default { //提交事件 handleSubmit() { let json = this.listForm; + console.log(this.fileInfoList.join(',')); this.listForm.fileId = this.fileInfoList.join(',') this.listForm.fileName = this.fileListName.join(',') // let json = Object.assign(this.listForm, this.roleForm) @@ -1110,9 +1111,11 @@ export default { // 删除上传的文件 delFileInfo(file, fileList) { this.fileInfoList = fileList + let middle = [] fileList.forEach(item => { - this.fileListName = item.name + middle.push(item.name) }) + this.fileListName = middle }, fileUpload () { this.fileMadel = true @@ -1120,9 +1123,11 @@ export default { // 上传文件成功回调 uploadBackSuccess (res, file, fileList) { if (res.ok) { + let middle = [] fileList.forEach(item => { - this.fileListName = item.name + middle.push(item.name) }) + this.fileListName = middle this.fileInfoList = fileList this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.$message.success('上传成功') diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index b09a5622e..3643f6062 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -111,7 +111,7 @@
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ref="tree2"> -
-
+
{ + // if (this.selectList.includes(item.itemId)) { + // this.listForm.breakdownList[index].implementerId = this.roleRow.id; + // this.listForm.breakdownList[index].implementer = this.roleRow.name; + // } + // }); + // } else { + // this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; + // this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; + // } + // this.listForm.implementer = this.roleRow.name; + // this.showColumn = false; + // this.$nextTick(() => { + // this.showColumn = true; + // }); + // } + // this.modalshowflag = false; + // }, + saveUserInfo2 () { + var idList = ""; + var nameList = ""; + this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); // 如果有勾选的项 if (this.selectList.length) { this.listForm.breakdownList.forEach((item, index) => { + console.log(item.itemId); + console.log(index); if (this.selectList.includes(item.itemId)) { - this.listForm.breakdownList[index].implementerId = this.roleRow.id; - this.listForm.breakdownList[index].implementer = this.roleRow.name; + this.listForm.breakdownList[index].implementerId = idList; + this.listForm.breakdownList[index].implementer = nameList; } }); } else { - this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; - this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; + this.listForm.breakdownList[this.dsadadadsada].implementerId = idList; + this.listForm.breakdownList[this.dsadadadsada].implementer = nameList; } - this.listForm.implementer = this.roleRow.name; + this.listForm.implementer = nameList; this.showColumn = false; this.$nextTick(() => { this.showColumn = true; }); - } - this.modalshowflag = false; + this.modalshowflag2 = false; }, - cancleUserInfo() { - this.modalshowflag = false; + cancleUserInfo2() { + this.modalshowflag2 = false; }, - choiceZRR(scope, type, title, id) { + choiceZRRS(scope) { if (scope != null) this.dsadadadsada = scope.$index; this.nodeList = []; - this.nodeList.push(id); - this.type = type; - this.drawerTitle = title; - this.modalshowflag = true; + if (this.roleForm.implementer.length > 0) { + this.nodeList = this.roleForm.implementer.split(","); + } + this.modalshowflag2 = true; }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index a0d0d502b..a26e77563 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -271,9 +271,9 @@
-
+
-
+
-
+
-
+