Merge remote-tracking branch 'origin/knowledgePlat' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -178,7 +178,7 @@
                 }
                 const obj = this.ruleTermTypeList.find((it)=>it.code===val);
                 this.baseTypeList = obj.subMenuList;
-
+                this.subRuleMaxNum=obj.number;
             },
             'form.parConceptId':function(val){
                 if(this.checkFirstPlace) {
@@ -220,7 +220,7 @@
                 let arr=[];
                 data.map((it)=>{
                     if(!arr[it.groupType]){arr[it.groupType]=[];}
-                    if(it.subMaxOperator){
+                    if(it.subMaxOperator||it.subMinOperator){
                         it.dataType='1';
                     }else if(it.subEqValue){
                         it.dataType='2';

src/components/knowledgeExtra/SubConditions.vue

@@ -212,7 +212,7 @@
             this.conceptList=[{conceptName:this.groupData.subLibName||this.groupData.subConceptName,conceptId:this.groupData.subConceptId}];
             if(this.groupData.subLenCode){
                 this.baseTermTypeList=[{name:this.groupData.subLenName,code:this.groupData.subLenCode}];
-            };console.log(this.conceptList)
+            }
         },
         methods:{
             dataTypeChange(val){