From fb8d9cf548a05d3d7c6b3cc8fde46b1c9a449083 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 17 Aug 2023 20:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/distributionReservation.js    | 11 ++++++++---
 .../distribution/turndelivery/deliveryDiscuss.vue     |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/option/distribution/distributionReservation.js b/src/option/distribution/distributionReservation.js
index 87a88404..92c62a16 100644
--- a/src/option/distribution/distributionReservation.js
+++ b/src/option/distribution/distributionReservation.js
@@ -411,11 +411,16 @@ export default {
       width: '100',
       search: true
     },
+    // {
+    //   label: '服务类型',
+    //   prop: 'typeService',
+    //   width: '100',
+    //   search: true
+    // },
     {
       label: '服务类型',
-      prop: 'typeService',
-      width: '100',
-      search: true
+      prop: 'typeServerName',
+      width: '100'
     },
     {
       label: '顾客名字',
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index baff682c..9f45313e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -1049,6 +1049,10 @@
        * 订单提交
        */
       onSubmitBusiness() {
+        if (this.orderData.length===0){
+          this.$message.warning('请选择订单');
+          return;
+        }
         if (this.deliveryListId){
           let data = {};
           let tripartite = {};
@@ -1551,6 +1555,7 @@
         this.query={};
       },
       async onLoad(page, params = {}) {
+        this.stockUpForm.deliveryType="1";
         console.log("》》》》》》》》》》》》》》》",this.deliveryListId);
         if (this.deliveryListId){
           getDeliveryList(this.deliveryListId).then( async res=>{
@@ -1635,7 +1640,6 @@
           })
           this.isDisable=true;
         }else {
-          this.stockUpForm.deliveryType="1";
           this.stockUpForm.deliveryWay="10";
           this.loadAndUnload = ["1","2"];
           this.stockUpForm.otherFee = 0;