Merge remote-tracking branch 'origin/develop' into develop

2022-05-10 10:23:53 +08:00
parent aa7fd756e6 26e9044117
commit 4fae8f208b
2 changed files with 8 additions and 1 deletions
@@ -3823,6 +3823,13 @@ export default {
            location['child2'] = []
          } else {
            const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
+            if(childList.length){
+              childList.forEach(item => {
+                if(item.value === "[]"){
+                  item.value = ''
+                }
+              })
+            }
            location['child2'] = childList
          }
        }
@@ -409,7 +409,7 @@ export default {
        }
        this.qbfsForm = item.qbfsForm || item;
        this.formLoading = false;
-        this.commentText = item.qbfsForm ? item.qbfsForm.commentText : ''
+        this.commentText = item.commentText
        this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
        this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
        this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;