From 33866d2966fc9c99234078b1aa01aa7e8a07ac41 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Mon, 17 Jul 2023 19:03:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/reservation/reservation.vue  | 26 ++++++++++++++++---
 .../turndelivery/deliveryDiscuss.vue          |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 32d57717..b98a225f 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -73,6 +73,7 @@
                     <template #default="slotProps">
                         <el-button size="small" @click="viewReservation(slotProps.scope)">查看</el-button>
                         <el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
+                        <br/>
                         <el-button size="small" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
                     </template>
                 </tablecmt>
@@ -183,6 +184,21 @@
       </span>
         </template>
     </el-dialog>
+
+
+    <el-dialog title="预约取消"
+               v-model="dialogCancelReservation"
+               style="width: 50%;height: 50%" >
+        <el-form :model="form" >
+            <el-form-item label="原因:" >
+                <el-input v-model="form.message" autocomplete="off"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogCancelReservation = false">取 消</el-button>
+            <el-button type="primary" @click="dialogCancelReservation = false">确 定</el-button>
+        </div>
+    </el-dialog>
 </template>
 
 <script>
@@ -496,8 +512,8 @@
         loaderData: [],
         goodsAreaIdData: [],
         deptId: '',
-        visible: false,
-        message: ''
+        dialogCancelReservation: false,
+        message: '',
       };
     },
     mounted() {
@@ -616,8 +632,10 @@
         const { row } = scope;
         console.log(row);
       },
-      cancelReservation(){
-
+      cancelReservation(scope){
+        const { row } = scope;
+        this.dialogCancelReservation = true;
+        console.log(row);
       },
       editsolt(scope) {
         const { row } = scope;
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index be3ec3f1..d19618f5 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -1230,7 +1230,7 @@
         this.loadAndUnload = [];
       },
       handleAddOrder() {
-        this.query.typeService=2;
+        this.query.typeService=1;
         let page =this.page;
         let params = {};
         selectStockArticleList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{