回避设计及选择对比文件界面bug修改

RMS-FrontEnd/src/views/report/FTO/FTOPage/ChosePatent.vue

@@ -46,6 +46,8 @@
           border
           :row-key="getRowKeys"
           v-loading="loading"
+          ref="table"
+          id="table"
           style="min-width: 100%; overflow:auto">
             <el-table-column width="80" align="center">
               <template slot-scope="scope">
@@ -87,7 +89,7 @@
     </el-main>
       <!-- 自定义栏位 -->
       <!-- <div class="patent-articles-content-left" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }"> -->
-      <div class="patent-left" :style="{ width: showRight ? '280px' : '0px' }" >
+      <div class="patent-left" :style="[{ width: showRight ? '280px' : '0px' },{height:tableHeight>450?tableHeight+80+'px':450+'px'}]" >
         <ChoseList @onChange="onChangeList" :reportId="reportId" :patentNo="queryParams.patentNo" ></ChoseList>
       </div>
     <!-- </div> -->
@@ -195,11 +197,13 @@ mixins:[PatentDetails,importPatent],
         patentName: "",
         patentNo: "",
         filedOptions: [],
+        pasOptions:[],//专题库自定义字段
       },
       mergeArr: ['id', 'patentNo'],
       mergeObj: {},
       selectNumberLoading: false,
-      showRight:false,
+      showRight: false,
+      tableHeight:null,
     }
   },
   created() {
@@ -209,6 +213,10 @@ mixins:[PatentDetails,importPatent],
     this.getList()
   },
   methods: {
+    tableOffSetHeight() {
+      let b = document.getElementById("table")
+      this.tableHeight=b.offsetHeight
+    },
     // onChangeOne(val) {
     //   console.log(val);
     //   this.$api.getPatentListPAS()
@@ -217,9 +225,9 @@ mixins:[PatentDetails,importPatent],
     //子页面自定义字段值
     onChangeList({field,a}) {
       // console.log(field,a);
-      this.queryParams.field = field
+      this.queryParams.pasOptions = field
       this.queryParams.projectId = a
-      this.getListPro()
+      this.getList2()
       
     },
     getListPro() {
@@ -252,18 +260,18 @@ mixins:[PatentDetails,importPatent],
         for (let key in this.formS) {
           this.queryParams[key]=this.formS[key]
         }
-        if (this.queryParams.projectId) {
-          this.getListPro()
-        } else {
-          this.getList()
-        }
+        // if (this.queryParams.projectId) {
+        //   this.getListPro()
+        // } else {
+          this.getList2()
+        // }
         
       } else {
-        if (this.queryParams.projectId) {
-          this.getListPro()
-        } else {
-          this.getList()
-        }
+        // if (this.queryParams.projectId) {
+        //   this.getListPro()
+        // } else {
+          this.getList2()
+        // }
       }
       
       this.visible = false
@@ -330,26 +338,26 @@ mixins:[PatentDetails,importPatent],
       }
     },
     commonSwitch(){
-            if(this.queryParams.size*this.queryParams.current>=this.queryParams.startNumber ){
-              if(this.queryParams.size*this.queryParams.current>=this.queryParams.endNumber){
-                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
-                  var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
-                  var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+            if(this.queryParams.size*this.queryParams.current>=this.startNumber ){
+              if(this.queryParams.size*this.queryParams.current>=this.endNumber){
+                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.startNumber){
+                  var a = this.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                  var b = this.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   for(var y=a;y<=b;y++){
                    this.toIsDelete(this.tableData[y].patentNo,y)
 
                   }
                 }else{
                   var a = (this.queryParams.size*(this.queryParams.current-1)+1)-(this.queryParams.size*(this.queryParams.current-1)+1)
-                  var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                  var b = this.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   for(var y=a;y<=b;y++){
                     this.toIsDelete(this.tableData[y].patentNo,y)
 
                   }
                 }
               }else{
-                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
-                  var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.startNumber){
+                  var a = this.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   var b = this.queryParams.size*this.queryParams.current-(this.queryParams.size*(this.queryParams.current-1)+1)
                   for(var y=a;y<=b;y++){
                     this.toIsDelete(this.tableData[y].patentNo,y)
@@ -406,12 +414,13 @@ mixins:[PatentDetails,importPatent],
       this.queryParams.isAdd = []
       this.queryParams.isDelete = []
       this.startNumber = 1
+      this.queryParams.startNumber = 1
       this.endNumber = 0
       this.queryParams.selected = []
       this.checkList = []
       this.quickSelect = false
       this.selectedTotal = 0
-      this.getList()
+      // this.getList()
     },
     handleClick(tab, event) {
       // console.log(tab, event);
@@ -559,8 +568,11 @@ mixins:[PatentDetails,importPatent],
        endNumber:this.endNumber,
        reportId:this.reportId
       }
+      this.queryParams.startNumber=this.startNumber
+      this.queryParams.endNumber=this.endNumber
+      this.queryParams.reportId=this.reportId
       // console.log(add)
-      this.$api.addFTOCompareFile(add).then(res => {
+      this.$api.addFTOCompareFile(this.queryParams).then(res => {
           if (res.code==200) {
             this.startNumber = 1
             this.endNumber = 0
@@ -617,8 +629,8 @@ mixins:[PatentDetails,importPatent],
         this.loading = false
         this.total = response.data.datas.total
         // this.queryParams.endNumber =this.queryParams.endNumber==0? response.data.datas.total:this.queryParams.endNumber
-        this.queryParams.endNumber =response.data.datas.total
-        
+        this.queryParams.endNumber =this.endNumber>0?this.endNumber:response.data.datas.total
+        this.queryParams.startNumber =this.endNumber>0?this.startNumber:1
         this.tableData = response.data.datas.records
         this.queryParams.selected = response.data.select
         this.queryParams.selectedTotal = response.data.selectedTotal
@@ -638,6 +650,14 @@ mixins:[PatentDetails,importPatent],
     },
   },
   watch: {
+    'tableData'(val,val1) {
+      if (JSON.stringify(val)!=JSON.stringify(val1)) {
+        this.handleCancelSelectNumber()
+      }
+      this.$nextTick(() => {
+        this.tableOffSetHeight()
+      })
+    },
     ChosePatentSure(val) {
       if (val) {
         if(this.queryParams.selectedTotal>0){

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

@@ -51,7 +51,7 @@
                   </div>
               </el-tree> 
 
-              <div class="patent-query-filter-search-bottom">
+              <div class="patent-query-filter-search-bottom" v-if="item.type!=6">
                 <el-button type="success" size="small" @click="handleSelectAll(item)" >全选</el-button>
                 <el-button type="danger" size="small" @click="handleSelectCancel(item)">取消</el-button>
                 <el-button v-if="!sourceQuery[item.id].isEnd" type="primary" size="small" @click="handleLoadMore(item)"
@@ -88,6 +88,7 @@ export default {
       activeNames: [],
       hasSource: [],
       sourceQuery: [],
+      // projectId:'',
       queryParams: {
         reportId: this.reportId,
         folder: null,
@@ -205,7 +206,7 @@ export default {
     },
     //勾选后进行筛选
     onChange1(node, checked) {
-      //console.log(node, checked);
+      // console.log(node, checked);
       if (checked) {
         this.sourceQuery[node.fieldId].checked.push(node.id)
         if (node.children) {
@@ -246,13 +247,23 @@ export default {
         return item.checked.length>0
        })
       k.forEach(item => {
-        field.push({
-          key: item.type==6?item.key+"-0":item.key,
-          type: item.type,
-          classId: item.classId,
-          value:item.checked,
+        item.checked.forEach(item2 => {
+           field.push({
+              fieldId: item.key,
+              key:item2,
+            })
         })
+       
       });
+      // console.log(field);
+      // k.forEach(item => {
+      //   field.push({
+      //     key: item.type==6?item.key+"-0":item.key,
+      //     type: item.type,
+      //     classId: item.classId,
+      //     value:item.checked,
+      //   })
+      // });
       // const res = new Map()
       //console.log(this.field);
       let a=this.field[0].projectId
@@ -294,8 +305,7 @@ export default {
     }, 
     //全选,点击勾选全部的自定义选项并查找相关专利
     handleSelectAll(item) {//全选
-      //console.log(item);
-        const key = item.id
+      const key = item.id
         let params = {
           projectId: this.sourceQuery[key].projectId,
           folder: this.sourceQuery[key].folder,
@@ -314,7 +324,7 @@ export default {
         this.$api.postfieldFromPAS(params).then(response => {
           const records = response.data.records
           this.sourceQuery[key].checked = records.map(item => item.value)
-          this.onChange(key)
+             this.onChange(key)
           this.sourceQuery[key].loading = false
         }).catch(error => {
           this.sourceQuery[key].loading = false
@@ -393,8 +403,10 @@ export default {
         if(this.data.length>0){
           let dataA = this.data.filter(item => item.type != 6)
         // 树类型
+        //   this.projectId = dataA[0].projectId
+        // this.$emit("projectId",this.projectId)
         let tree = {
-          projectId: dataA[0].projectId,
+          projectId:  dataA[0].projectId,
         }
         this.$api.getPatentQueryTree(tree).then(res => {
           for (let i = 0; i < res.data.length; i++) {

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

@@ -104,6 +104,8 @@
               border
               :row-key="getRowKeys"
               v-loading="loading"
+              ref="table"
+              id="table"
               style="min-width: 100%; overflow:auto">
               <el-table-column width="80" align="center">
                 <template slot-scope="scope">
@@ -154,7 +156,7 @@
     </el-main>
       <!-- 自定义栏位 -->
       <!-- <div class="patent-articles-content-left" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }"> -->
-      <div class="patent-left" :style="{ width: showRight ? '280px' : '0px' }" >
+      <div class="patent-left" :style="[{ width: showRight ? '280px' : '0px' },{height:tableHeight>450?tableHeight+80+'px':450+'px'}]" >
         <ChoseList @onChange="onChangeList" :reportId="reportId" :patentNo="queryParams.patentNo" ></ChoseList>
       </div>
     <!-- </div> -->
@@ -265,11 +267,13 @@ mixins:[PatentDetails,importPatent],
         patentName: "",
         patentNo: "",
         filedOptions: [],
+        pasOptions:[],//专题库自定义字段
       },
       mergeArr: ['id', 'patentNo'],
       mergeObj: {},
       selectNumberLoading: false,
       showRight:false,
+      tableHeight:null,
     }
   },
   created() {
@@ -281,6 +285,10 @@ mixins:[PatentDetails,importPatent],
     //console.log(this.selectedTotal)
   },
   methods: {
+    tableOffSetHeight() {
+      let b = document.getElementById("table")
+      this.tableHeight=b.offsetHeight
+    },
     // onChangeOne(val) {
     //   //console.log(val);
     //   this.$api.getPatentListPAS()
@@ -288,10 +296,10 @@ mixins:[PatentDetails,importPatent],
     // },
     //子页面自定义字段值
     onChangeList({field,a}) {
-      //console.log(field,a);
-      this.queryParams.field = field
+      // console.log(field,a);
+      this.queryParams.pasOptions = field
       this.queryParams.projectId = a
-      this.getListPro()
+      this.getList2()
       
     },
     getListPro() {
@@ -325,19 +333,20 @@ mixins:[PatentDetails,importPatent],
         for (let key in this.formS) {
           this.queryParams[key]=this.formS[key]
         }
-        if (this.queryParams.projectId) {
-          this.getListPro()
-        } else {
-          this.getList()
-        }
+        // if (this.queryParams.projectId) {
+        //   this.getListPro()
+        // } else {
+          this.getList2()
+        // }
         
-      } else {
-        if (this.queryParams.projectId) {
-          this.getListPro()
-        } else {
-          this.getList()
-        }
       }
+      // else {
+      //   // if (this.queryParams.projectId) {
+      //   //   this.getListPro()
+      //   // } else {
+      //     this.getList2()
+      //   // }
+      // }
       
       this.visible = false
       // this.form = {}
@@ -403,11 +412,11 @@ mixins:[PatentDetails,importPatent],
     },
     commonSwitch(){
       //console.log(this.queryParams.startNumber,this.queryParams.endNumber)
-            if(this.queryParams.size*this.queryParams.current>=this.queryParams.startNumber ){
-              if(this.queryParams.size*this.queryParams.current>=this.queryParams.endNumber){
-                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
-                  var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
-                  var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+            if(this.queryParams.size*this.queryParams.current>=this.startNumber ){
+              if(this.queryParams.size*this.queryParams.current>=this.endNumber){
+                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.startNumber){
+                  var a = this.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                  var b = this.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   //console.log(a,b)
                   for(var y=a;y<=b;y++){
                     //console.log(this.tableData[y])
@@ -416,15 +425,15 @@ mixins:[PatentDetails,importPatent],
                   }
                 }else{
                   var a = (this.queryParams.size*(this.queryParams.current-1)+1)-(this.queryParams.size*(this.queryParams.current-1)+1)
-                  var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                  var b = this.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   for(var y=a;y<=b;y++){
                     this.toIsDelete(this.tableData[y].patentNo,y)
 
                   }
                 }
               }else{
-                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
-                  var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                if(this.queryParams.size*(this.queryParams.current-1)+1<=this.startNumber){
+                  var a = this.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                   var b = this.queryParams.size*this.queryParams.current-(this.queryParams.size*(this.queryParams.current-1)+1)
                   for(var y=a;y<=b;y++){
                     this.toIsDelete(this.tableData[y].patentNo,y)
@@ -485,10 +494,12 @@ mixins:[PatentDetails,importPatent],
       this.checkList = []
       this.quickSelect = false
       this.startNumber = 1
+      this.queryParams.startNumber = 1
       this.endNumber = 0
       this.selectedTotal = 0
-      this.getList()
+      // this.getList()
     },
+    // handleClear(){},
     handleClick(tab, event) {
       //console.log(tab.index, event);
       if (tab.index==0) {
@@ -706,9 +717,12 @@ mixins:[PatentDetails,importPatent],
        endNumber:this.endNumber,
        reportId:this.reportId
       }
-      this.btnLoading = true
+      this.queryParams.startNumber=this.startNumber
+      this.queryParams.endNumber=this.endNumber
+      this.queryParams.reportId=this.reportId
+      this.btnLoading = true//保存调试后放开
       // //console.log(add)
-      this.$api.addCompareFile(add).then(res => {
+      this.$api.addCompareFile(this.queryParams).then(res => {
           //console.log(res);
           if (res.code==200) {
             this.btnLoading = false
@@ -767,10 +781,12 @@ mixins:[PatentDetails,importPatent],
      this.$store.commit('SET_PATENT_PARAMS', params)
       this.loading=true
      await this.$api.getCompareFile(params).then(response => {
+    //  await this.$api.getPatentListPAS(params).then(response => {
         this.loading = false
         this.total = response.data.datas.total
         // this.queryParams.endNumber =this.queryParams.endNumber==0? response.data.datas.total:this.queryParams.endNumber
-        this.queryParams.endNumber =response.data.datas.total
+        this.queryParams.endNumber =this.endNumber>0?this.endNumber:response.data.datas.total
+        this.queryParams.startNumber =this.endNumber>0?this.startNumber:1
 
         this.tableData = response.data.datas.records
         this.queryParams.selected = response.data.select
@@ -791,6 +807,16 @@ mixins:[PatentDetails,importPatent],
     },
   },
   watch: {
+    'tableData'(val, val1) {
+     
+      if (JSON.stringify(val)!=JSON.stringify(val1)) {
+        this.handleCancelSelectNumber()
+      }
+      
+      this.$nextTick(() => {
+        this.tableOffSetHeight()
+      })
+    },
     ChosePatentSure(val) {
       if (val) {
         if(this.queryParams.selectedTotal>0){

RMS-FrontEnd/src/views/report/avoid/avoidPage/avoidDirection.vue

@@ -25,7 +25,7 @@
       </div>
       <div>
         <el-button @click="keep" type="primary">保存</el-button>
-        <el-button @click="finish" type="primary">完成</el-button>
+        <!-- <el-button @click="finish" type="primary">完成</el-button> -->
       </div>
         
     </div>
@@ -142,32 +142,33 @@ export default {
   },
   methods: {
     //完成
-    finish() {
-      this.$confirm('请您确定任务不再修改, 是否继续?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              this.$message.success("任务已完成,跳转报告管理页面")
-              var a = {
-                reportId:this.reportId,
-                status:2
-              }
-              this.$api.UpdateStatus(a).then(response=>{
-                if(response.code == 200){
-                  var a = this.$s.getSession('params')
-                  a.reportStatus = 2
-                  this.$s.setSession('params',a)
-                  var b = this.$s.getSession('reportMessage1')
-                  b.status = 2
-                  this.$s.setSession('reportMessage1', b)
-                  this.$router.replace("/admin/rManage");
-                }
-              })
-            }).catch(() => {
-              this.$message.info("任务继续进行")         
-      });
-    },
+    // finish() {
+    //   this.$confirm('请您确定任务不再修改, 是否继续?', '提示', {
+    //           confirmButtonText: '确定',
+    //           cancelButtonText: '取消',
+    //           type: 'warning'
+    //         }).then(() => {
+              
+    //           var a = {
+    //             reportId:this.reportId,
+    //             status:2
+    //           }
+    //           this.$api.UpdateStatus(a).then(response=>{
+    //             if (response.code == 200) {
+    //               this.$message.success("任务已完成,跳转报告管理页面")
+    //               // var a = this.$s.getSession('params')
+    //               // a.reportStatus = 2
+    //               this.$s.setSession('params',a)
+    //               var b = this.$s.getSession('reportMessage1')
+    //               b.status = 2
+    //               this.$s.setSession('reportMessage1', b)
+    //               this.$router.replace("/admin/rManage");
+    //             }
+    //           })
+    //         }).catch(() => {
+    //           this.$message.info("任务继续进行")         
+    //   });
+    // },
     getSplitMessage() {
       let a = {
         taskId:null,
@@ -212,6 +213,7 @@ export default {
                     featuresItem.pRightName=featuresItem.rightName
                     featuresItem.pContentOut=rightsiItem.contentOut
                     featuresItem.pContent=rightsiItem.content
+                    featuresItem.pSort=rightsiItem.sort
                     featuresItem.pType = featuresItem.rightType
                     this.splitBy1 = featuresItem.splitBy.toString()
                     this.splitType1 = featuresItem.splitType.toString()
@@ -424,12 +426,14 @@ export default {
               pContent: this.tableData1[i].pContent,
               pContentOut: this.tableData1[i].pContentOut,
         })
+        // console.log(this.tableData1[i].littleDirection);
       }
       let keepStr = {
         reportId: this.reportId,
         avoidDesignLittleDirectionDTOs: keepArr,
         wholeDirection:this.textarea1.wholeDirection?this.textarea1.wholeDirection:''
       }
+      // console.log(this.textarea1.wholeDirection);
       this.$api.addAvoidDesignDirection(keepStr).then(res => {
         if (res.code == 200) {
           // if (this.isNum!=0) {
@@ -445,12 +449,14 @@ export default {
       
       let Index=this.row.findIndex(item=>{ return item.id==scope.row.id })
       if (Index < 0) {
-        this.Index_row.push(scope.$index)
+        // this.Index_row.push(scope.$index)
+        scope.row.$index = scope.$index
         this.row.push(scope.row)
       } else {
         this.row.splice(Index, 1)
-        this.Index_row.splice(Index, 1)
+        // this.Index_row.splice(Index, 1)
       }
+      // console.log(this.row);
     },
     // 特征等合并
     merge() { 
@@ -467,10 +473,11 @@ export default {
               })
               return false
           } else {
-            let Index_rowArr=this.Index_row.sort((a, b) => {
-              return a-b
+            let Index_rowArr=this.row.sort((a, b) => {
+              return a.$index-b.$index
             })
-            if (Index_rowArr[i+1]-Index_rowArr[i]!=1) {
+            // console.log(this.Index_row,Index_rowArr);
+            if (Index_rowArr[i+1].$index-Index_rowArr[i].$index!=1) {
               this.$alert("非相邻不能合并特征","提示", {
                 confirmButtonText: '确定',
               })
@@ -534,6 +541,10 @@ export default {
               splitBy:rowItem.splitBy,
               splitType:rowItem.splitType,
               signPatentNo:rowItem.signPatentNo,
+              rightId:rowItem.rightId,
+              rightType:rowItem.rightType,
+              isFinal:rowItem.isFinal,
+              partnerId:rowItem.partnerId,
             reportId: rowItem.reportId,
 
             pRightName:rowItem.pRightName,

RMS-FrontEnd/src/views/report/components/Card.vue

@@ -17,6 +17,7 @@
                         <el-dropdown-item command="4" v-if="[2,3].includes(item.status)&& item.type != 4">任务分配</el-dropdown-item>
                         <el-dropdown-item command="5" v-if="[1].includes(item.status) || (item.type == 4&& [1,2,3].includes(item.status))">{{!([3,4].includes(item.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
                         <el-dropdown-item command="8" v-if="(item.type == 4 && [1,2,3].includes(item.status))">专利与产品关联比对</el-dropdown-item>
+                        <el-dropdown-item command="9" v-if="(item.type == 5 && [1,2,3].includes(item.status))"> 规避方案填写</el-dropdown-item>
                         <el-dropdown-item command="6" v-if="[2,3].includes(item.status)&& item.type != 4">导入 </el-dropdown-item>
                         <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
                         <!-- <el-dropdown-item command="0">分享</el-dropdown-item> -->

RMS-FrontEnd/src/views/report/components/ReportTemplate.vue

@@ -102,7 +102,7 @@ export default {
             this.getList()
         },
         getTemplateId(val){
-            console.log(val)
+            // console.log(val)
             this.$emit('getReportTemplateId',val)
         },
     },

RMS-FrontEnd/src/views/report/components/SelectedPatent.vue

@@ -237,7 +237,7 @@
         this.queryParams[key]=this.formS[key]
       }
       // this.queryParams.patentName=this.form.patentName
-      this.getList()
+      this.getList2()
       this.visible = false
       // this.form = {}
     },
@@ -295,6 +295,7 @@
             this.queryParams.isAdd = []
             this.getList()
             this.commonSwitch()
+            console.log(this.checkList);
             this.quickSelect = true
             
             break
@@ -302,26 +303,26 @@
       },
       commonSwitch(){
         
-              if(this.queryParams.size*this.queryParams.current>=this.queryParams.startNumber ){
-                if(this.queryParams.size*this.queryParams.current>=this.queryParams.endNumber){
-                  if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
-                    var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
-                    var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+              if(this.queryParams.size*this.queryParams.current>=this.startNumber ){
+                if(this.queryParams.size*this.queryParams.current>=this.endNumber){
+                  if(this.queryParams.size*(this.queryParams.current-1)+1<=this.startNumber){
+                    var a = this.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                    var b = this.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                     for(var y=a;y<=b;y++){
                      this.toIsDelete(this.tableData[y].patentNo,y)
   
                     }
                   }else{
                     var a = (this.queryParams.size*(this.queryParams.current-1)+1)-(this.queryParams.size*(this.queryParams.current-1)+1)
-                    var b = this.queryParams.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                    var b = this.endNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                     for(var y=a;y<=b;y++){
                       this.toIsDelete(this.tableData[y].patentNo,y)
   
                     }
                   }
                 }else{
-                  if(this.queryParams.size*(this.queryParams.current-1)+1<=this.queryParams.startNumber){
-                    var a = this.queryParams.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
+                  if(this.queryParams.size*(this.queryParams.current-1)+1<=this.startNumber){
+                    var a = this.startNumber-(this.queryParams.size*(this.queryParams.current-1)+1)
                     var b = this.queryParams.size*this.queryParams.current-(this.queryParams.size*(this.queryParams.current-1)+1)
                     for(var y=a;y<=b;y++){
                       this.toIsDelete(this.tableData[y].patentNo,y)
@@ -379,12 +380,13 @@
         this.queryParams.isAdd = []
         this.queryParams.isDelete = []
         this.startNumber = 1
+        this.queryParams.startNumber = 1
         this.endNumber = 0
         this.queryParams.selected = []
         this.checkList = []
         this.quickSelect = false
         this.selectedTotal = 0
-        this.getList()
+        // this.getList()
       },
       handleClick(tab, event) {
         // console.log(tab, event);
@@ -561,7 +563,8 @@
         this.queryParams.current = val;
         // this.checkList = []
         // this.queryParams.endNumber=0
-       await this.getList();
+          await this.getList();
+          console.log(this.checkList);
         if(this.quickSelect){
           this.commonSwitch()
         }
@@ -589,7 +592,7 @@
                 this.queryParams[key]=''
               }
               this.form = {}
-              this.getList()
+              this.getList2()
               this.$emit("save", true);
               this.$message({
                 message: '删除成功',
@@ -635,9 +638,10 @@
         this.$store.commit('SET_PATENT_PARAMS', params)
        await this.$api.getCompareFile(params).then(response => {
           this.loading = false
-          this.total = response.data.datas.total
+           this.total = response.data.datas.total
+          this.queryParams.startNumber = this.endNumber>0?this.startNumber:1
           // this.queryParams.endNumber =this.queryParams.endNumber==0? response.data.datas.total:this.queryParams.endNumber
-          this.queryParams.endNumber = response.data.datas.total
+          this.queryParams.endNumber =this.endNumber>0?this.endNumber: response.data.datas.total
           this.tableData = response.data.datas.records
           this.queryParams.selected = []
           // this.checkList =JSON.parse(JSON.stringify(this.queryParams.selected)) 
@@ -656,6 +660,11 @@
       },
     },
     watch: {
+     'tableData'(val,val1){
+          if (JSON.stringify(val)!=JSON.stringify(val1)) {
+            this.handleCancelSelectNumber()
+          }
+      },
       loadPatent(val){
         for (let key in this.form) {
           this.queryParams[key]=''

RMS-FrontEnd/src/views/report/components/Tabel.vue

@@ -45,6 +45,7 @@
               <el-dropdown-item command="4" v-if="[2,3].includes(scope.row.status)&& scope.row.type != 4">任务分配</el-dropdown-item>
               <el-dropdown-item command="5" v-if="[1].includes(scope.row.status) || (scope.row.type == 4 && [1,2,3].includes(scope.row.status))">{{!([3,4].includes(scope.row.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
               <el-dropdown-item command="8" v-if="(scope.row.type == 4 && [1,2,3].includes(scope.row.status))">专利与产品关联比对</el-dropdown-item>
+              <el-dropdown-item command="9" v-if="(scope.row.type == 5 && [1,2,3].includes(scope.row.status))"> 规避方案填写</el-dropdown-item>
               <el-dropdown-item command="6" v-if="[2,3].includes(scope.row.status)&& scope.row.type != 4">导入 </el-dropdown-item>
               <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
             </el-dropdown-menu>

RMS-FrontEnd/src/views/report/components/mixins.js

@@ -20,7 +20,8 @@ export const explain = {
   methods: {
      // 解释所需方法
     saveValue(val) {//点击输入触发,第一次为空不打印
-      // console.log("saveValue",val);
+      // console.log("saveValue", val);
+      // this.$set(row,name,str +text)
       if (this.keepSure) {
         this.keepSure = false;
       }
@@ -32,11 +33,11 @@ export const explain = {
       // console.log(this.innerhtml)
     },
     getValue(row,name) {//失去焦点触发，row本行数据，name是传过来的row里面每一个属性
-      // console.log("getValue",row[name]);
-      if (this.innerhtml != '') {
+      // console.log("getValue",row[name],row,this.innerHtml);
+      // if (this.innerhtml != '') {
         row[name] = this.innerhtml
         this.innerhtml = ''
-      }
+      // }
     },
     handlePaste(event, row,name) {//图片的处理(剪切板方法clipboard)//row本行数据，name是传过来的row里面每一个属性
       // console.log("handleP",event,row);
@@ -55,8 +56,9 @@ export const explain = {
           var text =  (e.originalEvent || e).clipboardData.getData('text/plain') || prompt('在这里输入文本');
           //清除回车
           text = text.replace(/\[\d+\]|\n|\r/ig,"")
-          let str = row[name]?row[name]:''
-          this.$set(row,name,str +text)
+          let str = row[name] ? row[name] : ''
+          // console.log(text,str);
+          this.$set(row, name, this.innerhtml + text)
           this.saveValue(row[name])
           // this.$forceUpdate()
           // if(this.tableHeight){

RMS-FrontEnd/src/views/report/index.vue

@@ -8,7 +8,7 @@
                 </el-button>
                    <el-dropdown-menu slot="dropdown" style="margin-top:0px" v-if="dictMessage.REPORT_TYPE">
                     <!-- 遍历按钮 -->
-                      <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['5','6'].includes(item.dictChildValue))" :key="item.dictChildLabel"  @click.native="handleAnalyse(item.dictChildValue)">{{item.dictChildLabel}}</el-dropdown-item>
+                      <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['6'].includes(item.dictChildValue))" :key="item.dictChildLabel"  @click.native="handleAnalyse(item.dictChildValue)">{{item.dictChildLabel}}</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
 
@@ -272,6 +272,9 @@ export default {
                 })
             window.open(routerReport3.href, '_blank');
             break
+        case '9'://回避设计
+            this.handleDetails(row)
+            break
         case 'e':
           this.handleEdit(row)
           break

RMS-FrontEnd/src/views/report/reportDetails/components/taskDetails.vue

@@ -197,7 +197,7 @@
     },
     //点击任务名称
     rowTaskType(row) { 
-      console.log(this.row)
+      // console.log(this.row)
       row.reportType = this.row.type
       row.reportName = this.row.name
       row.reportId = this.row.id