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/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
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 => {