From 2df6b33b420759356aa5ff5a66cc2fc0a14032ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 14:27:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 23 +++++++++++++++++-- .../pages/creatProcess/xmpg2/step3.vue | 20 +++++++++------- .../pages/creatProcess/xmpg2/step4.vue | 15 ++++++++++-- .../pages/creatProcess/xmpg2/step5.vue | 1 + 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 72226053d..7b9b0d664 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -399,8 +399,27 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.approvalOpinion = "1"; - this.handleSubmit(); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.approvalOpinion = "1"; + this.saveLoading = true + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.saveLoading = false + }); + }/**/ }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index c59d0535d..81f1b0667 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -282,7 +282,7 @@ export default { }, // 点击查看 handlePreview(item) { - console.log(item) + console.log(item); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -304,14 +304,14 @@ export default { }, res => { this.standardData = res.data.list; this.standardData.forEach(item => { - if(item.attrInfoMap === null){ - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - }else{ + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); } - }) + }); this.totalNo = res.data.count; }, e => { }); @@ -354,7 +354,10 @@ export default { }, //提交事件 handleSubmit() { - this.isSubmit = true + if (!this.listForm.jgUser) { + this.$message.warning("请选择架构经理"); + } else { + this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -368,9 +371,10 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); + } }, choiceZRR(scope, type, title, id) { if (scope != null) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7bf689c06..7f30f2f5b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -108,12 +108,12 @@ > @@ -370,6 +370,7 @@ export default { if(this.peopleFlag === true){ this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + console.log(json) this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -430,6 +431,7 @@ export default { if (this.type === 1) { this.dataList[this.zrIndex].liablePeopleId = data[0].id this.dataList[this.zrIndex].liablePeople = data[0].name + this.$forceUpdate() } else if(this.type === 2) { this.dataList.forEach( item => { this.selectList.forEach( items => { @@ -437,6 +439,7 @@ export default { item.liablePeopleId = data[0].id item.liablePeople = data[0].name } + this.$forceUpdate() }) }) } @@ -451,6 +454,14 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, + watch: { + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } + }, mounted() { this.processTable(); this.getData(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 1f133c46f..eae3ab927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -315,6 +315,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); From 23b53acfd5944fc2618060783580aaa5f84a0771 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 14:29:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 6f7caa83e..846e6f474 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -50,7 +50,10 @@ + placeholder="请输入链接"> + From 4dd2f05b04fcf1643ba2c414a7f48dc3dbf26170 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 14:31:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 846e6f474..c8f93bc6b 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -51,7 +51,7 @@ label="链接"> From 0267a00eefe43f8da5f9daf2b89aedb8bb5173f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 14:55:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 71 ++++++++++++++++--- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 7b9b0d664..f1966e1a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -37,18 +37,40 @@ clearable > - -
-

{{ listForm.modelName }} + + + + + + + + + + + + + + + + + + + + + + +

+

{{ item.name }} @@ -255,6 +277,7 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -356,6 +379,9 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + this.fileIds = item.fileId; + console.log(this.fileIds); + this.getFileInfo(); }); }, // 请求上传的文件信息 @@ -365,11 +391,15 @@ export default { }, { _this: this }, res => { - console.log(res); this.$nextTick(() => { res.data.map(item => { - this.listForm.modelName = item.oldFileName; - this.listForm.model = item.id; + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); }); }); }, e => { @@ -499,6 +529,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { From b1e39201f567260dd1fe4cfe3d36d37323af678a Mon Sep 17 00:00:00 2001 From: song2048 <2639528268@qq.com> Date: Fri, 6 Aug 2021 15:10:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9C=A8=E8=A1=A8=E6=A0=BC=E5=90=8E?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=93=8D=E4=BD=9C=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 601dc8728..03ea3ab2f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -189,7 +189,7 @@ align="center" label="项目经理"> - +