From 7d4d3724cb7d99c3ae5c76a7b2ae19cf6e66dcd4 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 10:29:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B)=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 114 +++++++++++------- 1 file changed, 72 insertions(+), 42 deletions(-) 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 () { From f3b95693bdb8666f37182e3aa6effec4a1297733 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 10:47:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 1642658d3f351adf23e5dfdd6dfb79c84740d221 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 11:09:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index 673a6c6be..ffc22c8f3 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) } }) From 3f27a33cbdbc521df022dbf214d39e91fe9ff93d Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 11:26:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue | 1 + src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index ffc22c8f3..89b2528c9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -454,7 +454,7 @@ export default { pId: this.pId }).then(res => { if (res) { - this.commentText = res.commitText + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); } From d17e99e4b4918ecfe9be6244f90c753e33673c7c Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 11:36:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue | 1 + 1 file changed, 1 insertion(+) 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){