From d9a96c0cc83779e1a62da36d63cf16f638427561 Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Mon, 10 Jul 2023 12:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=81=E5=8F=91=E8=B4=A7=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/order/index.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 3a04924..f0c9f51 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -126,7 +126,6 @@
             <el-button
               size="mini"
               type="text"
-              @click="handleDelivery(scope.row)"
               v-hasPermi="['oms:order:delivery']"
               :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
             >编辑</el-button>
@@ -158,7 +157,6 @@
             size="mini"
             type="text"
             @click="handleDelivery(scope.row)"
-            v-hasPermi="['oms:order:delivery']"
             :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
           >发货</el-button>
         </template>
@@ -175,7 +173,7 @@
 
     <!-- 发货对话框 -->
     <el-dialog :title="deliveryObj.title" :visible.sync="deliveryObj.open" width="500px" append-to-body>
-      <el-form ref="deliveryForm" :model="deliveryObj.form" :rules="rules" label-width="100px">
+      <el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
         <el-form-item label="快递公司" prop="expressName">
           <el-select v-model="deliveryObj.form.expressName" placeholder="请选择快递公司" clearable size="small" filterable>
 <!--            <el-option v-for="(item, index) in experssList" :label="item.expressName" :value="item.expressCode"/>-->
@@ -530,10 +528,14 @@ export default {
       this.deliveryObj.open = true
     },
     submitDelivery(){
-      deliverProduct(this.deliveryObj.form).then(resp => {
-        this.$modal.msgSuccess('发货成功')
-        this.cancelDelivery()
-        this.getList()
+      this.$refs['deliveryForm'].validate((valid) => {
+        if (valid){
+          deliverProduct(this.deliveryObj.form).then(resp => {
+            this.$modal.msgSuccess('发货成功')
+            this.cancelDelivery()
+            this.getList()
+          })
+        }
       })
     },
     cancelDelivery(){