bug修复

src/views/components/indicia/components/card.vue

@@ -106,7 +106,7 @@ export default {
       var router = this.$router.resolve({
         path: '/patentDetails/' + row.patentNo,
         query: {
-          projectId: row.projectId,
+          projectId: 0,
           outside:row.createFrom == 0?true:false//createFrom添加批注的时候传后台，0接口检索出的专利1专题库2报告
         }
       })

src/views/event/components/dialog/addEvent.vue

@@ -73,7 +73,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="applicationScenarios" label="事件场景" align="center">
+          <el-table-column prop="scenarioId" label="事件场景" align="center">
             <template slot-scope="scope">
               <div>
                 <!-- multiple -->

src/views/project/components/PatentKeywordsHighlight.vue

@@ -3,9 +3,9 @@
     <el-container>
       <el-header class="patent-keywords-highlight-header">
         <el-switch v-model="form.ifEnable" active-color="#13ce66" @change="onChange2"></el-switch>
-        <div>
+        <div v-if="this.projectType != 3 && !this.outside">
           <el-button type="primary" size="small" @click="handleAdd" :loading="btnLoading">新增</el-button>
-          <el-button v-if="projectType && projectType == 3" type="success" size="small" @click="handleSave">保存</el-button>
+          <el-button type="success" size="small" @click="handleSave">保存</el-button>
         </div>
       </el-header>
       <el-main class="patent-keywords-highlight-main">
@@ -50,7 +50,7 @@
 <script>
 export default {
   // projectType从产品进来传3，控制高亮的保存是否显示
-  props: ['projectId','projectType'],
+  props: ['projectId', 'projectType','outside'],
   data() {
     return {
       dataList: [],
@@ -66,9 +66,53 @@ export default {
     }
   },
   mounted() {
-    this.getList()
+    // 从产品进入进入projectType为3，从接口检索进入为outside为true
+    if (this.projectType != 3 && !this.outside) {
+      this.getList()
+    } else {
+      this.defaultData()
+    }
+
   },
   methods: {
+    // 从产品或接口检索进入直接给默认值
+    defaultData() {
+      this.dataList = [
+        {
+          id: '-1',
+          name: "默认模板",
+          ifEnable: true,
+          ifDefault: true,
+          createId: "328",
+          createName: "朱豪",
+          createTime: "2024-01-16 15:33:26",
+          projectId: -1,
+          configs: [
+            {
+              color: "#5470c6",
+              keywords: ""
+            },
+            {
+              color: "#91cc75",
+              keywords: ""
+            },
+            {
+              color: "#fac858",
+              keywords: ""
+            },
+            {
+              color: "#ee6666",
+              keywords: ""
+            },
+            {
+              color: "#73c0de",
+              keywords: ""
+            }
+          ]
+        }
+      ]
+      this.onChange()
+    },
     close() {
       this.visible = false
     },
@@ -84,40 +128,6 @@ export default {
     },
     // 查询数据
     getList() {
-      // this.dataList = [
-      //     {
-      //       "name": "默认模板",
-      //       "projectId": 425,
-      //       "userId": 103,
-      //       "ifEnable": true,
-      //       "ifDefault": true,
-      //       "configs": [
-      //           {
-      //               "color": "#5470c6",
-      //               "keywords": ""
-      //           },
-      //           {
-      //               "color": "#91cc75",
-      //               "keywords": ""
-      //           },
-      //           {
-      //               "color": "#fac858",
-      //               "keywords": ""
-      //           },
-      //           {
-      //               "color": "#ee6666",
-      //               "keywords": ""
-      //           },
-      //           {
-      //               "color": "#73c0de",
-      //               "keywords": ""
-      //           }
-      //       ],
-      //         "id": 1085
-      //     }
-      //   ]
-      //   this.onChange()
-      //   return
       let params = {
         projectId: this.projectId
       }
@@ -206,4 +216,5 @@ export default {
       text-align: right;
     }
   }
-}</style>
+}
+</style>

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

@@ -33,7 +33,7 @@
             <el-form>
               <el-form-item label="名称">
                 <div>
-                  <el-link type="primary" @click.native="handleClick(item)" :title="item.name">
+                  <el-link type="primary" @click.native="handleClick(item,'name')" :title="item.name">
                     <span v-if="item.volumeNumber">{{ item.volumeNumber }} - </span>
                     <span>{{ item.name }}</span>
                   </el-link>

src/views/project/patentCollection/components/drawer/MergeInventor.vue

@@ -1,5 +1,6 @@
 <template>
   <!-- 合并发明人，合并权利人/申请人 -->
+  <!-- 暂时没有用到 -->
   <div class="">
     <el-drawer class="custom-drawer-form" :title="mergeType == 2?'合并发明人':'合并申请人/权利人'" size="1000px" :visible.sync="drawer" direction="rtl"
       :before-close="close" destroy-on-close>

src/views/project/patentCollection/components/drawer/merge.vue

@@ -8,7 +8,7 @@
           <div>
             <el-form :inline="true" class="margin-left_20">
               <el-form-item label="名称">
-                <el-input v-model="queryParams.name" size="small" placeholder="请输入名称"></el-input>
+                <el-input v-model="queryParams.name" size="small" placeholder="请输入名称" clearable @clear="getList"></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" size="small" @click="getList">查询</el-button>
@@ -23,20 +23,22 @@
         <el-main class="container-common-main">
           <!-- <el-table v-loading="loading" :data="tableData" border header-row-class-name="custom-table-header"
             v-el-table-infinite-scroll="getList" :infinite-scroll-distance="10" :infinite-scroll-disabled="disabled"> -->
-          <el-table v-loading="loading" :data="tableData" border header-row-class-name="custom-table-header">
+          <el-table v-loading="loading" :data="tableData" border header-row-class-name="custom-table-header" @sort-change="sortChange">
             <el-table-column align="center" width="60">
               <template slot-scope="scope">
                 <el-checkbox @change="onChange(scope.row)" v-if="refresh"
                   :checked="mergedList.indexOf(scope.row.name) !== -1"></el-checkbox>
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="名称" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="name" label="名称" sortable align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="address" label="地址" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" align="center" width="100">
-              <template slot-scope="scope">
-                <el-button v-if="scope.row.mergeId" type="primary" size="small"
+              <template slot-scope="scope" v-if="scope.row.mergeId">
+                <el-button  type="text" size="small"
                   @click="handleEdit(scope.row)">编辑</el-button>
+                <el-button type="text" size="small"
+                  @click="handleDelete(scope.row)" style="color: red;">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -74,7 +76,7 @@
                   :value="item.label"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="地址" prop="province">
+            <el-form-item label="省/直辖市" prop="province">
               <el-cascader ref="myCascader" @change="changeCas" v-model="ruleForm.provinceOld" :options="areaOptions"
                 class="width_100"></el-cascader>
             </el-form-item>
@@ -160,6 +162,8 @@ export default {
       mergeType: null,
       // 刷新
       refresh: true,
+      // 排序
+      sort:[],
       /**编辑合并人及基本信息 start*/
       // 控制弹窗开关
       visible: false,
@@ -189,6 +193,15 @@ export default {
 
   },
   methods: {
+    // 表格排序 等后端
+    sortChange({ column, prop, order }) {
+      let obj = {
+        orderBy: prop,
+        orderType:order
+      }
+      this.sort=[obj]
+      // this.getList()
+    },
     changeCas(val) {
       this.ruleForm.province = this.$refs.myCascader.getCheckedNodes()[0].pathLabels[0]
     },
@@ -253,6 +266,29 @@ export default {
       this.mergeTitle = '编辑合并'
       this.visible = true
     },
+     // 删除表格数据
+     handleDelete(row) {
+      this.$confirm('确认删除本条数据吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true
+        let params = {
+          id: row.mergeId,
+          type: 2,
+        }
+        this.$api.delMergePerson(params).then(response => {
+          if (response.code == 200) {
+            this.$message.success('删除成功')
+            this.loading = false
+            this.getList()
+          }
+        }).catch(error => {
+          this.loading = false
+        })
+      })
+    },
     // 关闭弹窗
     closeDialog() {
       this.$refs.ruleForm.resetFields()

src/views/project/patentCollection/index.vue

@@ -172,7 +172,7 @@
     <!-- 批量那个标引 -->
     <PatentBatchIndexVue ref="PatentBatchIndexVue" :projectId="projectId"></PatentBatchIndexVue>
     <!-- 合并发明人/合并权利人、申请人 -->
-    <patentInventorMergeDrawer ref="patentInventorMergeDrawer" @mergeClose="mergeClose"></patentInventorMergeDrawer>
+    <patentMergeDrawer ref="patentMergeDrawer" :projectId="projectId" @mergeClose="mergeClose"></patentMergeDrawer>
   </div>
 </template>
 
@@ -190,7 +190,8 @@ import searchPatent from '@/views/report/components/patentList/components/search
 import reportFileDrawer from '@/views/report/components/drawer/reportFileDrawer.vue'
 import addAndEditReport from '@/views/report/components/dialog/addAndEditReport.vue'
 import PatentBatchIndexVue from './components/dialog/PatentBatchIndex.vue'
-import patentInventorMergeDrawer from './components/drawer/MergeInventor.vue'
+// import patentInventorMergeDrawer from './components/drawer/MergeInventor.vue'
+import patentMergeDrawer from './components/drawer/merge.vue'
 import PatentKeywordsHighlight from '../components/PatentKeywordsHighlight.vue'
 export default {
   mixins: [fastSelectPatent],
@@ -205,7 +206,7 @@ export default {
     reportFileDrawer,
     addAndEditReport,
     PatentBatchIndexVue,
-    patentInventorMergeDrawer,
+    patentMergeDrawer,
     PatentKeywordsHighlight
   },
   props: {},
@@ -686,9 +687,10 @@ export default {
     handleMerge(type) {
       let obj = {
         projectId: this.projectId,
-        type: type
+        mergeType: type
       }
-      this.$refs.patentInventorMergeDrawer.open(obj)
+      let title = type == 2?'合并发明人':'合并申请人/权利人'
+      this.$refs.patentMergeDrawer.open(obj,title)
     },
     // 合并发明人、申请人、权利人后子组件发送的消息
     mergeClose() {

src/views/project/patentDetails/components/menu.vue

@@ -6,7 +6,7 @@
           <el-header
             style="width: 100%;display: flex;justify-content: space-evenly; align-items: center; height: 50px;line-height: 50px;">
             <el-popover ref="heightPopover" placement="bottom" title="高亮" width="320" trigger="click">
-              <patent-keywords-highlight :project-id="projectId" :projectType="projectType"/>
+              <patent-keywords-highlight :project-id="projectId" :projectType="projectType" :outside="outside"/>
             </el-popover>
             <el-tooltip content="返回" placement="top">
               <el-button size="small" @click="other('goBack')"><i class="iconfont icon-fanhui"></i></el-button>
@@ -73,7 +73,7 @@
             </div>
         <el-tooltip content="设定高亮关键词" placement="right-end">
           <el-popover placement="right" title="关键词高亮" width="320" trigger="click" style="margin-top:20px">
-            <patent-keywords-highlight :project-id="projectId" :projectType="projectType"/>
+            <patent-keywords-highlight :project-id="projectId" :projectType="projectType" :outside="outside"/>
             <div class="articles-Loop" slot="reference" style="">
               <i class="iconfont icon-wodegaoliang"></i>
             </div>

src/views/project/patentDetails/index.vue

@@ -2,7 +2,7 @@
   <div class="height_100 article" :style="{ 'flex-direction': isRight ? 'row-reverse' : 'row' }">
     <articleMenu @event="event" :value="showView" :reportType="reportType" :menu="menuList" :isRight="isRight" :outside="outside"
       :projectId="projectId" :productId="productId" :taskId="taskId" :searchOption="search.searchOption" :patentNo="patentNo" :fromPath="search.fromPath"
-      :location="search.location" @getPatentLeft="getPatentLeft" :handlerType="handlerType"></articleMenu>
+      :location="search.location" @getPatentLeft="getPatentLeft" :handlerType="handlerType" :projectType="projectType"></articleMenu>
     <div class="height_100 content">
       <my-View :showView="showView">
         <div slot="left" style="width:100%">
@@ -84,7 +84,7 @@ export default {
       return this.$route.query.outside
     },
     projectType() {
-      return this.$route.query.projectType//判断是不是从专题库进入专利详情1为专题库2为报告(报告未传2)
+      return this.$route.query.projectType//判断是不是从专题库进入专利详情1为专题库2为报告(报告未传2)3是产品
     },
     productId(){
       return this.$route.query.productId

src/views/report/components/reportFile/reportFileTable.vue

@@ -236,6 +236,7 @@ export default {
     },
     // 新增
     handleAdd() {
+      this.title='新增报告文档'
       this.form.projectId = this.projectId
       this.dialogVisible = true
     },
@@ -324,6 +325,7 @@ export default {
         name: row.referencesName,
         guid:row.guid,
       }]
+      this.title='编辑报告文档'
       this.form = row
       this.dialogVisible = true
     },
@@ -332,7 +334,7 @@ export default {
       this.handleDeletes([data.id])
     },
     handleDeletes(ids) {
-      this.$confirm(str, '提示', {
+      this.$confirm('删除后不可恢复', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'