Merge branch 'dragTerm1025' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -679,10 +679,11 @@ export default {
         }
         if (arr.length == 3 && key != 0 && type) {
           //获取互斥项code
+          const val = key==1?arr[2].subLenCode:arr[1].subLenCode
           const list = obj.subMenuList.filter((it) => {
-            return it.code == this.dragVal && it.remark.split("|")[0] == 3;
+            return it.code ==val && it.remark.split("|")[0] == 3;
           });
-          arr[1].aa = "0";
+          console.log(obj.subMenuList);
           const dragArr = list[0].remark.split("|")[1].split(",");
           this.dragArr = dragArr;
           arr[1].dragArr = arr[2].dragArr = dragArr;

src/components/knowledgeExtra/RuleManager.vue

@@ -59,7 +59,7 @@
         <el-table-column prop="parRuleType" label="规则类型" width="160">
           <template slot-scope="scope">{{statusTrans(scope.row.parRuleType)}}</template>
         </el-table-column>
-        <el-table-column prop="parConceptName" label="医学标准术语" width="180">
+        <el-table-column prop="parConceptName" label="医学标准术语" >
           <template slot-scope="scope">
             <!--<el-tooltip
               v-if="scope.row.parConceptName.length>8"
@@ -73,7 +73,7 @@
             <span>{{scope.row.parConceptName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="parLibTypeName" label="术语类型" width="190"></el-table-column>
+        <el-table-column prop="parLibTypeName" label="术语类型"></el-table-column>
         <el-table-column prop="parHasSub" label="有无子条件" width="105">
           <template slot-scope="scope">{{scope.row.parHasSub == '0'?'无':'有'}}</template>
         </el-table-column>