diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index 13ce4e5c0..b69e1ff75 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -365,15 +365,21 @@ export default { let dataChildren = [] let dataListChildren = [] this.listForm.dataList.forEach(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); - } - }) + if(item.workPeople !== ''){ + 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.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); + } + }) + } }) this.listForm.dataList.forEach(item => { dataChildren.push(item.children) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index c07086c46..89d261398 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -476,7 +476,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 215c4b6ed..4df5c1836 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -474,7 +474,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 1a973f96c..1474667c0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -476,19 +476,21 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - 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.$set(items, "zccssrq", item.zccssrq); - this.$set(items, "xcxssrq", item.xcxssrq); - this.$set(items, "ssrq", item.ssrq); - } - }) + if(item.workPeople !== ''){ + 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.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); + } + }) + } }) this.listForm.dataList.forEach(item => { dataChildren.push(item.children) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 268900670..5b8749ebf 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -799,6 +799,11 @@ export default { this.$message.warning('请填写完整的不符合项信息') this.comFlag = 0 }else{ + this.listForm.dataList.forEach(item => { + if(item.workPeople === '请选择责任人'){ + item.workPeople = '' + } + }) this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index fc24e7ff7..70d0b79c0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -435,7 +435,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 943cd51c7..e2f7bb78a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -474,7 +474,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index ff6f995eb..ccb983998 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -476,7 +476,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/phone/xmpg2/step10.vue b/src/pages/processCenter/pages/phone/xmpg2/step10.vue index 8e3e04084..114a82347 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step10.vue @@ -423,7 +423,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/phone/xmpg2/step11.vue b/src/pages/processCenter/pages/phone/xmpg2/step11.vue index c7629186e..51ea516ce 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step11.vue @@ -421,7 +421,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/phone/xmpg2/step12.vue b/src/pages/processCenter/pages/phone/xmpg2/step12.vue index 7455d8709..7e910d46e 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step12.vue @@ -423,7 +423,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); diff --git a/src/pages/processCenter/pages/phone/xmpg2/step7.vue b/src/pages/processCenter/pages/phone/xmpg2/step7.vue index e5b1c1a7b..4f3aa79ba 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step7.vue @@ -424,7 +424,7 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + if(item.workPeople !== ''){ this.dataList.push(item) } item.children.forEach(items=> { @@ -434,6 +434,9 @@ export default { this.$set(items, "standYear", item.standYear); this.$set(items, "standSort", item.standSort); this.$set(items, "standNumber", item.standNumber); + this.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); } }) }) diff --git a/src/pages/processCenter/pages/phone/xmpg2/step8.vue b/src/pages/processCenter/pages/phone/xmpg2/step8.vue index f032174ba..8f67ab4a2 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step8.vue @@ -423,19 +423,21 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - 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.$set(items, "zccssrq", item.zccssrq); - this.$set(items, "xcxssrq", item.xcxssrq); - this.$set(items, "ssrq", item.ssrq); - } - }) + if(item.workPeople !== ''){ + 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.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); + } + }) + } }) this.listForm.dataList.forEach(item => { dataChildren.push(item.children) diff --git a/src/pages/processCenter/pages/phone/xmpg2/step9.vue b/src/pages/processCenter/pages/phone/xmpg2/step9.vue index 10834346a..32a8f0961 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step9.vue @@ -422,7 +422,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName);