diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue index c1c53ecd8..bdd588f52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue @@ -501,43 +501,69 @@ }, getData() { this.$http.get('lawss/activiti/decodeDetail',{ - taskId: this.taskIds, + taskIds: this.taskIds, pId: this.pId },{},res=>{ - + let data = JSON.parse(res.mesg) + console.log(data) + this.form.endTime = data.endTime || data.form.endTime + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName + this.commentText6 = data.commentText || '' + if (data.form) { + this.form.itemsName1 = data.form.itemsName1 || '' + this.form.itemsNum1 = data.form.itemsNum1 || '' + } else { + this.form.itemsName1 = data.itemsName1 || '' + this.form.itemsNum1 = data.itemsNum1 || '' + } + this.sarType = data.standInData || data.sarType + this.json = data + this.itemList = data.itemList + this.itemList.forEach(item => { + if(item.complianceRequir === '1'){ + item.complianceRequirShow = '符合' + }else{ + item.complianceRequirShow = '不符合' + } + }) + this.loading = false }) + // return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - this.form.endTime = data.endTime || data.form.endTime - this.form.itemsNum = data.itemsNum || data.form.itemsNum - this.form.itemsName = data.itemsName || data.form.itemsName - this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId - this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName - this.commentText6 = data.commentText || '' - if (data.form) { - this.form.itemsName1 = data.form.itemsName1 || '' - this.form.itemsNum1 = data.form.itemsNum1 || '' - } else { - this.form.itemsName1 = data.itemsName1 || '' - this.form.itemsNum1 = data.itemsNum1 || '' - } - this.sarType = data.standInData || data.sarType - this.json = data - this.itemList = data.itemList - this.itemList.forEach(item => { - if(item.complianceRequir === '1'){ - item.complianceRequirShow = '符合' - }else{ - item.complianceRequirShow = '不符合' - } - }) - this.loading = false - }).catch(e => { - }) + // inboundLiaisonDetail({ + // taskIds: this.taskIds, + // pId: this.pId + // }).then(res => { + // let data = JSON.parse(res.mesg) + // this.form.endTime = data.endTime || data.form.endTime + // this.form.itemsNum = data.itemsNum || data.form.itemsNum + // this.form.itemsName = data.itemsName || data.form.itemsName + // this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + // this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName + // this.commentText6 = data.commentText || '' + // if (data.form) { + // this.form.itemsName1 = data.form.itemsName1 || '' + // this.form.itemsNum1 = data.form.itemsNum1 || '' + // } else { + // this.form.itemsName1 = data.itemsName1 || '' + // this.form.itemsNum1 = data.itemsNum1 || '' + // } + // this.sarType = data.standInData || data.sarType + // this.json = data + // this.itemList = data.itemList + // this.itemList.forEach(item => { + // if(item.complianceRequir === '1'){ + // item.complianceRequirShow = '符合' + // }else{ + // item.complianceRequirShow = '不符合' + // } + // }) + // this.loading = false + // }).catch(e => { + // }) // }) }, },