Sfoglia il codice sorgente

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

zhuliu 2 anni fa
parent
commit
9cf19ff6db

+ 4 - 0
RMS-FrontEnd/src/api/report.js

@@ -505,4 +505,8 @@ export default {
   getTaskSources(params){
     return axios.get('/report/api/task/getTaskSources',{params})
   },
+  //回避设计方案查询
+  getAvoidDesignDirection(params){
+    return axios.get('/report/api/avoidDesignDirections/getAvoidDesignDirection',{params})
+  },
 }

+ 1 - 1
RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -112,7 +112,7 @@
         </div>
       </el-main>
     </el-container>
-    <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId" :patentNo1="patentNo1"></sendCollaboration>
+    <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId" :patentNo1="patentNo1" :reportType="reportType"></sendCollaboration>
     <!-- <el-dialog :visible.sync="dialogVisible">
         <img width="100%" :src="dialogImageUrl" alt="">
     </el-dialog> -->

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

@@ -44,6 +44,7 @@
           :span-method="objectSpanMethod"
           v-loading="loading"
           :height="tableHeight"
+          :cell-class-name="checkDel"
           style="min-width: 100%; margin-top: 20px;overflow:auto">
 
           <el-table-column prop="pRightName" label="权要"  align="center"  width="200px">
@@ -197,6 +198,7 @@
         coordinationA:this.coordination,
         taskWorkRemakA: this.taskWorkRemak,
         // isKeepB:this.isKeepA,
+        isAll:false,
         options: [
           {
             value: 1,
@@ -490,6 +492,7 @@
               console.log(2222, this.taskWorkRemakA);
               if (res.code == 200) {
                 this.CompareMessage(res)
+                this.isAll=true
               }
             // console.log("@@",this.tableData1);
             })
@@ -581,7 +584,26 @@
         // this.getSpanArr(this.tableData)
         this.loading = false
       },
+      // 协同对比结果高亮
+      checkDel({ row, column, rowIndex, columnIndex }) {
+        if (!this.isAll) {
+          return false
+        }
+        // var two = ["targetDescription2", "compareDescription2", "compareResult2"]
+          if (this.tableData[rowIndex].compareResult2 ==undefined) {
+            this.tableData[rowIndex].compareResult2=''
+          }
+          if (this.tableData[rowIndex].targetDescription2 ==undefined) {
+            this.tableData[rowIndex].targetDescription2=''
+          }
+          if (this.tableData[rowIndex].compareDescription2 ==undefined) {
+            this.tableData[rowIndex].compareDescription2=''
+          }
+        if (this.tableData[rowIndex].targetDescription!=this.tableData[rowIndex].targetDescription2||this.tableData[rowIndex].compareDescription!=this.tableData[rowIndex].compareDescription2||this.tableData[rowIndex].compareResult != this.tableData[rowIndex].compareResult2) {
+          return 'red';
 
+        }
+      },
       //拆分权要
       splitPatentRight() {//patentRightVos
         this.loading=true
@@ -804,4 +826,9 @@
       color: red;
       text-decoration:underline;
   }
-    </style>
+    </style>
+<style scope >
+  .el-table .red{
+    background: #F5F5DC;
+  }
+</style>

+ 1 - 0
RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ProductResult.vue

@@ -284,6 +284,7 @@ export default {
     // 选择专利数据
     handleSelected(val) {
       console.log(val);
+      this.selected=val
       this.isHandleSure=false
     },
     // 选择专利筛选条件

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

@@ -129,70 +129,122 @@ export default {
       loading: false,
       row: [],
       Index_row: [],
+      isNum:1,
     };
   },
   mounted() {
-    this.splitPatentRight()
+    // console.log( this.$s.getSession('reportMessage1'));
+    // this.splitPatentRight()
+    this.getSplitMessage()
   },
   methods: {
     //完成
     // finish() {
-      
+      // this.$confirm('请您确定任务不再修改, 是否继续?', '提示', {
+      //         confirmButtonText: '确定',
+      //         cancelButtonText: '取消',
+      //         type: 'warning'
+      //       }).then(() => {
+      //         this.$message.success("任务已完成")
+      //         // this.$api
+      //       }).catch(() => {
+      //         this.$message.info("任务继续进行")         
+      // });
     // },
+    getSplitMessage() {
+      let a = {
+        taskId:null,
+        patentNo:null,
+        reportId: this.reportId,
+      }
+      this.$api.getSplitMessage(a).then(res => {
+        console.log(res);
+        if (res.code == 200) {
+          console.log(JSON.stringify(res.data) =='{}');
+          if (JSON.stringify(res.data) =='{}') {
+            this.isNum=1
+          } else {
+            this.isNum=0
+          }
+          this.splitPatentRight()
+        }
+      })
+    },
     //初始拆分
     splitPatentRight() {
       this.loading = true
       this.tableData1=[]
-      let PatentRight = {
+      var PatentRight = {
         patentNo: this.patentNo,
         splitType: this.splitType1,
         splitBy: this.splitBy1,
         ReportId: this.reportId,
       }
-      this.$api.splitPatentRight(PatentRight).then(res => {
-        if (res.code == 200) {
-          let a=this.$s.getSession('reportMessage1')
-          a.splitBy=res.data.splitBy.toString()
-          a.splitType = res.data.splitType.toString()
-          this.$s.setSession('reportMessage1',a)
-          if (res.data.patentRightVos.length>0) {
-            res.data.patentRightVos.forEach(RightVosItem => {
-              if (RightVosItem.features.length>0) {
-                RightVosItem.features.forEach(FeaturesItem => {
-                  FeaturesItem.pRightName=RightVosItem.RightName
-                  FeaturesItem.pSignPatentNo=RightVosItem.signPatentNo
-                  FeaturesItem.pContentOut=RightVosItem.contentOut
-                  FeaturesItem.pContent=RightVosItem.content
-                  FeaturesItem.pReportId=RightVosItem.reportId
-                  FeaturesItem.pPatentId=RightVosItem.patentId
-                  FeaturesItem.pType=RightVosItem.type
-                  FeaturesItem.pSort=RightVosItem.sort
-                  if (!FeaturesItem.hasOwnProperty("explainText")) {
-                    FeaturesItem.explainText=FeaturesItem.contentOut
-                  } else {
-                    if (FeaturesItem.explainText=="") {
+      var PatentReportId = {
+        patentNo: this.patentNo,
+        reportId: this.reportId,
+      }
+      if (this.isNum==0) {
+        this.$api.getAvoidDesignDirection(PatentReportId).then(res => {
+          if (res.code==200) {
+            this.tableData1 = res.data.features
+            // this.tableData.pRightName = res.data.features.rightName
+            this.textarea1.wholeDirection = res.data.wholeDirection
+            this.tableData1.forEach(item => {
+              item.pRightName=res.data.features.rightName
+            })
+            this.TypeSelect(this.Type)
+            this.loading=false
+          }
+          
+        })
+      } else {
+         this.$api.splitPatentRight(PatentRight).then(res => {
+           if (res.code == 200) {
+            let a=this.$s.getSession('reportMessage1')
+            a.splitBy=res.data.splitBy.toString()
+            a.splitType = res.data.splitType.toString()
+            this.$s.setSession('reportMessage1',a)
+            if (res.data.patentRightVos.length>0) {
+              res.data.patentRightVos.forEach(RightVosItem => {
+                if (RightVosItem.features.length>0) {
+                  RightVosItem.features.forEach(FeaturesItem => {
+                    FeaturesItem.pRightName=RightVosItem.RightName
+                    FeaturesItem.pSignPatentNo=RightVosItem.signPatentNo
+                    FeaturesItem.pContentOut=RightVosItem.contentOut
+                    FeaturesItem.pContent=RightVosItem.content
+                    FeaturesItem.pReportId=RightVosItem.reportId
+                    FeaturesItem.pPatentId=RightVosItem.patentId
+                    FeaturesItem.pType=RightVosItem.type
+                    FeaturesItem.pSort=RightVosItem.sort
+                    if (!FeaturesItem.hasOwnProperty("explainText")) {
                       FeaturesItem.explainText=FeaturesItem.contentOut
+                    } else {
+                      if (FeaturesItem.explainText=="") {
+                        FeaturesItem.explainText=FeaturesItem.contentOut
+                      }
                     }
-                  }
-                  if (!FeaturesItem.hasOwnProperty("littleDirection")) {
-                    FeaturesItem.littleDirection=FeaturesItem.contentOut
-                  } else {
-                    if (FeaturesItem.littleDirection=="") {
+                    if (!FeaturesItem.hasOwnProperty("littleDirection")) {
                       FeaturesItem.littleDirection=FeaturesItem.contentOut
+                    } else {
+                      if (FeaturesItem.littleDirection=="") {
+                        FeaturesItem.littleDirection=FeaturesItem.contentOut
+                      }
                     }
-                  }
-                   this.tableData1.push(FeaturesItem)
-                })
-               
-              }
-              
-            })
+                    this.tableData1.push(FeaturesItem)
+                  })
+                
+                }
+                
+              })
+            }
+            console.log(this.tableData1);
+            this.TypeSelect(this.Type)
+            this.loading=false
           }
-          console.log(this.tableData1);
-          this.TypeSelect(this.Type)
-          this.loading=false
-        }
-      })
+        })
+      }
+     
     },
     // 选择下拉框
     splitTypeSelect(even) {
@@ -323,18 +375,14 @@ export default {
               splitBy: this.tableData1[i].splitBy,
               splitType: this.tableData1[i].splitType,
               featuresOrder: this.tableData1[i].featuresOrder,
-              id: this.tableData1[i].id,
+              partnerId: this.tableData1[i].partnerId,
+              rightId: this.tableData1[i].rightId,
+              rightType: this.tableData1[i].rightType,
+              // id: this.tableData1[i].id,
               rightName: this.tableData1[i].rightName,
               isFinal: this.tableData1[i].isFinal,
         })
       }
-//       {
-//   "reportId": 0,
-//   "avoidDesignLittleDirectionDTOs": [
-//     {}
-//   ],
-//   "wholeDirection": "string"
-// }
       let keepStr = {
         reportId: this.reportId,
         avoidDesignLittleDirectionDTOs: keepArr,

+ 25 - 5
RMS-FrontEnd/src/views/report/components/sendCollaboration.vue

@@ -90,7 +90,7 @@
 import { mapGetters } from 'vuex'
 import PersonnelList from './personnelList'
 export default {
-  props: ["visibleCollaborations", "reportId", "onChangesIn", "formS","compareResultA","patentNo1","selected"],
+  props: ["visibleCollaborations", "reportId", "onChangesIn", "formS","compareResultA","patentNo1","selected","reportType"],
   components: {
     PersonnelList
   },
@@ -146,7 +146,8 @@ export default {
         // reportId: this.reportId,
         // applicationName: "",//申请人
         // obligeeName: "",//权利人
-        patentNo: this.patentNo1,
+        // patentNo: this.patentNo1,
+        patentNos:[],
         // applicationNo: "",
         // numberIpc: "",
         // numberCpc: "",
@@ -199,11 +200,17 @@ export default {
     ...mapGetters(['userinfo'])
   },
   mounted() {
+    // if (this.reportType==4) {
+      // this.queryParams.patentNos.push(this.patentNo1)
+    // }
+    console.log(this.selected);
     this.getPersonnelList()
     
   },
   watch: {
-   
+    // selected(val) {
+    //   this.queryParams.patentNo.push(val)
+    // },
     visibleCollaborations(val) {
       this.visibleCollaboration = val
     },
@@ -229,9 +236,22 @@ export default {
                 }
               }
           }
-          if (this.queryParams.patentNo) {
-            this.queryParams.isAll=null
+          if (this.selected.length > 0) {
+            console.log(this.selected);
+            this.selected.forEach(item => {
+              this.queryParams.patentNos.push(item)
+              this.queryParams.isAll=0
+            })
+            
+            // this.queryParams.isAll=null
           }
+          // if (this.queryParams.patentNo) {
+          //   this.queryParams.isAll=null
+          // }
+          // console.log(this.queryParams.patentNo);
+          // if (this.queryParams.patentNo.length>0) {
+          //   this.queryParams.isAll=null
+          // }
             
           // }
           if (Object.keys(this.clientForm).length > 0) {