fto对比文件bug修改，回避设计添加报告详情

RMS-FrontEnd/src/views/report/FTO/FTOPage/ChosePatent.vue

@@ -110,10 +110,10 @@
             <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
           </el-form-item>
           <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询(多个申请人查询中间请用符号“|”隔开，示例：“申请人|申请人”)"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询(多个权利人查询中间请用符号“|”隔开，示例：“权利人|权利人”)"></el-input>
           </el-form-item>
           <!-- <el-form-item label="申请号">
             <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
@@ -298,6 +298,7 @@ mixins:[PatentDetails,importPatent],
           this.queryParams.selected = this.tableData.map(item => item.patentNo);
           this.checkList = [...new Set(this.checkList.concat(this.queryParams.selected))]
           // this.selectedTotal = this.checkList.length
+          this.queryParams.selected=[]
           if(!this.quickSelect){
             this.queryParams.isAdd=JSON.parse(JSON.stringify(this.checkList))
             this.getSelectedTotal()

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/ChosePatent.vue

@@ -178,10 +178,10 @@
             <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
           </el-form-item>
           <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询(多个申请人查询中间请用符号“|”隔开，示例：“申请人|申请人”)"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询(多个权利人查询中间请用符号“|”隔开，示例：“权利人|权利人”)"></el-input>
           </el-form-item>
           <!-- <el-form-item label="申请号">
             <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
@@ -371,6 +371,7 @@ mixins:[PatentDetails,importPatent],
           this.queryParams.selected = this.tableData.map(item => item.patentNo);
           this.checkList = [...new Set(this.checkList.concat(this.queryParams.selected))]
           // this.selectedTotal = this.checkList.length
+          this.queryParams.selected=[]
           if(!this.quickSelect){
             this.queryParams.isAdd=JSON.parse(JSON.stringify(this.checkList))
             this.getSelectedTotal()

RMS-FrontEnd/src/views/report/avoid/avoidAsid/index.vue

@@ -13,7 +13,7 @@
         <!-- <el-header></el-header> -->
         <el-main class="admin-main-box">
           <!-- <component :row="row" :is="activeMenu" :reportId="reportId" :patentNo="signPatentNo" :signPatentNo="signPatentNo" :reportId2="reportId"></component> -->
-          <component :row="row" :is="activeMenu" :reportId="reportId" :patentNo="signPatentNo" :splitBy="splitBy" :splitType="splitType"></component>
+          <component :row="row" :is="activeMenu" :reportId="reportId"  :reportId2="reportId" :patentNo="signPatentNo" :splitBy="splitBy" :splitType="splitType"></component>
         </el-main>
       </el-container>
     </el-container>
@@ -22,40 +22,28 @@
 
 <script>
 import BasicInformation from '@/views/report/reportDetails/components/basicMessage.vue';
+import SignPatent from '@/views/components/articles/components/features.vue';
 import avoid from '@/views/report/avoid/index.vue';
 import direction from '@/views/report/avoid/avoidPage/direction.vue';
-// import SignPatent from '@/views/components/articles/components/features.vue';
-// import ContrastFile from './components/SelectedPatent.vue';
-// import ContrastResult from '../Invalid/InvalidPage/Result.vue';
-// import ContrastPlan from './components/ContrastPlan.vue';
 import ReportFile from '@/views/report/reportDetails/components/reportFile.vue';
-// import referenceFile from './components/referenceFile.vue';
 import TaskDetails from '@/views/report/reportDetails/components/taskDetails.vue';
 export default {
   components:{
     BasicInformation,
     avoid,
     direction,
-      // SignPatent,
-      // ContrastFile,
-      // ContrastResult,
-      // ContrastPlan,
+      SignPatent,
       ReportFile,
       TaskDetails,
-  // referenceFile
   },
   data() {
       return {
           activeMenu: "BasicInformation",
           menuList: [
-              { title: '基本信息', path:"BasicInformation"}, 
+            { title: '基本信息', path: "BasicInformation" }, 
+            { title: '标的专利特征拆分详情', path:"SignPatent"}, 
               { title: '回避设计方案', path:"avoid"}, 
               { title: '回避设计结果', path:"direction"}, 
-              // { title: '标的专利特征拆分详情', path:"SignPatent"}, 
-              // { title: '对比文件', path:"ContrastFile"}, 
-              // // { title: '新对比文件', path:"referenceFile"}, 
-              // { title: '对比结果', path:"ContrastResult"}, 
-              // { title: '对比方案', path:"ContrastPlan"}, 
               { title: '报告文档', path:"ReportFile"}, 
               { title: '任务清单', path:"TaskDetails"}, 
           ],

RMS-FrontEnd/src/views/report/avoid/avoidPage/direction.vue

@@ -1,32 +1,14 @@
 <template>
   <div style="padding:20px">
-    <!-- <div style="display: flex; justify-content: space-between;margin:20px 0px 20px 0 ;">
-      <el-button-group>
-        <el-button @click="merge" :disabled="checkList.length > 1 ? false : true">合并</el-button>
-        <el-button @click="split" :disabled="checkList.length > 0 ? false : true">拆分</el-button>
-      </el-button-group>
-      <div>
-        <el-select placeholder="请选择拆分类型" v-model="splitType1" style="margin-left: 50px;"
-          @change="splitTypeSelect($event)">
-          <el-option label="仅拆主权要" value="0"></el-option>
-          <el-option label="全部拆分" value="1"></el-option>
-        </el-select>
-        <el-select placeholder="请选择拆分符号" v-model="splitBy1" style="margin-left: 10px;" @change="splitBySelect($event)">
-          <el-option label="逗号拆分" value="0"></el-option>
-          <el-option label="分号拆分" value="1"></el-option>
-          <el-option label="逗号和分号拆分" value="2"></el-option>
-        </el-select>
-        <el-select placeholder="请选择显示类型" v-model="Type" style="margin-left: 10px;" @change="TypeSelect($event)">
-          <el-option label="仅显示主权要" value="1"></el-option>
-          <el-option label="全部显示" value="0"></el-option>
-        </el-select>
-      </div>
-      <div>
-        <el-button @click="keep" type="primary">保存</el-button>
-      </div>
-
-    </div> -->
-    <el-button @click="taskWork" type="primary" size="small" style="float: right;margin-bottom: 10px;">协同办公</el-button>
+   
+    <div style="display: flex;justify-content: center;margin-bottom: 10px;">
+      <el-select placeholder="请选择显示类型" v-model="Type" style="" @change="TypeSelect($event)">
+            <el-option label="仅显示主权要" value="1"></el-option>
+            <el-option label="全部显示" value="0"></el-option>
+      </el-select>
+    </div>
+   
+    <!-- <el-button @click="taskWork" type="primary" size="small" style="float: right;margin-bottom: 10px;">协同办公</el-button> -->
     <template>
       <el-table :data="tableData" border ref="table" :span-method="objectSpanMethod" v-loading="loading"
         style="width: 100%" :height="tableHeight">
@@ -40,40 +22,23 @@
         <el-table-column prop="content" label="特征" width="300" align="center">
           <template slot-scope="scope">
             <p> {{ scope.row.content }}</p>
-            <!-- <el-checkbox-group v-model="checkList">
-              <el-checkbox :label="scope.row.id" @change="getRow(scope)" style="display: flex;align-items: center;">
-                <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content">
-                  {{ scope.row.content }}</el-input>
-              </el-checkbox>
-            </el-checkbox-group> -->
+           
           </template>
         </el-table-column>
-        <el-table-column prop="explainText" label="解释(可粘贴图片)" align="center">
+        <el-table-column prop="explainText" label="解释" align="center">
           <template slot-scope="scope">
             <p style="width:100%;outline: #dcdfe6;" 
                   v-html="scope.row.explainText" >
             </p>
-            <!-- <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview"
-              contenteditable="true" v-html="scope.row.explainText" @input="saveValue($event.target.innerHTML)"
-              @click="saveValue($event.target.innerHTML)" @blur="getValue(scope.row, 'explainText')"
-              v-on:paste="handlePaste($event, scope.row, 'explainText')">
-
-            </div> -->
-            <!-- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.explainText"> {{scope.row.explainText}}</el-input> -->
+            
           </template>
         </el-table-column>
-        <el-table-column prop="littleDirection" label="回避设计方向(可粘贴图片)" align="center">
+        <el-table-column prop="littleDirection" label="回避设计方向" align="center">
           <template slot-scope="scope">
              <p style="width:100%;outline: #dcdfe6;" 
                     v-html="scope.row.littleDirection" >
             </p>
-            <!-- <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview"
-              contenteditable="true" v-html="scope.row.littleDirection" @input="saveValue($event.target.innerHTML)"
-              @click="saveValue($event.target.innerHTML)" @blur="getValue(scope.row, 'littleDirection')"
-              v-on:paste="handlePaste($event, scope.row, 'littleDirection')">
-
-            </div> -->
-            <!-- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.littleDirection"> {{scope.row.littleDirection}}</el-input> -->
+           
           </template>
         </el-table-column>
       </el-table>
@@ -86,17 +51,10 @@
             v-html="textarea1.wholeDirection" >
           </p>
         </div>
-        
-        <!-- <div style="min-height:60px;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px;padding: 10px;"
-          id="preview" class="edit-box" contenteditable="true" placeholder="请输入回避设计总体方向（可粘贴图片）"
-          v-html="textarea1.wholeDirection" @input="saveValue($event.target.innerHTML)"
-          @click="saveValue($event.target.innerHTML)" @blur="getValue(textarea1, 'wholeDirection')"
-          v-on:paste="handlePaste($event, textarea1, 'wholeDirection')">
-        </div> -->
       </div>
 
     </div>
-    <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId"  :reportType="row.type" :patentNo1="row.signPatentNo"></sendCollaboration>
+    <sendCollaboration :visibleCollaborations="visibleWork" @collaboration="collaboration" :reportId="reportId"  :reportType="row.type" :patentNo1="row.signPatentNo" :choiceFormS="choiceFormS"  :selected="selected"></sendCollaboration>
   </div>
 </template>
 
@@ -115,8 +73,6 @@ export default {
       tableData: [],
       tableData1: [],
       checkList: [],
-      // splitType1:this.$s.getSession('reportMessage1').splitType?this.$s.getSession('reportMessage1').splitType.toString():"0",//拆分类型0仅拆主权要，1全部拆分
-      // splitBy1: this.$s.getSession('reportMessage1').splitBy?this.$s.getSession('reportMessage1').splitBy.toString():"2",
       splitType1: "0",//拆分类型0仅拆主权要，1全部拆分
       splitBy1: "2",
       Type: "0",
@@ -125,12 +81,14 @@ export default {
       mergeObj: {},
       typeArr: [1],//显示权要还是全部显示
       loading: false,
-      row: [],
+      rows: [],
       Index_row: [],
       isNum: 1,
       isTypeBy: 0,
       tableHeight: null,
       visibleWork: false,
+      choiceFormS: {},
+      selected: [],
     };
   },
   watch: {
@@ -141,10 +99,8 @@ export default {
     },
   },
   mounted() {
-    // console.log( this.$s.getSession('reportMessage1'),this.reportId);
-    // this.splitPatentRight()
+   
     this.getSplitMessage()
-    // console.log(this.reportId);
   },
   methods: {
     setHeight() {
@@ -302,7 +258,7 @@ export default {
     },
     //获取每个元素所需合并的行数
     getSpanArr(data) {
-      this.row = []
+      this.rows = []
       this.mergeArr.forEach((key, index1) => {
         let count = 0;
         this.mergeObj[key] = [];

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

@@ -144,10 +144,10 @@
               <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
             </el-form-item>
             <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询(多个申请人查询中间请用符号“|”隔开，示例：“申请人|申请人”)"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询(多个权利人查询中间请用符号“|”隔开，示例：“权利人|权利人”)"></el-input>
           </el-form-item>
             <!-- <el-form-item label="申请号">
               <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
@@ -261,7 +261,7 @@
             // this.endNumber = this.queryParams.endNumber
             // this.selectedTotal = this.checkList.length
               // 
-            
+            this.queryParams.selected=[]
           if(!this.quickSelect){
             this.queryParams.isAdd=JSON.parse(JSON.stringify(this.checkList))
             this.getSelectedTotal()
@@ -441,6 +441,7 @@
         // console.log(tab, event);
       },
       getFunInfo(val) {
+        console.log(this.queryParams.selected);
         if(this.quickSelect){
           var index4 = this.queryParams.selected.findIndex(item=>{
               return item == val

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

@@ -110,10 +110,10 @@
             <!-- <el-input type="textarea" v-model="choiceForm.compareResult" placeholder="请输入查询内容"></el-input> -->
           </el-form-item>
           <el-form-item label="标题" >
-            <el-input v-model="choiceForm.title" placeholder="请输入查询内容"></el-input>
+            <el-input v-model="choiceForm.title" placeholder="请输入标题查询"></el-input>
           </el-form-item>
           <el-form-item label="专利号">
-            <el-input v-model="choiceForm.patentNo" placeholder="请输入查询内容"></el-input>
+            <el-input v-model="choiceForm.patentNo" placeholder="请输入专利号查询"></el-input>
           </el-form-item>
          
         </el-form>
@@ -127,22 +127,22 @@
       <div style="height: 500px">
         <el-form ref="form" :model="form" label-width="80px" label-position="left">
           <el-form-item label="标题">
-            <el-input type="textarea" v-model="form.patentName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.patentName" placeholder="请输入标题查询"></el-input>
           </el-form-item>
           <el-form-item label="摘要">
-            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入摘要查询"></el-input>
           </el-form-item>
           <el-form-item label="专利号">
-            <el-input type="textarea" v-model="form.patentNo" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开，示例：“专利号|专利号”)"></el-input>
           </el-form-item>
           <el-form-item label="申请号">
-            <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
           </el-form-item>
           <el-form-item label="申请人">
-            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.applicationName" placeholder="请输入申请人查询(多个申请人查询中间请用符号“|”隔开，示例：“申请人|申请人”)"></el-input>
           </el-form-item>
           <el-form-item label="权利人">
-            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入查询内容"></el-input>
+            <el-input type="textarea" v-model="form.obligeeName" placeholder="请输入权利人查询(多个权利人查询中间请用符号“|”隔开，示例：“权利人|权利人”)"></el-input>
           </el-form-item>
         </el-form>
         </div>

RMS-FrontEnd/src/views/report/reportDetails/components/SelectedPatent.vue

@@ -36,31 +36,31 @@
           <div >
             <el-form ref="form" :model="form" label-width="100px" label-position="left">
               <el-form-item label="标题">
-                <el-input type="" v-model="form.patentName" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.patentName" placeholder="请输入标题查询"></el-input>
               </el-form-item>
               <el-form-item label="摘要">
-                <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入查询内容"></el-input>
+                <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入摘要查询"></el-input>
               </el-form-item>
               <el-form-item label="申请人" >
-                <el-input type="" v-model="form.applicationName" placeholder="请输入查询内容" ></el-input>
+                <el-input type="" v-model="form.applicationName" placeholder="请输入申请人查询(多个申请人查询中间请用符号“|”隔开，示例：“申请人|申请人”)" ></el-input>
               </el-form-item>
               <el-form-item label="权利人">
-                <el-input type="" v-model="form.obligeeName" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.obligeeName" placeholder="请输入权利人查询(多个权利人查询中间请用符号“|”隔开，示例：“权利人|权利人”)"></el-input>
               </el-form-item>
               <el-form-item label="专利号">
-                <el-input type="" v-model="form.patentNo" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开，示例：“专利号|专利号”)"></el-input>
               </el-form-item>
               <el-form-item label="申请号">
-                <el-input type="" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
               </el-form-item>
               <el-form-item label="IPC分类号">
-                <el-input type="" v-model="form.numberIpc" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.numberIpc" placeholder="请输入IPC分类号查询"></el-input>
               </el-form-item>
               <el-form-item label="CPC分类号">
-                <el-input type="" v-model="form.numberCpc" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.numberCpc" placeholder="请输入CPC分类号查询"></el-input>
               </el-form-item>
               <el-form-item label="UPC分类号">
-                <el-input type="" v-model="form.numberUpc" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.numberUpc" placeholder="请输入UPC分类号查询"></el-input>
               </el-form-item> 
             
              

RMS-FrontEnd/src/views/task/components/Incomplete.vue

@@ -61,31 +61,31 @@
           <div >
             <el-form ref="form" :model="form" label-width="100px" label-position="left">
               <el-form-item label="标题">
-                <el-input type="" v-model="form.patentName" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.patentName" placeholder="请输入标题查询"></el-input>
               </el-form-item>
               <el-form-item label="摘要">
-                <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入查询内容"></el-input>
+                <el-input type="textarea" v-model="form.abstractStr" placeholder="请输入摘要查询"></el-input>
               </el-form-item>
               <el-form-item label="申请人" >
-                <el-input type="" v-model="form.applicationName" placeholder="请输入查询内容" ></el-input>
+                <el-input type="" v-model="form.applicationName" placeholder="请输入申请人查询(多个申请人查询中间请用符号“|”隔开，示例：“申请人|申请人”)" ></el-input>
               </el-form-item>
               <el-form-item label="权利人">
-                <el-input type="" v-model="form.obligeeName" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.obligeeName" placeholder="请输入权利人查询(多个权利人查询中间请用符号“|”隔开，示例：“权利人|权利人”)"></el-input>
               </el-form-item>
               <el-form-item label="专利号">
-                <el-input type="" v-model="form.patentNo" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.patentNo" placeholder="请输入专利号查询(多个专利号查询中间请用符号“|”隔开，示例：“专利号|专利号”)"></el-input>
               </el-form-item>
               <el-form-item label="申请号">
-                <el-input type="" v-model="form.applicationNo" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.applicationNo" placeholder="请输入申请号查询"></el-input>
               </el-form-item>
               <el-form-item label="IPC分类号">
-                <el-input type="" v-model="form.numberIpc" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.numberIpc" placeholder="请输入IPC分类号查询"></el-input>
               </el-form-item>
               <el-form-item label="CPC分类号">
-                <el-input type="" v-model="form.numberCpc" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.numberCpc" placeholder="请输入CPC分类号查询"></el-input>
               </el-form-item>
               <el-form-item label="UPC分类号">
-                <el-input type="" v-model="form.numberUpc" placeholder="请输入查询内容"></el-input>
+                <el-input type="" v-model="form.numberUpc" placeholder="请输入UPC分类号查询"></el-input>
               </el-form-item>