From e3b238db173c14437669e810e42294be760144fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 30 Nov 2021 20:53:40 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/xmpg2/step10.vue | 12 +++---- .../pages/creatProcess/xmpg2/step11.vue | 12 +++---- .../pages/creatProcess/xmpg2/step12.vue | 11 ++++--- .../pages/creatProcess/xmpg2/step7.vue | 32 ------------------- .../pages/creatProcess/xmpg2/step8.vue | 11 ++++--- .../pages/creatProcess/xmpg2/step9.vue | 11 ++++--- .../pages/details.vue | 2 +- 7 files changed, 31 insertions(+), 60 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 041a1f3a3..4bc687e09 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -470,13 +470,16 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); + let dataChildren = [] + let dataListChildren = [] this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - let dataChildren = [] - let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -493,11 +496,9 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; - // this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 @@ -529,7 +530,6 @@ export default { this.listForm.bzFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); - console.log(json); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index bbfdd69d1..ff5c3e3f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -467,16 +467,18 @@ export default { }, //动态表单读取 getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); + let dataChildren = [] + let dataListChildren = [] this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - let dataChildren = [] - let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -493,11 +495,9 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; - // this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - // this.listForm.breakdownList = item.breakdownList; }); }, //提交事件 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 0efc5a1d9..87f80fe44 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -470,13 +470,16 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); + let dataChildren = [] + let dataListChildren = [] this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - let dataChildren = [] - let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -493,11 +496,9 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; - // this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 806cb6bc4..9d55151cc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -471,7 +471,6 @@ export default { console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - if (item.form === undefined) { let dataChildren = [] let dataListChildren = [] this.listForm.prcNum = this.prcNum; @@ -501,37 +500,6 @@ export default { dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; - } else { - this.listForm = item.form; - let dataChildren = [] - let dataListChildren = [] - this.listForm.dataList.forEach(item => { - if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ - this.dataList.push(item) - } - item.children.forEach(items=> { - if(items.key === item.standId){ - this.$set(items, "standName", item.standName); - this.$set(items, "standEnName", item.standEnName); - this.$set(items, "standYear", item.standYear); - this.$set(items, "standSort", item.standSort); - this.$set(items, "standNumber", item.standNumber); - } - }) - }) - this.listForm.dataList.forEach(item => { - dataChildren.push(item.children) - }) - dataChildren.forEach((item,index) => { - dataListChildren = dataListChildren.concat(item) - }) - dataListChildren = this.dataList.concat(dataListChildren) - this.dataList = dataListChildren - this.total = this.dataList.length; - // this.dataList = item.form.dataList[0].children; - // this.total = item.form.dataList[0].children.length; - } - }); }, //驳回事件 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 604607676..ecd61f622 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -468,13 +468,16 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); + let dataChildren = [] + let dataListChildren = [] this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - let dataChildren = [] - let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -491,11 +494,9 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; - // this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 647699719..96e427c4b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -470,13 +470,16 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); + let dataChildren = [] + let dataListChildren = [] this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - let dataChildren = [] - let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -493,11 +496,9 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; - // this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 9c475ba22..3c9121860 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -161,7 +161,7 @@