修改bug

RMS-FrontEnd/src/views/components/articles/components/history/examination.vue

@@ -40,9 +40,9 @@
                              <span v-else><i class="el-icon-minus"></i></span>
                         </span>
                         <span v-else>
-                          <span v-if="scope.row.reportFiles || scope.row.fileList">
+                          <span v-if="(scope.row.reportFiles && scope.row.reportFiles.length>0)">
                               <div v-if="scope.row.reportFiles" v-for="item in scope.row.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.id)"><i class="el-icon-close"></i></p></div>
-                              <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div>
+                              <!-- <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div> -->
                             </span>
                              <span v-else><i class="el-icon-minus"></i></span>
                              <span style="float:right;">
@@ -104,6 +104,8 @@ export default {
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
+      var a = row.reportFiles?row.reportFiles:[]
+      this.$set(this.row,'reportFiles',a)
     },
     onChange(file, fileList) {
       if(this.row.reportFiles){
@@ -144,6 +146,10 @@ export default {
       if(index!=-1){
         this.Already.push(this.row.fileList[index].name)
       }else{
+        this.row.reportFiles.push({
+          id:file.raw.uid,
+          name:file.raw.name
+        })
         this.row.fileList.push(file.raw) 
       }
     },
@@ -171,11 +177,11 @@ export default {
       
     },
     delFile1(row,id,index){
-        var index = row.reportFiles.findIndex(item=>{
+        var index1 = row.reportFiles.findIndex(item=>{
           return item.id == id
         })
-        if(index!=-1){
-          row.reportFiles.splice(index,1)
+        if(index1!=-1){
+          row.reportFiles.splice(index1,1)
         }
       this.update(row,index)
     },

RMS-FrontEnd/src/views/components/articles/components/history/invalid.vue

@@ -50,9 +50,9 @@
                              <span v-else><i class="el-icon-minus"></i></span>
                         </span>
                         <span v-else>
-                            <span v-if="scope.row.reportFiles || scope.row.fileList">
+                            <span v-if="(scope.row.reportFiles && scope.row.reportFiles.length>0)">
+                              <!-- <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div> -->
                               <div v-if="scope.row.reportFiles" v-for="item in scope.row.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.id)"><i class="el-icon-close"></i></p></div>
-                              <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div>
                             </span>
                              <span v-else><i class="el-icon-minus"></i></span>
                              <span style="float:right;">
@@ -116,6 +116,8 @@ export default {
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
+      var a = row.reportFiles?row.reportFiles:[]
+      this.$set(this.row,'reportFiles',a)
     },
     // onChange(file){
     //   this.row.fileList.push(file.raw)
@@ -159,6 +161,10 @@ export default {
       if(index!=-1){
         this.Already.push(this.row.fileList[index].name)
       }else{
+        this.row.reportFiles.push({
+          id:file.raw.uid,
+          name:file.raw.name
+        })
         this.row.fileList.push(file.raw) 
       }
     },
@@ -185,11 +191,11 @@ export default {
       
     },
     delFile1(row,id,index){
-        var index = row.reportFiles.findIndex(item=>{
+        var index1 = row.reportFiles.findIndex(item=>{
           return item.id == id
         })
-        if(index!=-1){
-          row.reportFiles.splice(index,1)
+        if(index1!=-1){
+          row.reportFiles.splice(index1,1)
         }
       this.update(row,index)
     },

RMS-FrontEnd/src/views/components/articles/components/history/litigation.vue

@@ -70,9 +70,9 @@
                              <span v-else><i class="el-icon-minus"></i></span>
                         </span>
                         <span v-else>
-                          <span v-if="scope.row.reportFiles || scope.row.fileList">
+                          <span v-if="(scope.row.reportFiles && scope.row.reportFiles.length>0)">
                               <div v-if="scope.row.reportFiles" v-for="item in scope.row.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.id)"><i class="el-icon-close"></i></p></div>
-                              <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div>
+                              <!-- <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div> -->
                             </span>
                              <span v-else><i class="el-icon-minus"></i></span>
                              <span style="float:right;">
@@ -134,6 +134,8 @@ export default {
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
+      var a = row.reportFiles?row.reportFiles:[]
+      this.$set(this.row,'reportFiles',a)
     },
     onChange(file, fileList) {
       if(this.row.reportFiles){
@@ -174,6 +176,10 @@ export default {
       if(index!=-1){
         this.Already.push(this.row.fileList[index].name)
       }else{
+        this.row.reportFiles.push({
+          id:file.raw.uid,
+          name:file.raw.name
+        })
         this.row.fileList.push(file.raw) 
       }
     },
@@ -201,11 +207,11 @@ export default {
       
     },
     delFile1(row,id,index){
-        var index = row.reportFiles.findIndex(item=>{
+        var index1 = row.reportFiles.findIndex(item=>{
           return item.id == id
         })
-        if(index!=-1){
-          row.reportFiles.splice(index,1)
+        if(index1!=-1){
+          row.reportFiles.splice(index1,1)
         }
       this.update(row,index)
     },

RMS-FrontEnd/src/views/components/articles/components/history/other.vue

@@ -31,9 +31,9 @@
                              <span v-else><i class="el-icon-minus"></i></span>
                         </span>
                         <span v-else>
-                          <span v-if="(scope.row.reportFiles && scope.row.reportFiles.length>0) || (scope.row.fileList&&scope.row.fileList.length>0)">
+                          <span v-if="(scope.row.reportFiles && scope.row.reportFiles.length>0)">
                               <div v-if="scope.row.reportFiles" v-for="item in scope.row.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.id)"><i class="el-icon-close"></i></p></div>
-                              <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div>
+                              <!-- <div v-if="scope.row.fileList" v-for="item in scope.row.fileList" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(scope.row,item.uid,1)"><i class="el-icon-close"></i></p></div> -->
                             </span>
                              <span v-else><i class="el-icon-minus"></i></span>
                              <span style="float:right;">
@@ -101,6 +101,8 @@ export default {
       this.$set(row,'fileList',row.fileList)
       this.row = row
       this.row.fileList = row.fileList?row.fileList:[]
+      var a = row.reportFiles?row.reportFiles:[]
+      this.$set(this.row,'reportFiles',a)
     },
     onChange(file, fileList) {
       if(this.row.reportFiles){
@@ -141,6 +143,10 @@ export default {
       if(index!=-1){
         this.Already.push(this.row.fileList[index].name)
       }else{
+        this.row.reportFiles.push({
+          id:file.raw.uid,
+          name:file.raw.name
+        })
         this.row.fileList.push(file.raw) 
       }
 
@@ -169,12 +175,11 @@ export default {
       
     },
     delFile1(row,id,index){
-      console.log(row)
-        var index = row.reportFiles.findIndex(item=>{
+        var index1 = row.reportFiles.findIndex(item=>{
           return item.id == id
         })
-        if(index!=-1){
-          row.reportFiles.splice(index,1)
+        if(index1!=-1){
+          row.reportFiles.splice(index1,1)
         }
       this.update(row,index)
     },

RMS-FrontEnd/src/views/components/articles/components/history/permit.vue

@@ -253,7 +253,7 @@ export default {
        addPermit(){
             this.form = {
                 patentNo:this.patent.patentNo,
-                licensor:this.patent.applicant.filter(a => a.dataType === 1)[0].name
+                licensor:this.patent.applicant.filter(a => a.dataType === 1).length>0?this.patent.applicant.filter(a => a.dataType === 1)[0].name:''
             }
             this.permitVisible = true
        },

RMS-FrontEnd/src/views/product/components/product.vue

@@ -291,7 +291,7 @@ export default {
       title: null,
       categoryTitle: null,
       queryParams: {
-        patentNo: this.patentNo ? this.patentNo[0] : null,
+        patentNo: this.patentNo ? (typeof this.patentNo=='string'?this.patentNo:this.patentNo[0]) : null,
         groupBy:'',
         orderBy:'',//排序名称
         orderType:'',//排序类型
@@ -319,7 +319,7 @@ export default {
   },
   watch:{
     patentNo(val){
-      this.queryParams.patentNo = val[0]
+      this.queryParams.patentNo = typeof val=='string'?val:val[0]
       this.getList()
     },
   },
@@ -342,7 +342,7 @@ export default {
     //保存选择的产品
     submitProduct(){
       var params={
-        patentNos:this.patentNo,
+        patentNos:typeof this.patentNo=='string'?[this.patentNo]:this.patentNo,
         productIds:this.productIds
       }
       this.$api.PatentAndProduct(params).then(response=>{

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

@@ -93,7 +93,7 @@
                 :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
                 <!-- @isTrues="getIsTrue"  @openContrast='openContrast' -->
                 <component :is="componentName" :project-id="projectId" :isTrue="isTrue" :type1="type" :patent="patent"
-                  :reportId="reportId" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
+                :patentNo="[patent.patentNo]" :domId="patent.patentNo + '1'" :reportId="reportId" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
               </div>
               <div class="patent-articles-content-right" v-if="showRight">
                 <el-container>

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

@@ -34,7 +34,7 @@
             </el-header>
             <el-main class="patent-articles-content" style="padding-left:30px">
               <div class="patent-articles-content-left" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
-                <component :is="componentName" :project-id="projectId" :patent="patent" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
+                <component :is="componentName" :project-id="projectId" :patent="patent" :patentNo="[patent.patentNo]" :domId="patent.patentNo + '1'" :reportId="reportId" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
               </div>
               <div class="patent-articles-content-right" v-if="showRight">
                 <el-container>