1

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

@@ -224,7 +224,7 @@ export default {
         },
         searchByInventionPoint(val){
             this.semanteme = val
-            if(this.DBType == 'customSearch'){
+            if(this.isComponent == 'customSearch'){
                 this.$refs.componentsSearch.search1()
             }else{
                 this.$refs.componentsSearch.search()

src/views/project/patentCollection/index.vue

@@ -368,11 +368,13 @@ export default {
               })
           ]),
           showCancelButton: true,
+          closeOnClickModal:false,
           confirmButtonText: '检索',
           cancelButtonText: '取消',
           beforeClose: (action, instance, done) => {
               if (action === 'confirm') {
                   instance.confirmButtonLoading = true;
+                  _this.queryParams.current = 1
                   _this.getList()
                   done();
                   instance.confirmButtonLoading = false;