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

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

@@ -298,7 +298,6 @@ export default {
   },
   methods: {
     isRead(val) {
-      
       if(this.patentStatus2==0 && this.reportType != 4){
         this.changeStatus(val)
       }
@@ -340,7 +339,7 @@ export default {
     },
     async onChange(data) {
       // this.isKeepA=data.patentNo
-      if (this.coordinationA) {
+      // if (this.coordinationA) {
         console.log(this.projectId,data)
         this.message = data.patentNo
         this.patentNo1 = data.patentNo
@@ -349,7 +348,7 @@ export default {
         }
 
         await this.$router.push({
-          path: '/FTOContrasts/' + data.id,
+          path: this.coordinationA? '/FTOContrasts/' + data.id:'/FTOContrast/' + data.id,
           query: {
             patentNo: data.patentNo,
             location: data.location,
@@ -358,25 +357,25 @@ export default {
         this.location1 = data.location
         this.patentId = data.id
         this.changePageTitle()
-      } else {
-        console.log(this.projectId,data)
-        this.message = data.patentNo
-        this.patentNo1 = data.patentNo
-        if (this.fix != true) {
-          await this.getPatent(data.patentNo)
-        }
+      // } else {
+      //   console.log(this.projectId,data)
+      //   this.message = data.patentNo
+      //   this.patentNo1 = data.patentNo
+      //   if (this.fix != true) {
+      //     await this.getPatent(data.patentNo)
+      //   }
 
-        await this.$router.push({
-          path: '/FTOContrast/' + data.id,
-          query: {
-            patentNo: data.patentNo,
-            location: data.location,
-          }
-        })
-        this.location1 = data.location
-        this.patentId = data.id
-        this.changePageTitle()
-      }
+      //   await this.$router.push({
+      //     path: '/FTOContrast/' + data.id,
+      //     query: {
+      //       patentNo: data.patentNo,
+      //       location: data.location,
+      //     }
+      //   })
+      //   this.location1 = data.location
+      //   this.patentId = data.id
+      //   this.changePageTitle()
+      // }
       // console.log(this.projectId,data)
       // this.message = data.patentNo
       // this.patentNo1 = data.patentNo
@@ -413,6 +412,7 @@ export default {
       
       this.$api.getPatentStatus(a).then(response => {
         if (response.code == 200) {
+          console.log("ContrasrProduct",response.data);
           this.patentStatus2 = response.data
         }
       })

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

@@ -153,6 +153,11 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column v-if="this.taskWorkRemakA==0" label="操作" min-width="120"  align="center" >
+            <template slot-scope="scope">
+              <el-button @click="handleClick(scope.row)" size="small">一键修改</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -404,34 +409,26 @@
         }
         
         //协同对比调用querySynery
-        if (this.coordination) {
-          console.log(111111,this.coordination);
-          this.$api.querySynery(PatentRight).then(res => {
-            if (res.code == 200) {
-              this.CompareMessage(res)
-            }
-          // console.log("@@",this.tableData1);
-          })
-        }else if (this.typeFto==1&&this.taskWorkRemakA!=0) {
-          console.log(111111,this.coordination);
-          this.$api.querySynery(PatentRight).then(res => {
-            if (res.code == 200) {
-              this.CompareMessage(res)
-            }
-          // console.log("@@",this.tableData1);
-          })
-        }
-        else if (this.taskWorkRemakA == 0) {
-          this.$api.queryAllCompareMessage(PatentRight).then(res => {
-            console.log(2222, this.taskWorkRemakA);
-            if (res.code == 200) {
-              this.CompareMessage(res)
-            }
-          // console.log("@@",this.tableData1);
-          })
-          
-        }else {//queryCompareMessage
-           this.$api.queryCompareMessage(PatentRight).then(res => {
+        if (this.typeFto==1) {
+          if (this.coordination || this.taskWorkRemakA != 0) {
+            console.log(111111, this.coordination,this.taskWorkRemakA);
+            this.$api.querySynery(PatentRight).then(res => {
+              if (res.code == 200) {
+                this.CompareMessage(res)
+              }
+              // console.log("@@",this.tableData1);
+            })
+          } else {
+            this.$api.queryAllCompareMessage(PatentRight).then(res => {
+              console.log(2222, this.taskWorkRemakA);
+              if (res.code == 200) {
+                this.CompareMessage(res)
+              }
+            // console.log("@@",this.tableData1);
+            })
+          }
+        } else {
+          this.$api.queryCompareMessage(PatentRight).then(res => {
             console.log(3333,this.coordination);
             if (res.code == 200) {
               this.CompareMessage(res)
@@ -439,6 +436,42 @@
           // console.log("@@",this.tableData1);
           })
         }
+        
+        // if (this.coordination) {
+        //   console.log(111111,this.coordination);
+        //   this.$api.querySynery(PatentRight).then(res => {
+        //     if (res.code == 200) {
+        //       this.CompareMessage(res)
+        //     }
+        //   // console.log("@@",this.tableData1);
+        //   })
+        // }else if (this.typeFto==1&&this.taskWorkRemakA!=0) {
+        //   console.log(111111,this.coordination);
+        //   this.$api.querySynery(PatentRight).then(res => {
+        //     if (res.code == 200) {
+        //       this.CompareMessage(res)
+        //     }
+        //   // console.log("@@",this.tableData1);
+        //   })
+        // }
+        // else if (this.taskWorkRemakA == 0) {
+        //   this.$api.queryAllCompareMessage(PatentRight).then(res => {
+        //     console.log(2222, this.taskWorkRemakA);
+        //     if (res.code == 200) {
+        //       this.CompareMessage(res)
+        //     }
+        //   // console.log("@@",this.tableData1);
+        //   })
+          
+        // }else {//queryCompareMessage
+        //    this.$api.queryCompareMessage(PatentRight).then(res => {
+        //     console.log(3333,this.coordination);
+        //     if (res.code == 200) {
+        //       this.CompareMessage(res)
+        //     }
+        //   // console.log("@@",this.tableData1);
+        //   })
+        // }
       },
       //查询对比记录数据处理
       CompareMessage(res) {
@@ -717,6 +750,17 @@
          this.$message.success("任务完成，邮件已发送成功")
         })
       },
+      // 一键修改
+      handleClick(row) {
+        // console.log(this.tableData1,row);
+        let a=this.tableData1.findIndex(item => {
+          return item.id==row.id
+        })
+        this.tableData1[a].targetDescription=row.targetDescription2
+        this.tableData1[a].compareDescription=row.compareDescription2
+        this.tableData1[a].compareResult = row.compareResult2
+        this.$message.success("修改成功,请进行保存")
+      },
     },
   }
    

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

@@ -3,8 +3,9 @@
         <el-container>
             
             <el-aside style="background:white" :style="{width:'calc(100% - ' + width +')'}">
-                <div style="display:flex; justify-content:flex-end;align-items:center">
-                    <el-dropdown size="medium" style="margin-top:10px;margin-right:20px">
+                <div style="display:flex; justify-content:flex-end;align-items:center;margin-bottom: 10px;">
+                    <el-button @click="taskWork" type="primary" size="small" >协同办公</el-button>
+                    <el-dropdown size="medium" style="margin:10px 20px 10px 20px">
                         <el-button type="primary" size="small" >
                             创建报告<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-button>
@@ -60,7 +61,7 @@
                             <td>优先权</td>
                             <td><span v-if="patent">{{patent.priorityNo}}</span></td>
                             <td>案件状态</td>
-                            <td>已授权，维持中</td>
+                            <td> <span v-if="patent.affair">{{patent.affair[0].status}}</span></td>
                             <td>同族专利</td>
                             <td><span v-if="patent" v-html="getPatentFamily(patent)"></span></td>
                         </tr>
@@ -141,18 +142,22 @@
             </el-main>
         </el-container>
         <CreateReport ref="ReportForm" @getList="isGetList"></CreateReport>
+        <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="queryParams.reportId" :compareResultA="compareResult"></sendCollaboration>
     </div>
 </template>
 
 <script>
 import CreateReport from '@/views/report/components/CreateReport.vue'
+import sendCollaboration from "@/views/report/components/sendCollaboration.vue"
 export default {
     components: {
-        CreateReport,
+    CreateReport,
+    sendCollaboration
     },
     props:['reportId','row'],
     data() {
-        return {
+      return {
+            visibleWork:false,
             total:'',
             index:0,
             loading:false,
@@ -169,7 +174,8 @@ export default {
                 current:1,
                 reportId:this.reportId,
                 compareResult:null,
-            },
+        },
+        compareResult:null,
             options: [
                 {
                     value: 1,
@@ -197,7 +203,8 @@ export default {
             }else{
                 this.width = '0px'
             }
-        },
+      },
+        
     },
    async mounted() {
        await this.getPatentList()
@@ -277,7 +284,8 @@ export default {
             this.queryParams.current+=1
            await this.getPatentList()
         },
-        async change(){
+      async change() {
+          console.log(this.queryParams.compareResult);
             this.index = 0
           this.patentList = []
           await this.getPatentList()
@@ -288,9 +296,9 @@ export default {
         },
         async getPatentList(){
            await this.$api.getComparedMessage(this.queryParams).then(response=>{
-                if(response.code == 200){
-                    this.total = response.data.total
-                    this.patentList=this.patentList.concat(response.data.records)
+             if (response.code == 200) {
+                  this.total = response.data.total
+                  this.patentList=this.patentList.concat(response.data.records)
                 }
             })
         },
@@ -378,6 +386,14 @@ export default {
           }
         }
       },
+       // 工作协同
+      taskWork() { 
+        this.visibleWork = true
+        this.compareResult=this.queryParams.compareResult
+      },
+      collaboration(val) { 
+        this.visibleWork=val
+      },
     },
 }
 </script>

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

@@ -302,6 +302,7 @@ import Features from '@/views/components/articles/components/features.vue'
         patentNo:this.publicNo,
       }
       this.$api.getPatentStatus(a).then(response => {
+        console.log("patentMessage",response.data);
         if (response.code == 200) {
           this.patentStatus2 = response.data
         }

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"],
+  props: ["visibleCollaborations", "reportId", "onChangesIn", "formS","compareResultA"],
   components: {
     PersonnelList
   },
@@ -150,8 +150,9 @@ export default {
         // endTime: this.clientForm.date,
         // remark: this.clientForm.remark,
         // clientForm: {},
-        // type: this.type
-        patentVO:{}
+        type: this.type,
+        patentVO: {},
+        compareResult:this.compareResultA,
       },
       ploading: false,
       userInformation: false,
@@ -179,11 +180,16 @@ export default {
   },
   mounted() {
     this.getPersonnelList()
+    
   },
   watch: {
    
     visibleCollaborations(val) {
       this.visibleCollaboration = val
+    },
+    compareResultA(val) {
+      this.queryParams.compareResult = val
+      console.log(this.queryParams.compareResult);
     }
   },
   // 点击子组件personnelList中确定按钮，像父级发送数据，父级通过getCheck接收存入到checked数组中（数据是对象）
@@ -192,17 +198,22 @@ export default {
       // this.queryParams.clientForm=this.clientForm
       this.$refs.clientForm.validate((valid) => {
         if (valid) {
-          this.queryParams.patentVO.filedOptions = this.onChangesIn
-          if (Object.keys(this.formS).length > 0) {
-            for (let k in this.formS) {
-              this.queryParams.patentVO[k] = this.formS[k]
+          if (this.queryParams.type==4) {
+            //侵权分析
+          } else {
+            if (this.queryParams.compareResult=='') {
+              this.queryParams.patentVO.filedOptions = this.onChangesIn
+              if (Object.keys(this.formS).length > 0) {
+                for (let k in this.formS) {
+                  this.queryParams.patentVO[k] = this.formS[k]
+                }
+              }
             }
           }
-          // personEmail
           if (Object.keys(this.clientForm).length > 0) {
-            for (let kForm in this.clientForm) {
-              this.queryParams[kForm] = this.clientForm[kForm]
-            }
+              for (let kForm in this.clientForm) {
+                this.queryParams[kForm] = this.clientForm[kForm]
+              }
           }
           console.log(this.personnelList);
           this.$api.addSyneryTask(this.queryParams).then(res => {

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

@@ -32,31 +32,34 @@ export const Contrast = {
             })
             this.$s.setSession('params', this.queryParams)
             window.open(router.href, '_blank');
-          } else if (this.coordination) {
-            console.log(row.id);
-            var router = this.$router.resolve({
-              path: '/FTOContrasts/' + row.id,
-              query: {
-                // taskId: this.taskId,
-                patentNo:row.patentNo,
-                reportId:this.reportId,
-                coordination:this.coordination,
-                location:location,
-                // state:this.queryParams.taskStatus
-              }
-            })
-            this.$s.setSession('params', this.queryParams)
-            window.open(router.href, '_blank');
+          }
+          // else if (this.coordination) {
+          //   console.log(row.id);
+          //   var router = this.$router.resolve({
+          //     path: '/FTOContrasts/' + row.id,
+          //     query: {
+          //       // taskId: this.taskId,
+          //       patentNo:row.patentNo,
+          //       reportId:this.reportId,
+          //       coordination:this.coordination,
+          //       location:location,
+          //       // state:this.queryParams.taskStatus
+          //     }
+          //   })
+          //   this.$s.setSession('params', this.queryParams)
+          //   window.open(router.href, '_blank');
             
-          }else{
+          // }
+          else {
             
             var router = this.$router.resolve({
-              path: '/FTOContrast/' + row.id,
+              path: this.coordination?'/FTOContrasts/' + row.id:'/FTOContrast/' + row.id,
               query: {
                 // taskId: this.taskId,
                 patentNo:row.patentNo,
                 reportId:this.reportId,
-                location:location,
+                location: location,
+                coordination:this.coordination,
                 // state:this.queryParams.taskStatus
               }
             })