zhuliu 1 year ago
parent
commit
df4fc571dc

+ 7 - 4
src/views/project/patentCollection/index.vue

@@ -213,9 +213,9 @@
     <!-- 创建FTO报告 -->
     <addAndEditReport ref="addAndEditReport" @addPatentToReport="addPatentToReport"></addAndEditReport>
     <!-- 批量那个标引 -->
-    <PatentBatchIndexVue ref="PatentBatchIndexVue" @submit="submitIndex" :projectId="projectId"></PatentBatchIndexVue>
+    <PatentBatchIndexVue ref="PatentBatchIndexVue" @submit="submitIndex(true)" :projectId="projectId"></PatentBatchIndexVue>
     <!-- 单个栏位标引 -->
-    <patent-index-setting @submit="submitIndex" :projectId="projectId" ref="patentIndexSetting" />
+    <patent-index-setting @submit="submitIndex(false)" :projectId="projectId" ref="patentIndexSetting" />
     <!-- 合并发明人/合并权利人、申请人 -->
     <patentMergeDrawer ref="patentMergeDrawer" :projectId="projectId" @mergeClose="mergeClose"></patentMergeDrawer>
   </div>
@@ -908,8 +908,11 @@ export default {
         this.$refs.patentIndexSetting.open(obj,patent, field)
       }
     },
-    submitIndex(){
-      this.handleCancelSelectNumber()
+    submitIndex(value){
+      if(value){
+        this.handleCancelSelectNumber()
+      }
+      
       this.getList()
       this.$refs.customFields.refreshOptions(1)
     },

+ 8 - 3
src/views/report/components/patentList/components/index.vue

@@ -116,9 +116,9 @@
     <field ref="field" type="patent" :projectId="projectId" :taskId="taskId" @getFieldList="getFieldList"></field>
 
      <!-- 批量那个标引 -->
-     <PatentBatchIndexVue ref="PatentBatchIndexVue" @submit="submitIndex" :taskId="taskId" :projectId="projectId"></PatentBatchIndexVue>
+     <PatentBatchIndexVue ref="PatentBatchIndexVue" @submit="submitIndex(true)" :taskId="taskId" :projectId="projectId"></PatentBatchIndexVue>
     <!-- 单个栏位标引 -->
-    <patent-index-setting @submit="submitIndex" :taskId="taskId" :projectId="projectId" ref="patentIndexSetting" />
+    <patent-index-setting @submit="submitIndex(false)" :taskId="taskId" :projectId="projectId" ref="patentIndexSetting" />
   </div>
 </template>
 
@@ -219,6 +219,7 @@ export default {
       this.searchStr = searchStr
       this.customFields = customFields
       this.queryParams.current = 1
+      this.handleCancelSelectNumber()
       this.getList()
       this.$refs.customFields.close()
     },
@@ -533,7 +534,11 @@ getPatentFields(){
         this.$refs.patentIndexSetting.open(obj,patent, field)
       }
     },
-    submitIndex(){
+    submitIndex(value){
+      if(value){
+        this.handleCancelSelectNumber()
+      }
+      
       this.getList()
       this.$refs.customFields.refreshOptions(1)
     },