Ver Fonte

Merge branch 'release2.0' into dev

zhuliu há 2 anos atrás
pai
commit
37989320e7

+ 2 - 3
RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Claims.vue

@@ -127,8 +127,8 @@ export default {
       row: [],//选中特征push到row中
       mergeArr: ['id', 'pRightName'],//解释
       // patentNo:"",//专利号
-      splitType1:this.$s.getSession('reportMessage1').splitType?this.$s.getSession('reportMessage1').splitType.toString():"0",//拆分类型0仅拆主权要,1全部拆分
-      splitBy1: this.$s.getSession('reportMessage1').splitBy?this.$s.getSession('reportMessage1').splitBy.toString():"2",//拆分符号0 ',',1';',2','和';'
+      splitType1:[0,1,'0','1'].includes(this.$s.getSession('reportMessage1').splitType)?this.$s.getSession('reportMessage1').splitType.toString():"0",//拆分类型0仅拆主权要,1全部拆分
+      splitBy1:[0,1,2,'0','1','2'].includes(this.$s.getSession('reportMessage1').splitBy)?this.$s.getSession('reportMessage1').splitBy.toString():"2",//拆分符号0 ',',1';',2','和';'
       Type: "0",//下拉框
       typeArr:[1],//显示权要还是全部显示
       // ReportId:"",//报告id
@@ -141,7 +141,6 @@ export default {
   },
 
   mounted() {
-    //console.log(this.$s.getSession('reportMessage1'))
     // this.splitBy1 = this.$s.getSession('reportMessage1').splitBy.toString()
     // this.splitType1 = this.$s.getSession('reportMessage1').splitType.toString()
     this.show = this.isshow == false ? this.isshow : true