From e2ce0493b0978ed2706eed28555bd83ed329cb97 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 24 七月 2025 11:36:12 +0800
Subject: [PATCH] qx

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

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 76e2459..d039963 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -118,10 +118,10 @@
               @keyup.enter.native="handleQuery"
             />
           </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
@@ -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"
       />
@@ -620,10 +627,10 @@
                   style="width: 160px"
                 />
               </el-form-item>
-              <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+              <el-form-item label="鍗曚綅鍚嶇О" prop="companyId">
                 <el-select
                   :remote-method="getRemoteData"
-                  v-model="formIn.company"
+                  v-model="formIn.companyId"
                   remote
                   default-first-option
                   allow-create
@@ -956,10 +963,11 @@
                     >
                     </el-table-column>
                     <el-table-column label="鎶樻墸" width="160px" align="center">
+                      <!-- @input="validateDiscount(scope.row)" -->
                       <template slot-scope="scope">
                         <el-input-number
                           v-model.number="scope.row.discount"
-                          @input="validateDiscount(scope.row)"
+                          
                           placeholder="杈撳叆鎶樻墸"
                           size="small"
                           type="number"
@@ -1411,10 +1419,10 @@
                   style="width: 160px"
                 />
               </el-form-item>
-              <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+              <el-form-item label="鍗曚綅鍚嶇О" prop="companyId">
                 <el-select
                   :remote-method="getRemoteData"
-                  v-model="formIn.company"
+                  v-model="formIn.companyId"
                   remote
                   default-first-option
                   allow-create
@@ -1732,9 +1740,10 @@
                     </el-table-column>
                     <el-table-column label="鎶樻墸" width="160px" align="center">
                       <template slot-scope="scope">
+                        <!-- @input="validateDiscount(scope.row)" -->
                         <el-input-number
                           v-model.number="scope.row.discount"
-                          @input="validateDiscount(scope.row)"
+                          
                           placeholder="杈撳叆鎶樻墸"
                           size="small"
                           type="number"
@@ -2549,7 +2558,29 @@
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
+     this.startTime = [];
+      this.createTimeList = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        cusName: null,
+        cusSex: null,
+        cusBrithday: null,
+        cusAddr: null,
+        phone: null,
+        yykssj: "", // 棰勭害寮�濮嬫椂闂�
+        yyjssj: "", // 棰勭害缁撴潫鏃堕棿
+        cusPostcode: null,
+        cusEmail: null,
+        indexCard: null,
+        cusNational: null,
+        cusMarryStatus: null,
+        cusIdcard: null,
+        cusIntroduce: null,
+        cusNumber: null,
+        cusIsvip: null,
+      };
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -3100,6 +3131,11 @@
       if (this.formIn.timeRegion === "11:00-12:00") {
         this.formIn.timeRegion = 3;
       }
+      this.CompanyList.forEach((item) => {
+        if (item.drugManufacturerId === this.formIn.companyId) {
+          this.formIn.company = item.cnName;
+        }
+      });
       let data;
       if (pacId) {
         data = {

--
Gitblit v1.8.0