From 5b58a2c07e2317b2dc8f60c6bfe83dd0774896bc Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 04 七月 2025 17:36:21 +0800
Subject: [PATCH] 1

---
 src/views/reservation/reservations/index.vue |   61 +++++++++++++++---------------
 1 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 371047c..806b615 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
@@ -409,14 +409,21 @@
       <el-table-column
         label="濂楅鍚嶇О"
         align="center"
-        prop="tcmc"
+        prop="dwDeptName"
         :show-overflow-tooltip="true"
         width="160px"
       />
       <el-table-column
         label="鍒嗙粍鍚嶇О"
         align="center"
-        prop="fzmc"
+        prop="groupingName"
+        :show-overflow-tooltip="true"
+        width="160px"
+      />
+      <el-table-column
+        label="鍒嗙粍鍚嶇О"
+        align="center"
+        prop="department"
         :show-overflow-tooltip="true"
         width="160px"
       />
@@ -2033,6 +2040,7 @@
       webSocket: null,
       defaultKeys: [],
       deptList: [],
+      groupingList: [],
       value1: "",
       pacName: "",
       hides: false,
@@ -2429,7 +2437,8 @@
       this.open1 = true;
       this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
     },
-    idFn1(value) {
+     idFn1(value) {
+      console.log(value)
       if (value) {
         this.form.dictCompId = value;
         this.CompanyList.forEach((item) => {
@@ -2438,7 +2447,21 @@
             this.queryParams.company = item.cnName;
           }
         });
+        Deptlist(value).then((response) => {
+          this.deptList = response.data;
+        });
       }
+    },
+      idFn2(value) {
+      let data = {
+        deptId: value,
+        dwId: this.form.dictCompId,
+      };
+      getDwAndDwDept(data).then((response) => {
+        // 閮ㄩ棬鍚嶇О
+        this.groupingList = response.data;
+
+      });
     },
     dateChangebirthday2(val) {
       this.startTime = val;
@@ -2489,32 +2512,8 @@
         });
       }
     },
-    idFn1(value) {
-      console.log(value)
-      if (value) {
-        this.form.dictCompId = value;
-        this.CompanyList.forEach((item) => {
-          if (item.drugManufacturerId == this.form.dictCompId) {
-            this.form.compName = item.cnName;
-            this.queryParams.company = item.cnName;
-          }
-        });
-        Deptlist(value).then((response) => {
-          this.deptList = response.data;
-        });
-      }
-    },
-    idFn2(value) {
-      let data = {
-        deptId: value,
-        dwId: this.form.dictCompId,
-      };
-      getDwAndDwDept(data).then((response) => {
-        // 閮ㄩ棬鍚嶇О
-        this.groupingList = response.data;
-
-      });
-    },
+   
+  
     // 琛ㄥ崟閲嶇疆
     reset() {
       this.form = {

--
Gitblit v1.8.0