From 31badcdb4ce90f9b52c15267500d498da29cda16 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 08 八月 2024 16:57:26 +0800
Subject: [PATCH] su

---
 dist.zip                                  |    0 
 src/views/reservation/resercopy/index.vue |   11 ++++++-----
 src/api/team/tuanti.js                    |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dist.zip b/dist.zip
index 525394a..4a05d16 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/team/tuanti.js b/src/api/team/tuanti.js
index a632830..024a847 100644
--- a/src/api/team/tuanti.js
+++ b/src/api/team/tuanti.js
@@ -21,7 +21,7 @@
 //鍥綋棰勭害纭鎺ュ彛 (鏂扮増鏈�)
 export function newConfirm(data) {
   return request({
-    url: '/reservation/reservation/newReservationConfirm' ,
+    url: '/reservation/reservation/newReservationConfirmxbb' ,
     method: 'post',
     data:data
   })
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 418d563..b82e029 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -29,7 +29,7 @@
         </el-select>
         <i class="el-icon-circle-plus-outline" @click="handleAdd"></i>
       </el-form-item>
-      <el-form-item label="閮ㄩ棬" prop="dwDeptName">
+      <!-- <el-form-item label="閮ㄩ棬" prop="dwDeptName">
         <el-select
           v-model="objs.dwDeptName"
           placeholder="璇烽�夋嫨閮ㄩ棬"
@@ -45,7 +45,7 @@
           />
         </el-select>
         <i class="el-icon-circle-plus-outline" @click="handleAddbumen"></i>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="鍒嗙粍" prop="payType">
         <el-select v-model="objs.payType" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 200px" clearable>
           <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.groupingName" :value="dict.id" />
@@ -474,7 +474,6 @@
 
       objs: {
         drugManufacturerId: "",
-        dwDeptName: "",
         reservationTime: "",
         yxts:"30",
       },
@@ -507,7 +506,7 @@
         // 涓婁紶鐨勫湴鍧�
         url:
           process.env.VUE_APP_BASE_API +
-          "/reservation/reservation/newExcelImport",
+          "/reservation/reservation/newExcelImportNotDwDeptId",
       },
       // 鏌ヨ鍙傛暟
       queryParam: {
@@ -971,13 +970,15 @@
 
     /** 纭鎸夐挳 */
     submitForm() {
-      if (this.objs.reservationTime && this.data.dwDeptId) {
+      // if (this.objs.reservationTime && this.data.dwDeptId) {
+      if (this.objs.reservationTime) {
         let data = {
           copeWith: this.ListObj.hjMoney,
           reservations: this.userList,
           reservationTime: this.objs.reservationTime,
           dwDeptId: this.data.dwDeptId,
           yxts:this.objs.yxts,
+           dwId: this.data.dwId,
         };
         newConfirm(data).then((res) => {
           this.$modal.msgSuccess("鎻愪氦鎴愬姛");

--
Gitblit v1.8.0