1

src/views/components/import/conditionImport/AdvancedSearch.vue

@@ -37,8 +37,9 @@
 
 <script>
 export default {
+    name:'AdvancedSearch',
   components: {},
-  props:['countryList','DBType'],
+  props:['countryList','DBType','editData'],
   data() {
     return {
         condition:'',
@@ -52,6 +53,11 @@ export default {
   created() {},
   mounted() {
     this.field = [].concat(...this.field.map(item=>{return item.children}))
+    if(this.editData && this.editData.component == 'AdvancedSearch'){
+      if(this.editData.data){
+        this.$set(this,'condition',this.editData.data)
+      }     
+    }
   },
   methods: {
     changeRed(val){
@@ -73,7 +79,11 @@ export default {
         // if(a.trim().indexOf('(')!=0){
         //     a = `${a}`
         // }
-        this.$emit('search',a.trim())
+        var params = {
+            DBType:this.DBType,
+            component:'AdvancedSearch'
+        }
+        this.$emit('search',a.trim(),params)
     },
   },
 };

src/views/components/import/conditionImport/searchResult.vue

@@ -226,7 +226,7 @@ export default {
       }
       if(val.data){
         var params = this.$s.getSession('conditionImport')
-        if(params.data){
+        if(params.data && params.component != 'AdvancedSearch'){
           if(val.isRepeat){
             if(params.data.data && params.data.data.length>0){
               params.data.data.push(val.data[0])
@@ -251,6 +251,9 @@ export default {
           }
           params.data.component = 'customSearch'
           this.$s.setSession('conditionImport',params)
+        }else if(params.component == 'AdvancedSearch'){
+          params.data = this.condition.searchCondition
+          this.$s.setSession('conditionImport',params)
         }
       }
       await this.searchBth()