Merge remote-tracking branch 'origin/master'

src/views/article-management/article-management.vue

 <template>
   <div style="background-color: #FFFFFF;">
     <div class="app-container">
-      <el-tabs v-model="activeName">
-        <el-tab-pane name="article" label="文章管理">
       <!--顶部搜索区-->
       <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px">
         <el-form-item prop="articleTitle">
@@ -210,8 +208,6 @@
         :total="total"
         @pagination="getList"
       />
-        </el-tab-pane>
-      </el-tabs>
 
       <!-- 添加或修改文章对话框 -->
       <el-dialog :title="title" :visible.sync="open" append-to-body width="60%">
@@ -568,7 +564,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .app-container {
-  padding: 0 1.5rem;
+  padding: 1.5rem;
   margin-bottom: 0.5em;
 }
 

src/views/service-management/hospitalization-management/hospitalization-details.vue

@@ -38,6 +38,7 @@
                   <el-col :span="8">
                     <!--宠物品种-->
                     <el-form-item label="宠物品种" prop="petBreed" class="petBreed">
+                      <el-input v-model="detailInfo.petBreed" placeholder="暂无数据" disabled class="half__-5px" />
                       <el-input
                         v-model="detailInfo.petChildBreed"
                         placeholder="暂无数据"

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -100,6 +100,7 @@
       >批量导出
       </el-button>
       <el-button
+        v-hasPermi="['business:check:item']"
         class="fourWordsBtn"
         icon="el-icon-setting"
         size="mini"

src/views/service-management/treatment-management/treatment-detail.vue

@@ -116,14 +116,14 @@
       <el-row v-show="treatSchedule<=1">
         <el-col :span="8">
           <el-form-item label="代缴费金额">
-            <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
+            <span>￥{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-show="treatSchedule>1">
         <el-col :span="8">
           <el-form-item label="缴费金额">
-            <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
+            <span>￥{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">