Merge remote-tracking branch 'origin/master'

src/views/equipment-management/use-management/use-management.vue

@@ -62,20 +62,20 @@
     <el-row>
       <el-col :span="12" style="padding-bottom: 20px;">
         <el-button
-          icon="el-icon-top-left"
-          class="fourWordsBtn"
+          class="fourWordswhiteBtn"
+          icon="el-icon-finished"
           @click="selectAll()"
         >选择全部
         </el-button>
         <el-button
-          icon="el-icon-top-right"
-          class="fourWordsBtn"
+          class="fourWordswhiteBtn"
+          icon="el-icon-back"
           @click="reverseSelect(userList)"
         >反向选择
         </el-button>
         <el-button
-          class="fourWordsBtn"
-          icon="el-icon-bottom-left"
+          class="fourWordswhiteBtn"
+          icon="el-icon-upload2"
           @click="handleExport"
         >批量导出
         </el-button>

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/hospitalization-management/hospitalization-management.vue

@@ -62,21 +62,21 @@
 
     <el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
       <el-button
-        class="fourWordsBtn"
+        class="fourWordswhiteBtn"
         icon="el-icon-finished"
         size="mini"
         @click="selectAll()"
       >选择全部
       </el-button>
       <el-button
-        class="fourWordsBtn"
+        class="fourWordswhiteBtn"
         icon="el-icon-back"
         size="mini"
         @click="reverseSelect(hospitalList)"
       >反向选择
       </el-button>
       <el-button
-        class="fourWordsBtn"
+        class="fourWordswhiteBtn"
         icon="el-icon-upload2"
         size="mini"
         @click="handleExport()"

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">