From c1829340fe8c94c0fe059b7605843038a2676c2a Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 11 Apr 2023 10:30:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step5.vue | 122 +++++++++++++----- 1 file changed, 87 insertions(+), 35 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 78f088bcf..1e95821ba 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -662,6 +662,18 @@ 提交 + + + 当前征询意见暂无，请确认是否提交 + + 取 消 + 确 定 + + { if (valid) { - this.isSubmit = true - this.saveLoading = true - - this.summary=this.summaryList.map(item => item.id).join(",") - this.summaryName=this.summaryList.map(item => item.name).join(",") - - this.form.commentText = this.formTongGuo.commentText - // this.form.approvalOpinion = this.formTongGuo.approvalOpinion - // 会签意见存储 - const json = JSON.stringify(this.form); - 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.isSubmit = false - this.saveLoading = false - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } - }else { - this.$message.success(res.message) - } - }) + if(this.form.modelData.length === 0){ + this.opinionDialogVisible = true + }else{ + this.commentTextHandle(); + } + // this.isSubmit = true + // this.saveLoading = true + // + // this.summary=this.summaryList.map(item => item.id).join(",") + // this.summaryName=this.summaryList.map(item => item.name).join(",") + // + // this.form.commentText = this.formTongGuo.commentText + // + // // this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // // 会签意见存储 + // const json = JSON.stringify(this.form); + // 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.isSubmit = false + // this.saveLoading = false + // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // // if(this.formTongGuo.approvalOpinion === '1'){ + // // this.$message.warning("驳回成功") + // // this.isSubmit = false + // // // 流程提交之后，应该流转至待办任务页面 + // // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // // }else{ + // // this.processCreateLaws(json) + // // } + // }else { + // this.$message.success(res.message) + // } + // }) }else { this.$message.warning('请确认是否填写完整') } @@ -2946,6 +2965,39 @@ } }) }, + opinionClick(){ + this.opinionDialogVisible = false + this.commentTextHandle(); + }, + commentTextHandle(){ + this.isSubmit = true + this.saveLoading = true + + this.summary=this.summaryList.map(item => item.id).join(",") + this.summaryName=this.summaryList.map(item => item.name).join(",") + + this.form.commentText = this.formTongGuo.commentText + + // 会签意见存储 + const json = JSON.stringify(this.form); + 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.isSubmit = false + this.saveLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + }else { + this.$message.success(res.message) + } + }) + }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { _this: this From 1a137cb6fc9698cd519ac96a5531716181d0254f Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 11 Apr 2023 10:42:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personal/pages/my-questions/components/questionDetail.vue | 3 ++- src/pages/personal/pages/my-questions/index3.vue | 3 ++- src/pages/regulatoryRepository/standQA/index.vue | 3 ++- src/pages/regulatoryRepository/standQA/index2.vue | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/questionDetail.vue b/src/pages/personal/pages/my-questions/components/questionDetail.vue index f284d082f..72d306346 100644 --- a/src/pages/personal/pages/my-questions/components/questionDetail.vue +++ b/src/pages/personal/pages/my-questions/components/questionDetail.vue @@ -44,7 +44,8 @@ export default { }, getDetail(){ this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ - id: this.attId + id: this.attId, + userId: this.$store.getters.userInfo.userId },{ _this: this }, res => { diff --git a/src/pages/personal/pages/my-questions/index3.vue b/src/pages/personal/pages/my-questions/index3.vue index 654186a87..c675a94cc 100644 --- a/src/pages/personal/pages/my-questions/index3.vue +++ b/src/pages/personal/pages/my-questions/index3.vue @@ -1724,7 +1724,8 @@ export default { this.dataLoading = true sessionStorage.setItem('queId', this.activeQue) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ - id: this.activeQue + id: this.activeQue, + userId: this.$store.getters.userInfo.userId },{ _this: this }, res => { diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index b79eeb03c..8f02d804b 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -691,7 +691,8 @@ export default { console.log('row = ', row) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ id: row.id, - state: 'yes' + state: 'yes', + userId: this.$store.getters.userInfo.userId },{ _this: this }, res => { diff --git a/src/pages/regulatoryRepository/standQA/index2.vue b/src/pages/regulatoryRepository/standQA/index2.vue index c915af9d2..4cb43e9bc 100644 --- a/src/pages/regulatoryRepository/standQA/index2.vue +++ b/src/pages/regulatoryRepository/standQA/index2.vue @@ -1037,7 +1037,8 @@ export default { sessionStorage.setItem('queId', this.activeQue) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ id: this.activeQue, - state: 'yes' + state: 'yes', + userId: this.$store.getters.userInfo.userId },{ _this: this }, res => {