Merge branch 'dragTerm1025' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -688,7 +688,6 @@ export default {
               (ele) => ele === item.code && item.remark.split("|")[0] == 3
             )
           );
-          console.log(123);
         } else {
           screenArr = obj.subMenuList.filter((item) => {
             if (item.remark == "") {
@@ -697,7 +696,6 @@ export default {
               return item.remark.split("|")[0] == (key % 3) + 1;
             }
           });
-          console.log(455);
         }
         // const klRuleByIdSub = this.form.klRuleByIdSub;
         // klRuleByIdSub.forEach((item, i) => {
@@ -1119,7 +1117,8 @@ export default {
               (ele) => ele === item.code && item.remark.split("|")[0] == 3
             )
           );
-          if (this.form.klRuleByIdSub[inx]) {
+          console.log(this.form.klRuleByIdSub[inx].subType);
+          if (this.form.klRuleByIdSub[inx] && this.form.klRuleByIdSub[inx].subType !='') {
             this.$set(
               this.form.klRuleByIdSub[inx],
               "baseTermTypeList",