Merge branch 'dev' of http://47.106.221.167:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -370,6 +370,15 @@
       },
       //拆分
       split() {
+        if (this.row.length > 1) {
+          this.$alert('不能同时拆分多条特征','提示',{
+            confirmButtonText: '确定',
+            type:'warning',
+            callback: action => {
+            }
+          })
+          return false
+        }
         //只对勾选的进行拆分
         this.keepSure=false
         this.checkList = []//
@@ -398,7 +407,7 @@
               isFinal: ele.isFinal,
               reportId: ele.reportId,
               explainText: "",
-
+              
               rightName: ele.rightName,
               rightType: ele.rightType,
               splitBy: ele.splitBy,
@@ -705,7 +714,7 @@
           var keepArr = [];
           console.log(this.tableData1);
           for (let i = 0; i < this.tableData1.length; i++) {
-            console.log(1);
+            console.log(1, this.tableData1[i].compareResult);
             keepArr.push(
               {
                 taskId: this.taskId?this.taskId:null,
@@ -721,7 +730,7 @@
                 explainText: this.tableData1[i].explainText ? this.tableData1[i].explainText : "",
                 targetDescription: this.tableData1[i].targetDescription ? this.tableData1[i].targetDescription : "",
                 compareDescription: this.tableData1[i].compareDescription ? this.tableData1[i].compareDescription : "",
-                compareResult: this.tableData1[i].compareResult.toString() != "" ? this.tableData1[i].compareResult : "",
+                compareResult: this.tableData1[i].compareResult?.toString() != "" ? this.tableData1[i].compareResult : "",
               }
             )
           }

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/ChosePatent.vue

@@ -358,7 +358,8 @@ mixins:[PatentDetails,importPatent],
         case 0:
           this.queryParams.selected = this.tableData.map(item => item.patentNo);
           this.checkList = [...new Set(this.checkList.concat(this.queryParams.selected))]
-          this.selectedTotal=this.checkList.length
+          this.selectedTotal = this.checkList.length
+          this.queryParams.isAdd=JSON.parse(JSON.stringify(this.checkList))
           this.getList()
           break
         case 1:

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Claims.vue

@@ -232,9 +232,19 @@ export default {
     },
     //拆分
     split() {
+      if (this.row.length > 1) {
+          this.$alert('不能同时拆分多条特征','提示',{
+            confirmButtonText: '确定',
+            type:'warning',
+            callback: action => {
+            }
+          })
+          return false
+        }
       //只对勾选的进行拆分
       this.keepSure=false
       this.checkList = []
+      console.log(this.row);
       this.row.forEach(ele=>{
         var Index = this.tableData1.findIndex(item => {
           return item.id==ele.id