Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/api/patent.js

@@ -25,7 +25,7 @@ export default{
       return axios.get('/v2/patent/keywords/highlight/list', { params })
     },
 
-      /**
+  /**
    * 获取说明书文件流
    */
   getPatentInstructionFile(params) {
@@ -54,5 +54,33 @@ export default{
      */
     updateUserSettingField(data) {
       return axios.post('/v2/patent/field/setting', data)
-    }
+  },
+     /**
+   * 更新标签
+   */
+  updatePatentLabel(data) {
+    return axios.post('/v2/patent/label', data)
+  },
+  /**
+   * 上传专利附图
+   */
+  uploadPatentImage(data) {
+    return axios.post('/v2/patent/image/add', data)
+  },
+  /**
+   * 修改专利附图
+   */
+  editPatentImage(data) {
+    return axios.post('/v2/patent/image/edit', data)
+  },
+  /**
+   * 删除专利附图
+   */
+  deletePatentImage(params) {
+    return axios({
+      url: '/v2/patent/image/delete',
+      method: 'post',
+      params: params
+    })
+  },
 }

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

@@ -47,7 +47,7 @@
         </el-header>
         <el-main class="patent-articles-content" style="padding-left:30px">
           <div class="patent-articles-content-left" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
-            <component :is="componentName" :type1='type' :isTrue="isTrue" @openContrast='openContrast' :project-id="projectId" :patent="patent" :patent-id="patentId" :signPatentNo="signPatentNo" :patentNo="this.activeMenu == 'patentWorth'?[patentNo]:patentNo" :publicNo="publicNo" :domId="patentNo + '2'" :reportId="reportId" @refresh="getPatent(patentId)"></component>
+            <component :is="componentName" :type1='type' :isTrue="isTrue" @openContrast='openContrast' :project-id="projectId" :patent="patent" :patent-id="patentId" :signPatentNo="signPatentNo" :patentNo="this.activeMenu == 'patentWorth'?[patentNo]:patentNo" :publicNo="publicNo" :domId="patentNo + '2'" :reportId="reportId" @refresh="getPatent(patent.patentNo)"></component>
           </div>
           <div class="patent-articles-content-right" v-if="showRight">
             <el-container>

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

@@ -26,7 +26,7 @@
             </td>
           </tr>
           <tr>
-            <td width="80"><span  class="patent-basic-label">标签:</span></td>
+            <!-- <td width="80"><span  class="patent-basic-label">标签:</span></td>
             <td>
               <div class="patent-label">
                 <template >
@@ -43,12 +43,12 @@
                   >
                   </el-input>
                   <el-button :disabled="!($permission('/workspace/details/addLabel') && $r(projectId,[1,2]))" v-else type="primary" size="mini" @click="showInputLabel" circle icon="el-icon-plus"></el-button>
-                </template>
+                </template> -->
                 <!-- <template v-else>
                   <el-tag v-for="(label, index) in patent.label" effect="dark" type="success" size="small">{{ label.name }}</el-tag>
                 </template> -->
-              </div>
-            </td>
+              <!-- </div>
+            </td> -->
           </tr>
         </table>
               </el-tab-pane>
@@ -181,6 +181,9 @@ watch:{
     },
     handleInputLabelConfirm() {
       let inputLabelValue = this.inputLabelValue;
+      if (!this.patent.label) {
+        this.patent.label=[]
+      }
       if (inputLabelValue) {
         this.patent.label.push({
           name: inputLabelValue

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

@@ -4,8 +4,8 @@
     <div class="demonstration">图片大小：</div>
     <el-slider v-model="value"  @change="changeWidth" :min="25" :max="100" style="padding-left:90px"></el-slider>
   </div>
-    <el-row :gutter="24" >
-      <el-col :span="24" v-for="(item, index) in patent.image" class="imageCard">
+    <!-- <el-row :gutter="24" >
+      <el-col :span="24" v-for="(item, index) in patent.image" class="imageCard"> -->
         <!-- <el-card class="preview" shadow="hover" :style="{width:width}">
           <div slot="header" class="card-header" v-if="$r(projectId, [1, 2])">
             <span></span>
@@ -16,22 +16,26 @@
             <el-image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2Ftp09%2F210F2130512J47-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1660802554&t=1e93af3906def4044c9b4642a2098d66" :preview-src-list="srcList" style="height: 100%;"></el-image>
           </div>
         </el-card> -->
-            <el-card class="preview" shadow="hover" :style="{width:width}">
-          <div slot="header" class="card-header" >
-            <span></span>
-            <el-button :disabled="!$permission('/workspace/details/figureDelete')" class="delete" type="text" @click="handleDelete(item)">删除</el-button>
-            <el-button :disabled="!$permission('/workspace/details/figuremodify')" class="edit" type="text" @click="handleEdit(item)">编辑</el-button>
-          </div>
-          <div class="text-align_center">
-            <el-image :src="getImagePath(item.url)" :preview-src-list="srcList" style="height: 100%; min-height:125px;"></el-image>
-          </div>
-        </el-card>
+        <div class="imageCard">
+
+        
+          <el-card class="preview" v-for="(item, index) in patent.image" shadow="hover" :style="{width:width}">
+            <div slot="header" class="card-header" >
+              <span></span>
+              <el-button :disabled="!$permission('/workspace/details/figureDelete')" class="delete" type="text" @click="handleDelete(item)">删除</el-button>
+              <el-button :disabled="!$permission('/workspace/details/figuremodify')" class="edit" type="text" @click="handleEdit(item)">编辑</el-button>
+            </div>
+            <div class="text-align_center">
+              <el-image  l-image :src="getImagePath(item.url)" :preview-src-list="srcList" style="height: 100%; min-height:125px;"></el-image>
+            </div>
+          </el-card>
+        </div>
         
-      </el-col>
+      <!-- </el-col> -->
       <!-- <el-col :span="24" v-if="$r(projectId, [1, 2])" :style="{width:width}">
         
       </el-col> -->
-    </el-row>
+    <!-- </el-row> -->
     <div type="primary" class="up" v-if="$permission('/workspace/details/figureUpdata') && $r(projectId,[1,2])" @click="handleAdd">上传图片</div>
           <!-- <i class="el-icon-circle-plus-outline" style="font-size:40px"  @click="handleAdd"></i> -->
      <!-- <div type="primary" class="up" v-else :disabled="true">上传图片</div> -->

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

@@ -77,7 +77,7 @@
             </el-header>
             <el-main class="patent-articles-content" style="padding-left:30px">
               <div class="patent-articles-content-left" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
-                <component :is="componentName" :reportType="reportType"  @getVisible="getVisible" :project-id="projectId" @isTrues="getIsTrue" :isTrue="isTrue" :type1="type" :patent="patent" :patentNo="[patent.patentNo]" :domId="patent.patentNo + '1'" :reportId="reportId" :patent-id="patentId" @openContrast='openContrast' @refresh="getPatent(patentId)" ></component>
+                <component :is="componentName" :reportType="reportType"  @getVisible="getVisible" :project-id="projectId" @isTrues="getIsTrue" :isTrue="isTrue" :type1="type" :patent="patent" :patentNo="[patent.patentNo]" :domId="patent.patentNo + '1'" :reportId="reportId" :patent-id="patentId" @openContrast='openContrast' @refresh="getPatent(patent.patentNo)" ></component>
               </div>
               <div class="patent-articles-content-right" v-if="showRight">
                 <el-container>

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

@@ -94,7 +94,7 @@
                 :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
                 <!-- @isTrues="getIsTrue"  @openContrast='openContrast' -->
                 <component :is="componentName" :project-id="projectId" :isTrue="isTrue" :type1="type" :patent="patent"
-                  :reportId="reportId" :patent-id="patentId" @refresh="getPatent(patentId)"></component>
+                  :reportId="reportId" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
               </div>
               <div class="patent-articles-content-right" v-if="showRight">
                 <el-container>

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

@@ -755,8 +755,10 @@
               {
                 taskId: this.taskId?this.taskId:null,
                 signPatentNo: this.tableData1[i].signPatentNo,
-                contentOut: this.tableData1[i].contentOut.trim(),
-                content: this.tableData1[i].content.trim(),
+                // contentOut: this.tableData1[i].contentOut.trim(),
+                // content: this.tableData1[i].content.trim(),
+                contentOut: this.tableData1[i].contentOut,
+                content: this.tableData1[i].content,
                 rightId: this.tableData1[i].rightId,
                 isFinal: this.tableData1[i].isFinal,
                 reportId: this.tableData1[i].reportId,
@@ -806,26 +808,21 @@
               this.$message.info("已取消，请您继续进行协同任务")         
         });
       },
-      // 一键修改
+      // 当前行一键修改
       handleClick(row) {
-        // //console.log(this.tableData1,row);
-        // let a=this.tableData1.findIndex(item => {
-        //   return item.id==row.id
-        // })
         row.targetDescription=row.targetDescription2
         row.compareDescription=row.compareDescription2
-        row.compareResult = row.compareResult2
+        row.compareResult = Number(row.compareResult2)
         this.$message.success("修改成功,请进行保存")
       },
       // 全部修改
       handleWhole() {
-      //   let a = ["targetDescription2", "compareDescription2", "compareResult2"]
-      //   var old = ["targetDescription", "compareDescription", "compareResult"]
         this.tableData.forEach(item => {
-          item.targetDescription=item.targetDescription2
-          item.compareDescription=item.compareDescription2
-          item.compareResult = item.compareResult2
-          
+          if (item.compareResult2) {
+            item.targetDescription=item.targetDescription2
+            item.compareDescription=item.compareDescription2
+            item.compareResult = Number(item.compareResult2)
+          }
         })
         this.$message.success("修改成功,请进行保存")
       },

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

@@ -34,7 +34,7 @@
             </el-header>
             <el-main class="patent-articles-content" style="padding-left:30px">
               <div class="patent-articles-content-left" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
-                <component :is="componentName" :project-id="projectId" :patent="patent" :patent-id="patentId" @refresh="getPatent(patentId)"></component>
+                <component :is="componentName" :project-id="projectId" :patent="patent" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
               </div>
               <div class="patent-articles-content-right" v-if="showRight">
                 <el-container>

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

@@ -233,12 +233,13 @@ export default {
       // let value=JSON.parse(val)
       if (Object.keys(val).length != 0) {
         if (this.params) {
+          this.params.current = 1
           for (let key in val) {
             this.params[key]=val[key]
           } 
           this.getList2()
         } else {
-
+          this.queryParams.current = 1
           for (let key in val) {
           this.queryParams[key]=val[key]
         } 
@@ -612,31 +613,35 @@ export default {
       })
     },
     async getList2() {
-      // 需要根据报告id查询所有对比文件
-      await this.$api.getSureCompareFile(this.params).then(response => {
-        // //console.log(res);
-        if(response.code==200){
-          this.tableData = response.data.records
-          //console.log(this.tableData,response.data.records);
-          this.total = response.data.total
-          this.totalNumber = this.total
-          this.leaveNumber = this.leaveNumber===null?this.total:this.leaveNumber
+      this.tableData = []
+    await this.$api.getSureCompareFile(this.params).then(response=>{
+      if (response.code == 200) {
+          var tableData = response.data.records
+        this.total = response.data.total
+          this.queryParams.total = response.data.total
+          if(this.isFirst==true){
+            this.totalNumber = this.total
+            this.leaveNumber = this.leaveNumber===null?this.total:this.leaveNumber
+          }
+          this.isFirst = false
+          
           // var a = []
           // var b=this.tableData
           for(var i=0;i<this.checkList.length;i++){
             if(this.checkList[i].patentNos.length>0){
               for(var j=0;j<this.checkList[i].patentNos.length;j++){
                 // //console.log(b)
-                var index = this.tableData.findIndex(item=>{
+                var index = tableData.findIndex(item=>{
                   return item.patentNo == this.checkList[i].patentNos[j]
                 })
                 if(index!=-1){
-                   this.tableData[index].disabled =  true
+                   tableData[index].disabled =  true
                 }
               }
              
             }
-          }
+        }
+          this.tableData = tableData
           if (this.checkList.length==0) {
             this.fu()
           }
@@ -644,6 +649,7 @@ export default {
         }
       })
     },
+    
   },
   getData(){
 

RMS-FrontEnd/src/views/report/components/matter/remarryMatter.vue

@@ -136,12 +136,12 @@ export default {
             total:0,
             registerForm:{},
             Already:[],
-            file:[],
-
+            file: [],
+            
         }
     },
     mounted() {
-        this.getList()
+      this.getList()
     },
     methods: {
         //设置表格高度
@@ -213,8 +213,11 @@ export default {
             }
         },
         //打开编辑后续跟进事项弹窗
-        edit(row){
-            this.title = '编辑后续跟进事项'
+      edit(row) {
+            this.title = '查看后续跟进事项'
+            if (row.status == '进行中') {
+              this.title = '编辑后续跟进事项'
+            }
             this.type = 1
             this.row = JSON.parse(JSON.stringify(row))
             this.dialogVisible = true

RMS-FrontEnd/src/views/report/components/mixins.js

@@ -41,7 +41,7 @@ export const explain = {
     },
     //图片路径转64位编码
     getBase64Image(img) {
-      console.log(img)
+      // console.log(img)
       var canvas = document.createElement("canvas");
       canvas.width = img.width;
       canvas.height = img.height;
@@ -56,7 +56,7 @@ export const explain = {
       var e = event || window.event
       e.preventDefault();
       const items = (event.clipboardData || window.clipboardData).items;
-      console.log(items)
+      // console.log(items)
       let file = null;
       if (!items || items.length === 0) {//？
         this.$message.error("当前浏览器不支持本地");
@@ -90,7 +90,7 @@ export const explain = {
       const reader = new FileReader();
       reader.onload = (event) => {
         var blobUrl = event.target.result
-        console.log(blobUrl)
+        // console.log(blobUrl)
         var new_img = '<img src="' + blobUrl + '" style="width:80px;height: 80px;border: 1px solid #f9f6f675;vertical-align:middle" >';
         
         let str = row[name]?row[name]:''

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

@@ -323,7 +323,7 @@ export default{
       if (this.choiceMark) {
         var choice = this.choiceTableData.map(item => item.patentNo);
       } else {
-         var choice = this.tableData.map(item => item.patentNo);
+        var choice = this.tableData.filter(item=>!item.disabled).map(item => item.patentNo);
       }
       
       this.selected = [...new Set(this.selected.concat(choice))]

RMS-FrontEnd/src/views/report/reportDetails/components/common/customFields.vue

@@ -24,13 +24,21 @@
             <!-- v-if="sourceQuery[item.key]" -->
               <el-collapse-item v-for="item in field" :title="item.name" :name="item.id" v-if="sourceQuery[item.id] && item.type!=2">
                 <div class="patent-query-filter-search">
-                  <div class="patent-query-filter-search-input">
+                  <!-- <div class="patent-query-filter-search-input">
                     <el-input v-if="(item.type!=1&&item.type!=6)" v-model="sourceQuery[item.id].name"  size="small" placeholder="请输入查询内容"></el-input>
                     <div v-else-if="item.type!=6" class="year-data-picker">
                       <el-date-picker  clear-icon size="small" v-model="sourceQuery[item.id].datePicker[0]"  type="year" value-format="yyyy" placeholder="请选择时间"></el-date-picker>
                       <span style="margin: 5px;">至</span>
                       <el-date-picker clear-icon size="small" v-model="sourceQuery[item.id].datePicker[1]" type="year" value-format="yyyy" placeholder="请选择时间"></el-date-picker>
                     </div>
+                  </div> -->
+                  <div class="patent-query-filter-search-input">
+                    <el-input v-if="item.type!=6" v-model="sourceQuery[item.id].name"  size="small" placeholder="请输入查询内容"></el-input>
+                    <div v-else-if="!item.type" class="year-data-picker">
+                      <el-date-picker  clear-icon size="small" v-model="sourceQuery[item.id].datePicker[0]"  type="year" value-format="yyyy" placeholder="请选择时间"></el-date-picker>
+                      <span style="margin: 5px;">至</span>
+                      <el-date-picker clear-icon size="small" v-model="sourceQuery[item.id].datePicker[1]" type="year" value-format="yyyy" placeholder="请选择时间"></el-date-picker>
+                    </div>
                   </div>
                   <el-button v-if="item.type!=6"  @click="handleSearch(item)" size="small" type="primary" icon="el-icon-search" circle></el-button>
                 </div>
@@ -191,7 +199,7 @@ export default {
     },
     //模糊查询，每个面板中查询自定义字段的选项
     handleSearch(item) {
-      //console.log(item, this.sourceData, this.sourceQuery);
+      // console.log(item, this.sourceData, this.sourceQuery);
       this.sourceData[item.id] = []
       this.sourceQuery[item.id].checked = []
       this.sourceQuery[item.id].current = 1
@@ -335,7 +343,7 @@ export default {
         }
        
       })
-      //console.log(field);
+      // console.log(field);
       
       this.$emit("onChange",field)
     }, 

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

@@ -19,7 +19,7 @@
               <el-table-column prop="name" label="名称" align="center" show-overflow-tooltip>
                 <template slot-scope="scope" v-if="scope.row.reportFiles">
                   <div>
-                    <span>{{scope.row.reportFiles[0].name}}</span>
+                    <span>{{scope.row.name}}</span>
                   </div>
                 </template>
               </el-table-column>
@@ -163,6 +163,7 @@ export default {
         this.$set(this.ruleForm, 'remark', '')
         this.$set(this.ruleForm, 'type', this.type)
         this.$set(this.ruleForm, 'id', null)
+        this.$set(this.ruleForm, 'name', '')
         this.dialogVisible = false
       },
       handleAdd() {

RMS-FrontEnd/src/views/task/MyHandle.vue

@@ -261,11 +261,12 @@ import Menu from '@/views/components/common/menu/index.vue'
 		},
 	},
 	methods: {
-		checkReport(row){
-			row.dictMessage = this.dictMessage
-			row.type = row.reportType
-			row.name = row.taskName
-			this.$s.setSession('row', row)
+    checkReport(row) {
+      var data = JSON.parse(JSON.stringify(row))
+			data.dictMessage = this.dictMessage
+			data.type = row.reportType
+			data.name = row.taskName
+      this.$s.setSession('row', data)
 			var router = this.$router.resolve({
 				name: 'taskReportDetails' ,
 			})