Merge branch 'groupAdd0819'

src/components/base/LtModal.vue

@@ -225,7 +225,7 @@ export default {
       this.isEdit = true;
       this.editId = this.data.id;
       this.form.hisName = this.data.hisName;
-      this.form.hisDetailName = this.data.hisDetailName;
+      this.form.hisDetailName = this.data.hisDetailName?this.data.hisDetailName:'' ;
       this.form.searchText = this.data.uniqueName;
       this.form.icdCode = this.data.code;
       this.form.conceptId = this.data.conceptId;
@@ -251,7 +251,7 @@ export default {
         this.searchType = 2;
         name = this.data.hisDetailName;
       }
-      console.log(this.ty)
+      console.log(this.ty);
       this.getTermMatching(this.ty, name);
       this.getRelatedMapping();
     }
@@ -301,7 +301,11 @@ export default {
         return;
       }
       const { hisName, hisDetailName } = this.form;
-      if (hisName !== '' && (this.data.hisDetailName == null || this.data.hisDetailName === '') && this.type == 1) {
+      if (
+        hisName !== '' &&
+        (this.data.hisDetailName == null || this.data.hisDetailName === '') &&
+        this.type == 1
+      ) {
         this.ty = 1;
       } else if (hisName !== '' && hisDetailName !== '' && this.type == 1) {
         this.ty = 2;
@@ -424,8 +428,10 @@ export default {
             source
           } = this.form;
           // 当标准术语是套餐时，细项必须为空
-          console.log(this.searchType);
+        console.log(hisDetailName);
+        
           if (this.searchType === 1 && hisDetailName !== '') {
+            console.log(123);
             this.warning('医院术语与标准术语类型不匹配，请修改');
             return;
           }

src/components/knowledgeExtra/AddTermSet.vue

@@ -302,7 +302,8 @@
               class="tabs"
               ref="tables"
               @row-click="btn"
-              :header-row-style="{height:'40px'}"
+              :header-row-style="{height:'40px',cursor: 'pointer'}"
+              :row-style="{height:'40px',cursor: 'pointer'}"
               :header-cell-style="{height:'40px',borderColor:'#DCDFE6'}"
               @selection-change="handleSelectionChange"
             >
@@ -541,25 +542,26 @@ export default {
       }
     },
     btn(row) {
-      if (this.whether) {
-        return;
-      }
-      let concepts = {
-        conceptId: row.conceptId,
-        conceptLibType: row.libType,
-        conceptLibName: row.conceptName
-      };
-      this.excludedConceptIds.push(row.conceptId);
-      this.form.concepts.push(concepts);
-      this.leftList = this.form.concepts;
-      this.conceptList = [];
-      this.searchtext = '';
-      this.searchtext2 = '';
-      this.$nextTick(() => {
-        setTimeout(() => {
-          this.getTreeSearchList();
-        }, 150);
-      });
+      // if (this.whether) {
+      //   return;
+      // }
+      // let concepts = {
+      //   conceptId: row.conceptId,
+      //   conceptLibType: row.libType,
+      //   conceptLibName: row.conceptName
+      // };
+      // this.excludedConceptIds.push(row.conceptId);
+      // this.form.concepts.push(concepts);
+      // this.leftList = this.form.concepts;
+      // this.conceptList = [];
+      // this.searchtext = '';
+      // this.searchtext2 = '';
+      // this.$nextTick(() => {
+      //   setTimeout(() => {
+      //     this.getTreeSearchList();
+      //   }, 150);
+      // });
+      this.$refs.tables.toggleRowSelection(row)
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;

src/components/testManager/staticKnowledgeMap/StaticKnowledgeMapTest.vue

@@ -152,7 +152,7 @@ export default {
   methods: {
     getRunningState() {
       api
-        .getRunningState({ caseGroup: 1 })
+        .getRunningState({ caseGroup: 2 })
         .then(res => {
           if (res.data.code == '0') {
             this.implement = res.data.data