Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

src/components/icss/ConceptRelation.vue

@@ -160,9 +160,14 @@ export default {
           this.$router.push({name:'AddConceptRelation',params:pam})
         },
         modifyRelation(row) {
+          const typeL = this.filter.type.toString().split('101');
+          const typeId = [];
+          typeId[0] = +typeL[1];
             const param = {
               "conceptId": row.conceptId,
-              "relationId":17
+              // "relationId":17
+              "relationIds":[17],//9-20新增
+              "typeIds":typeId
             }
           const pam = this.searched ? {
             currentPage: this.currentPage,
@@ -223,10 +228,14 @@ export default {
         },
         showDelDialog(row){
           this.showConfirmDialog('是否删除该关联？',()=>{
+            const typeL = this.filter.type.toString().split('101');
+            const typeId = [];
+            typeId[0] = +typeL[1];
             const param = {
               "conceptId": row.conceptId,
-              "isDeleted": row.isDeleted=== 'N'?'Y':'N',
-              "relationId": 17
+              // "isDeleted": row.isDeleted=== 'N'?'Y':'N',
+              "relationIds":[17],//9-20新增
+              "typeIds":typeId
             }
             api.delConceptRelation(param).then((res)=>{
               if(res.data.code=='0'){