Parcourir la source

导入时标引栏位的修改

zhuliu il y a 1 an
Parent
commit
1490b08060

+ 22 - 2
src/views/components/import/components/importPatent.vue

@@ -172,8 +172,28 @@ export default {
             });
             this.form.importContent = Number(importContent.join(''))
         }
-        this.form.assoImportTaskFieldVOS = this.assoImportTaskFieldVOS
-        // console.log(this.form)
+        // this.form.fieldDTOS = this.assoImportTaskFieldVOS
+
+        this.form.fieldDTOS = []
+        for(var i = 0;i<this.assoImportTaskFieldVOS.length;i++){
+            var choose = this.assoImportTaskFieldVOS[i]
+            var index = this.form.fieldDTOS.findIndex(item=>{
+                return item.fieldId == choose.fieldId
+            })
+            if(index == -1){
+                this.form.fieldDTOS.push(
+                    {
+                        projectId:choose.projectId,
+                        fieldType:choose.fieldType,
+                        fieldId:choose.fieldId,
+                        fieldValue:[choose.fieldValueId],
+                        optionType:2
+                    }
+                )
+            }else{
+                this.form.fieldDTOS[index].fieldValue.push(choose.fieldValueId)
+            }
+        }
         this.addImportTask(this.form)
       
     }

+ 21 - 1
src/views/components/import/conditionImport/components/projectListDialog.vue

@@ -407,7 +407,27 @@ export default {
                 }
             });
             this.form.importContent = Number(importContent.join(''))
-            this.form.assoImportTaskFieldVOS = this.assoImportTaskFieldVOS
+            // this.form.fieldDTOS = this.assoImportTaskFieldVOS
+            this.form.fieldDTOS = []
+            for(var i = 0;i<this.assoImportTaskFieldVOS.length;i++){
+                var choose = this.assoImportTaskFieldVOS[i]
+                var index = this.form.fieldDTOS.findIndex(item=>{
+                    return item.fieldId == choose.fieldId
+                })
+                if(index == -1){
+                    this.form.fieldDTOS.push(
+                        {
+                            projectId:choose.projectId,
+                            fieldType:choose.fieldType,
+                            fieldId:choose.fieldId,
+                            fieldValue:[choose.fieldValueId],
+                            optionType:2
+                        }
+                    )
+                }else{
+                    this.form.fieldDTOS[index].fieldValue.push(choose.fieldValueId)
+                }
+            }
             // console.log(this.form)
             this.addImportTask(this.form)
         }