From 4d186d588a4ebae2b2b30e0e7e24c42e9e859c42 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 22 七月 2025 16:56:20 +0800
Subject: [PATCH] 1

---
 src/views/reservation/reservations/index.vue |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index c887aac..525fb4c 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -119,10 +119,10 @@
             />
           </el-form-item>
 
-          <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+          <el-form-item label="鍗曚綅鍚嶇О" prop="companyId">
             <el-select
               :remote-method="getRemoteData"
-              v-model="queryParams.company"
+              v-model="queryParams.companyId"
               remote
               default-first-option
               allow-create
@@ -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,
@@ -2213,7 +2247,7 @@
         phoe: null,
         email: null,
         tjType: null,
-        company: null,
+        companyId: null,
         reservationTime: null,
         isExpire: null,
       },
@@ -2392,15 +2426,29 @@
       this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
     },
     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;
+            // 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() {
@@ -2416,6 +2464,8 @@
         this.queryParams.yyjssj = null;
       }
       listReservation(this.queryParams).then((response) => {
+        console.log(this.queryParams,9999999);
+        
         this.reservationList = response.rows;
         //  response.rows.forEach((item, index) =>
         // {item.newID =(this.queryParams.pageNum - 1) * this.queryParams.pageSize +index +1;
@@ -2467,6 +2517,7 @@
         proIds: null,
         pacId: null,
         company: null,
+        drugManufacturerId:null,
         companyId: null,
         jobNo: null,
         department: null,
@@ -3359,12 +3410,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