From c0385414cabe453110d78740ad7f046bd5f0157d Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Sun, 18 Feb 2024 16:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=99=AE=E9=80=9A=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E5=8C=85=E8=A3=B9=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/order/order/orderDetail.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 6380d76e..44a16d93 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -8,7 +8,7 @@
         <Button @click="orderLogModal = true" type="primary">订单日志</Button>
         <Button @click="printOrder" type="primary" ghost style="float:right;">打印发货单</Button>
         <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
-        <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
+        <!-- <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button> -->
 
         <Button v-if="allowOperation.ship" @click="groupShip" type="primary">分包裹发货</Button>
 
@@ -420,7 +420,7 @@
         <Form :model="faceSheetForm" ref="faceSheetForm" v-if="facesheetFlag" :rules="faceSheetFormValidate">
           <FormItem label="物流公司" prop="logisticsId" style="position: relative" :label-width="90">
             <Select v-model="faceSheetForm.logisticsId" placeholder="请选择" style="width: 250px">
-              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.logisticsId">{{ item.name }}
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{ item.name }}
               </Option>
             </Select>
           </FormItem>
@@ -429,7 +429,7 @@
           :rules="orderDeliverFormValidate" style="position: relative">
           <FormItem label="物流公司" prop="logisticsId">
             <Select v-model="orderDeliveryForm.logisticsId" placeholder="请选择" style="width: 250px">
-              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.logisticsId">{{ item.name }}
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{ item.name }}
               </Option>
             </Select>
           </FormItem>
@@ -1116,6 +1116,7 @@ export default {
           }
         })
       } else {
+        console.log("this.orderDeliveryForm",this.orderDeliveryForm)
         this.$refs['orderDeliveryForm'].validate((valid) => {
           if (valid) {
             API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then(