Merge branch 'sonHospital1011' into test

src/components/cdssManage/hospital/Hospital.vue

@@ -40,7 +40,7 @@
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
             <el-button @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
-            <span style="margin:0 3px;">|</span>
+            <!-- <span style="margin:0 3px;">|</span>
             <el-button
               @click="resetFildF(scope.row)"
               v-if="scope.row.id !== -1"
@@ -62,7 +62,7 @@
               type="text"
               size="small"
               v-if="scope.row.status === 1"
-            >禁用</el-button>
+            >禁用</el-button> -->
             <span style="margin:0 3px;">|</span>
             <el-button @click="showDelDialog(scope.row)" class="delete" type="text" size="small">删除</el-button>
           </template>