Merge branch 'diagBase0706' into test

src/components/knowledgeExtra/AddDiagBase.vue

@@ -660,6 +660,9 @@ export default {
             klDiagnoseDetailj[k].conceptList = this.formatData2(
               klDiagnoseDetailj[k].libNameList
             );
+            klDiagnoseDetailj[k].basConceptList = this.formatData2(
+              klDiagnoseDetailj[k].libNameList
+            );
             if (klDiagnoseDetailj[k].basType == 1) {
               klDiagnoseDetailj[k].libNameList.forEach(item => {
                 this.arr.push(item.basConceptId);
@@ -1138,7 +1141,7 @@ export default {
           this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[i]
         )
       );
-      this.basConceptId = [];
+      let basConceptId = [];
       let data2 = formData.basConceptList.filter(it => {
         let arr = formData.basConceptId.map(v => v.conceptId);
         return !arr.includes(it.conceptId);
@@ -1146,13 +1149,13 @@ export default {
       formData.basConceptId.forEach(item => {
         data2.forEach(it => {
           if (item == it.conceptId) {
-            this.basConceptId.push(it);
+            basConceptId.push(it);
           }
         });
       });
       this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
         i
-      ].conceptList = this.basConceptId;
+      ].conceptList = basConceptId;
     },
     //医学标准术语
     conceptChange(val, inx, index, i, basType) {
@@ -1205,9 +1208,9 @@ export default {
                 ].conceptList = data2; // 改变了的值
                 formData.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
                   i
-                ].basConceptList = formData.klDiagnoseTypeVO[inx].groupVO[
+                ].basConceptList =  formData.klDiagnoseTypeVO[inx].groupVO[
                   index
-                ].klDiagnoseDetail[i].basConceptList.concat(data);
+                ].klDiagnoseDetail[i].basConceptList.concat(data2);
               } else {
                 formData.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
                   i
@@ -1548,11 +1551,11 @@ export default {
 <style lang="less" scoped>
 @import '../../less/admin.less';
 
-.box-o{
-  /deep/ .el-select{
+.box-o {
+  /deep/ .el-select {
     width: 210px;
   }
-  /deep/.el-input--suffix .el-input__inner{
+  /deep/.el-input--suffix .el-input__inner {
     height: 30px !important;
   }
 }