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

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

@@ -13,7 +13,7 @@
         </p> -->
         <div v-html="getViewDom1(patent.rights,'权利要求原文','contentOut')"  data-type="权利要求译文" :style="setStyle()"></div>
       </el-tab-pane>
-      <el-tab-pane v-if="signPatentNo && type1!=7" label="权利特征" name="2" :style="{height: height + 'px',overflowY: 'auto'}">
+      <el-tab-pane v-if="(signPatentNo == patent.patentNo) && type1!=7" label="权利特征" name="2" :style="{height: height + 'px',overflowY: 'auto'}">
           <Features :patentNo="signPatentNo" :reportId="reportId"></Features>
       </el-tab-pane>
     </el-tabs>

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

@@ -375,7 +375,9 @@ export default {
         this.rules.personId[0].required = false
         this.rules.clientId[0].required = false
         // this.rules.departmentId[0].required = false
-        this.$set(this.form,'conclusionIds',[])
+        if (!this.form.id) {
+          this.$set(this.form,'conclusionIds',[])
+        }
         this.conclusion = this.dictMessage[this.reportAsDicItem[this.form.type]]
         this.matterType = 2
       }else{

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

@@ -439,6 +439,7 @@ export default {
       var form = JSON.parse(JSON.stringify(row))
       this.$set(form,'associateReportName',row.volumeNumber?row.volumeNumber:row.name)
       this.$set(form,'associateReportId',row.id)
+      this.$set(form,'conclusionIds',[])
       if(isNaN((row.name).substring((row.name).length-1))){
         form.name = row.name + '-V1'
       }else{