Merge branch 'ChronicMag_zxc' into dev

src/components/icss/AddMedicalMultRelation.vue

@@ -18,15 +18,15 @@
             <li 
               v-for="item in conceptList" 
               class="conceptItem ellipsis"
-              :title="item.nameAndType"
+              :title="item.conceptNameType"
               @click="selectConcept(item)"
-              :key="item.id">
-              {{item.nameAndType}}
+              :key="item.conceptId">
+              {{item.conceptNameType}}
             </li>
           </ul>
         </div>
-
-        <el-tree
+        <div class="tree">
+          <el-tree
             :data="list"
             show-checkbox
             :props="defaultProps"
@@ -54,7 +54,9 @@
                   </el-button>
                 </span>
             </span>
-        </el-tree>
+          </el-tree>
+        </div>
+        
         <div class="btn">
           <el-button
             type="primary"
@@ -208,12 +210,12 @@ import api from '@api/icss.js';
         
         const param = {
           "name": this.conceptText,
-          "isMedical": 1,
-          "isConcept": 1,
           "excludedConceptIds": this.excludedConceptIds,
+          "relationId": 17,
+          "relationPosition": 1,
         }
         
-        api.getAllConcept(param).then((res) => {
+        api.getConceptInfoAssay(param).then((res) => {
           const { data } = res
           if(data.code == '0') {
             this.conceptList = data.data
@@ -222,11 +224,11 @@ import api from '@api/icss.js';
       },
       selectConcept(item) {
         if(this.addLevel == 0) {
-          this.list.push(Object.assign({}, item,  {nodeList: [], level: 0, conceptId: item.id, conceptNameType: item.nameAndType, sonRelationId: 17}))
+          this.list.push(Object.assign({}, item,  {nodeList: [], level: 0, conceptId: item.conceptId, conceptNameType: item.conceptNameType, sonRelationId: 17}))
           this.list = JSON.parse(JSON.stringify(this.list))
         }else {
           const data = this.operaList
-          const newChild = Object.assign({}, item,  {nodeList: [], level: data.level+1, conceptId: item.id, conceptNameType: item.nameAndType, relationId: 17});
+          const newChild = Object.assign({}, item,  {nodeList: [], level: data.level+1, conceptId: item.conceptId, conceptNameType: item.conceptNameType, relationId: 17});
           // const newChild = { id: id++, label: 'nodeList', level: data.level+1, children: [] };
           if (!data.nodeList) {
           this.$set(data, 'nodeList', []);
@@ -279,6 +281,9 @@ import api from '@api/icss.js';
 .addMedicalMultRelationWrapper {
   height: calc(100% - 70px);
 }
+.tree {
+  margin-bottom: 230px;
+}
 .contents {
   height: 100%;
 }

src/components/icss/MedicalMultRelation.vue

@@ -102,7 +102,6 @@
     },
     methods: {
       toEditProduct(row){
-        console.log('roww', row)
         const param = {
           conceptId: row.conceptId,
           relationId: 17