Merge remote-tracking branch 'origin/master'

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

@@ -96,10 +96,9 @@
         </el-button>
         <el-button
           v-hasPermi="['business:device:export']"
-          icon="el-icon-back"
           class="fourWordswhiteBtn"
           @click="reverseSelect(deviceList)"
-        >反向选择
+        ><svg-icon icon-class="shuaixuan_icon_fanxiang" />反向选择
         </el-button>
         <el-button
           v-hasPermi="['business:device:import']"

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

@@ -69,9 +69,8 @@
         </el-button>
         <el-button
           class="fourWordswhiteBtn"
-          icon="el-icon-back"
           @click="reverseSelect(userList)"
-        >反向选择
+        ><svg-icon icon-class="shuaixuan_icon_fanxiang" />反向选择
         </el-button>
         <el-button
           class="fourWordswhiteBtn"

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

@@ -66,7 +66,8 @@
         class="fourWordswhiteBtn"
         size="mini"
         @click="selectAll()"
-      ><svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />
+      >
+        <svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />
         选择全部
       </el-button>
       <el-button
@@ -75,7 +76,7 @@
         icon="el-icon-back"
         size="mini"
         @click="reverseSelect(hospitalList)"
-      >反向选择
+      ><svg-icon icon-class="shuaixuan_icon_fanxiang" />反向选择
       </el-button>
       <el-button
         v-hasPermi="['business:hospital:export']"
@@ -108,7 +109,6 @@
       v-loading="loading"
       :data="hospitalList"
       :row-key="getRowKeys"
-      :row-class-name="highlightRow"
       :header-cell-style="{ background:'#F4F4F4'}"
       @selection-change="handleSelectionChange"
     >
@@ -119,6 +119,7 @@
           <span v-if="scope.row.diseaseLevel==='1'">
             <!--                        <img src="/src/assets/images/zhuyuan_bingwei@2x.png">-->
             <svg-icon icon-class="zhuyuan_bingwei" />
+<!--            <el-image src="/tmt-pic/business/fbe41c8939154a01a713d49efeb7b72c-20230902-195608.png"></el-image>-->
           </span>
           <dict-tag v-else-if="scope.row.diseaseLevel" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
           <span v-else>-</span>
@@ -238,6 +239,7 @@
             @click="handleDischargeMe(scope.row)"
           >办理出院</el-button>
           <el-button
+            style="visibility: hidden"
             v-else-if="scope.row.status==='4'"
             icon="el-icon-paperclip"
             plain
@@ -286,6 +288,7 @@ export default {
       //   chooseStatus: '',
       //   wardType: ''
       // },
+      baseURL: process.env.VUE_APP_TEST_API,
       diseaseLevel: '',
       disChargeFlag: '0',
       wardSelectList: [],
@@ -357,11 +360,11 @@ export default {
   },
   methods: {
     moneyFormat,
-    highlightRow(scope) {
-      if (scope.row.diseaseLevel === '1') {
-        return 'height-line'
-      }
-    },
+    // highlightRow(scope) {
+    //   if (scope.row.diseaseLevel === '1') {
+    //     return 'height-line'
+    //   }
+    // },
     // 病房下拉框
     getWardSelect() {
       listWardSelect().then(res => {