From ccc79fb9ff0df56ee1ce6c7a74ab6a2fdc2afe87 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 16:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B=20=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B)=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 146 +++++++++--------- .../pages/creatProcess/bzzqyj/step5-1.vue | 1 + .../pages/creatProcess/qbfz/step4-1.vue | 4 +- .../pages/processDetail/index.vue | 5 +- 4 files changed, 82 insertions(+), 74 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index 9d581ca7e..b9fff7703 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -436,77 +436,81 @@ }) }, getData() { - 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 => { - // }) - // }) + // return new Promise((resolve, reject) => { + // this.$http.get("lawss/activiti/queryTaskIndex", { + // prcId: this.$route.query.processInstanceId, + // taskIds: this.$route.query.taskIds + // }, { + // _this: this + // }, res => { + // this.$nextTick(()=>{ + // console.log(res) + // let data = JSON.parse(res.mesg) + // let jsonData = JSON.parse(res.mesg) + // console.log(jsonData) + // 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.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 + // + // 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.commentText5 = data.commentText || '' + 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[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/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index db7b76430..39f440ebe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -676,6 +676,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); + console.log(data) this.commentText5 = data.commentText || '' this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue index 7777ffc6a..5ca8bfef6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue @@ -278,7 +278,7 @@ export default { data() { return { activesNames:'1', - disabledXX:this.$route.query.disabledXX, + disabledXX:!!this.$route.query.disabledXX, active: "1", isTransfer: false, isSubmit: false, @@ -360,9 +360,9 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)); + this.commentText = item.commentText let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; res = res.split(","); this.dataList = []; diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 6c4d5245d..363b77b35 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -205,7 +205,10 @@ export default { approveHandler(){ let index = this.detailData.length - 1 // 当前流程任务最后一步index let isEnd = true - let row = {...this.detailData[this.approveRowIndex]}//汇总页数据 + let row = {...this.detailData[this.approveRowIndex+1]}//汇总页数据 + if(this.approveRowIndex ===this.detailData.length-1){ //最后一步 + row = {...this.detailData[this.approveRowIndex]} + } row.taskIds = row.id row.taskInfo = row.name row.tabsName = this.$route.query.tabsName