Merge branch 'product' into noveltySearch2

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

@@ -346,7 +346,9 @@ export default {
       })
     },
     searchBth() {
-      // this.queryParams.retrieveRecordId = null
+      if(this.outside){
+        this.queryParams.retrieveRecordId = null
+      }
       this.queryParams.current = 1
       this.getList()
       if(this.outside){

src/views/project/index.vue

@@ -595,7 +595,7 @@ export default {
     },
     //删除专利数据库
     deletePatentProject(ids) {
-      this.$confirm('此操作将删除该产品类别, 是否继续?', '提示', {
+      this.$confirm('此操作将删除该专利数据库, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'