From d59fae7b17d4c6a7521968042823d0561b023611 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 6 Aug 2021 15:31:03 +0800 Subject: [PATCH 1/7] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index fd03d1776..a8363e696 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -329,9 +329,10 @@ this.form.title = data.title this.form.date = data.date this.json = data - this.tableData = data.responUserListMap + this.tableData = data.responUserList this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName + console.log(data); }).catch(e => { }) }) From e213095f8fdeabde3e16a0914c62bd53a60f2312 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 6 Aug 2021 15:31:34 +0800 Subject: [PATCH 2/7] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index a8363e696..1c962674b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -332,7 +332,6 @@ this.tableData = data.responUserList this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName - console.log(data); }).catch(e => { }) }) From 75eefe43944a57ee16a48876cabd4a5560f2e748 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 6 Aug 2021 15:39:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzdy/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzdy/step7.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzdy/step8.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzdy/step9.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 307627111..529ac6782 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -344,7 +344,7 @@ this.form.title = data.title this.form.date = data.date this.json = data - this.tableData = data.responUserListMap + this.tableData = data.responUserList this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index caf5acd2d..6bbd01b4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -344,7 +344,7 @@ this.form.title = data.title this.form.date = data.date this.json = data - this.tableData = data.responUserListMap + this.tableData = data.responUserList this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index df88eaaca..af250d1cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -344,7 +344,7 @@ this.form.title = data.title this.form.date = data.date this.json = data - this.tableData = data.responUserListMap + this.tableData = data.responUserList this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 16c896fdb..889c9514d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -344,7 +344,7 @@ this.form.title = data.title this.form.date = data.date this.json = data - this.tableData = data.responUserListMap + this.tableData = data.responUserList this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId }).catch(e => { From 8975e7a82755a3df7db0fa3adeb07a319e61a3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 16:08:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step4.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7f30f2f5b..c5656481f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -429,17 +429,19 @@ export default { }, checkedRole (data) { if (this.type === 1) { - this.dataList[this.zrIndex].liablePeopleId = data[0].id - this.dataList[this.zrIndex].liablePeople = data[0].name - this.$forceUpdate() + const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])) + newRow.liablePeopleId = data[0].id + newRow.liablePeople = data[0].name + this.$set(this.dataList, this.zrIndex, newRow) } else if(this.type === 2) { - this.dataList.forEach( item => { + this.dataList.forEach((item, index) => { this.selectList.forEach( items => { if (item.standId === items.standId) { - item.liablePeopleId = data[0].id - item.liablePeople = data[0].name + const newRow = JSON.parse(JSON.stringify(item)) + newRow.liablePeopleId = data[0].id + newRow.liablePeople = data[0].name + this.$set(this.dataList, index, newRow) } - this.$forceUpdate() }) }) } From acda18549d858a2c12115744f8b0c3389fdcf10e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 6 Aug 2021 17:22:32 +0800 Subject: [PATCH 5/7] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 337123722..9d2bb1b9c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -597,7 +597,7 @@ // this.form.itemsNum = bringData[0].showNumber // this.form.itemsName = bringData[0].standName // } - this.form.standId = bringData[0].id + this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId this.listModel = false; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index e585ffffa..c8934d8d6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -602,7 +602,7 @@ // this.form.itemsNum = bringData[0].showNumber // this.form.itemsName = bringData[0].standName // } - this.form.standId = bringData[0].id + this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId this.listModel = false; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index cbfc3ee3e..74b330f0a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -281,6 +281,7 @@ export default { cid: '', // 编号 endTime: '', // 结束日期 cname: '', // 名称 + standType: '', }, formRules: { cid: [ @@ -454,6 +455,7 @@ export default { } else { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber } + this.form.standType = bringData[0].standType this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { From e08cbb9a0c785e73420acdfb7bf603b4eacaa7b5 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 6 Aug 2021 17:25:59 +0800 Subject: [PATCH 6/7] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 9d2bb1b9c..2bd84c26a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -603,7 +603,7 @@ this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { - infoId: this.form.standId, + infoId: bringData[0].id, page: 1, pageSize: 9999 }, { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index c8934d8d6..a636f009c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -608,7 +608,7 @@ this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { - infoId: this.form.standId, + infoId: bringData[0].id, page: 1, pageSize: 9999 }, { From 16e221c5caa54991f3dab8580db5eacb11b3d4a9 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 6 Aug 2021 17:29:07 +0800 Subject: [PATCH 7/7] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 64ddfde94..2422224f2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -190,7 +190,7 @@

点击或拖拽上传文件

- +