协同bug修改

RMS-FrontEnd/src/views/components/identificationCode/index.vue

@@ -48,6 +48,7 @@ export default {
                 // path: '/Incomplete'+`taskId=470&reportId=350&type=3&reportType=${}`,
                       // path: '/customer_review',
               })
+              this.$s.setSession('params',res.data)
               this.$store.commit("COORDINATION",this.coordination)
               window.open(a.href,"_blank")
             } else {

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

@@ -40,6 +40,7 @@ export default {
   mixins: [webSocket],
   data() {
     return {
+      aside:false,
       isCollapse: true,
       activeMenu: this.$route.meta.active
     }

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

@@ -317,7 +317,7 @@ export default {
     },
   },
   created() {
-    //console.log(this.$s.getSession('params'));
+    // console.log(this.$s.getSession('params'));
     this.row.type=this.$s.getSession('params').reportType
     this.taskId = this.$s.getSession('params').taskId
     this.type = this.$s.getSession('params').type
@@ -329,6 +329,9 @@ export default {
     // this.reportId = this.$s.getSession('params').reportId
   },
   mounted() {
+    if (this.reportType == 4) {
+      this.FeaturesNumber = 0
+    }
     //console.log(this.location, this.reportType, this.isShow,this.taskWorkRemakA);
     this.getPatent(this.patentNo)
     //console.log(this.reportId, this.$s.getSession('params'));

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

@@ -113,7 +113,7 @@
             <el-input v-model="choiceForm.title" placeholder="请输入标题查询"></el-input>
           </el-form-item>
           <el-form-item label="专利号">
-            <el-input v-model="choiceForm.patentNo" placeholder="请输入专利号查询"></el-input>
+            <el-input v-model="choiceForm.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开)"></el-input>
           </el-form-item>
          
         </el-form>

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

@@ -235,11 +235,11 @@ export default {
                 }
               }
           }
-          if (this.selected==undefined) {
-            this.selected=[]
-          }
+          // if (this.selected==undefined) {
+          //   this.selected=[]
+          // }
           // selected直接赋值queryParams.patentNos
-          if (this.selected.length > 0 && this.reportType!=4 ) {
+          if (this.selected&& this.selected.length > 0 && this.reportType!=4 ) {
                 this.queryParams.patentNos=this.selected
                 this.queryParams.isAll=0
           }
@@ -250,7 +250,7 @@ export default {
               }
           }
 
-          if (Object.keys(this.choiceFormS).length > 0) {
+          if (this.choiceFormS&&Object.keys(this.choiceFormS).length > 0 ) {
             for (let k in this.choiceFormS) {
                 if (k=='title') {
                   this.queryParams.patentVO.patentName = this.choiceFormS[k]

RMS-FrontEnd/src/views/task/MyInitiate.vue

@@ -201,7 +201,8 @@ export default {
     },
     // 查看(确认)结果
     taskWorkRemakBtn(ev,row) {
-      //console.log(ev, row);
+      // console.log(ev, row);
+     
       if (ev == 1) {
         if (row.reportType==4) {
           let queryParams = {
@@ -217,15 +218,17 @@ export default {
           this.$api.reTaskPatents(queryParams).then(res => {
           //console.log(res);
           if (res.code == 200) {
-            var b = {
-                taskId:row.id,
-                type:row.type,
-                reportId:row.reportId,
-                patentNo:res.data.records[0].patentNo,
-                reportType : row.reportType,
-                reportStatus: "",
-            }
-            this.$s.setSession('params',b)
+            // var b = {
+            //     taskId:row.id,
+            //     type:row.type,
+            //     reportId:row.reportId,
+            //     patentNo:res.data.records[0].patentNo,
+            //     reportType : row.reportType,
+            //     reportStatus: "",
+            // }
+            row.patentNo = res.data.records[0].patentNo
+            row.taskId = row.id
+            this.$s.setSession('params',row)
             let a = this.$router.resolve({
               path: '/FTOContrast/' + res.data.records[0].id,
               query: {
@@ -243,6 +246,7 @@ export default {
             path: '/Incomplete',
             query: {
               taskId: row.id,
+              reportName:row.reportName,
               reportId: row.reportId,
               type: row.type,
               taskWorkRemak:0,
@@ -253,6 +257,7 @@ export default {
           // path: '/Incomplete'+`taskId=470&reportId=350&type=3&reportType=${}`,
           // path: '/customer_review',
           })
+          this.$s.setSession('params',row)
           window.open(a.href, "_blank")
         }