优化

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -8,12 +8,12 @@
     </div>
     <div style="background:white;display:flex; justify-content:flex-end;align-items: center;height: 50px;" >
       <el-button type="primary" size="small" @click="checkResult" style="margin-right:10px;height:32px;"> 查看结果 </el-button>
-      <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" >
+      <!-- <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" >
         <patent-keywords-highlight :project-id="projectId" />
           <el-button :disabled="!$permission('/workspace/common/highlight')" slot="reference" size="small" type="primary" class="margin-right_10">
             高亮<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
-      </el-popover>
+      </el-popover> -->
       <el-switch
         v-model="value"
         :disabled="!$permission('/workspace/details/comparison')"
@@ -552,7 +552,7 @@ if(index!=-1){
               var a = {
                 patentNo:this.contrastMessage.patentNo,
                 position:this.contrastMessage.index,
-                fields:this.contrastMessage.column,
+                fields:this.ruleForm.position,
                 content:this.contrastMessage.text,
                 paresingProcess:this.ruleForm.paresingProcess,
                 assoRecordsFeatures:this.ruleForm.features,

RMS-FrontEnd/src/views/report/FTO/FTOPage/ReportDetails/index.vue

@@ -12,7 +12,7 @@
         <el-container>
           <!-- <el-header></el-header> -->
           <el-main class="admin-main-box">
-            <component :row="row" :is="activeMenu" :reportMessage="row" :reportId="reportId" :patentNo="signPatentNo" :signPatentNo="signPatentNo" :reportId2="reportId" :reportType="reportType"></component>
+            <component :row="row" :is="activeMenu" :reportMessage="row" :reportId="reportId" :patentNo="signPatentNo" :signPatentNo="signPatentNo" :reportId2="reportId" :reportType="reportType" :isShow="isShow"></component>
           </el-main>
         </el-container>
       </el-container>
@@ -43,6 +43,7 @@ export default {
     },
     data() {
         return {
+            isShow:true,
             activeMenu: "BasicInformation",
             menuList: [
                 { title: '基本信息', path:"BasicInformation",show:true}, 

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

@@ -1,9 +1,9 @@
 <template>
   <div style="top:0px;left:0px;">
     <div style="display:flex;justify-content: space-between;align-items: center;">
-      <div :style="{visibility: !coordinationA?'visible':'hidden'}">
+      <div :style="{visibility: !coordinationA&&!isShow1?'visible':'hidden'}" >
         <el-tooltip class="item" effect="dark" content="返回任务页面" placement="top-start">
-          <el-button type="primary" size="small" @click="goBack"> 返回 </el-button>
+          <el-button type="primary" size="small" @click="goBack" > 返回 </el-button>
         </el-tooltip>
       </div>
       <div style="background:white;display:flex; justify-content:flex-end;align-items: center;height: 50px;">
@@ -11,13 +11,13 @@
           style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2] }}</el-tag> -->
         <!-- <el-button type="primary" size="small" @click="checkResult" style="margin-top:20px;margin-right:10px;height:32px;"> 查看结果 </el-button> -->
         <el-button v-if="reportType==4 && !taskId" @click="taskWork" type="primary" size="small" style="height: 32px;"> 协同办公 </el-button>
-        <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-left: 20px;">
+        <!-- <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-left: 20px;">
           <patent-keywords-highlight :project-id="projectId" />
           <el-button slot="reference" size="small" type="primary"
             class="margin-right_10">
             高亮<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
-        </el-popover>
+        </el-popover> -->
         <el-switch v-model="value" 
           inactive-text="查看详情" active-color="#00BFFF" inactive-color="#D3D3D3">
         </el-switch>
@@ -163,7 +163,7 @@ import ProductMessage from './ProductMessage.vue'
 
 export default {
   mixins: [patentKeywordsHighlight, changeTranslation],
-  props: ['patentNo', 'taskId1', 'location', "taskWorkRemak",'state',"reportId1","coordination",],
+  props: ['patentNo', 'taskId1', 'location', "taskWorkRemak",'state',"reportId1","coordination",'isShow'],
   components: {
     PatentFeatures,
     PatentMessage,
@@ -191,6 +191,7 @@ export default {
   },
   data() {
     return {
+      isShow1:this.isShow,
       isEdit:true,
       row:{},
       showProduct:false,
@@ -328,7 +329,7 @@ export default {
     // this.reportId = this.$s.getSession('params').reportId
   },
   mounted() {
-    console.log(this.location, this.reportType, this.state,this.taskWorkRemakA);
+    console.log(this.location, this.reportType, this.isShow,this.taskWorkRemakA);
     this.getPatent(this.patentNo)
     console.log(this.reportId, this.$s.getSession('params'));
   },

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

@@ -3,7 +3,7 @@
         <el-container>
             <el-main  style="border:0;padding:35px 20px 20px;">
                 <div class="header1">
-                    <el-button type="primary" @click="saveProduct" v-if="!noEdit">保存</el-button>
+                    <el-button type="primary" @click="saveProduct" v-if="!noEdit1">保存</el-button>
                 </div>
                 <div class="demo-input-suffix" style="width:800px;margin:0 auto">
                     <div>
@@ -29,10 +29,10 @@
                                             <span class="deleteImg">
                                                 <span> 
                                                     <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview1(item)"></i>
-                                                    <i class="el-icon-delete" @click.stop="handleRemove1(index)"></i>
+                                                    <i class="el-icon-delete" @click.stop="handleRemove1(index)" v-if="!noEdit1"></i>
                                                 </span>
                                             </span>
-                                            <el-image ref="image" :src="$p + item.address" :preview-src-list="imgList"></el-image>
+                                            <el-image ref="image" class="img" :src="$p + item.address" :preview-src-list="imgList"></el-image>
                                         </span>
                                         <span class="avatar" v-for="(item,index) in dialogImageUrl" style="margin-left:10px">
                                             <span class="deleteImg">
@@ -41,7 +41,7 @@
                                                     <i class="el-icon-delete" @click.stop="handleRemove(index)"></i>
                                                 </span>
                                             </span>
-                                            <el-image ref="image" :src="item" :preview-src-list="imgList"></el-image>
+                                            <el-image ref="image" class="img" :src="item" :preview-src-list="imgList"></el-image>
                                         </span>
                                         <i class="el-icon-plus avatar-uploader-icon" v-if="!noEdit1"></i>
                                     </span>
@@ -312,7 +312,7 @@ span:empty::before {
         margin: auto;
         z-index: 999;
     }
-    .avatar img{
+    .avatar .img{
         width: 148px;
         height: 148px;
     }

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

@@ -12,7 +12,7 @@
                         </el-button>
                         <el-dropdown-menu slot="dropdown" style="margin-top:0px" v-if="dictMessage.REPORT_TYPE">
                             <!-- 遍历按钮 -->
-                            <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE" :key="item.dictChildLabel" v-if="![3,6].includes(Number(item.dictChildValue))"  @click.native="handleAnalyse(item.dictChildValue)">{{item.dictChildLabel}}</el-dropdown-item>
+                            <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE" :key="item.dictChildLabel" v-if="![3,5,6].includes(Number(item.dictChildValue))"  @click.native="handleAnalyse(item.dictChildValue)">{{item.dictChildLabel}}</el-dropdown-item>
                             </el-dropdown-menu>
                     </el-dropdown>
                     <div style="display:flex; justify-content:flex-end;align-items:center" v-if="row.type!=4">
@@ -296,7 +296,13 @@ export default {
             var form = {
                 signPatentNo:this.patent?this.patent.patentNo:'',
                 type:id,
-                associateReportName:this.row.volumeNumber?this.row.volumeNumber:this.row.name
+                clientId:this.row.clientId,
+                departmentId:this.row.departmentId,
+                personId:this.row.personId,
+                proTec:this.row.proTec,
+                scenarioList:this.row.scenarioList,
+                associateReportName:this.row.volumeNumber?this.row.volumeNumber:this.row.name,
+                associateReportId:this.reportId
             }
             this.$refs.ReportForm.open(form)
         },

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

@@ -27,7 +27,7 @@
                                                 <i class="el-icon-delete" @click.stop="handleRemove1(index)"></i>
                                             </span>
                                         </span>
-                                        <el-image ref="image" :src="$p + item.address" :preview-src-list="imgList"></el-image>
+                                        <el-image ref="image" class="img" :src="$p + item.address" :preview-src-list="imgList"></el-image>
                                     </span>
                                     <span class="avatar" v-for="(item,index) in dialogImageUrl" style="margin-left:10px">
                                         <span class="deleteImg">
@@ -36,7 +36,7 @@
                                                 <i class="el-icon-delete" @click.stop="handleRemove(index)"></i>
                                             </span>
                                         </span>
-                                        <el-image ref="image" :preview-src-list="imgList" :src="item" ></el-image>
+                                        <el-image ref="image" class="img" :preview-src-list="imgList" :src="item" ></el-image>
 
                                     </span>
                                     <i class="el-icon-plus avatar-uploader-icon"></i>
@@ -305,7 +305,7 @@ export default{
         margin: auto;
         z-index: 999;
     }
-    .avatar img{
+    .avatar .img{
         width: 148px;
         height: 148px;
     }

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

@@ -362,6 +362,7 @@ export default {
       console.log("getCheck",val)
       this.checkList = val
       this.personInformation=false
+      this.beforeHandleConfirm()
     },
     edit(row) {//编辑
         this.num = row.assignCount
@@ -408,6 +409,7 @@ export default {
         this.checkList.splice(index,1)
         this.leaveNumber = Number(this.leaveNumber) + row.assignCount
       }
+      this.beforeHandleConfirm()
     },
     submit() {
       this.personInformation = false
@@ -429,6 +431,13 @@ export default {
     handleConfirm() {
       this.isEqually = true
       if (this.checkList.length > 0) {
+        if(this.checkList.length == 1){
+          if(this.checkList[0].isChoose==false&&this.checkList[0].isEdit==false){
+            this.checkList[0].assignCount=this.totalNumber
+            this.leaveNumber = 0
+          }
+          return true
+        }
         // var num = parseInt(Number(this.totalNumber) / Number(this.checkList.length))
           var a = 0
         for(var i=0;i<this.checkList.length;i++){
@@ -444,12 +453,6 @@ export default {
         if(this.leaveNumber>0){
           this.getRowNumber(data)
         }
-       
-        // data.forEach(item => {
-        //   item.assignCount = num
-        // });
-        // this.leaveNumber = Number(this.totalNumber) % Number(this.checkList.length)
-        // // this.getList()
         this.checkList = data
       }
       

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

@@ -21,7 +21,7 @@
       </el-select> -->
       <div>
         <el-button type="primary" @click="checkSelected">查看已选择</el-button>
-        <el-button type="primary" @click="savePatentList" >保存</el-button>
+        <el-button type="primary" @click="savePatentList" :loading="btnLoading">保存</el-button>
       </div>
       
     </div>
@@ -215,6 +215,7 @@ mixins:[PatentDetails,importPatent],
   props: ['reportId',"ChosePatentSure"],
   data() {
     return {
+      btnLoading:false,
       loadPatent:false,
       visibleSelected:false,
       selectedTotal:0,
@@ -705,10 +706,12 @@ mixins:[PatentDetails,importPatent],
        endNumber:this.endNumber,
        reportId:this.reportId
       }
+      this.btnLoading = true
       // console.log(add)
       this.$api.addCompareFile(add).then(res => {
           console.log(res);
           if (res.code==200) {
+            this.btnLoading = false
             this.startNumber = 1
             this.endNumber = 0
             this.selectedTotal = 0

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

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div style="display:flex; justify-content:flex-end;align-items: center;height: 50px;">
-        <el-button type="danger" @click="delPlan">删除</el-button>
+        <el-button type="danger" @click="delPlan" v-if="checkList.length>0">删除</el-button>
       </div>
         <el-table
         v-if="show"
@@ -52,61 +52,20 @@
                         </el-checkbox>
                   </div> -->
                 <!-- </el-checkbox-group> -->
-              <div style="display:flex;justify-content:space-around;line-height:20px">
-                    <p  @click="checkPatentList">筛选</p>
-                    <p @click="reset">重置</p>
+              <div style="display:flex;justify-content:space-around;line-height:20px;">
+                    <p style="cursor:pointer;" @click="checkPatentList">筛选</p>
+                    <p style="cursor:pointer;" @click="reset">重置</p>
                 </div>
               <!-- <el-button @click="exchange" style="float:right">交换</el-button> -->
               <i class="el-icon-arrow-down el-icon--right" slot="reference" @click="getChecked"></i>
             </el-popover>
 
-
-              <!-- <el-dropdown size="small" >
-                <div class="el-dropdown-link">
-                  <i class="el-icon-arrow-down el-icon--right"></i>
-                </div>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-for="item in resultant">
-                    <el-checkbox-group v-model="checkList2"> 
-                      <el-checkbox :label="item.text">
-                        <el-tooltip class="item" effect="dark" :content="item.patentNoList.join('+')" placement="top-start">
-                          <span>{{ item.text }}</span>
-                        </el-tooltip>
-                      </el-checkbox>
-                    
-                    </el-checkbox-group>
-                    
-                  </el-dropdown-item>
-                <el-dropdown-item>
-                  <div style="display:flex;justify-content:space-around;line-height:20px">
-                    <p :style="{color:checkList2.length==0?'#cbc5c5':''}" @click="checkPatentList">筛选</p>
-                    <p @click="reset">重置</p>
-                  </div>
-                  
-                </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown> -->
             </div>
           </template>
-          <!-- <template slot="header">
-            <div>
-               <span>对比组合</span>
-              <el-dropdown size="small">
-              <div class="el-dropdown-link">
-                <i class="el-icon-arrow-down el-icon--right"></i>
-              </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-for="item in resultant" @click.native="handleClick(item)">
-                  <span>{{ item.text }}</span>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-            </div>
-          </template> -->
           <template slot-scope="scope" >
             <div >
               <el-checkbox-group v-model="checkList" >
-                <el-checkbox :label="scope.row.id" @change="getFunInfo(scope.row)" >
+                <el-checkbox :label="scope.row.id"  >
                   <!-- <p>对比组合{{(scope.$index+1)}}</p>  -->
                   <p>{{ scope.row.resultant}}</p>
                 </el-checkbox>

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

@@ -1,6 +1,6 @@
 <template>
     <div> 
-        <el-button type="primary" @click="submit" style="float:right" v-if="!noEdit">提交</el-button>
+        <el-button type="primary" @click="submit" style="float:right" v-if="!noEdit1">提交</el-button>
         <div style="width:500px;margin:0 auto">
             <el-form :model="form" ref="reportForm" label-width="120px">
                 
@@ -37,9 +37,9 @@
                 <el-form-item label="卷号：" prop="volumeNumber" v-if="form.volumeNumber">
                     <span>{{form.volumeNumber}}</span>
                 </el-form-item>
-                <el-form-item :label="noEdit?'附件':'上传附件：'">
+                <el-form-item :label="noEdit1?'附件':'上传附件：'">
                 <div v-if="form.reportFiles" class="upload-file">
-                    <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(item.id)"><i class="el-icon-close"></i></p></div>
+                    <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;"><p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis">{{item.name?item.name:item.fileName}}</p> <p style="margin:0;" @click="delFile(item.id)" v-if="!noEdit1"><i class="el-icon-close"></i></p></div>
                 </div>
                 <el-upload v-if="!noEdit1" ref="upload" class="upload-file" drag action="#" :auto-upload="false" :show-file-list="true" :on-change="onChange" multiple   :on-preview="handlePreview" :on-remove="handleRemove">
                     <i :class="!file ? 'el-icon-upload' : 'el-icon-refresh'"></i>

RMS-FrontEnd/src/views/report/tort/tortPage/ProductContrast.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Contrast-Product :patentNo="patentNo" :reportId1="reportId" ></Contrast-Product>
+        <Contrast-Product :patentNo="patentNo" :reportId1="reportId" :isShow="isShow1"></Contrast-Product>
     </div>
 </template>
   
@@ -10,9 +10,10 @@
     components:{
       ContrastProduct
     },
-    props:['reportMessage'],
+    props:['reportMessage','isShow'],
     data() {
         return {
+            isShow1:this.isShow,
             reportId:'',
             patentNo:''
         }

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

@@ -40,12 +40,12 @@ export default {
             menuList: [
               { title: '基本信息', path:"BasicInformation",show:true}, 
                 { title: '标的产品信息', path:"ProductMessage",show:true}, 
-                { title: '对比结果', path:"ProductContrastResult",show:true}, 
+                // { title: '对比结果', path:"ProductContrastResult",show:true}, 
             ],
             menuList1: [
               { title: '基本信息', path:"BasicInformation",show:true}, 
                 { title: '标的专利特征拆分详情', path:"SignPatent",show:true}, 
-                { title: '对比结果', path:"ContrastResult",show:true }
+                // { title: '对比结果', path:"ContrastResult",show:true }
             ],
         }
     },