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

2021-09-01 16:05:12 +08:00
parent ab4bc4f3a5 e28621a77d
commit 1df56128e8
4 changed files with 638 additions and 610 deletions
@@ -312,8 +312,13 @@ export default {
          let listJSON = JSON.parse(JSON.stringify(item.responUserList))
          this.dataList = [listJSON][0].standardInfoList
        } else {
-          let listJSONInfo = item.info
-          this.dataList = [listJSONInfo]
+          if (item.dockUserList !== undefined) {
+            let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
+            this.dataList = listJSON[0].standardInfoList
+          }else {
+            let listJSONInfo = item.info
+            this.dataList = [listJSONInfo]
+          }
        }
        this.dataList.forEach(item => {
          if (item.fileText.length !== 0) {