From 3453ba7e5243022ad4388da1515dc75ad8d81f94 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期日, 17 五月 2026 15:00:23 +0800
Subject: [PATCH] 近期调试

---
 src/views/business/maintain/index.vue |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/views/business/maintain/index.vue b/src/views/business/maintain/index.vue
index 6c4f9e4..65f602c 100644
--- a/src/views/business/maintain/index.vue
+++ b/src/views/business/maintain/index.vue
@@ -159,36 +159,6 @@
           min-width="180"
           show-overflow-tooltip
         />
-<<<<<<< HEAD
-
-=======
-        <el-table-column
-          label="棣栬瘖鍖荤枟鏈烘瀯"
-          align="center"
-          prop="treatmenthospitalname"
-          width="150"
-          show-overflow-tooltip
-        />
-
-        <!-- <el-table-column
-          label="璁板綍鐘舵��"
-          align="center"
-          prop="recordstate"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <el-tag :type="statusFilter(scope.row.recordstate)">
-              {{ statusTextFilter(scope.row.recordstate) }}
-            </el-tag>
-          </template>
-        </el-table-column> -->
-        <el-table-column
-          label="鍗忚皟鍛�"
-          align="center"
-          prop="coordinatorName"
-          width="100"
-        />
->>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
         <!-- <el-table-column
           label="缁存姢椤圭洰"
           align="center"
@@ -196,6 +166,19 @@
           width="120"
           show-overflow-tooltip
         /> -->
+        <el-table-column
+          label="缁存姢鐘舵��"
+          align="center"
+          prop="state"
+          width="100"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.maintain_type"
+              :value="scope.row.state"
+            />
+          </template>
+        </el-table-column>
         <el-table-column
           label="棣栨缁存姢鏃堕棿"
           align="center"
@@ -298,7 +281,7 @@
 export default {
   name: "MaintenanceList",
   components: { Pagination },
-  dicts: ["sys_user_sex",'sys_BloodType'],
+  dicts: ["sys_user_sex",'sys_BloodType','maintain_type'],
   data() {
     return {
       // 閬僵灞�

--
Gitblit v1.9.3