Merge branch 'ChronicMag_zxc' into dev

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="AddChemicalAndCommonMappingWrapper clearfix">
+    <div class="AddChemicalAndCommonMappingWrapper clearfix" @click="close">
         <!-- <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
@@ -125,6 +125,14 @@ export default {
         // }
     },
     methods: {
+        close() {
+            this.mealNameList = [];
+            this.itemNameList =[];
+            this.uniqueNameList = [];
+            this.$refs['mealNameList'].style.display='none';
+            this.$refs['itemNameList'].style.display='none';
+            this.$refs['uniqueNameList'].style.display='none';
+        },
         back() {
             this.$router.go(-1)
         },

src/components/icss/AddChronicAndIndexRelation.vue

@@ -1,6 +1,6 @@
 <!-- 添加常见科室症状  -->
 <template>
-    <div class="AddChronicAndIndexRelationWrapper">
+    <div class="AddChronicAndIndexRelationWrapper" @click="close">
         <!-- <div class="groupTitle"><i
             class="el-icon-back"
             @click="back"
@@ -117,6 +117,12 @@
         // }
     },
     methods: {
+        close() {
+            this.diagList = [];
+            this.indexList = [];
+            this.$refs['diagList'].style.display = 'none';
+            this.$refs['indexList'].style.display = 'none';
+        },
         back(){
             this.$router.go(-1);
         },

src/components/icss/AddDisAndScaleRelation.vue

@@ -1,6 +1,6 @@
 <!-- 添加常见科室症状  -->
 <template>
-    <div class="addDisAndScaleRelationWrapper">
+    <div class="addDisAndScaleRelationWrapper" @click="close">
         <!-- <div class="groupTitle"><i
             class="el-icon-back"
             @click="back"
@@ -148,6 +148,10 @@
         }
     },
     methods: {
+        close() {
+            this.diagList =[];
+            this.$refs['diagList'].style.display='none' ;
+        },
         back(){
             this.$router.go(-1);
         },

src/components/icss/DisAndScaleRelation.vue

@@ -56,7 +56,7 @@
                     <template slot-scope="scope">
                         <el-button  @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                        <el-button @click="showDelDialog(scope.row)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -181,9 +181,9 @@ export default {
             resolve();
           }).catch(() => {});
         },
-        showDelDialog(id){
+        showDelDialog(row){
           this.showConfirmDialog('是否删除该关联？',()=>{
-            api.delDisScaleInfo({id:id}).then((res)=>{
+            api.delDisScaleInfo({delId:row.delId}).then((res)=>{
               if(res.data.code=='0'){
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');