Merge branch 'ruleSearch220222' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -199,12 +199,17 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="table_cell" v-if="showHasSub" style="max-width: 25%">
+          <div
+            class="table_cell"
+            v-if="showHasSub && isShow"
+            style="max-width: 25%"
+          >
             <el-form-item
               label-width="130px"
               label="有无子条件："
               :rules="rules.parHasSub"
               prop="parHasSub"
+              :disabled="form.parHasSub ? true : false"
             >
               <el-select
                 v-model="form.parHasSub"
@@ -303,6 +308,7 @@ export default {
         parLenCode: "",
         klRuleByIdSub: [],
       },
+      isShow: false,
       rules: formRules,
       dragVal: null,
       dragArr: null,
@@ -338,6 +344,7 @@ export default {
       const obj = await this.ruleTermTypeList.find(
         (it1) => it1.code == this.form.parLenCode
       );
+      console.log(obj);
       this.baseTypeList = obj.subMenuList;
       this.subRuleMaxNum = obj.number;
 
@@ -552,6 +559,7 @@ export default {
       this.baseTypeList = obj.subMenuList;
       this.subRuleMaxNum = obj.number;
       this.form.parHasSub = obj.subMenuList.length ? 1 : 0;
+      this.isShow = obj.subMenuList.length ? 1 : 0;
       this.setInitGroupData();
     },
     // 医学标准术语
@@ -1251,7 +1259,10 @@ export default {
       );
     },
     showHasSub() {
+      console.log(this.ruleTermCodeStrs);
+      console.log(this.subDict);
       if (this.ruleTermCodeStrs.length > 2) {
+        console.log(this.subDict.indexOf(this.ruleTermCodeStrs) != -1);
         return this.subDict.indexOf(this.ruleTermCodeStrs) != -1;
       }
       return false;

src/components/knowledgeExtra/DiagCheckRule.vue

@@ -24,6 +24,11 @@
 			<ux-grid ref="plxTable" :merge-cells="tdSpanArr" show-overflow style="width: 100%;" height="600px">
 				<ux-table-column field="id" :title="'组(共'+total+'组)'" width="120"></ux-table-column>
 				<ux-table-column field="description" title="规则名称"></ux-table-column>
+			  	<ux-table-column field="hasSubCond" title="子条件">
+				  <template slot-scope="scope">
+				  {{scope.row.hasSubCond?"有":"无"}}
+				</template>
+				</ux-table-column>
 				<ux-table-column field="msg" title="附加信息" show-overflow-tooltip></ux-table-column>
 				<ux-table-column field="baseType" title="基础规则类型">
 					<template slot-scope="scope">
@@ -42,7 +47,7 @@
 				<ux-table-column field="baseMaxOperator" title="最大域比较符" width="80"></ux-table-column>
 				<ux-table-column field="baseMaxValue" title="最大域值" width="80"></ux-table-column>
 				<ux-table-column field="baseMaxUnit" title="最大域单位" width="80"></ux-table-column>
-				<ux-table-column field="baseEqOperator" title="等于阈值" width="80"></ux-table-column>
+				<ux-table-column field="baseEqValue" title="等于阈值" width="80"></ux-table-column>
 				<ux-table-column field="baseEqUnit" title="等于域单位" width="80"></ux-table-column>
 			</ux-grid>
 		</el-main>

src/components/knowledgeExtra/RuleCheck.vue

@@ -275,6 +275,7 @@
 									  	rowspan:isFirst?dtoList.length:0,
 									  	colspan:isFirst?1:0,
 									  	ruleGroup:datai.ruleGroup,
+									  	hasSubCond:datai.hasSubCond,
 										msg:datai.msg,
 										description:datai.description,
 										...dtoList[j]