From ad54cf427ee94e01e8c72a01f738615eb2b6569d Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 04 七月 2025 17:58:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/reservation/reservations/index.vue |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index c887aac..119a39e 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -142,6 +142,18 @@
             <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
           </el-form-item>
 
+          <!-- <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" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="鍒嗙粍鍚嶇О" prop="groupingName">
+            <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 label="棰勭害鏃堕棿">
             <el-date-picker
               clearable
@@ -184,6 +196,7 @@
               />
             </el-select>
           </el-form-item>
+
           <el-form-item>
             <el-button
               type="primary"
@@ -319,7 +332,7 @@
           <span>{{ parseTime(scope.row.reservationTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="浣撴绫诲瀷"
         align="center"
         prop="tjType"
@@ -329,7 +342,7 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="濠氬Щ"
         align="center"
@@ -379,9 +392,23 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="閭"
+        label="濂楅鍚嶇О"
         align="center"
-        prop="email"
+        prop="dwDeptName"
+        :show-overflow-tooltip="true"
+        width="160px"
+      />
+      <el-table-column
+        label="鍒嗙粍鍚嶇О"
+        align="center"
+        prop="groupingName"
+        :show-overflow-tooltip="true"
+        width="160px"
+      />
+      <el-table-column
+        label="鍗曚綅閮ㄩ棬"
+        align="center"
+        prop="department"
         :show-overflow-tooltip="true"
         width="160px"
       />
@@ -1920,7 +1947,12 @@
 </template>
 
 <script>
-import { addComp, addPlOrderAndDetail } from "@/api/system/comp";
+import {
+  addComp,
+  addPlOrderAndDetail,
+  Deptlist,
+  getDwAndDwDept,
+} from "@/api/system/comp";
 import Big from "big.js";
 import { Loading } from "element-ui";
 import {
@@ -1989,6 +2021,8 @@
       taocan: false,
       webSocket: null,
       defaultKeys: [],
+      deptList: [],
+      groupingList: [],
       value1: "",
       pacName: "",
       hides: false,
@@ -2392,6 +2426,7 @@
       this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
     },
     idFn1(value) {
+      console.log(value);
       if (value) {
         this.form.dictCompId = value;
         this.CompanyList.forEach((item) => {
@@ -2400,7 +2435,20 @@
             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;
+      });
     },
     /** 鏌ヨ浣撴棰勭害鍒楄〃 */
     getList() {
@@ -3359,12 +3407,14 @@
   -moz-border-radius: 2em;
   border-radius: 2em;
 }
+
 .dialog-footer2 {
   width: 960px;
   height: 36px;
   display: flex;
   justify-content: center;
 }
+
 /* 淇敼 婊戝潡 */
 #printIframe::-webkit-scrollbar-thumb {
   background-color: #dcdfe6;

--
Gitblit v1.8.0