diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index 9cc739ea8..9d581ca7e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -56,6 +56,7 @@ {{ form.hzfileName }} { - console.log(res) - }, e => { - }); - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - let jsonData = JSON.parse(res.mesg) - this.jsonData = jsonData.form ? jsonData.form : jsonData - this.commentText5 = data.commentText5 || '' - this.form.title = data.title || data.form.title - this.form.processName = data.processName || data.form.processName - this.form.date = data.date || data.form.date - let arr = data.responUserList || data.form.responUserList - let newArr = [] - for (let a = 0; a { - arr[a].institutionName = res.data[0].institutionName - }) - newArr.push(arr[a]) - } - this.tableData = newArr - this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') - this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') - this.newDocUser = data.form ? data.form.docUser : data.docUser - this.json = data || data.form - }).catch(e => { - }) - }) + return new Promise((resolve, reject) => { + this.$http.get("lawss/activiti/queryTaskIndex", { + prcId: this.$route.query.processInstanceId, + index: this.$route.query.index + }, { + _this: this + }, res => { + this.$nextTick(()=>{ + let data = JSON.parse(res.mesg) + let jsonData = JSON.parse(res.mesg) + this.jsonData = jsonData.form ? jsonData.form : jsonData + this.form.title = data.title || data.form.title + this.form.processName = data.processName || data.form.processName + this.form.date = data.date || data.form.date + let arr = data.responUserList || data.form.responUserList + let newArr = [] + for (let a = 0; a < arr.length; a++) { + arr[a].institutionName = '' + this.$http.get('sarUser/user/selectDeptByDY', { + ids: arr[a].dockUser + }, { + _this: this + }, res => { + arr[a].institutionName = res.data[0].institutionName + }) + newArr.push(arr[a]) + } + this.tableData = newArr + this.form.hzfileId = data.fileId + this.form.hzfileName = data.fileName + this.newDocUser = data.form ? data.form.docUser : data.docUser + this.json = data || data.form + + this.commentText5 = res.commitText || '' + }) + }, e => { + }); + }) + // return new Promise((resolve, reject) => { + // inboundLiaisonDetail({ + // taskIds: this.taskIds, + // pId: this.pId + // }).then(res => { + // let data = JSON.parse(res.mesg) + // let jsonData = JSON.parse(res.mesg) + // this.jsonData = jsonData.form ? jsonData.form : jsonData + // this.commentText5 = data.commentText5 || '' + // this.form.title = data.title || data.form.title + // this.form.processName = data.processName || data.form.processName + // this.form.date = data.date || data.form.date + // let arr = data.responUserList || data.form.responUserList + // let newArr = [] + // for (let a = 0; a { + // arr[a].institutionName = res.data[0].institutionName + // }) + // newArr.push(arr[a]) + // } + // this.tableData = newArr + // this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') + // this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') + // this.newDocUser = data.form ? data.form.docUser : data.docUser + // this.json = data || data.form + // }).catch(e => { + // }) + // }) }, }, mounted () { diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue index fbc4bc27f..57cb4b6be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue @@ -601,6 +601,7 @@ export default { pId: this.pId }).then(res => { if (res) { + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index 355a89064..db7b76430 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -676,7 +676,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - this.commentText5 = data.commentText5 || '' + this.commentText5 = data.commentText || '' this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index 673a6c6be..89b2528c9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -454,6 +454,7 @@ export default { pId: this.pId }).then(res => { if (res) { + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); } @@ -489,12 +490,9 @@ export default { titleList.push(data.title); } }) - console.log(titleList,"titleList!!!!") - console.log(this.dataList,"dataList 进入方法前 !!!!") titleList.forEach(tl => { this.dataList.forEach(data=>{ if (data.title === tl){ - console.log(data.title,"方法中的title !!!!") ordelTitleList.push(data) } }) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue index be6aaa8c9..069bb9633 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -866,6 +866,7 @@ export default { pId: this.pId }).then(res => { if (res) { + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg); let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){