Merge branch 'shaoyin' into product-shaoyin

src/api/newApi/report.js

@@ -269,6 +269,8 @@ export default {
   },
 
 
+
+
   /**
    * 无效应对
    * 添加非专利对比文献
@@ -514,6 +516,29 @@ updateSupplyEvidence(data) {
     return axios.post("/xiaoshi/invalidStatutes/updateMessage", data);
   },
   /**
+      * 无效应对
+      * 官方无效导入最终无效理由和证据（同步）
+    */
+  importFinalInvalidStatues(params) {
+    return axios.get("/xiaoshi/invalidStatutes/importFinalInvalidStatues", {params});
+  },
+  /**
+      * 无效应对
+      * 官方无效编辑最终无效理由和证据
+    */
+  editFinalInvalidStatues(data) {
+    return axios.post("/xiaoshi/invalidStatutes/editFinalInvalidStatues", data);
+  },
+  /**
+      * 无效应对
+      * 官方查询最终无效理由和证据
+    */
+  queryFinalInvalidStatues(data) {
+    return axios.post("/xiaoshi/invalidStatutes/queryFinalInvalidStatues", data);
+  },
+
+
+  /**
     * 无效应对
     * 添加（修改）证据组合
   */
@@ -677,6 +702,7 @@ updateSupplyEvidence(data) {
     return axios.post("/xiaoshi/reportProject/updateIfSecondInvalid", data);
   },
 
+
   /**
     * 无效应对
     *添加或更新报告附图
@@ -700,6 +726,7 @@ updateSupplyEvidence(data) {
     },
 
 
+
   /**
     * 稳定性分析和第三方意见
     * 添加或更新对比记录

src/utils/axios.js

@@ -83,7 +83,6 @@ _axios.interceptors.response.use(
     if (code === 500) {
       // TODO
       if(response.data == '未登录'){
-        console.log('未登录')
         Router.push({
           path: `/login`
         }).then(r => {})
@@ -102,11 +101,19 @@ _axios.interceptors.response.use(
     // return response;
   },
   function (error) {
-    // Do something with response error
-    Notification.error({
-      title: '系统错误',
-      message: error.response.data.message
-    })
+    if(error.response.status == 404){
+      Notification.error({
+        title: '接口不存在',
+        message: error.response.data.message
+      })
+    }else{
+      // Do something with response error
+      Notification.error({
+        title: '系统错误',
+        message: error.response.data.message
+      })
+    }
+    
     
     isRefreshing = false
     return Promise.reject(error);

src/utils/model/RichText/index.vue

@@ -24,7 +24,7 @@ export default {
   components: {},
   props:{
         value:{
-            type:String,
+            type:[String,Function],
             default:(value)=>{
                   return ""
             }
@@ -35,6 +35,10 @@ export default {
                 return "请输入"
             }
         },
+        autoFocus:{
+          type:Boolean,
+          default:false
+        },
         keys:{
           type:String,
           default:()=>{
@@ -64,7 +68,8 @@ export default {
           // }
         ],
         selectObj:null,
-        show:false
+        show:false,
+
     };
   },
   watch: {
@@ -90,6 +95,9 @@ export default {
       
     })
     window.onkeydown = this.checkKeyPress
+    if(this.autoFocus){
+      this.$refs.myEditBox.focus()
+    }
   },
   methods: {
 
@@ -105,9 +113,9 @@ export default {
       }
       //  var html = this.addTag(SplitHtmls,method)
       this.content = html
-
+      this.show = false
       this.$emit('input',html)
-      this.$emit('blur',html)
+      // this.$emit('blur',html)
       this.$emit('change',html)
       this.close()
     },
@@ -185,7 +193,7 @@ export default {
       }
       if (e.keyCode === 13) {
           e.preventDefault(); // 阻止默认操作
-          document.execCommand("insertHTML", false, "<br>"); // 插入换行
+          document.execCommand("insertHTML", false, "<br><br>"); // 插入换行
       }
     },
     //粘贴
@@ -389,6 +397,9 @@ async urlToBase64(imageUrl) {
       event.target.parentNode.focus();
     },
     saveValue(event){
+      if(this.show){
+        return 
+      }
         var a  = event.target.innerHTML
         this.$emit('input',a)
         this.$emit('blur',a)

src/views/components/import/task/components/index.vue

@@ -16,7 +16,7 @@
             </template>
           </el-table-column>
           <el-table-column v-for="item in columnList.filter(item => !item.ifHidden)" :key="item.value" :label="item.name"
-            :prop="item.value" :min-width="item.value == 'percentage' ? '200' : '100'" align="center" sortable="custom">
+            :prop="item.value" :min-width="item.value == 'percentage' ? '200' : '100'" align="center" :sortable="item.ifSort?'custom':false">
             <template slot-scope="scope">
               <div v-if="item.value == 'type'"
                 v-html="$commonJS.getColumnData(scope.row, item, null, { data: importType })">

src/views/event/components/view/table.vue

@@ -10,7 +10,7 @@
       </el-table-column>
 
       <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" align="center"
-        sortable="custom">
+        :sortable="item.ifSort?'custom':false">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
             <el-link type="primary" @click="handleItem(scope.row, item.value)" >

src/views/patentMining/components/view/commonTable.vue

@@ -11,7 +11,7 @@
       </el-table-column>
 
       <el-table-column v-for="item in column.filter(item => !item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value"
-        :label="item.name" align="center" sortable="custom">
+        :label="item.name" align="center" :sortable="item.ifSort?'custom':false">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
             <el-link type="primary" @click="handleItem(scope.row, item.value)" >

src/views/project/components/view/table.vue

@@ -9,7 +9,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" sortable="custom" align="center">
+        <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" :sortable="item.ifSort?'custom':false" align="center">
           <template slot-scope="scope">
             <div v-if="['name'].includes(item.value)">
               <el-link type="primary" @click="handleClick(scope.row, item.value)">

src/views/report/InvalidResponse/components/Evidence/evidence.vue

@@ -22,37 +22,38 @@
         <el-main v-DivHeight="getDivHeight">
             <el-progress style="margin-bottom:10px;" v-if="showPercentage" :text-inside="true" :stroke-width="20" :percentage="percentage>100?100:percentage" :color="customColors"></el-progress>
             <el-table :data="tableData" border :maxHeight="tableHeight - 35" style="width: 100%">
-                <el-table-column prop="sysOrder" label="序号" width="80" align="center">
+                <el-table-column prop="sysOrder" label="证据序号" width="80" align="center">
                     <template slot-scope="scope">
                         <div>
-                            <span>D{{ scope.row.sysOrder }}</span>
+                            <el-link type="primary" @click="checkDetails(scope)">D{{ scope.row.sysOrder }}</el-link>
                             <span>
                                 <my-draggable :list="tableData" :check="scope.row.id" @change="changeOrder" @update="updateOrder"></my-draggable>
                             </span>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="专利号/标题" align="center">
+                <el-table-column prop="publicNo" label="公开号" align="center">
                     <template slot-scope="scope">
-                        <el-link type="primary" @click="checkDetails(scope)">
-                            {{scope.row.name}}
-                        </el-link>
+                        <div>
+                            {{scope.row.publicNo}}
+                        </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="authorName" label="权利人/作者" align="center">
+                <el-table-column prop="name" label="名称" align="center">
                     <template slot-scope="scope">
-                        <div>
-                            {{scope.row.authorName}}
-                        </div>
+                        <span >
+                            {{getEvidenceName(scope.row)}}
+                        </span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="publicNo" label="公开号" align="center">
+                <el-table-column prop="authorName" label="权利人/作者" align="center">
                     <template slot-scope="scope">
                         <div>
-                            {{scope.row.publicNo}}
+                            {{scope.row.authorName}}
                         </div>
                     </template>
                 </el-table-column>
+                
                 <el-table-column prop="publicDate" label="公开日" align="center">
                     <template slot-scope="scope">
                         <div>
@@ -164,6 +165,19 @@ export default {
     this.getList()
   },
   methods: {
+    getEvidenceName(row){
+        return row.name
+        if(row.type == 1){
+            return row.name
+        }
+        var name = row.name.trim()
+        name = name.replace(row.publicNo.trim(),'')
+        if(name.length>1){
+            return name.slice(1,-1)
+        }
+        return ''
+
+    },
     initTask() {
           this.webSocket.onmessage = (e) => {
             if(e.data.indexOf('{') == -1){

src/views/report/InvalidResponse/components/dialog/ReviewCommittee.vue

@@ -3,8 +3,8 @@
     <el-dialog  :title="title" :visible.sync="showDialog" width="1000px" :close-on-click-modal="false"  :before-close="handleClose" append-to-body>
         <div style="margin-bottom:10px" v-if="radio != 3">
             <el-radio-group v-model="radio" @input="change">
-                <el-radio label="4">第一次法院意见</el-radio>
-                <el-radio label="6">第二次法院意见</el-radio>
+                <el-radio :label="4">第一次法院意见</el-radio>
+                <el-radio :label="6">第二次法院意见</el-radio>
             </el-radio-group>
         </div>
         <div style="height:calc(100vh - 350px)" v-DivHeight="getDivHeight">
@@ -42,9 +42,9 @@
                         <div>
                             <span>
                                 <el-select v-model="scope.row[column.value]"  placeholder="请选择">
-                                    <el-option label="维持有效"  value="维持有效"></el-option>
-                                    <el-option label="部分有效"  value="部分有效"></el-option>
-                                    <el-option label="无效"  value="无效"></el-option>
+                                    <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
+                                    <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
+                                    <el-option label="全部无效"  value="全部无效"></el-option>
                                 </el-select>
                             </span> 
                         </div>
@@ -78,7 +78,7 @@ export default {
         btnLoading:false,
         tableData:[],
         column:{},
-        radio:'4'
+        radio:4
     };
   },
   watch: {},
@@ -125,6 +125,11 @@ export default {
                 label:'一审法院决定'
             }
         }
+        var titles = {
+            3:'添加复审委决定',
+            4:'添加法院决定'
+        }
+        this.title = titles[type]
         this.column = types[type]
         this.showDialog = true
     },

src/views/report/InvalidResponse/components/reasonsAndEvidence/common.js

@@ -0,0 +1,189 @@
+import { getTableHeight } from '@/views/components/mixins'
+export default {
+    components: {},
+    mixins:[getTableHeight],
+    props: {
+        projectId:{
+            default:null
+        },
+    },
+    data() {
+      return {
+          tableData:[],
+        //   column:column,
+          loading:false,
+          editField:'',
+          editMessage:''
+      };
+    },
+    watch: {},
+    computed: {
+        provisions(){
+            return this.$store.state.dictMessage.dictMessage.STATUTE || []
+        }
+      },
+    created() {},
+    mounted() {
+      this.init()
+    },
+    methods: {
+      async init(){
+         var params = {
+            id:this.projectId,
+            statueType:this.statueType
+         }
+         this.loading = true
+         this.$api.queryFinalInvalidStatues(params).then(res=>{
+            if(res.code == 200){
+                this.tableData = res.data
+                var arr = this.tableData.filter(item=>{
+                    return item.invalidStatue.courtOpinions2
+                })
+                if(arr&& arr.length > 0){
+                    this.column.find(item=>{
+                        return item.field == 'invalidStatue.courtOpinions2'
+                    }).ifHidden = false
+                }
+                this.loading = false
+            }
+         }).catch(error=>{
+            this.tableData = [
+                {
+                    "id":1,
+                    invalidReason:"无效理由",      
+                    presentOpinions:"陈述意见" ,
+                    "rbDecision":"复审委意见" ,
+                    invalidStatue:{
+                        "id":1,
+                        "statuteId":"4", 
+                        "claimText":"权要内容",
+                        "courtOpinions1":"一审法院意见", 
+                        "court_opinions2":"二审法院意见 ", 
+                        
+                    }
+                }
+            ]
+            this.loading = false
+         })
+      },
+      synchronization(){
+        var params = {
+            id:this.projectId
+        }
+        this.$api.importFinalInvalidStatues(params).then(res=>{
+            if(res.code == 200){
+                this.init()
+            }
+        })
+      },
+      getData(row,field,value){
+        var fieldArray = this.getFieldArray(field)
+        let current = row;  
+        // 遍历路径中的每一部分，直到最后一个属性的父对象  
+        for (let i = 0; i < fieldArray.length - 1; i++) {  
+            // 确保当前对象有下一个属性，否则创建一个空对象（或你需要的任何默认值）  
+            if (!current.hasOwnProperty(fieldArray[i])) {  
+                current[fieldArray[i]] = {};  
+            }  
+            current = current[fieldArray[i]];  
+        }  
+        
+        // 给最后一个属性赋值  
+        current[fieldArray[fieldArray.length - 1]] = value;  
+      },
+      getColumnData(row,field){
+        const parts = this.getFieldArray(field) 
+        let current = row;  
+          
+        for (let i = 0; i < parts.length; i++) {  
+            if (current && current.hasOwnProperty(parts[i])) {  
+                current = current[parts[i]];  
+            } else {  
+                // 如果路径中的某一部分不存在，则返回undefined或自定义的默认值  
+                return ''; // 或者你可以返回null、默认值等  
+            }  
+        }  
+        if(this.editField!=field+row.id && parts[parts.length-1] == 'statuteId'){
+            var obj = this.provisions.find(item=>{
+                return item.value == current
+            })
+            if(obj){
+                return obj.simpleLabel || obj.label
+            }
+        }
+        return current+''; 
+      },
+      getFieldArray(field){
+        return field.split('.')
+      },
+      cellDblclick(row, column, cell, event){
+        var key = column.property
+        var item = this.column.find(item=>{
+            return item.field == key
+        })
+        this.edit(item,row)
+      },
+       //编辑
+       async edit(item,row){
+          if(item.field && row){
+            if(this.editField){
+                return
+            }
+              if(!item.editable){
+                  this.$message.warning('该栏位不可编辑')
+                  return
+              }
+              
+            //   if((row.invalidStatue.statuteId == '4' || row.invalidStatue.statuteId == '5') && item.field == 'invalidStatue.claimText'){
+            //     this.$message.warning('该栏位不可编辑')
+            //     return
+            //   }
+              this.editField = item.field + row.id
+              this.editMessage = this.getColumnData(row,item.field)
+              return
+          }
+      },
+      cellClick(row, column, cell, event){
+        
+        if(this.editField){
+            var parts = this.getFieldArray(this.editField)
+            if(!(parts.length>1 && parts[parts.length - 1]!='claimText'+row.id)){
+              return  
+            }
+            
+        }
+        this.editField = null
+      },
+
+      changeMessage(field,row,value){
+          if(value == this.editMessage){
+              this.editField = null
+              return
+          }
+          const parts = this.getFieldArray(field) 
+          var part = parts[parts.length-1]
+          var params = {
+              invalidStatueId:row.invalidStatue.id,
+              proofGroupId:row.id,
+              editField:part,   
+              fieldContent: value 
+          }
+          this.$api.editFinalInvalidStatues(params).then(res=>{
+            if(res.code == 200){
+                this.$message.success('编辑成功')
+                this.editField = null
+                if(parts.length>1){
+                    this.init()
+                }else{
+                  this.getData(row,field,value)  
+                }
+                
+            }
+          }).catch(error=>{
+            
+          })
+          
+         
+      },
+    },
+  };

src/views/report/InvalidResponse/components/reasonsAndEvidence/details_1.vue

@@ -0,0 +1,189 @@
+
+<template>
+    <div class="height_100">
+      <el-container>
+        <el-header>
+              <div class="head">
+                  <el-button type="primary" size="small"  @click="synchronization" class="margin-right_10">同步</el-button>
+              </div>
+          </el-header>
+          <el-main v-DivHeight="getDivHeight" class="Evidence_details">
+            <el-table :data="tableData" border v-loading="loading" :maxHeight="tableHeight" @cell-dblclick="cellDblclick" @cell-click="cellClick">
+                <el-table-column  v-for="item in column.filter(item=>!item.ifHidden)"
+                :render-header="$commonJS.renderHeaderMethods" :key="item.field" :prop="item.field" :label="item.label" :width="item.width || 'auto'"
+                align="center">
+                    <template slot-scope="scope">
+                        <div>
+                            <!-- @input="(value)=>getData(scope.row,item.field,value)" -->
+                            <div v-if="editField==(item.field+scope.row.id)">
+                                <el-select clearable v-if="item.field == 'invalidStatue.courtOpinions1' || item.field == 'invalidStatue.courtOpinions2'" :value="getColumnData(scope.row,item.field)" @change="(value)=>changeMessage(item.field,scope.row,value)" placeholder="请选择">
+                                    <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
+                                    <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
+                                    <el-option label="全部无效"  value="全部无效"></el-option>
+                                </el-select>
+                                <el-select clearable v-else-if="item.field == 'invalidStatue.statuteId'" :value="getColumnData(scope.row,item.field)" @change="(value)=>changeMessage(item.field,scope.row,value)" placeholder="请选择" style="width:100%">
+                                    <el-option
+                                        v-for="item in provisions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    >
+                                    </el-option>
+                                </el-select>
+                                <my-RichText v-else :autoFocus="true" :value="getColumnData(scope.row,item.field)" @blur="(value)=>changeMessage(item.field,scope.row,value)"></my-RichText>
+                            </div>
+                            
+                            <div class="text" v-else v-html="getColumnData(scope.row,item.field)"></div>
+                        </div>
+                        
+                    </template>
+                </el-table-column>
+            </el-table>
+          </el-main>
+      </el-container>
+  
+      
+    </div>
+</template>
+<script>
+import common from './common';
+const column = [
+    {
+        field:'invalidStatue.statuteId',
+        label:'法条',
+        editable:true,
+        width:100
+    },
+    {
+        field:'invalidStatue.claimText',
+        label:'权利要求',
+        editable:true,
+        width:180
+    },
+    {
+        field:'invalidReason',
+        label:'具体理由',
+        editable:true
+    },
+    {
+        field:'presentOpinions',
+        label:'权利人答复',
+        editable:true
+    },
+    {
+        field:'rbDecision',
+        label:'合议组认定',
+        editable:true,
+        width:180
+    },
+    {
+        field:'invalidStatue.courtOpinions1',
+        label:'一审',
+        editable:true,
+        width:100
+    },
+    {
+        field:'invalidStatue.courtOpinions2',
+        label:'二审',
+        editable:true,
+        width:100,
+        ifHidden:true
+    }
+]
+export default {
+  components: {},
+  mixins:[common],
+  props: {},
+  data() {
+    return {
+        // tableData:[],
+        column:column,
+        // loading:false,
+        // editField:'',
+        // editMessage:''
+        statueType:0
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {
+    // this.init()
+  },
+//   methods: {
+//     async init(){
+//         var url = './非三性表格.html'
+//         this.loading = true
+//         await fetch(url).then(res =>  res.text() ).then(data => {
+//             var html = data  
+//             const parser = new DOMParser();  
+//             // 解析包含 HTML 实体的字符串  
+//             const doc = parser.parseFromString(html, "text/html");  
+//             var trList =  doc.body.getElementsByTagName('tr')
+//             var head = trList[0]
+//             var headList = head.getElementsByTagName('td')
+
+//             var tableData = []
+//             for(var i = 1;i<trList.length;i++){
+//                 var bodyList = trList[i].getElementsByTagName('td')
+//                 var obj = {
+//                     id:i
+//                 }
+//                 for(var j = 0;j<bodyList.length;j++){
+//                     obj[headList[j].innerText] = bodyList[j].innerHTML
+//                 }
+//                 tableData.push(obj)
+//             }
+//             this.tableData = tableData
+//             this.loading = false
+//         })
+//     },
+//      //编辑
+//      async edit(item,row){
+//         if(item.field && row){
+//             if(!item.editable){
+//                 this.$message.warning('该栏位不可编辑')
+//                 return
+//             }
+//             if(this.editField){
+//                 return
+//             }
+//             this.editField = item.field + row.id
+//             this.editMessage = row[item.field]
+//             return
+//         }
+//     },
+//     changeMessage(field,row,value){
+       
+//         if(value == this.editMessage){
+//             this.editField = null
+//             this.$message('没有发生修改')
+//             return
+//         }
+//         var params = {
+//             editField:field,   
+//             fieldContent: value 
+//         }
+        
+//         // this.editField = null
+//         this.$message('修改了')
+//     },
+//   },
+};
+</script>
+<style lang="scss" scoped>
+.head{
+    width:100%;
+    display: flex;
+    flex-direction: row-reverse;
+}
+.text{
+    text-align: left;
+}
+</style>
+<style lang="scss">
+.Evidence_details .el-table .el-table__cell {  
+    vertical-align: top;  
+    /* 其他样式... */  
+}  
+</style>

src/views/report/InvalidResponse/components/reasonsAndEvidence/details_2.vue

@@ -0,0 +1,207 @@
+
+<template>
+    <div class="height_100">
+      <el-container>
+        <el-header>
+              <div class="head">
+                  <el-button type="primary" size="small"  @click="synchronization" class="margin-right_10">同步</el-button>
+              </div>
+          </el-header>
+          <el-main v-DivHeight="getDivHeight" class="Evidence_details">
+            <el-table :data="tableData" border v-loading="loading" :maxHeight="tableHeight" @cell-dblclick="cellDblclick" @cell-click="cellClick">
+                <el-table-column  v-for="item in column.filter(item=>!item.ifHidden)"
+                :render-header="$commonJS.renderHeaderMethods" :key="item.field" :prop="item.field" :label="item.label" :width="item.width || 'auto'"
+                align="center">
+                    <template slot-scope="scope">
+                        <div>
+                            <!-- @input="(value)=>getData(scope.row,item.field,value)" -->
+                            <div v-if="editField==(item.field+scope.row.id)">
+                                <el-select clearable v-if="item.field == 'invalidStatue.courtOpinions1' || item.field == 'invalidStatue.courtOpinions2'" :value="getColumnData(scope.row,item.field)" @change="(value)=>changeMessage(item.field,scope.row,value)" placeholder="请选择">
+                                    <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
+                                    <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
+                                    <el-option label="全部无效"  value="全部无效"></el-option>
+                                </el-select>
+                                <el-select clearable v-else-if="item.field == 'invalidStatue.statuteId'" :value="getColumnData(scope.row,item.field)" @change="(value)=>changeMessage(item.field,scope.row,value)" placeholder="请选择" style="width:100%">
+                                    <el-option
+                                        v-for="item in provisions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    >
+                                    </el-option>
+                                </el-select>
+                                <my-RichText v-else :autoFocus="true" :value="getColumnData(scope.row,item.field)" @blur="(value)=>changeMessage(item.field,scope.row,value)"></my-RichText>
+                            </div>
+                            
+                            <div class="text" v-else v-html="getColumnData(scope.row,item.field)"></div>
+                        </div>
+                        
+                    </template>
+                </el-table-column>
+            </el-table>
+          </el-main>
+      </el-container>
+  
+      
+    </div>
+</template>
+<script>
+import common from './common';
+const column = [
+    {
+        field:'invalidStatue.statuteId',
+        label:'法条',
+        editable:true,
+        width:100
+    },
+    {
+        field:'invalidStatue.claimText',
+        label:'权利要求',
+        editable:true,
+        width:180
+    },
+    {
+        field:'invalidReason',
+        label:'证据公开',
+        editable:true
+    },
+    {
+        field:'presentOpinions',
+        label:'权利人答复',
+        editable:true
+    },
+    {
+        field:'rbDecision',
+        label:'合议组认定',
+        editable:true,
+        width:180
+    },
+    {
+        field:'invalidStatue.courtOpinions1',
+        label:'一审',
+        editable:true,
+        width:100
+    },
+    {
+        field:'invalidStatue.courtOpinions2',
+        label:'二审',
+        editable:true,
+        width:100,
+        ifHidden:true
+    }
+]
+export default {
+  components: {},
+  mixins:[common],  
+  props: {},
+  data() {
+    return {
+        // tableData:[],
+        column:column,
+        // loading:false,
+        // editField:'',
+        // editMessage:'',
+        statueType:1
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {
+    // this.init()
+  },
+//   methods: {
+//     async init(){
+//         var url = './三性表格.html'
+//         this.loading = true
+//         await fetch(url).then(res =>  res.text() ).then(data => {
+//             var html = data  
+//             const parser = new DOMParser();  
+//             // 解析包含 HTML 实体的字符串  
+//             const doc = parser.parseFromString(html, "text/html"); 
+//             var trList =  doc.body.getElementsByTagName('tr')
+//             var head = trList[0]
+//             var headList = head.getElementsByTagName('td')
+//             var sign = true
+//             var num = 0
+//             var tableData = []
+//             for(var i = 1;i<trList.length;i++){
+//                 var bodyList = trList[i].getElementsByTagName('td')
+//                 var obj = {
+//                     id:i
+//                 }
+//                 for(var j = 0;j<bodyList.length;j++){
+//                     obj[headList[j].innerText] = bodyList[j].innerHTML
+//                     if(sign){
+//                        if(headList[j].innerText == '一审'){
+//                             num = 1
+//                         }
+//                         if(headList[j].innerText == '二审'){
+//                             num = 2
+//                         } 
+//                     }
+                    
+//                 }
+//                 if(sign){
+//                     if(num == 0){
+//                         var arr = this.column.filter(item=>{
+//                             return item.field == '一审' || item.field == '二审'
+//                         })
+//                         arr.forEach(item=>{
+//                             item.ifHidden = true
+//                         })
+//                     }
+//                     else if(num == 1){
+//                         this.column.find(item=>{
+//                             return item.field == '二审'
+//                         }).ifHidden = true
+//                     }  
+//                 }
+                
+//                 sign = false
+//                 tableData.push(obj)
+//             }
+//             this.tableData = tableData
+//             this.loading = false
+//         })
+//     },
+//      //编辑
+//      async edit(item,row){
+//         if(item.field && row){
+//             if(!item.editable){
+//                 this.$message.warning('该栏位不可编辑')
+//                 return
+//             }
+//             this.editField = item.field + row.id
+//             this.editMessage = row[item.field]
+//             return
+//         }
+//     },
+//     changeMessage(field,row,value){
+//         this.editField = null
+//         if(value == this.editMessage){
+//             this.$message('没有发生修改')
+//             return
+//         }
+//         this.$message('修改了')
+//     },
+
+//   },
+};
+</script>
+<style lang="scss" scoped>
+.head{
+    width:100%;
+    display: flex;
+    flex-direction: row-reverse;
+}
+.text{
+    text-align: left;
+}
+</style>
+<style lang="scss">
+    .Evidence_details .el-table .el-table__cell {  
+        vertical-align: top;  
+        /* 其他样式... */  
+    }  
+</style>

src/views/report/InvalidResponse/components/reasonsAndEvidence/reasonsAndEvidence.vue

@@ -1196,7 +1196,22 @@ export default {
         this.mergeArr.forEach((key, index1) => {
             let count = 0;
             this.mergeObj[key] = [];
-            if(key == 'statutesId'){
+            if(key == 'claimSort'){
+                data.forEach((item, index) => {
+                    if (index === 0) {
+                        this.mergeObj[key].push(1);
+                    } else {
+                    if (item[key] === data[index - 1][key] && item.relatedContent === data[index - 1].relatedContent) {
+                        this.mergeObj[key][count] += 1;
+                        this.mergeObj[key].push(0);
+                    } else {
+                        count = index;
+                        this.mergeObj[key].push(1);
+                    }
+                    }
+                })
+            }
+            else if(key == 'statutesId'){
                 data.forEach((item, index) => {
                     if (index === 0) {
                         this.mergeObj[key].push(1);

src/views/report/components/details/components/basicMessage.vue

@@ -69,6 +69,31 @@
               </el-form-item>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="案件阶段" prop="caseStage">
+                <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseStage' })"></div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国知局受理年份" prop="acceptYear">
+                <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'acceptYear' })"></div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="请求人代理所" prop="applicantAgency">
+                <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'applicantAgency' })"></div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="专利权人代理所" prop="rightHolderAgency">
+                <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'rightHolderAgency' })"></div>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
       </template>
       <el-form-item label="是否完成：">
@@ -76,7 +101,7 @@
       </el-form-item>
       <template v-if="form.status == 3">
         <div>
-          <el-form-item label="核心结论：">
+          <el-form-item label="报告结果：">
             <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'cronNames' })"></div>
           </el-form-item>
           <el-form-item label="结论论述：">

src/views/report/components/details/components/basicMessage_official.vue

@@ -0,0 +1,539 @@
+<template>
+  <div>
+        <div class="message">
+            <div class="title">
+                专利信息
+                <span>
+                    <i v-if="!show.showPatentMessage" class="el-icon-caret-right" @click="show.showPatentMessage = !show.showPatentMessage"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.showPatentMessage = !show.showPatentMessage"></i>
+                </span>
+            </div>
+            <div v-show="show.showPatentMessage">
+                <el-card shadow="always">
+                    <el-form style="width:100%" :model="patentMessage" label-width="140px">
+                        <el-row>
+                            <el-col :span="12">
+                                <template>
+                                    <div>
+                                        <el-form-item label="被无效的专利：">
+                                            <div class="box1">
+                                                <el-link type="primary" @click="$commonJS.checkPatentDetails(reportMessage.signPatentNo,projectId)">
+                                                    <span v-html="reportMessage.signPatentNo"></span>
+                                                </el-link>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+                                </template>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="专利名称：">
+                                    <div class="box1" v-html="getView(patentMessage, 'title')"></div>
+                                    <el-link v-if="haveTranslatedText(patentMessage, 'title')" type="primary" @click.native="handleChange(patentMessage, 'title')"
+                                        style="margin-left: 10px;margin-top: -3px;">
+                                        <span v-if="!patentMessage.change">切换译文</span>
+                                        <span v-else>切换原文</span>
+                                    </el-link>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <template>
+                                    <div>
+                                        <el-form-item label="专利权人：">
+                                            <div class="box1">
+                                                <div class="box1" v-html="$commonJS.getColumnData(patentMessage, { type: 'Array', value: 'rightHolder' })"></div>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+                                </template>
+                            </el-col>
+                            <el-col :span="12" v-if="patentMessage.simpleStatus">
+                                <el-form-item label="法律状态：">
+                                    <div class="box1" v-html="simpleStatus[patentMessage.simpleStatus]"></div>
+                                    
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="24">
+                                <template>
+                                    <div>
+                                        <el-form-item label="专利附图：" v-if="patentMessage.pictureGuid">
+                                            <div style="height: 120px;" class="picture">
+                                                <el-image  :src="$commonJS.checkViewer(patentMessage.pictureGuid)" :preview-src-list="[$commonJS.checkViewer(patentMessage.pictureGuid)]" style="height:120px">
+                                                    <div slot="error" class="image-slot">
+                                                        <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" >
+                                                    </div>
+                                                </el-image>
+                                            </div>
+                                        </el-form-item>
+                                    </div>
+                                </template>
+                            </el-col>
+                            <el-col :span="24" v-if="patentMessage.abstractStr">
+                                <el-form-item label="摘要：">
+                                    <div class="box1" v-html="getView(patentMessage, 'abstractStr','摘要'+(patentMessage.change2?'译文':'原文'))"></div>
+                                    <span v-if="haveTranslatedText(patentMessage, 'abstractStr')">
+                                        <el-link type="primary" @click.native="handleChange(patentMessage, 'abstractStr')" >
+                                        <span v-if="!patentMessage.change2">切换译文</span>
+                                        <span v-else>切换原文</span>
+                                        </el-link>
+                                    </span>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        
+                    </el-form>
+                </el-card>
+            </div>
+        </div>
+        <div class="message">
+            <div class="title">
+                案件信息
+                <span>
+                    <i v-if="!show.showCaseMessage" class="el-icon-caret-right" @click="show.showCaseMessage = !show.showCaseMessage"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.showCaseMessage = !show.showCaseMessage"></i>
+                </span>
+            </div>
+            <div v-show="show.showCaseMessage">
+                <el-card shadow="always">
+                    <el-form style="width:100%" :model="reportMessage" label-width="140px">
+                        <el-form-item label="专题名称：">
+                            <div class="box1" v-html="reportMessage.name"></div>
+                        </el-form-item>
+                        <el-form-item label="核心结论：" >
+                            <div  v-if="!editField.cardingOpinion" style="display:flex;align-items:center">
+                                <div v-html="reportMessage.cardingOpinion" class="div_MAX_Height" style="color:#000000 !important;"></div>
+                                <span @click="editSuggestions(reportMessage)">
+                                    <el-link type="primary">
+                                        <i class="iconfont icon-bianji" style="font-size:28px"></i>
+                                    </el-link>
+                                </span>
+                            </div>
+                            <div v-else style="width:100%;display:flex;align-items:center">
+                                <myRich-Text style="width:100%" v-model="reportMessage.cardingOpinion" placeholder="请输入核心结论"></myRich-Text>
+                                <el-button type="primary" class="margin-left_10" icon="el-icon-check" circle style="font-size:15px" @click="submit('cardingOpinion')"></el-button>
+                                <el-button type="primary" class="margin-left_10" icon="iconfont icon-fanhui" circle style="font-size:15px" @click="cancelSuggestion(reportMessage)"></el-button>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="无效法条：">
+                            <div class="box1">
+                                <div v-if="statutes.invalidStatutes1.length>0">
+                                   三性法条： {{ statutes.invalidStatutes1.join('、') }}
+                                </div>
+                                <div v-if="statutes.invalidStatutes2.length>0">
+                                    非三性法条： {{ statutes.invalidStatutes2.join('、') }}
+                                </div>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </div>
+        <div class="message">
+            <div class="title">
+                更多信息
+                <span>
+                    <i v-if="!show.showOtherMessage" class="el-icon-caret-right" @click="show.showOtherMessage = !show.showOtherMessage"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.showOtherMessage = !show.showOtherMessage"></i>
+                </span>
+            </div>
+            <div v-show="show.showOtherMessage">
+                <el-card shadow="always">
+                    <el-form style="width:100%" :model="reportMessage" label-width="140px">
+                        <template v-if="reportMessage.reportType == 7">
+                            <div>
+                                <el-row>
+                                    <el-col :span="12">
+                                    <el-form-item label="案件编号：">
+                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseNumber' })"></div>
+                                    </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                    <el-form-item label="无效宣告请求人：">
+                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'invalidApplication' })"></div>
+                                    </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="12">
+                                        <el-form-item label="发文序号：">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'issueNumber' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="发明创造名称：">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'inventionName' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <el-col :span="12">
+                                        <el-form-item label="案件阶段" prop="caseStage">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseStage' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="国知局受理年份" prop="acceptYear">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'acceptYear' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="12">
+                                        <el-form-item label="请求人代理所" prop="applicantAgency">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'applicantAgency' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="专利权人代理所" prop="rightHolderAgency">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'rightHolderAgency' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                        </template>
+                        <el-form-item label="是否完成：">
+                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'status' })==3?'是':'否'"></div>
+                        </el-form-item>
+                        <template v-if="reportMessage.status == 3">
+                            <div>
+                                <el-form-item label="报告结果：">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'cronNames' })"></div>
+                                </el-form-item>
+                                <el-form-item label="结果论述：">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'cronDescription' })"></div>
+                                </el-form-item>
+                            </div>
+                        </template>
+                        <el-row>
+                            <el-col :span="12">
+                                <el-form-item label="承担部门：" prop="departmentId">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'departmentName' })"></div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="负责人：" prop="headId">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'headName' })"></div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="12">
+                                <template>
+                                    <div>
+                                        <el-form-item label="委托方：" prop="entrustId" v-if="userinfo.tenantType == 1">
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'entrustName' })"></div>
+                                        </el-form-item>
+                                        <el-form-item label="委托部门：" prop="departmentId" v-else>
+                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'departmentName' })"></div>
+                                        </el-form-item>
+                                    </div>
+                                </template>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="卷号：" prop="volumeNumber">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'volumeNumber' })"></div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="24">
+                                <el-form-item label="产品/技术：">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'productOrTech' })"></div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="24">
+                                <el-form-item label="关联报告：">
+                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'associateReportName' })"></div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <template>
+                            <div>
+                            <el-row>
+                                <el-col :span="24">
+                                    <el-form-item label="事件：">
+                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'eventNames' })"></div>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            <el-row>
+                                <el-col :span="24">
+                                    <el-form-item label="调查类型：" prop="matterIds">
+                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'matterNames' })"></div>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                            </div>
+                        </template>
+                        <el-form-item label="附件：">
+                            <div class="box1">
+                                <div v-for="item in reportMessage.systemFileList" style="display:flex;align-items:center" :key="item.guid">
+                                    <div style="margin-right:20px">{{ item.originalName }}</div>
+                                    <my-menu :data="item" :deleted="false"></my-menu>
+                                </div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="备注：" prop="description">
+                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'description' })"></div>
+                        </el-form-item>
+                    </el-form>
+                </el-card>
+            </div>
+        </div>
+        <div class="message">
+            <div class="title">
+                案件流程
+                <span>
+                    <i v-if="!show.showFlowPath" class="el-icon-caret-right" @click="show.showFlowPath = !show.showFlowPath"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.showFlowPath = !show.showFlowPath"></i>
+                </span>
+            </div>
+            <div v-show="show.showFlowPath">
+                <el-card shadow="always">
+                    <flow-Path :projectId="projectId"></flow-Path>
+                </el-card>
+            </div>
+        </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import flowPath from '@/views/report/InvalidResponse/components/flowPath/flowPath.vue';
+import { handleData } from '@/views/project/patentCollection/components/mixins/index'
+export default {
+  components: {
+    flowPath
+  },
+  mixins:[handleData],
+  props: {
+    projectId:{
+      default:0
+    },
+    reportMessage:{
+
+    }
+  },
+  data() {
+    return {
+        editMessage:{},
+        editField:{},
+        patentMessage:{},
+        loading:{
+            patentLoading:false
+        },
+        show:{
+            showPatentMessage:true,
+            showCaseMessage:true,
+            showOtherMessage:false,
+            showFlowPath:true
+        },
+        statutes:{
+            invalidStatutes1:[],
+            invalidStatutes2:[]
+        }
+        
+    };
+  },
+  watch: {},
+  computed: {
+    ...mapGetters(['userinfo']),
+    provisions(){
+        return this.$store.state.dictMessage.dictMessage.STATUTE || []
+    },
+    patentNo(){
+        return this.reportMessage.signPatentNo
+    }
+  },
+  created() {},
+  mounted() {
+    this.getPatentDetails()
+    this.queryInvalidStatutes()
+  },
+  methods: {
+    //查询无效发条
+    queryInvalidStatutes(){
+        var params = {
+            projectId:this.projectId
+        }
+        this.$api.queryInvalidStatutes(params).then(response=> {
+            if(response.code == 200){
+                var a = response.data.data
+                var invalidStatutes = [2,3,4]
+                var arr = []
+                var invalidStatutes1 = []
+                var invalidStatutes2 = []
+                for(var i = 0;i<a.length;i++){
+                    var statute = a[i].statutesId
+                    if(invalidStatutes.indexOf(statute) !=-1 ){
+                        if(arr.indexOf(statute)==-1){
+                            arr.push(statute)
+                            invalidStatutes1.push(this.getStatuteName(statute))
+                        } 
+                    }else{
+                        if(arr.indexOf(statute)==-1){
+                            arr.push(statute)
+                            invalidStatutes2.push(this.getStatuteName(statute))
+                        } 
+                    }
+                }
+                this.statutes = {
+                    invalidStatutes1:invalidStatutes1,
+                    invalidStatutes2:invalidStatutes2
+                }
+            }
+        })
+    },
+    getStatuteName(value){
+        var obj = this.provisions.find(item=>{
+            return item.value == value
+        })
+        if(obj){
+            return obj.simpleLabel
+            // var label = obj.label
+            // const regex = /\b(?![\({\[])\d+(?![\)}\]])\b/g
+            // const matches = [...label.matchAll(regex)]
+            // var arr = matches.map(match => Number(match[0]))
+
+            // // const results = label.match(/\（(.*?)\）|\((.*?)\)/)
+            // // console.log(results)
+            // // const text = results ? `（${results[1]}）` : ''
+
+            // var newLabel = this.getTextInsideParentheses(label)
+            // const text = newLabel.length>0?`（${newLabel[newLabel.length -1]}）`:''
+
+            // var zimu = ''
+            // if(label.trim()[0] == '法'){
+            //     zimu = 'A'
+            // }else{
+            //     zimu = 'R'
+            // }
+            // return `${zimu}${arr.join('.')}${text}`
+        }
+        return ''
+    },
+    getTextInsideParentheses(str) {  
+        const stack = [];  
+        const results = [];  
+        let current = '';  
+    
+        for (let i = 0; i < str.length; i++) {  
+            if (str[i] === '（' || str[i] === '(') {  
+                stack.push(i);  
+                if (current) {  
+                    // 如果之前已经有内容，说明遇到了新的括号对，开始新的捕获  
+                    results.push(current);  
+                    current = '';  
+                }  
+            } else if (str[i] === '）'|| str[i] === ')') {  
+                if (stack.length === 0) {  
+                    // 不匹配的右括号，可能是错误的输入，可以选择忽略或抛出错误  
+                    continue;  
+                }  
+                const startIndex = stack.pop();  
+                results.push(str.substring(startIndex + 1, i));  
+                current = '';  
+            } else {  
+                // 如果不在括号内，则忽略  
+                if (stack.length === 0) {  
+                    continue;  
+                }  
+                current += str[i];  
+            }  
+        }  
+    
+        // 处理字符串末尾可能还剩下的内容（如果最后一个括号后还有内容）  
+        if (current) {  
+            results.push(current);  
+        }  
+    
+        // 通常，我们只关心括号内的内容，所以返回这些结果  
+        return results.filter(result => result !== '');  
+    } ,
+    getPatentDetails() {
+        if(!this.patentNo){
+            return
+        }
+        var params = {
+            patentNo: this.patentNo
+        }
+        var api = 'selectPatentDetail'
+        this.loading.patentLoading = true
+        this.$api[api](params).then(response => {
+            if (response.code == 200) {
+                this.patentMessage = response.data
+                this.loading.patentLoading = false
+            }
+        }).catch(error => {
+            this.loading.patentLoading = false
+        })
+    },
+    //编辑核心结论
+    editSuggestions(row){
+        this.$set(this.editField,'cardingOpinion',true)
+        this.$set(this.editMessage,'cardingOpinion',row.cardingOpinion)
+    },
+    //取消核心结论
+    cancelSuggestion(row){
+        this.$set(this.editField,'cardingOpinion',false)
+        this.$set(row,'cardingOpinion',this.editMessage.cardingOpinion)
+    },
+    //提交填写的信息
+    submit(field) {
+          this.reportMessage.type = 2//项目类型（1专利数据库 2报告 3专利挖掘项目）
+          // 判断文件是否都上传完毕
+          var guids = this.$commonJS.checkUploadFile(this.reportMessage.systemFileList)
+            if(!guids){
+                return false
+            }
+            this.reportMessage.fileGuids = guids
+          // this.$commonJS.allUploadFile(this.form)
+          // 事件及调查类型处理
+          if (this.reportMessage.scenarioIds && this.reportMessage.scenarioIds.length > 0) {
+            var scenarioIds = JSON.parse(JSON.stringify(this.reportMessage.scenarioIds))
+          }
+          if (this.reportMessage.eventId) {
+            this.reportMessage.events = []
+            this.reportMessage.scenarioIds = []
+            this.reportMessage.matterIds.forEach(item => {
+              this.reportMessage.events.push(
+                {
+                  matterId: item,
+                  scenarioId: scenarioIds[0],
+                  eventId: this.form.eventId
+                }
+              )
+            })
+          }
+          let formData = this.reportMessage
+          this.$api.updateReportProject(formData).then(response => {
+            if (response.code == 200) {
+              this.$message.success('报告更新成功')
+              this.$set(this.editField,field,false)
+            }
+          })
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.message{
+    margin: 20px 0;
+    .title{
+        margin-bottom: 10px;
+    }
+}
+.box1{
+    // border: 2px solid var(--color1);
+    // border-radius: 5px;
+    padding: 0px 10px;
+    color: var(--color1);
+    font-size: medium;
+}
+</style>

src/views/report/components/details/index.vue

@@ -6,14 +6,14 @@
           {{ isCollapse ? '收起' : '展开' }}
         </div>
         <el-menu class="theme-dark" :default-active="activeMenu" @select="changeComponent" :collapse="!isCollapse">
-          <el-menu-item v-for="item in menuList" :key="item.name" :index="item.name" v-if="!item.show">
+          <el-menu-item v-for="item in menuList" :key="item.name" :index="item.name" >
             <i class="el-icon-film"></i>
             <span slot="title">{{ item.label }}</span>
           </el-menu-item>
         </el-menu>
       </el-aside>
       <el-main>
-        <component :is='componentName' :projectId="projectId" :assProjectId="assProjectId" :projectType="projectType" :isOnly="activeMenu=='splitPatent'?true:false" :projectName="projectName" :patentNo="patentNo" :reportType="reportType" :patentType="reportMessage.patentType" :ifSecondInvalid="reportMessage.ifSecondInvalid" @refreshData="getReportMessage"></component>
+        <component :is='componentName' :projectId="projectId" :assProjectId="assProjectId" :reportMessage="reportMessage" :projectType="projectType" :isOnly="activeMenu=='splitPatent'?true:false" :projectName="projectName" :patentNo="patentNo" :reportType="reportType" :patentType="reportMessage.patentType" :ifSecondInvalid="reportMessage.ifSecondInvalid" @refreshData="getReportMessage"></component>
       </el-main>
     </el-container>
 
@@ -35,16 +35,16 @@ export default {
       activeMenu: 'Table',
       componentName: '',
       menuList: [
-        {
-          label: '基本信息',
-          name: 'Table',
-          path: 'report/components/details/components/basicMessage.vue'
-        },
-        {
-          label: '任务清单',
-          name: 'task',
-          path: 'task/components/index.vue'
-        }
+        // {
+        //   label: '基本信息',
+        //   name: 'Table',
+        //   path: 'report/components/details/components/basicMessage.vue'
+        // },
+        // {
+        //   label: '任务清单',
+        //   name: 'task',
+        //   path: 'task/components/index.vue'
+        // }
       ],
       comments: {},
       isCollapse: true,
@@ -108,6 +108,19 @@ export default {
       //0:无效分析；1：第三方意见；2：稳定性分析；3：FTO；4：侵权；5：回避；7：无效应对
       var menus = [
         {
+          label: '基本信息',
+          name: 'Table',
+          path: 'report/components/details/components/basicMessage.vue',
+          reportType: [1,2,3,4,5]
+        },
+        {
+          label: '基本信息',
+          name: 'Table',
+          path: 'report/components/details/components/basicMessage_official.vue',
+          reportType: [7]
+        },
+
+        {
           label: '标的专利特征拆分',
           name: 'splitPatent',
           path: 'report/components/details/components/splitDetails.vue',
@@ -180,6 +193,18 @@ export default {
           reportType: [7]
         },
         {
+          label: '无效理由和证据-三性',
+          name: "reasonsAndEvidence2",
+          path: 'report/InvalidResponse/components/reasonsAndEvidence/details_2.vue',
+          reportType: [7]
+        },
+        {
+          label: '无效理由和证据-非三性',
+          name: "reasonsAndEvidence1",
+          path: 'report/InvalidResponse/components/reasonsAndEvidence/details_1.vue',
+          reportType: [7]
+        },
+        {
           label: '证据文献',
           name: "evidence",
           path: 'report/InvalidResponse/components/Evidence/evidence.vue',
@@ -220,7 +245,7 @@ export default {
           label: '报告文档',
           name: "reportFile",
           path: 'report/components/reportFile/reportFileTable.vue',
-          reportType: [0, 1, 2, 3, 4, 5,7]
+          reportType: [0, 1, 2, 3, 4, 5]
         },
 
       ]
@@ -235,6 +260,14 @@ export default {
         ]
         menus = menus.concat(arr)
       }
+      menus.push(
+        {
+          label: '任务清单',
+          name: 'task',
+          path: 'task/components/index.vue',
+          reportType: [0, 1, 2, 3, 4, 5]
+        }
+      )
       var menu = menus.filter(item => {
         if(item.ifWaiGuan){
           if(this.reportMessage.patentType == 3){
@@ -245,7 +278,8 @@ export default {
         }
         return item.reportType.indexOf(Number(this.reportType)) != -1
       })
-      this.menuList.splice(1, 0, ...menu)
+      // this.menuList.splice(1, 0, ...menu)
+      this.menuList = menu
       this.getComponents()
     },
     getComponents() {

src/views/report/components/dialog/addAndEditReport.vue

@@ -59,6 +59,41 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
+            <!-- 新增 -->
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="案件阶段" prop="caseStage">
+                  <el-select v-model="form.caseStage" placeholder="请选择案件阶段" clearable  style="width:100%">
+                    <el-option label="无效" value="无效"></el-option>
+                    <el-option label="行诉状态" value="行诉状态"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="国知局受理年份" prop="acceptYear">
+                  <el-date-picker
+                    style="width:100%"
+                    value-format="yyyy"
+                    v-model="form.acceptYear"
+                    type="year"
+                    placeholder="请选择国知局受理年份">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="请求人代理所" prop="applicantAgency">
+                  <el-input v-model="form.applicantAgency" autocomplete="off" placeholder="请输入请求人代理所"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="专利权人代理所" prop="rightHolderAgency">
+                  <el-input v-model="form.rightHolderAgency" autocomplete="off" placeholder="请输入专利权人代理所"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </div>
         </template>
         <el-row>
@@ -85,14 +120,14 @@
         
         <template v-if="!form.id && form.status == 3">
           <div>
-            <el-form-item label="核心结论" prop="cronIds">
+            <el-form-item label="报告结果" prop="cronIds">
               <el-checkbox-group v-model="form.cronIds">
                 <el-checkbox v-for="item in conclusion" :key="item.value" :label="item.value">{{
                   item.label }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
-            <el-form-item label="结论论述" prop="cronDescription">
-              <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结论论述"></el-input>
+            <el-form-item label="结果论述" prop="cronDescription">
+              <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结果论述"></el-input>
             </el-form-item>
             <el-form-item label="后续跟进事项" prop="followUps">
               <span v-if="form.followUps"><span v-for="item in form.followUps" :key="item.name"
@@ -357,7 +392,7 @@ export default {
       load_text: '加载中',
       //应用场景
       commonData: {},
-      //核心结论
+      //核心结论（报告结果）
       conclusion: [],
       //部门数据
       departmentList: [],
@@ -365,7 +400,7 @@ export default {
       copyList: [],
       //上传文件列表
       files: [],
-      //核心结论类型字典
+      //核心结论（报告结果）类型字典
       reportAsDicItem: {
         "0": "INVALID_ASSESS",
         "1": "THIRD_ASSESS",

src/views/report/components/dialog/cronConclusion.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-dialog width="800px" title="添加核心结论" :visible.sync="showDialog" :before-close="resetForm">
+        <el-dialog width="800px" title="添加报告结果" :visible.sync="showDialog" :before-close="resetForm">
             <el-form :model="form" label-width="120px">
-                <el-form-item label="核心结论">
+                <el-form-item label="报告结果">
                 <el-checkbox-group v-model="form.cronIds">
                     <el-checkbox v-for="item in conclusion" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
@@ -126,12 +126,12 @@ export default {
           let formData = this.form
             this.$api.updateReportProject(formData).then(response=>{
                 if(response.code == 200){
-                    this.$message.success('核心结论添加成功')
+                    this.$message.success('报告结果添加成功')
                     this.resetForm()
                     this.$emit('save',true)
                 }
             }).catch(error=>{
-                this.$message.error('核心结论添加失败')
+                this.$message.error('报告结果添加失败')
             })
         },
         //关闭弹窗

src/views/report/components/index.vue

@@ -37,7 +37,7 @@
         </div>
       </el-header>
       <el-main id="patent-list-container" class="main" v-loading="loading">
-        <component :is="viewType" v-bind="$attrs" v-on="$listeners" :isOperate="isOperate" :tableData="dataList"
+        <component :is="viewType" v-bind="$attrs" v-on="$listeners" :isOperate="isOperate" :tableData="dataList" @tabChange="tabChange"
           :state="state" :queryParams="queryParams" @option="handleOption" @on-sort="handleSort" :groupBy="groupingValue"
           :groupingOption="groupingOption" :commonData="commonData" :searchOption="searchOption" :column="columnList" @params="getParams"></component>
       </el-main>
@@ -48,7 +48,7 @@
       </el-footer>
     </el-container>
     <CreateReport ref="ReportForm" @getList="isGetList"></CreateReport>
-    <fields ref="field" type="reportProject" @getFieldList="getFieldList"></fields>
+    <fields ref="field" :type="type" @getFieldList="getFieldList"></fields>
     <Field-Drawer ref="FieldDrawer"></Field-Drawer>
     <reportFileDrawer ref="reportFileDrawer"></reportFileDrawer>
     <cronConclusion ref="cronConclusion" @save="getList"></cronConclusion>
@@ -149,9 +149,12 @@ export default {
       commonData: [],
       // 栏位信息数组
       columnList: [],
+      columnType:{},
+      fixedSearch:{},
       // 子组件新增、编辑报告成功发送的字符串
       handleMessage: '',
       showView: false,
+      type:'reportProject'
     };
   },
   watch: {},
@@ -235,6 +238,7 @@ export default {
   async mounted() {
     // 获取table栏位
     this.columnList = await this.$commonJS.getCustomField('reportProject')
+    this.columnType.columnList1 = this.columnList
     // 获取搜索/分组
     await this.getColumn()
     //获取报告清单
@@ -242,6 +246,30 @@ export default {
     this.showViews()
   },
   methods: {
+    //标签页点击
+    async tabChange(name){
+      var type = Number(name)
+      switch(type){
+        case 1:
+         this.fixedSearch={}
+         this.type = 'reportProject'
+          break;
+        case 2:
+          this.type = 'invalidReportProject'
+          if(!this.columnType['columnList' + 2]){
+            //获取显示栏位
+            this.columnType.columnList2 = await this.$commonJS.getCustomField('invalidReportProject')
+          }
+          this.fixedSearch = {
+            reportType:[7]
+          }
+          break;
+      }
+      this.columnList = this.columnType['columnList' + type]
+      this.queryParams.current = 1
+      this.getList()
+    },
+
     //显示视图?
     showViews() {
       this.showView = false
@@ -388,6 +416,16 @@ export default {
         searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
         orderDTOList: this.sort,//排序信息
       }
+      params.ifInvalidReport = 0
+      if(this.fixedSearch.reportType){
+        params.ifInvalidReport = 1
+        if(params.searchQuery){
+          params.searchQuery = params.searchQuery + ' and reportType=(' + this.fixedSearch.reportType.join(' OR ') + ')'
+        }else{
+          params.searchQuery ='reportType=(' + this.fixedSearch.reportType.join(' OR ') + ')'
+        }
+        
+      }
       this.loading = true
       this.$api.queryReportProject(params).then(res => {
         if (res.code == 200) {

src/views/report/components/view/table.vue

@@ -1,59 +1,71 @@
 <template>
   <div class="height_100">
     <div class="height_100" v-DivHeight="getDivHeight">
-      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header"
-      @sort-change="sortChange" v-if="showTable" :height="tableHeight" v-el-table-infinite-scroll="getList" :infinite-scroll-distance="10" 
-    :infinite-scroll-disabled="disabled"
-        >
-        <el-table-column label="#" width="60" type="index" align="center">
-          <template slot-scope="scope">
-            <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
-          </template>
-        </el-table-column>
+      <el-container>
+        <el-aside width="95px">
+          <el-tabs v-model="tab" tab-position="left" @tab-click="tabClick">
+            <el-tab-pane label="总表" name="1"></el-tab-pane>
+            <el-tab-pane label="官方无效" name='2'></el-tab-pane>
+          </el-tabs>
+        </el-aside>
+        <el-main style="padding:0 0 0 10px !important">
+          <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header"
+          @sort-change="sortChange" v-if="showTable" :height="tableHeight" v-el-table-infinite-scroll="getList" :infinite-scroll-distance="10" 
+        :infinite-scroll-disabled="disabled"
+            >
+            <el-table-column label="#" width="60" type="index" align="center">
+              <template slot-scope="scope">
+                <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
+              </template>
+            </el-table-column>
 
-        <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :key="item.value" :prop="item.value" :render-header=" $commonJS.renderHeaderMethods" :label="item.name" sortable="custom" align="center">
-          <template slot-scope="scope">
-            <div v-if="['name'].includes(item.value)">
-              <el-link type="primary" @click="handleItem(scope.row,item.value)">
-                <span  v-html="$commonJS.getColumnData(scope.row,item)"></span>
-              </el-link>
-            </div>
-            <div v-else-if="['signPatentNo'].includes(item.value)">
-              <el-link type="primary" @click="checkPatentDetails(scope.row)">
-                <span  v-html="$commonJS.getColumnData(scope.row,item)"></span>
-              </el-link>
-            </div>
-            <div v-else-if="['eventNames','cronNames'].includes(item.value)" v-html="$commonJS.getColumnData(scope.row,item)"></div>
-            <div v-else v-html="$commonJS.getColumnData(scope.row,item)"></div>
-          </template>
-        </el-table-column>
+            <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :key="item.value" :prop="item.value" :render-header=" $commonJS.renderHeaderMethods" :label="item.name" :sortable="item.ifSort?'custom':false" align="center">
+              <template slot-scope="scope">
+               <div>
+               </div>
+                <div v-if="['name'].includes(item.value)">
+                  <el-link type="primary" @click="handleItem(scope.row,item.value)">
+                    <span  v-html="$commonJS.getColumnData(scope.row,item)"></span>
+                  </el-link>
+                </div>
+                <div v-else-if="['signPatentNo'].includes(item.value)">
+                  <el-link type="primary" @click="checkPatentDetails(scope.row)">
+                    <span  v-html="$commonJS.getColumnData(scope.row,item)"></span>
+                  </el-link>
+                </div>
+                <div v-else-if="['eventNames','cronNames'].includes(item.value)" v-html="$commonJS.getColumnData(scope.row,item)"></div>
+                <div v-else v-html="$commonJS.getColumnData(scope.row,item)"></div>
+              </template>
+            </el-table-column>
 
-        <el-table-column v-if="[1].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
-        <template slot-scope="scope">
-          <el-dropdown @command="handleCommand($event, scope.row)" split-button type="primary" size="small"  @click="handleCommand('e',scope.row)">
-            <span>编辑</span>
-            <el-dropdown-menu slot="dropdown" class="text-align_center">
-              <el-dropdown-item command="0">分享</el-dropdown-item>
-              <el-dropdown-item command="1" v-if="[2,3].includes(scope.row.status)">导出报告</el-dropdown-item>
-              <el-dropdown-item command="2" v-if="[2,3].includes(scope.row.status)">报告文档</el-dropdown-item>
-              <el-dropdown-item command="16" v-if="[1,2].includes(scope.row.reportType)">检索记录</el-dropdown-item>
-              <el-dropdown-item command="3" v-if="[2].includes(scope.row.status)&&[0,1,2,3].includes(scope.row.reportType)">自定义字段</el-dropdown-item>
-              <!-- <el-dropdown-item command="5" v-if="[2].includes(scope.row.status) && [0,1,2].includes(scope.row.reportType)">拆分特征</el-dropdown-item> -->
-              <el-dropdown-item command="15" v-if="[2].includes(scope.row.status) && [3,4].includes(scope.row.reportType)">产品信息录入</el-dropdown-item>
-              <el-dropdown-item command="8" v-if="(scope.row.reportType == 4 && [2].includes(scope.row.status))">专利与产品关联比对</el-dropdown-item>
-              <el-dropdown-item command="9" v-if="(scope.row.reportType == 5 && [2].includes(scope.row.status))"> 规避方案填写</el-dropdown-item>
-              <el-dropdown-item command="10" v-if="[3].includes(scope.row.reportType)&&[2,3].includes(scope.row.status)"> 相关对比文件</el-dropdown-item>
-              <el-dropdown-item command="11" v-if="[2].includes(scope.row.status)"> 完成报告</el-dropdown-item>
-              <el-dropdown-item command="12" v-if="[3].includes(scope.row.status)">添加追踪报告</el-dropdown-item>
-              <!-- <el-dropdown-item command="13" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status))">添加无效理由和证据</el-dropdown-item> -->
-              <el-dropdown-item command="14" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status))">证据文献</el-dropdown-item>
-              <el-dropdown-item command="17" v-if="([1,2,3,7].includes(scope.row.reportType) && [2,3].includes(scope.row.status))">导入导出历史</el-dropdown-item>
-              <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-      </el-table>
+            <el-table-column v-if="[1].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
+            <template slot-scope="scope">
+              <el-dropdown @command="handleCommand($event, scope.row)" split-button type="primary" size="small"  @click="handleCommand('e',scope.row)">
+                <span>编辑</span>
+                <el-dropdown-menu slot="dropdown" class="text-align_center">
+                  <el-dropdown-item command="0">分享</el-dropdown-item>
+                  <el-dropdown-item command="1" v-if="[2,3].includes(scope.row.status)">导出报告</el-dropdown-item>
+                  <el-dropdown-item command="2" v-if="[2,3].includes(scope.row.status)">报告文档</el-dropdown-item>
+                  <el-dropdown-item command="16" v-if="[1,2].includes(scope.row.reportType)">检索记录</el-dropdown-item>
+                  <el-dropdown-item command="3" v-if="[2].includes(scope.row.status)&&[0,1,2,3].includes(scope.row.reportType)">自定义字段</el-dropdown-item>
+                  <!-- <el-dropdown-item command="5" v-if="[2].includes(scope.row.status) && [0,1,2].includes(scope.row.reportType)">拆分特征</el-dropdown-item> -->
+                  <el-dropdown-item command="15" v-if="[2].includes(scope.row.status) && [3,4].includes(scope.row.reportType)">产品信息录入</el-dropdown-item>
+                  <el-dropdown-item command="8" v-if="(scope.row.reportType == 4 && [2].includes(scope.row.status))">专利与产品关联比对</el-dropdown-item>
+                  <el-dropdown-item command="9" v-if="(scope.row.reportType == 5 && [2].includes(scope.row.status))"> 规避方案填写</el-dropdown-item>
+                  <el-dropdown-item command="10" v-if="[3].includes(scope.row.reportType)&&[2,3].includes(scope.row.status)"> 相关对比文件</el-dropdown-item>
+                  <el-dropdown-item command="11" v-if="[2].includes(scope.row.status)"> 完成报告</el-dropdown-item>
+                  <el-dropdown-item command="12" v-if="[3].includes(scope.row.status)">添加追踪报告</el-dropdown-item>
+                  <!-- <el-dropdown-item command="13" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status))">添加无效理由和证据</el-dropdown-item> -->
+                  <el-dropdown-item command="14" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status))">证据文献</el-dropdown-item>
+                  <el-dropdown-item command="17" v-if="([1,2,3,7].includes(scope.row.reportType) && [2,3].includes(scope.row.status))">导入导出历史</el-dropdown-item>
+                  <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+          </el-table>
+      </el-main>
+      </el-container>
     </div>
   </div>
 </template>
@@ -83,6 +95,7 @@ export default {
   },
   data() {
     return {
+      tab:'1',
       // 报告类型
       reportTypeName: {
         '0':'无效分析报告',
@@ -141,6 +154,12 @@ export default {
     }
   },
   methods: {
+    //左侧标签点击
+    tabClick(tab, event){
+      var name = tab.name
+      this.$emit('tabChange',name)
+    },
+
      //更新数据
     updateData() {
       if(this.action.type == 1){