Merge branch 'termLink0615' into test

# Conflicts:
#	src/components/knowledgeExtra/AddDiagBase.vue

src/components/knowledgeExtra/AddDiagBase.vue

@@ -263,6 +263,24 @@
                         :rules="rules.subConceptId"
                       >
                         <el-select
+                        class="searchselect"
+                          v-model.trim="items.basConceptId"
+                          multiple
+                          filterable
+                          remote
+                          reserve-keyword
+                          placeholder="请输入关键词"
+                          :remote-method="(val)=>searchConcept(val,scope.$index,index,i)"
+                          @change="(val)=>conceptChange(val,scope.$index,index,i)"
+                        >
+                          <el-option
+                            v-for="item in items.conceptList"
+                            :key="item.conceptId"
+                            :label="item.conceptName"
+                            :value="item.conceptId"
+                          ></el-option>
+                        </el-select>
+                        <!-- <el-select
                           clearable
                           remote
                           filterable
@@ -276,7 +294,7 @@
                             :label="item.conceptName"
                             :value="item.conceptId"
                           ></el-option>
-                        </el-select>
+                        </el-select>-->
                       </el-form-item>
                     </div>
                     <div class="last-box" v-if="v.title == '依据具体内容'">
@@ -495,7 +513,7 @@ export default {
         { title: '基础依据名称', width: 160, istar: true },
         { title: '基础依据类型', width: 130, istar: true },
         { title: '基础依据术语类型', width: 160, istar: true },
-        { title: '医学标准术语', width: 130, istar: true },
+        { title: '医学标准术语', width: 180, istar: true },
         { title: '依据具体内容', width: 850 }
       ],
       dicts: {},
@@ -527,7 +545,7 @@ export default {
                     onlyNumType: false,
                     onlyTxtType: false,
                     basTypeName: '',
-                    basConceptId: '',
+                    basConceptId: [],
                     basDescription: '',
                     basLename: '',
                     basLibName: '',
@@ -599,6 +617,7 @@ export default {
         item => item.ruleType === this.form.klDiagnoseTypeVO[0].conditionType
       );
       this.baseTermTypeList = this.baseTypes[index2].subMenuList;
+<<<<<<< HEAD
       const klDiagnoseTypeVO =this.form.klDiagnoseTypeVO;
       let groupVOi,klDiagnoseDetailj;
       for (let i = 0; i < klDiagnoseTypeVO.length; i++) {
@@ -606,19 +625,44 @@ export default {
         for (let j = 0; j < groupVOi.length; j++) {
           klDiagnoseDetailj = groupVOi[j].klDiagnoseDetail;
           for (let k = 0;k <groupVOi[j].klDiagnoseDetail.length;k++) {
+=======
+      let arr = [];
+      for (let i = 0; i < this.form.klDiagnoseTypeVO.length; i++) {
+        for (let j = 0; j < this.form.klDiagnoseTypeVO[i].groupVO.length; j++) {
+          for (
+            let k = 0;
+            k <
+            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail.length;
+            k++
+          ) {
+>>>>>>> termLink0615
             var index2 = this.baseTermTypeList.findIndex(
               item =>item.type ===klDiagnoseDetailj[k].basType
             );
               klDiagnoseDetailj[k].basLibTypeList = this.baseTermTypeList[index2].subMenuList;
 
-              klDiagnoseDetailj[k].conceptList = [
-              {
-                conceptName: klDiagnoseDetailj[k].basLibName,
-                conceptId: klDiagnoseDetailj[k].basConceptId
-              }
-            ];
-            if (klDiagnoseDetailj[k].maxOperator || klDiagnoseDetailj[k].minOperator) {
-                klDiagnoseDetailj[k].dataType = '1';
+            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
+              k
+            ].conceptList = this.formatData2(this.form.klDiagnoseTypeVO[i].groupVO[
+              j
+            ].klDiagnoseDetail[k].libNameList)
+            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
+              k
+            ].libNameList.forEach(item => {
+              arr.push(item.basConceptId);
+            });
+            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
+              k
+            ].basConceptId = arr;
+            if (
+              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
+                .maxOperator ||
+              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
+                .minOperator
+            ) {
+              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
+                k
+              ].dataType = '1';
             } else if (
                 klDiagnoseDetailj[k].eqValue) {
                 klDiagnoseDetailj[k].dataType = '2';
@@ -798,7 +842,7 @@ export default {
       }
     },
     getInitData() {
-      this.i++
+      this.i++;
       return {
         conditionType: '',
         depart_id: this.i,
@@ -814,7 +858,7 @@ export default {
                 onlyNumType: false,
                 onlyTxtType: false,
                 basTypeName: '',
-                basConceptId: '',
+                basConceptId: [],
                 basDescription: '',
                 basLename: '',
                 basLibName: '',
@@ -851,7 +895,7 @@ export default {
     },
     //复制依据
     copyDiag(id) {
-      this.i++
+      this.i++;
       const formData = JSON.parse(JSON.stringify(this.form));
       let i = -1;
       let arr = [];
@@ -866,6 +910,37 @@ export default {
         this.form.klDiagnoseTypeVO.splice(i + index + 1, 0, item);
       });
       // console.log(this.form.klDiagnoseTypeVO);
+
+      // let map = {},
+      //   dest = [];
+      // for (let i = 0; i < formData.klDiagnoseTypeVO.length; i++) {
+      //   let ai = formData.klDiagnoseTypeVO[i];
+      //   if (!map[ai.depart_id]) {
+      //     dest.push({
+      //       depart_id: ai.depart_id,
+      //       conditionType: ai.conditionType,
+      //       groupVO: ai.groupVO
+      //     });
+      //     map[ai.depart_id] = ai;
+      //   } else {
+      //     for (let j = 0; j < dest.length; j++) {
+      //       var dj = dest[j];
+      //       if (dj.depart_id == ai.depart_id) {
+      //         dj.groupVO = dj.groupVO.concat(ai.groupVO);
+      //         break;
+      //       }
+      //     }
+      //   }
+      // }
+      // var index = dest.findIndex(item => {
+      //   return item.depart_id == id;
+      // });
+      // JSON.parse(JSON.stringify(dest[index])).depart_id=this.i
+      // dest.splice(index + 1, 0, JSON.parse(JSON.stringify(dest[index])));
+      // dest.forEach((item, i) => {
+      //   item.depart_id = i;
+      // });
+      // this.form.klDiagnoseTypeVO = JSON.parse(JSON.stringify(dest));
     },
     //删除依据
     delDiag(id, inx) {
@@ -891,7 +966,7 @@ export default {
             onlyNumType: false,
             onlyTxtType: false,
             basTypeName: '',
-            basConceptId: '',
+            basConceptId: [],
             basDescription: '',
             basLename: '',
             basLibName: '',
@@ -920,7 +995,7 @@ export default {
         dataType: '',
         basNameType: false,
         basTypeName: '',
-        basConceptId: '',
+        basConceptId: [],
         basDescription: '',
         basLename: '',
         basLibName: '',
@@ -1027,7 +1102,7 @@ export default {
 
       this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
         i
-      ].basConceptId = '';
+      ].basConceptId = [];
       if ((this.numTypes + ',').indexOf(val + ',') > -1) {
         this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
           i
@@ -1059,19 +1134,20 @@ export default {
       this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
         i
       ].basConceptId = val;
-      if (val) {
-        this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
-          i
-        ].basLibName = this.form.klDiagnoseTypeVO[inx].groupVO[
-          index
-        ].klDiagnoseDetail[i].conceptList.find(
-          it => it.conceptId === val
-        ).conceptName;
-      } else {
-        this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
-          i
-        ].basLibName = '';
-      }
+      console.log(val);
+      // if (val) {
+      //   this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
+      //     i
+      //   ].basLibName = this.form.klDiagnoseTypeVO[inx].groupVO[
+      //     index
+      //   ].klDiagnoseDetail[i].conceptList.find(
+      //     it => it.conceptId === val
+      //   ).conceptName;
+      // } else {
+      //   this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
+      //     i
+      //   ].basLibName = '';
+      // }
     },
     searchConcept(val, inx, index, i) {
       const formData = JSON.parse(JSON.stringify(this.form));
@@ -1116,7 +1192,7 @@ export default {
     clearConcept(val, inx, index, i) {
       this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
         i
-      ].basConceptId = '';
+      ].basConceptId = [];
       this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
         i
       ].basLibName = '';
@@ -1190,6 +1266,14 @@ export default {
       //console.log(JSON.parse(str))
       return JSON.parse(str);
     },
+    formatData2(data) {
+      //转换字段名
+      let str = JSON.stringify(data)
+        .replace(/basLibName/g, 'conceptName')
+        .replace(/basConceptId/g, 'conceptId');
+      //console.log(JSON.parse(str))
+      return JSON.parse(str);
+    },
     searchDiag(val) {
       const param = {
         diseaseName: val
@@ -1349,7 +1433,6 @@ export default {
       });
     },
     confirm() {
-      
       const formData = JSON.parse(JSON.stringify(this.form));
       const _this = this;
       for (let i = 0; i < formData.klDiagnoseTypeVO.length; i++) {
@@ -1408,6 +1491,12 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '../../less/admin.less';
+
+/deep/ .searchselect{
+  .el-input{
+    height: 100%!important;
+  }
+}
 .contents {
   height: 100%;
   .content {