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

src/components/knowledgeExtra/DiagCheckRule.vue

@@ -1,10 +1,13 @@
 <template>
 	<div>
-		<div style="margin-top: 10px;">
-			<span class="span1">规则类型：</span>{{row.ruleTypeName||'-'}}
-			<span class="span1" style="margin-left:100px;">规则术语类型：</span>{{row.libTypeName||'-'}}
-			<span class="span1" style="margin-left:100px;">医学标准术语：</span>{{row.libName||'-'}}
-			<el-form :inline="true" style="margin-top: 10px;height: 45px;">
+		<div style="margin: 10px 0;">
+		  	<span class="span1"><i>规则名称：</i>{{description||'-'}}</span>
+			<span class="span1"><i>规则类型：</i>{{row.ruleTypeName||'-'}}</span>
+			<span class="span1"><i>规则术语类型：</i>{{row.libTypeName||'-'}}</span>
+			<span class="span1"><i>医学标准术语：</i>{{row.libName||'-'}}</span>
+		  	<span class="span1"><i>基础规则术语类型：</i>{{baseTermTypeName||'-'}}</span>
+		  	<span class="span1"><i>基础医学标准术语：</i>{{baseLibName||'-'}}</span>
+			<!--<el-form :inline="true" style="margin-top: 10px;height: 45px;">
 				<el-form-item label="基础规则术语类型：">
 					<el-select v-model="filter.baseLibType" clearable placeholder="请选择" size="mini">
 						<el-option v-for="item in baseTermTypeList2" :key="item.val" :label="item.name"
@@ -18,7 +21,7 @@
 				<el-form-item>
 					<el-button size="mini" @click="getRuleDetail">确认</el-button>
 				</el-form-item>
-			</el-form>
+			</el-form>-->
 		</div>
 		<el-main>
 			<ux-grid ref="plxTable" :merge-cells="tdSpanArr" show-overflow style="width: 100%;" height="600px">
@@ -70,6 +73,14 @@
 				total: this.ruleTeamNum,
 			};
 		},
+	  	computed:{
+		  baseTermTypeName(){
+			  const item = this.baseTermTypeList.filter((it)=>{
+				return it.val===this.filterp.baseLibType;
+			  });
+			  return item[0].name;
+		  }
+		},
 		created() {
 			this.baseTermTypeList2 = this.baseTermTypeList;
 			this.filter.baseLibName=this.baseLibName;
@@ -79,7 +90,7 @@
 		this.$refs.plxTable.reloadData(this.rulelist)
 		  //this.loading.close();
 	  },
-		props: ['loading','mergeCells','rulelist','ruleTeamNum', 'baseTypeList', 'baseTermTypeList', 'row', 'description','baseLibType','baseLibName'],
+		props: ['loading','mergeCells','filterp','rulelist','ruleTeamNum', 'baseTypeList', 'baseTermTypeList', 'row', 'description','baseLibType','baseLibName'],
 		methods: {
 		  transDataMap(data){
 			const obj = {};
@@ -144,8 +155,11 @@
 		line-height: 25px;
 	}
 
-	.span1 {
+	.span1{
+	  i{
 		font-weight: bolder;
+	  }
+	  margin: 0 60px 0 0;
 	}
 
 	/deep/.el-form--inline .el-form-item__label {

src/components/knowledgeExtra/RuleCheck.vue

@@ -58,7 +58,7 @@
 		<el-dialog title="查看" :visible.sync="dialogVisible" :before-close="closecheckDialog" width="80rem"
 			v-if="dialogVisible" :close-on-click-modal="false" :fullscreen="true">
 			<CheckRule :mergeCells="mergeCells" :rulelist="rulelist" :ruleTeamNum="ruleTeamNum" :baseTypeList="baseTypeList" :baseTermTypeList="baseTermTypeList"
-				:row="row" :description="filter.description" :baseLibType="filter.baseLibType" :baseLibName="filter.baseLibName">
+				:row="row" :filterp="filter" :description="filter.description" :baseLibType="filter.baseLibType" :baseLibName="filter.baseLibName">
 			</CheckRule>
 			<div style="text-align: center;">
 				<el-button @click="closecheckDialog" style="width: 180px;">关闭</el-button>