审核任务bug修复

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

@@ -93,7 +93,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/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/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/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' ,
 			})