From e58836f1dd1047819861407129756903cae1f1d3 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 16 May 2023 16:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/components/confirmSubmit.vue |  2 ++
 src/views/order/index.vue                    | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/order/components/confirmSubmit.vue b/src/views/order/components/confirmSubmit.vue
index 4e40e78..d74ae09 100644
--- a/src/views/order/components/confirmSubmit.vue
+++ b/src/views/order/components/confirmSubmit.vue
@@ -157,6 +157,7 @@ export default {
         }
         serve.orderSuccess({ id: this.controlWindows.addInfo.id, ...targetPolicy[0] }).then(res => {
           if (res.code == 20000) {
+            this.$message.success(res.msg)
             this.closeWindow()
           }
         })
@@ -164,6 +165,7 @@ export default {
       }
       serve.orderSuccess({ id: this.controlWindows.addInfo.id }).then(res => {
         if (res.code == 20000) {
+          this.$message.success(res.msg)
           this.closeWindow()
         }
       })
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index cde5e60..d8c39d6 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -116,7 +116,7 @@
               <el-link slot="reference" type="primary" :underline="false">订单锁定</el-link>
             </el-popconfirm>
 
-            <el-link v-else type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link>
+            <el-link v-if="row.orderStatus == 'ORDER_LOCKED'" type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link>
 
             <el-popconfirm
               :title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单？' : '是否确认退款？'"
@@ -156,8 +156,8 @@
       </general-details>
     </el-drawer>
     <!-- 提货单 -->
-    <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
-    <confirmSubmit :controlWindows="controlWindows" @closeWindow="() => {}" />
+    <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="search" />
+    <confirmSubmit :controlWindows="controlWindows" @closeWindow="search" />
   </div>
 </template>
 
@@ -319,6 +319,10 @@ export default {
       this.parameter.pageSize = size
       this.getByPage()
     },
+    search() {
+      this.parameter.currentPage = 1
+      getByPage()
+    },
     //table list
     getByPage() {
       order.getByPage(this.parameter).then(res => {