Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -3823,6 +3823,13 @@ export default {
|
|||||||
location['child2'] = []
|
location['child2'] = []
|
||||||
} else {
|
} else {
|
||||||
const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
|
const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
|
||||||
|
if(childList.length){
|
||||||
|
childList.forEach(item => {
|
||||||
|
if(item.value === "[]"){
|
||||||
|
item.value = ''
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
location['child2'] = childList
|
location['child2'] = childList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -409,7 +409,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.qbfsForm = item.qbfsForm || item;
|
this.qbfsForm = item.qbfsForm || item;
|
||||||
this.formLoading = false;
|
this.formLoading = false;
|
||||||
this.commentText = item.qbfsForm ? item.qbfsForm.commentText : ''
|
this.commentText = item.commentText
|
||||||
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
|
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
|
||||||
this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
|
this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
|
||||||
this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
|
this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
|
||||||
|
|||||||
Reference in New Issue
Block a user