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

RMS-FrontEnd/src/router/index.js

@@ -72,7 +72,8 @@ const routes = [
         path: '/InvalidIndex',
         name:"InvalidIndex",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/report/Invalid/index.vue'),
       },
@@ -81,7 +82,8 @@ const routes = [
         path: '/FTOIndex',
         name:"FTOIndex",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/report/FTO/index.vue'),
       },
@@ -90,7 +92,8 @@ const routes = [
         path: '/tortIndex',
         name:"tortIndex",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/report/tort/index.vue'),
       },
@@ -99,7 +102,8 @@ const routes = [
         path: '/avoid',
         name:"avoid",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/report/avoid/index.vue'),
       },
@@ -153,7 +157,8 @@ const routes = [
         path: '/rDetails',
         name:"rDetails",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/report/reportDetails/index.vue'),
       },
@@ -161,7 +166,8 @@ const routes = [
         path: '/FTOrDetails',
         name:"FTOrDetails",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/report/FTO/FTOPage/ReportDetails/index.vue'),
       },
@@ -169,7 +175,7 @@ const routes = [
         path: '/taskReportDetails',
         name:"taskReportDetails",
         meta:{
-          aside:true
+          aside: true,
         },
         component:() => import('@/views/task/components/taskReportDetails.vue'),
       },
@@ -177,7 +183,8 @@ const routes = [
         path: '/import',
         name:"import",
         meta:{
-          aside:true
+          aside: true,
+          showHeader:true,
         },
         component:() => import('@/views/components/import'),
       },

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

@@ -41,7 +41,16 @@
         </el-aside>
         <el-container>
           <el-header>
-            <span v-if="header" style="margin-left:20px">所属报告：<el-link @click.native="checkReport(report)" style="font-size:16px;vertical-align: inherit;">{{ report.reportName}}</el-link></span>
+            <span v-if="header" style="margin-left:20px">
+              <span v-if="!report.taskName"> 报告名称：{{ report.reportName?report.reportName:report.name}}</span>
+              <span v-else>
+                <span > 报告名称：<el-link @click.native="checkReport(report)" style="font-size:16px;vertical-align: inherit;margin-right: 20px;">{{ report.reportName?report.reportName:report.name}}</el-link></span>
+                <span > 任务名称：{{ report.taskName}}</span>
+              </span>
+              <!-- <span v-if="!report.taskName"> 报告名称：{{ report.reportName?report.reportName:report.name}}</span>
+              <span v-else> 报告名称：<el-link @click.native="checkReport(report)" style="font-size:16px;vertical-align: inherit;margin-right: 20px;">{{ report.reportName?report.reportName:report.name}}</el-link></span>
+              <span v-if="report.taskName"> 任务名称：{{ report.taskName}}</span> -->
+            </span>
           </el-header>
           <el-main class="admin-main-box">
             <router-view style=""></router-view>
@@ -90,7 +99,6 @@ export default {
     header(val){
       if(val){
         this.report = this.$s.getSession('params')
-          
       }else{
         this.report = {}
       }
@@ -106,6 +114,7 @@ export default {
   async mounted() {
     this.aside = this.$route.meta.aside || false
     this.header = this.$route.meta.showHeader
+    // console.log(this.showTask);
     this.$store.commit('SET_PATENT_CONTRAST', [])
     this.$store.commit('SET_PREFIX', '/admin')
     // await this.getUserinfo()
@@ -113,7 +122,7 @@ export default {
     // this.getSelect()
   },
   methods: {
-    checkReport(row){
+    checkReport(row) {
 			row.type = row.reportType
 			row.name = row.taskName
 			this.$s.setSession('row', row)

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

@@ -98,22 +98,22 @@
       <div style="height: 500px">
         <el-form ref="form" :model="form" label-width="80px" label-position="left">
           <el-form-item label="标题">
-            <el-input type="textarea" v-model="form.patentName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.patentName" placeholder="请输入标题查询"></el-input>
           </el-form-item>
           <el-form-item label="摘要">
-            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入摘要查询"></el-input>
           </el-form-item>
           <el-form-item label="专利号">
-            <el-input type="textarea" v-model="form.patentNo" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开，示例：“专利号|专利号”)"></el-input>
           </el-form-item>
           <el-form-item label="申请号">
-            <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
           </el-form-item>
           <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询"></el-input>
           </el-form-item>
           <!-- <el-form-item label="申请号">
             <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>

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

@@ -227,12 +227,16 @@ export default{
             let a = {
                 reportId:this.reportId
             }
-            this.$api.getProduct(a).then(response=>{
-              if (response.code == 200) {
-                  if (response.data.deadLine) {
-                    this.isDate=true
-                  }
+          this.$api.getProduct(a).then(response => {
+            if (response.code == 200) {
+              this.product={}
+                  // if (response.data.deadLine) {
+                  //   this.isDate=true
+                  // }
+                  if (response.data) {
                     this.product = response.data
+                  }
+                    
                 }
             })
         },

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

@@ -212,9 +212,9 @@ export default{
             this.$api.getProduct(a).then(response=>{
                 if (response.code == 200) {
                   if (response.data) {
-                    if (response.data.deadLine) {
-                        this.isDate=true
-                      }
+                    // if (response.data.deadLine) {
+                    //     this.isDate=true
+                    //   }
                         this.product = response.data
                     }else{
                         this.$emit('isSave',false)

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

@@ -166,22 +166,22 @@
       <div style="height: 500px">
         <el-form ref="form" :model="form" label-width="80px" label-position="left">
           <el-form-item label="标题">
-            <el-input type="textarea" v-model="form.patentName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.patentName" placeholder="请输入标题查询"></el-input>
           </el-form-item>
           <el-form-item label="摘要">
-            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入摘要查询"></el-input>
           </el-form-item>
           <el-form-item label="专利号">
-            <el-input type="textarea" v-model="form.patentNo" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开，示例：“专利号|专利号”)"></el-input>
           </el-form-item>
           <el-form-item label="申请号">
-            <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
           </el-form-item>
           <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询"></el-input>
           </el-form-item>
           <!-- <el-form-item label="申请号">
             <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>

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

@@ -132,22 +132,22 @@
         <div style="height: 500px">
           <el-form ref="form" :model="form" label-width="80px" label-position="left">
             <el-form-item label="标题">
-              <el-input type="textarea" v-model="form.patentName" placeholder="请输入查询内容"></el-input>
+              <el-input type="textarea" v-model="form.patentName" placeholder="请输入标题查询"></el-input>
             </el-form-item>
             <el-form-item label="摘要">
-            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入摘要查询"></el-input>
             </el-form-item>
             <el-form-item label="专利号">
-              <el-input type="textarea" v-model="form.patentNo" placeholder="请输入查询内容"></el-input>
+              <el-input type="textarea" v-model="form.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开，示例：“专利号|专利号”)"></el-input>
             </el-form-item>
             <el-form-item label="申请号">
-              <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
+              <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
             </el-form-item>
             <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询"></el-input>
           </el-form-item>
             <!-- <el-form-item label="申请号">
               <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>

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

@@ -204,6 +204,7 @@ export default {
     getRow(row){
       row.dictMessage = this.dictMessage
       this.$s.setSession('row', row)
+      this.$s.setSession('params', row)
       switch(row.type){
         case 0:
         case 1:
@@ -241,6 +242,7 @@ export default {
       this.$refs.ReportForm.open(form)
     },
     handleOption({ option, row }) {
+      this.$s.setSession('params', row)
       switch (option) {
         case '0':
           this.handleImportPatent(row)

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

@@ -96,7 +96,7 @@ import ProductContrast from './tortPage/ProductContrast.vue'
             } else {
             this.active=this.active
             };
-            this.gong()
+            // this.gong()
     },
     methods: {
         handStep(id) {

RMS-FrontEnd/src/views/report/tort/tortPage/ProductContrast.vue

@@ -15,10 +15,10 @@
         return {
             isShow1:this.isShow,
             reportId:'',
-            patentNo:''
+            patentNo: ''
         }
     },
-    created(){
+    created() {
         this.reportId = this.reportMessage.id
         this.patentNo = this.reportMessage.signPatentNo
         var a = {
@@ -27,7 +27,8 @@
             reportId:this.reportId,
             patentNo:this.patentNo,
             reportType : this.reportMessage.type,
-            reportStatus:this.reportMessage.status
+            reportStatus: this.reportMessage.status,
+            name:this.reportMessage.name,
         }
         this.$s.setSession('params',a)
     },