Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/utils/model/retrieval/search.vue

@@ -131,7 +131,8 @@ export default {
     getSearchOptions() {
       this.searchOptions = []
       if (Object.keys(this.searchValue).length > 0) {
-        Object.keys(this.searchValue).forEach(key => {
+        var data = Object.keys(this.searchValue)
+        data.forEach(key => {
           if (this.searchValue[key] || (typeof this.searchValue[key] == 'object' && this.searchValue[key].length > 0)) {
             var field = this.SearchFields.find(item => {
               return item.value == key

src/views/components/import/conditionImport/searchResult.vue

@@ -28,7 +28,7 @@
       </el-header>
       <el-main id="patent-list-container" v-loading="loading">
         <div class="height_100">
-          <component ref="patentViewList" :is="viewSelected" :column="columnList" :tableData="tableData"  @clickPatentNo="handleClick"
+          <component ref="patentViewList" :is="viewSelected" :outsize="true" :column="columnList" :tableData="tableData"  @clickPatentNo="handleClick"
             @select-change="handleSelect" :selected.sync="queryParams.selected" :patentNoList.sync="patentNoList"
             :view-field="patentViewField" @on-sort="handleSort" @addSelect="getChoosePatentNo"></component>
         </div>

src/views/home/components/echarts/components/task.vue

@@ -33,10 +33,12 @@
         var data = [
           {
             value:completedNum,
+            status:[3],
             name:'已完成'
           },
           {
             value:incompleteNum,
+            status:[1,2,4,5,6],
             name:'未完成'
           }
         ]
@@ -56,6 +58,15 @@
       initChart(data) {
         const chartDom = this.$refs.taskEcharts;
         this.chart = this.$echarts.init(chartDom)
+        this.chart.on('click',(params)=>{
+          localStorage.status =`(${params.data.status.join(' OR ')})`
+          this.$router.push({
+            name:'myTask',
+          })
+          setTimeout(function () {
+            localStorage.removeItem('status')
+          }, 2000);
+      })
         this.chart.setOption(
             {
             tooltip: {

src/views/project/patentCollection/components/mixins/index.js

@@ -31,13 +31,16 @@ export const projectData = {
     //选择专利
     refresh: {
       default: false
-    },
+    },  
 
     patentNoList: {
       type: Array,
       default: () => {
         return []
       }
+    },
+    outsize:{
+      default:false
     }
   },
 

src/views/project/patentCollection/components/views/Abstract.vue

@@ -25,8 +25,8 @@
 
                 </div>
                 <div class="picture text-align_center patent-abstract-image-container">
-                  <el-image :src="$commonJS.checkViewer(patent.pictureGuid)"
-                    :preview-src-list="$commonJS.checkViewer(patent.pictureGuid)"
+                  <el-image :src="outsize?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)"
+                    :preview-src-list="[outsize?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)]"
                     style="margin:0 auto;vertical-align:middle;"
                     :style="{ width: patent.imgWidth ? patent.imgWidth : '100%', height: patent.imgHeight ? patent.imgHeight : '100%' }">
                     <div slot="error" class="image-slot">

src/views/project/patentCollection/components/views/Picture.vue

@@ -21,8 +21,8 @@
           </el-tooltip>
         </div>
         <div class="picture text-align_center" style="height: 200px;width:100%;line-height:200px;">
-          <el-image :src="$commonJS.checkViewer(item.pictureGuid)"
-            :preview-src-list="$commonJS.checkViewer(item.pictureGuid)" style="margin:0 auto;vertical-align:middle;"
+          <el-image :src="outsize?item.pictureGuid:$commonJS.checkViewer(item.pictureGuid)"
+            :preview-src-list="[outsize?item.pictureGuid:$commonJS.checkViewer(item.pictureGuid)]" style="margin:0 auto;vertical-align:middle;"
             :style="{ width: item.imgWidth ? item.imgWidth : '100%', height: item.imgHeight ? item.imgHeight : '100%' }">
             <div slot="error" class="image-slot">
               <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" style="">

src/views/project/patentCollection/components/views/Table.vue

@@ -26,8 +26,8 @@
                 <tr>
                   <td>
                     <div class="patent-abstract-image text-align_center">
-                      <el-image :src="$commonJS.checkViewer(scope.row.pictureGuid)"
-                        :preview-src-list="[$commonJS.checkViewer(scope.row.pictureGuid)]" style="vertical-align:middle;"
+                      <el-image :src="outsize?scope.row.pictureGuid:$commonJS.checkViewer(scope.row.pictureGuid)"
+                        :preview-src-list="[outsize?scope.row.pictureGuid:$commonJS.checkViewer(scope.row.pictureGuid)]" style="vertical-align:middle;"
                         :style="{ width: scope.row.imgWidth ? scope.row.imgWidth : '100%', height: scope.row.imgHeight ? scope.row.imgHeight : '100%' }">
                         <div slot="error" class="image-slot">
                           <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" style="">

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

@@ -153,6 +153,7 @@ export default {
         row:{},
         descriptions:'',
         editProofGroupDescription:false,
+        addFeatures:[]
     };
   },
   watch: {},
@@ -229,6 +230,8 @@ export default {
         this.$api.addProofGroup(params).then(response=>{
             if(response.code == 200){
                 this.cancelContents()
+                this.form.groupId = response.data.data[0]
+                this.$emit('save',true)
                 this.$set(this.form,'proofGroupDescription',this.descriptions)
             }
         }).catch(error=>{
@@ -251,8 +254,25 @@ export default {
    },
     //打开弹窗
     open(form,feature){
+        console.log(feature)
         this.form = form
-        this.features = feature || []
+        this.features = []
+        this.addFeatures = []
+        if(this.ifSecondInvalid){
+            this.features = feature
+        }else{
+            if(feature && feature.length>0){
+                for(var i = 0; i<feature.length;i++){
+                    var obj = feature[i].featureHistories.find(item=>{return item.featureGen == 0})
+                    if(obj){
+                        this.features.push(feature[i])
+                    }else{
+                        this.addFeatures.push(feature[i])
+                    }
+                }
+            }
+        }
+        
         this.getSpanArr(this.features)
         this.showDialog = true
     },
@@ -264,10 +284,31 @@ export default {
     submit(){
         this.$refs.form.validate((valid) => {
           if (valid) {
+            if(!this.form.groupId){
+                this.$message.warning('请先添加证据组合！')
+                return
+            }
+            var data = []
+            if(this.addFeatures.length>0){
+                var order = 0
+                if(this.features && this.features.length>0){
+                   order = Number(this.features[this.features.length-1].featureOrder) 
+                }
+                var order2 = Number(this.addFeatures[0].featureOrder)
+                if(order + 1 != order2){
+                    for(var i = 0;i<this.addFeatures.length;i++){
+                        order += 1
+                        this.addFeatures[i].featureOrder = order
+                    }
+                }
+                data = this.features.concat(this.addFeatures)
+            }else{
+                data = this.feature
+            }
             this.btnLoading = true
             var params = {
                 groupId:this.form.groupId,
-                evidenceReasonList:this.features,
+                evidenceReasonList:data,
                 gen:this.ifSecondInvalid?'1':'0'
             }
             this.$api.addEvidenceReason(params).then(response=>{
@@ -298,6 +339,8 @@ export default {
         for(var i = index;i<this.features.length;i++){
             var order = this.features[i].featureOrder
             this.features[i].featureOrder = Number(order) - 1
+            this.features[i].featureId = null
+
         }
         var feature = JSON.parse(JSON.stringify( this.features))
         this.features = feature

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

@@ -132,7 +132,7 @@ export default {
                         {
                             claimId:data.originalClaimVO.claimId,
                             content:data.originalClaimVO.content,
-                            description:data.originalClaimVO.comment,
+                            description:data.originalClaimVO.description,
                             typeContent:'原权要',
                             times:0
                         }
@@ -146,7 +146,7 @@ export default {
                             claimId:data.firstClaimVO.claimId,
                             claimHistoryId:data.firstClaimVO.claimHistoryId,
                             content:data.firstClaimVO.content,
-                            description:data.firstClaimVO.comment,
+                            description:data.firstClaimVO.description,
                             typeContent:'第一次修改后的权要',
                             times:1,
                             operate:data.firstClaimVO.operateType
@@ -165,7 +165,7 @@ export default {
                             claimId:data.secondClaimVO.claimId,
                             claimHistoryId:data.secondClaimVO.claimHistoryId,
                             content:data.secondClaimVO.content,
-                            description:data.secondClaimVO.comment,
+                            description:data.secondClaimVO.description,
                             typeContent:'第二次修改后的权要',
                             times:2,
                             operate:data.secondClaimVO.operateType

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

@@ -13,7 +13,7 @@
               <el-input  v-model="form.participator" autocomplete="off" placeholder="请输入参与人"></el-input>
             </el-form-item>
             <el-form-item  label="口审笔录描述">
-              <el-input  v-model="form.recordDescription" autocomplete="off" placeholder="请输入参与人"></el-input>
+              <el-input  v-model="form.recordDescription" autocomplete="off" placeholder="请输入口审笔录描述"></el-input>
             </el-form-item>
           </template>
           <template v-if="type.type ==1">
@@ -26,16 +26,16 @@
           <template v-if="type.type ==3">
             <div>
                 <el-form-item label="决定书号码">
-                    <el-input v-model="form.fileNo" autocomplete="off" placeholder="请输入参与人"></el-input>
+                    <el-input v-model="form.fileNo" autocomplete="off" placeholder="请输入决定书号码"></el-input>
                 </el-form-item>
                 <el-form-item label="法律依据">
-                    <el-input v-model="form.legalBase" autocomplete="off" placeholder="请输入参与人"></el-input>
+                    <el-input v-model="form.legalBase" autocomplete="off" placeholder="请输入法律依据"></el-input>
                 </el-form-item>
                 <el-form-item label="决定要点">
-                    <el-input v-model="form.decisionKey" autocomplete="off" placeholder="请输入参与人"></el-input>
+                    <el-input v-model="form.decisionKey" autocomplete="off" placeholder="请输入决定要点"></el-input>
                 </el-form-item>
                 <el-form-item label="结论">
-                    <el-input v-model="form.conclusion" autocomplete="off" placeholder="请输入参与人"></el-input>
+                    <el-input v-model="form.conclusion" autocomplete="off" placeholder="请输入结论"></el-input>
                 </el-form-item>
             </div>
           </template>

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

@@ -1,7 +1,7 @@
 <template>
   <div >
     <!-- 无效流程 -->
-    <div style="display: flex;justify-content: end;margin-bottom: 10px;" >
+    <div style="display: flex;justify-content: end;margin-bottom: 10px;" v-if="!taskId">
       <!-- <el-button type="primary" size="small" @click="addOption">添加陈述意见</el-button> -->
       <el-dropdown @command="handleCommand">
         <el-button type="primary" size="small">
@@ -68,7 +68,7 @@
 import responseDialog from '../dialog/editFlowPath.vue'
 
 export default {
-  props:['projectId','signPatentNo'],
+  props:['projectId','signPatentNo','taskId'],
   components: {
     responseDialog,
   },

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

@@ -10,7 +10,7 @@
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="2">添加证据组合</el-dropdown-item>
                         <el-dropdown-item command="3">添加复审委决定</el-dropdown-item>
-                        <el-dropdown-item command="4">添加法院意见</el-dropdown-item>
+                        <el-dropdown-item command="4">添加法院决定</el-dropdown-item>
                         <el-dropdown-item command="5" v-if="!ifSecondInvalid">添加第二次无效证据</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
@@ -499,10 +499,16 @@ export default {
                             // }else{
                             //     evidence = secondEvidenceReason
                             // }
-
-                            for(let y1 = 0;y1<evidence.length;y1++){
+                            var len = evidence[evidence.length-1]
+                            if(len){
+                                len = Number(len)
+                            }
+                            for(let y1 = 0;y1<len;y1++){
                                 var y = y1 + 1
                                 var feature = evidenceReason[y]
+                                if(!feature){
+                                    continue
+                                }
                                 var pobj = {
                                     ...obj2,
                                     featureHistories:feature.featureHistories,
@@ -558,6 +564,7 @@ export default {
                                 }else{
                                     var type = 0
                                     evidenceList = []
+                                    
                                     if(evidenceReason[y] && !secondEvidenceReason[y]){
                                         if(evidenceReason[y].evidenceList){
                                             type = 1

src/views/report/analysisAndOpinion/components/searchRecords/searchRecords.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="height_100">
+    <el-container>
+        <el-header>
+            <el-button type="primary" size="small" @click="add">添加</el-button>
+        </el-header>
+        <el-main v-DivHeight="getDivHeight">
+            <el-table
+                ref="table"
+                :data="tableData"
+                row-key="id"
+                style="width: 100%"
+                :maxHeight="tableHeight - 40"
+                v-loading="loading"
+                @selection-change="handleSelectionChange"
+            >
+                <el-table-column type="selection" width="55" :reserve-selection="true">
+
+                </el-table-column>
+                <el-table-column prop="conditions" label="检索式"></el-table-column>
+                <el-table-column prop="dbType" label="检索范围" width="140">
+                    <template slot-scope="scope">
+                    <div>
+                        {{ dbType[scope.row.dbType] }}
+                    </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="time" label="创建/更新时间" width="240">
+                    <template slot-scope="scope">
+                    <div class="time">
+                        <p>创建：{{ scope.row.retrieveTime }}</p>
+                        <p>更新：{{ scope.row.updateTime }}</p>
+                    </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="totalNum" label="检索结果" width="120">
+                    <template slot-scope="scope">
+                    <div>
+                        {{ scope.row.totalNum }}件
+                    </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="140">
+                    <template slot-scope="scope">
+                        <div class="icon">
+                            <span @click="editSearch(scope.row)" class="margin-left_10">
+                            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                                <i class="iconfont icon-bianji"></i>
+                            </el-tooltip>
+                            </span>
+                            <span @click="executeSearch(scope.row)" class="margin-left_10">
+                            <el-tooltip class="item" effect="dark" content="再次执行" placement="top">
+                                <i class="iconfont icon-zidongzhihang"></i>
+                            </el-tooltip>
+                            </span>
+                            <span @click="delSearch(scope.row)" class="margin-left_10">
+                            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                                <i class="iconfont icon-shanchu"></i>
+                            </el-tooltip>
+                            </span>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-main>
+        <el-footer class="pagination" style="display:flex;justify-content:space-between;align-items:center">
+          <div style="display:flex;align-items:center">
+            <span v-if="multipleSelection.length > 0">
+              已勾选 <b>{{ multipleSelection.length }}</b> 条
+            </span>
+            <div v-show="multipleSelection.length" class="margin-left_10">
+              <el-button type="primary" size="small" @click="del"></el-button>
+            </div>
+          </div>
+          <div>
+            <el-pagination background layout="total, sizes, prev, pager, next, jumper"
+              :current-page.sync="queryParams.current" :page-size.sync="queryParams.size"
+              @current-change="handleCurrentChange" @size-change="getList" :total="total">
+            </el-pagination>
+          </div>
+
+        </el-footer>
+    </el-container>
+  </div>
+</template>
+
+<script>
+import { getTableHeight } from '@/views/components/mixins'
+export default {
+    mixins:[getTableHeight],
+  components: {},
+  props: {
+    projectId:{
+        default:0
+    }
+  },
+  data() {
+    return {
+        tableData:[],
+        multipleSelection:[],
+        loading:false,
+        queryParams:{
+            current:1,
+            size:10
+        },
+        total:0
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList(){},
+    handleCurrentChange(val){
+        this.queryParams.current = val
+        this.getList()
+    },
+    add(){},
+    del(){},
+    handleSelectionChange(val){
+        this.multipleSelection = val
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

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

@@ -26,6 +26,21 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <template v-if="form.reportType==7 && !taskId">
+        <div>
+          <el-form-item label="案件梳理意见：" prop="cardingOpinion" >
+              <div  v-if="!editSuggestion" style="display:flex;align-items:center">
+                <div v-html="form.cardingOpinion" class="div_MAX_Height" style="color:#000000 !important;"></div>
+                <span @click="editSuggestions(form)"><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="form.cardingOpinion" placeholder="请输入案件梳理意见"></myRich-Text>
+                <el-button type="primary" class="margin-left_10" icon="el-icon-check" circle style="font-size:15px" @click="submit"></el-button>
+                <el-button type="primary" class="margin-left_10" icon="iconfont icon-fanhui" circle style="font-size:15px" @click="cancelSuggestion(form)"></el-button>
+              </div>
+          </el-form-item>
+        </div>
+      </template>
       <template v-if="form.reportType == 7">
         <div>
           <el-row>
@@ -145,7 +160,7 @@
       </el-form-item>
     </el-form>
 
-    <flow-Path :projectId="projectId" v-if="reportType == 7"></flow-Path>
+    <flow-Path :projectId="projectId" :taskId="taskId" v-if="reportType == 7"></flow-Path>
   </div>
 </template>
   
@@ -162,11 +177,16 @@ export default {
     },
     reportType:{
       default:0
+    },
+    taskId:{
+      default:''
     }
   },
   data() {
     return {
-      form: {}
+      form: {},
+      editSuggestion:false,
+      cardingOpinion:''
     };
   },
   watch: {},
@@ -178,6 +198,56 @@ export default {
     this.getReportMessage()
   },
   methods: {
+    //编辑案件梳理意见
+    editSuggestions(row){
+        this.$set(this,'editSuggestion',!this.editSuggestion)
+        this.$set(this,'cardingOpinion',row.cardingOpinion)
+      },
+      //取消案件梳理意见
+      cancelSuggestion(row){
+        this.$set(this,'editSuggestion',!this.editSuggestion)
+        this.$set(row,'cardingOpinion',this.cardingOpinion)
+      },
+      //提交填写的信息
+    submit() {
+      this.$refs.reportForm.validate((valid) => {
+        if (valid) {
+          this.form.type = 2//项目类型（1专利数据库 2报告 3专利挖掘项目）
+          // 判断文件是否都上传完毕
+          var guids = this.$commonJS.checkUploadFile(this.form.systemFile)
+            if(!guids){
+                return false
+            }
+            this.form.fileGuids = guids
+          // this.$commonJS.allUploadFile(this.form)
+          // 事件及调查类型处理
+          if (this.form.scenarioIds && this.form.scenarioIds.length > 0) {
+            var scenarioIds = JSON.parse(JSON.stringify(this.form.scenarioIds))
+          }
+          if (this.form.eventId) {
+            this.form.events = []
+            this.form.scenarioIds = []
+            this.form.matterIds.forEach(item => {
+              this.form.events.push(
+                {
+                  matterId: item,
+                  scenarioId: scenarioIds[0],
+                  eventId: this.form.eventId
+                }
+              )
+            })
+          }
+          let formData = this.form
+          this.$api.updateReportProject(formData).then(response => {
+            if (response.code == 200) {
+              this.$message.success('报告更新成功')
+              this.$set(this,'editSuggestion',false)
+            }
+          })
+         
+        }
+      })
+    },
     getReportMessage() {
       let params = {
         searchQuery: `id=${this.projectId}`,//检索条件

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

@@ -195,7 +195,12 @@ export default {
           path: 'report/analysisAndOpinion/components/comparisonPlan/comparisonPlan.vue',
           reportType: [1,2]
         },
-
+        {
+          label: '检索记录',
+          name: "searchRecords",
+          path: 'report/analysisAndOpinion/components/searchRecords/searchRecords.vue',
+          reportType: [1,2]
+        },
         {
           label: '报告文档',
           name: "reportFile",

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

@@ -17,7 +17,7 @@
                 </el-form-item>
                 <el-form-item v-else label="标的专利" prop="signPatentNo">
                   <div style="display:flex;align-items:center">
-                    <el-input v-model="form.signPatentNo" autocomplete="off" placeholder="请输入标的专利" @change="getPatentNo"></el-input>
+                    <el-input v-model="form.signPatentNo" autocomplete="off" placeholder="请输入标的专利" @change="getPatentNo(1)"></el-input>
                     <span v-if="patentLoading"> 
                       <i class="el-icon-loading"></i>
                     </span>
@@ -283,7 +283,6 @@ import { mapGetters } from 'vuex'
 import addMatter from './addMatter.vue'
 import ClientTable from '@/views/client'
 import addFlowPath from '@/views/report/InvalidResponse/components/dialog/editFlowPath.vue'
-import task from '@/api/task'
 export default {
   components: {
     addMatter,
@@ -441,7 +440,7 @@ export default {
           value:0
         },
       ],
-
+      isExist:true
     };
   },
   watch: {},
@@ -694,6 +693,9 @@ export default {
         this.personnelList.queryParams.id = null
       }
       this.getPermissionPersonnel()
+      if(this.form.signPatentNo){
+        this.getPatentNo()
+      }
       // this.getEventList()
       this.showDialog = true
     },
@@ -785,7 +787,7 @@ export default {
     },
 
     //获取专利号且填入报告名称
-    getPatentNo() {
+    getPatentNo(sign) {
       // if (!this.form.name) {
         var a = this.dictMessage.REPORT_TYPE.filter(item => { return item.value == this.form.reportType })[0].label
         if (this.form.signProjectId) {
@@ -809,7 +811,10 @@ export default {
           name+=a
           this.$set(this.form, 'name', name)
         }
-        this.checkPatent()
+        if(sign){
+          this.checkPatent()
+        }
+        
       // }
     },
     //校验专利是否存在
@@ -823,6 +828,8 @@ export default {
       this.$api.queryPatentByNo(params).then(response=>{
         if(response.code == 200){
           if(response.data){
+            this.isExist = true
+            this.patentLoading = false
             this.$set(this.form,'inventionName',response.data.title[0].text_content)
           }else{
             this.checkPatent2()
@@ -838,12 +845,17 @@ export default {
       this.$api.queryPatentByNoFromWeb(params).then(response=>{
         if(response.code == 200){
           if(response.data){
+            this.isExist = true
             this.patentImport()
           }else{
+            this.isExist = false
+            this.patentLoading = false
             this.$message.warning('该专利不存在')
           }
         }
       }).catch(error=>{
+        this.isExist = false
+        this.patentLoading = false
         this.$message.warning('该专利不存在')
       })
     },
@@ -921,6 +933,10 @@ export default {
     submit() {
       this.$refs.reportForm.validate((valid) => {
         if (valid) {
+          if(!this.isExist){
+            this.$message.warning('标的专利不存在')
+            return false
+          }
           this.form.type = 2//项目类型（1专利数据库 2报告 3专利挖掘项目）
           // 判断文件是否都上传完毕
           var guids = this.$commonJS.checkUploadFile(this.form.systemFile)

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

@@ -3,7 +3,7 @@
     <el-dialog :title="title" :visible.sync="showDialog" width="1000px" :close-on-click-modal="false" @close="handleClose"
       append-to-body>
 
-      <basicMessage :projectId="row.projectId"></basicMessage>
+      <basicMessage :projectId="row.projectId" :taskId="row.id"></basicMessage>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">取 消</el-button>

src/views/report/components/index.vue

@@ -40,8 +40,7 @@
       <el-main id="patent-list-container" class="main" v-loading="loading">
         <component :is="viewType" v-bind="$attrs" v-on="$listeners" :isOperate="isOperate" :tableData="dataList"
           :state="state" :queryParams="queryParams" @option="handleOption" @on-sort="handleSort" :groupBy="groupingValue"
-          :groupingOption="groupingOption" :commonData="commonData" :searchOption="searchOption" :column="columnList"
-          @getRow="checkDetails" @params="getParams"></component>
+          :groupingOption="groupingOption" :commonData="commonData" :searchOption="searchOption" :column="columnList" @params="getParams"></component>
       </el-main>
       <el-footer class="pagination" v-if="viewType != 'visual'">
         <el-pagination background layout="total,sizes, prev, pager, next, jumper" :current-page.sync="queryParams.current"
@@ -541,7 +540,8 @@ export default {
         query:{
           projectId:row.id,
           reportType:row.reportType,
-          signPatentNo:row.signPatentNo
+          signPatentNo:row.signPatentNo,
+          patentNo:row.signPatentNo
         }
       })
     },
@@ -649,46 +649,6 @@ export default {
       this.$refs.ReportForm.open(row)
     },
 
-    //查看详情（修改）
-    checkDetails(row) {
-      row.dictMessage = this.dictMessage
-      row.showMenu = true
-      this.$s.setSession('row', row)
-      this.$s.setSession('params', row)
-      switch (row.type) {
-        case 0://无效分析
-        case 1://稳定性分析
-        case 2://第三方意见
-          var router = this.$router.resolve({
-            name: 'rDetails',
-          })
-          window.open(router.href, '_blank');
-          break;
-        case 3://FTO
-
-        case 4://侵权
-          var router = this.$router.resolve({
-            name: 'FTOrDetails',
-          })
-          window.open(router.href, '_blank');
-          break;
-        case 5://回避
-          var router = this.$router.resolve({
-            name: 'avoidAside',
-          })
-          window.open(router.href, '_blank');
-          break;
-        case 6://图表
-          break;
-        case 7://无效应对
-          var router = this.$router.resolve({
-            name: 'InvalidResponse',
-          })
-          window.open(router.href, '_blank');
-          break;
-      }
-    },
-
     //接收可视化的参数
     getParams(params) {
       if (params.conclusionType == '-1') {

src/views/task/components/index.vue

@@ -125,7 +125,10 @@ export default {
       // 检索字段
       searchFiled: [],
       // 检索字符串
-      searchOption: {},
+      searchOption: {
+        status:localStorage.status,
+        type:''
+      },
       //排序字段
       sort: [{ "orderBy": "createTime", "orderType": 1 }],
       // 检索字段标识
@@ -506,7 +509,7 @@ export default {
             }
           }
           var obj2 = this.searchFiled.find(item => { return item.label == '任务类型' })
-          if (obj) {
+          if (obj2) {
             obj2.options = []
             for (let key in this.taskType) {
               obj2.options.push({