Merge branch 'dragTerm1025' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -858,7 +858,7 @@ export default {
       this.form.klRuleByIdSub = list;
     },
     // 删除规则
-    delGroupChild(groupChildId, index, groupId, del, key) {
+    delGroupChild(groupChildId, index, groupId, del, key,lens) {
       let newGroupList;
       const dragDel =
         localStorage
@@ -925,6 +925,13 @@ export default {
           newGroupList = this.form.klRuleByIdSub.filter(
             (item) => item.groupChildId != groupChildId
           );
+          if (lens == 4) {
+            const obj = this.baseTypeList.find((it) => it.type === 1);
+            const screenArr = obj.subMenuList.filter((item) => {
+              return item.remark.split("|")[0] == 2;
+            })
+            newGroupList[1].baseTermTypeList = screenArr
+          }
           this.dragVal = len[1].subLenCode;
         }
       } else {
@@ -1053,11 +1060,6 @@ export default {
         key > 0
       ) {
         if (len.length == 3 && type) {
-          console.log(this.dragArr);
-          console.log(this.dragVal);
-          console.log(code);
-          console.log(val);
-          console.log(this.dragArr.indexOf(val));
           //判断是否存在符合互斥条件的两条出具,若存在,置空另一条出具
           if (code != "" && this.dragArr.indexOf(val) > -1 && lens == 4) {
             //剂型给药途径互斥判断

src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -187,7 +187,7 @@
             
             <div class="btn_div" v-if="klRuleByIdSub.length > 1 && !scope.row.disabled">
               <img
-                @click="$emit('delGroupChild', scope.row.groupChildId,scope.$index,scope.row.groupId,scope.row.del,scope.row.key)"
+                @click="$emit('delGroupChild', scope.row.groupChildId,scope.$index,scope.row.groupId,scope.row.del,scope.row.key,scope.row.baseTermTypeList.length)"
                 src="../../images/add-new-rule-del.png"
                 alt
               />