From 7958d0726ed898b9eb53f2a8444914cae0e1ac96 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 04 七月 2025 17:23:43 +0800
Subject: [PATCH] 1

---
 src/views/reservation/reservations/index.vue |   11 +++++++++--
 src/views/doctor/checkAll/index.vue          |   40 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 38b200a..2a5907d 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -341,8 +341,9 @@
                   </div>
                   <template v-if="item.jyjc == '0'">
                     <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
-                      :header-cell-style="{ background: '#67C23A' }" :expand-row-keys="expends" :row-key="getRowKeys"
+                      :header-cell-style="{ background: '#67C23A' }"  :row-key="getRowKeys"
                       v-loading="loading">
+                      <!-- :expand-row-keys="expends" -->
                       <el-table-column type="expand">
                         <template slot-scope="props">
                           <div style="padding: 10px;">
@@ -389,11 +390,29 @@
                       <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="85"></el-table-column>
                       <el-table-column align="center" prop="stanId" label=" 鍙傝�冭寖鍥�" width="117"></el-table-column>
                       <el-table-column align="center" prop="proAdvice" label="鍗曚綅" width="78"></el-table-column>
+                      <el-table-column
+                        label="鎿嶄綔"
+                        align="center"
+                        class-name="small-padding fixed-width"
+                        width="60"
+                        fixed="right"
+                      >
+                        <template slot-scope="props">
+                          <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="shanchu(props.row)"
+                          >
+                          </el-button>
+                        </template>
+                      </el-table-column>
                     </el-table>
                   </template>
                   <template v-if="item.jyjc == '1'">
                     <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
-                      :header-cell-style="{ background: '#67C23A' }" :expand-row-keys="expends" :row-key="getRowKeys">
+                      :header-cell-style="{ background: '#67C23A' }" :row-key="getRowKeys">
+                      <!-- :expand-row-keys="expends"  -->
                       <el-table-column type="expand">
                         <template slot-scope="props">
                           <div style="padding: 10px;">
@@ -438,6 +457,23 @@
                         </template>
                       </el-table-column>
                       <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="403"></el-table-column>
+                      <el-table-column
+                        label="鎿嶄綔"
+                        align="center"
+                        class-name="small-padding fixed-width"
+                        width="60"
+                        fixed="right"
+                      >
+                        <template slot-scope="props">
+                          <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="shanchu(props.row)"
+                          >
+                          </el-button>
+                        </template>
+                      </el-table-column>
                     </el-table>
                   </template>
                 </div>
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 76e2459..3a996ed 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -141,7 +141,7 @@
             <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
           </el-form-item>
 
-           <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
+          <!--  <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
             <el-select v-model="queryParams.dwDeptName" placeholder="璇烽�夋嫨濂楅鍚嶇О" clearable style="width: 100%"
               @change="idFn2">
               <el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
@@ -152,7 +152,7 @@
             <el-select v-model="queryParams.groupingName" placeholder="璇烽�夋嫨鍒嗙粍鍚嶇О" clearable style="width: 100%">
               <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.pacName" :value="dict.id" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="棰勭害鏃堕棿">
             <el-date-picker
               clearable
@@ -421,6 +421,13 @@
         width="160px"
       />
       <el-table-column
+        label="鍒嗙粍鍚嶇О"
+        align="center"
+        prop="department"
+        :show-overflow-tooltip="true"
+        width="160px"
+      />
+      <el-table-column
         label="鍦板潃"
         align="center"
         prop="address"

--
Gitblit v1.8.0