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

jero-web/src/components/ImportFile/index.vue

@@ -120,7 +120,7 @@
             })
             } else {
               if (this.isTrue) {
-                this.$emit('getList')
+                this.$emit('getList',info.file.response.result)
               } else {
                 eventBUs.$emit('searchReset')
               }

jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue

@@ -109,6 +109,8 @@
           }
         ],
         dataList: [],
+        ImportFileData: [],
+        dataListData: [],
         loading: false
       }
     },
@@ -119,6 +121,12 @@
         this.dataList = this.dataList.filter(res => {
           return res.itemId != item.itemId
         })
+        this.dataListData = this.dataListData.filter(res => {
+          return res.itemId != item.itemId
+        })
+        this.ImportFileData = this.ImportFileData.filter(res => {
+          return res.itemId != item.itemId
+        })
         this.$emit('TermInformationRefForm', item)
       },
       PersonnelSelectionChange(value, id, index) {
@@ -126,10 +134,10 @@
         this.dataList = [...this.dataList]
       },
       getData(value) {
-        this.dataList = []
+        this.dataListData = []
         if (value && value.length > 0) {
           value.forEach(res => {
-            this.dataList.push({
+            this.dataListData.push({
               itemId: res.id,
               itemNum: res.items_num,
               itemName: res.items_name,
@@ -137,10 +145,13 @@
             })
           })
         }
+        this.dataList = this.ImportFileData.concat(this.dataListData)
         this.dataList = [...this.dataList]
       },
-      getPersonnelList() {
-
+      getPersonnelList(res) {
+        this.ImportFileData = this.ImportFileData.concat(res)
+        this.dataList = this.dataListData.concat(this.ImportFileData)
+        this.dataList = [...this.dataList]
       },
       getUUID() {
         var str = []