diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index 8fe10d24b..cdeaa62c6 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -116,6 +116,12 @@ export default { this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{ _this: this }, res => { + this.$http.post("lawss/activiti/completeTask", { + json: JSON.stringify(this.form), + taskId: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + }); if(res.respCode === '200'){ this.form.reply = '' this.fileList = [] diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue index 2db8bdde9..a6a033a1e 100644 --- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -58,7 +58,7 @@ export default { institutionId: this.$store.getters.userInfo.institutionId, answererNowUserId: this.$store.getters.userInfo.userId, answererNowUserName: this.$store.getters.userInfo.userName, - fileList:[], + // fileList:[], } }, methods:{ diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 10af77639..da931bca0 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1331,10 +1331,17 @@ export default { answerList: [], standList: [], questionsList: [], + prcName:'', + taskIds:'', standMap: new Map() } }, mounted(){ + if(this.$route.query){ + var index = this.$route.query.prcName.indexOf('-(') + this.prcName = this.$route.query.prcName.substring(0,index) + this.taskIds = this.$route.query.taskIds + } this.standSearch() // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -1824,6 +1831,10 @@ export default { }, //查询提问标准 standSearch(){ + if(this.$route.query){ + this.questionSerach.standardEncdoing = this.prcName + } + console.log(this.questionSerach) this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{ _this: this }, res =>{ @@ -1933,12 +1944,25 @@ export default { this.handleSelectForm.lawName = '' this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' - this.$http.postData('lawss/activiti/startProcessRollBack',{ + this.$http.post('lawss/activiti/startProcessRollBack',{ json: JSON.stringify(res.data), - type: '27' }, + type: '27', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + }, { _this: this - }, res => { + }, val => { + this.$http.post('lawss/activiti/completeTask',{ + taskIds: val.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(res.data), + }, + { + _this: this + }, res => { + }, e => { + }) }, e => { }) }, e => { diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 4ca8a60fe..89d232ba1 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -111,7 +111,11 @@ export default { { label: "企标制修订立项", value: "26" - } + }, + { + label: "问答流程", + value: "27" + } ], formDisableFlag: false, pickerOptions: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 39983ba25..399809b91 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2227,6 +2227,18 @@ export default { }) } break + case '27': + this.$router.push({ + name: 'MyQuestions', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + + } + }) } }, ...mapMutations(['setProcess', 'setHandleInfo']),