修改创建报告

RMS-FrontEnd/src/api/report.js

@@ -44,6 +44,12 @@ export default {
     return axios.post('/report/api/report/queryReport', params)
  },
  /** 
+   * 根据报告id查询报告详情
+  */
+ reReportDetail(params){
+  return axios.get('/report/api/report/reReportDetail', {params})
+},
+ /** 
    *新增审核任务
   */
   AddTask(params){

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

@@ -839,6 +839,7 @@ export const addContrast = {
       this.duiBiCurrentSelectObj=this.$store.state.patent.index
       // open打开弹窗
       if (this.duiBiCurrentSelectObj.Id) {
+        this.duiBiCurrentSelectObj.patentNo = this.duiBiCurrentSelectObj.pno
         this.$emit('openContrast',this.duiBiCurrentSelectObj)
       }
     },

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

@@ -920,7 +920,7 @@ if(index!=-1){
         }
       }else{
         var a = {
-          patentNo:this.patent.publicNo,
+          patentNo:this.patent.patentNo,
           reportId:this.reportId
         }
       }
@@ -961,7 +961,7 @@ if(index!=-1){
       
       var a = this.$store.state.report.contrastList
           var index = a.findIndex(i=>{
-            return i.patentNo == this.patent.publicNo && i.content == ruleForm.content
+            return i.patentNo == this.patent.patentNo && i.content == ruleForm.content
           })
           if(index!=-1){
             a.splice(index,1)

RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidDetails/InvalidDetails.vue

@@ -35,19 +35,22 @@ export default {
   components: {
     Table
   },
-  props: ['invalidReasonId'],
+  props: ['invalidReasonId','proofGroupId'],
   data() {
     return {
       InvalidDetails:[],
     };
   },
   watch: {
-    invalidReasonId(){
+    proofGroupId(){
       this.queryDetailByInvalidId()
     },
     opinionContrastList(){
       this.queryDetailByInvalidId()
     },
+    invalidReasonId(){
+      this.queryDetailByInvalidId()
+    }
   },
   computed: {
     opinionContrastList() {
@@ -63,9 +66,20 @@ export default {
     
     //根据无效理由Id查询证据组合详情
     queryDetailByInvalidId(){
-        this.$api.queryDetailByInvalidId({invalidReasonId:this.invalidReasonId}).then(response=>{
+      var params = {
+        invalidReasonId:this.invalidReasonId,
+        proofGroupId:this.proofGroupId?this.proofGroupId:null
+      }
+        this.$api.queryDetailByInvalidId(params).then(response=>{
             if(response.code == 200){
+              if(this.proofGroupId){
+                this.InvalidDetails = response.data.filter(item=>{
+                  return item.id == this.proofGroupId
+                })
+              }else{
                 this.InvalidDetails = response.data
+              }
+                
             }
         })
     },

RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidIndex.vue

@@ -74,7 +74,7 @@
               </span>
             </div> -->
             <div v-else-if="item.key=='argument_str'">
-              <span v-if="scope.row.proofGroups && scope.row.proofGroups.length!=0">{{ scope.row.proofGroups[0].argument_str }}</span>
+              <span v-if="scope.row.proofGroups && scope.row.proofGroups.length!=0" v-html="scope.row.proofGroups[0].argument_str"></span>
             </div>
             <div v-else v-html="getData(scope.row,item.key)"></div>
         </template>
@@ -124,7 +124,7 @@
       
       <el-table-column type="expand" width="1">
       <template slot-scope="scope">
-        <InvalidDetails :invalidReasonId="scope.row.id" :reportId="reportId" :patentNo="signPatentNo" :rightSort="scope.row.content" :right="rightList.find(item => item.sort == scope.row.content)"></InvalidDetails>
+        <InvalidDetails :invalidReasonId="scope.row.id" :proofGroupId="scope.row.proofGroups[0].id" :reportId="reportId" :patentNo="signPatentNo" :rightSort="scope.row.content" :right="rightList.find(item => item.sort == scope.row.content)"></InvalidDetails>
       </template>
     </el-table-column>
     </el-table>
@@ -194,7 +194,7 @@
                 <el-popover placement="top-start" width="200" trigger="hover">
                   <div>
                     <p><span>描述：</span><span>{{ item.description }}</span></p>
-                    <p><span>陈述意见：</span><span>{{ item.argumentStr }}</span></p>
+                    <p><span>陈述意见：</span><span v-html="item.argumentStr"></span></p>
                   </div>
                   <span class="check" slot="reference">
                     <i class="el-icon-view chakan"></i>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 创建报告-->
-    <el-dialog :title="title" :visible.sync="showDialog" width="600px" :close-on-click-modal="false"  @close="handleClose" >
+    <el-dialog :title="title" :visible.sync="showDialog" width="600px" :close-on-click-modal="false"  @close="handleClose(false)" >
         <el-form :model="form" :rules="rules" ref="reportForm" label-width="120px" v-loading="loading" :element-loading-text="load_text" element-loading-spinner="el-icon-loading"
     element-loading-background-color="rgba(0, 0, 0, 0.8)">
             
@@ -123,7 +123,7 @@
             </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer" v-if="$reportPermission(form.id,[0,1])">
-              <el-button @click="handleClose">取 消</el-button>
+              <el-button @click="handleClose(false)">取 消</el-button>
               <el-button type="primary" @click="ifNext " v-if="form.type==7 && !form.id">下一步</el-button>
               <el-button type="primary" @click="ifDialog "  v-else>确 定</el-button>
         </span>
@@ -865,9 +865,14 @@ export default {
       if (this.$refs.uploads) {
         this.$refs.uploads.clearFiles()
       }
-      this.$refs.upload.clearFiles()
+      if(this.$refs.upload){
+        this.$refs.upload.clearFiles()
+      }
       this.file = []
-      this.$refs.reportForm.resetFields();
+      if(this.$refs.reportForm){
+        this.$refs.reportForm.resetFields();
+      }
+      
       this.showDialog = false
       this.show = 0
       this.form = {}

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

@@ -625,7 +625,17 @@ export default {
       window.open(a.href,"_blank")
     },
     handleEdit(row) {
-      this.$refs.ReportForm.open(row)
+      if(row.type == 7){
+        this.$api.reReportDetail({reportId:row.id}).then(response=>{
+          if(response.code == 200){
+            // this.$set(this,'form',response.data)
+            this.$refs.ReportForm.open(response.data)
+          }
+        })
+      }else{
+          this.$refs.ReportForm.open(row)
+      }
+      
     },
     handleSort(sort) {
       // console.log(sort)

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

@@ -265,12 +265,13 @@ export default {
         },
         getList() {
             this.loading = true
-            let a = {
-                reportId:this.form.id
-            }
-            this.$api.QueryReport(a).then(response=>{
+            // let a = {
+            //     reportId:this.form.id
+            // }
+            // let a = this.form.id
+            this.$api.reReportDetail({reportId:this.form.id}).then(response=>{
                 if(response.code == 200){
-                    this.$set(this,'form',response.data[0])
+                    this.$set(this,'form',response.data)
                     // this.form = response.data[0]
                 }
             })

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

@@ -362,7 +362,7 @@ import Menu from '@/views/components/common/menu/index.vue'
 	  },
 	  //完成任务
     handleEdit(row) {
-      console.log(row);
+    //   console.log(row);
       switch (row.type) {
         case 0://开卷
           this.bookReviewTask(row)
@@ -392,13 +392,14 @@ import Menu from '@/views/components/common/menu/index.vue'
     },
     bookReviewTask(row) {
       this.taskId = row.id
-      var queryParams={
-        reportId:row.reportId
-      }
-      this.$api.QueryReport(queryParams).then(response=>{
+    //   var queryParams={
+    //     reportId:row.reportId
+    //   }
+	// var queryParams = row.reportId
+      this.$api.reReportDetail({reportId:row.reportId}).then(response=>{
         //console.log(response)
         this.showDialog=true
-        this.form = response.data[0]
+        this.form = response.data
       })
     },
     coordinationTask(row) {