From b54c83388bce2d768a43415f14048fcf4f5deb01 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 30 三月 2024 15:38:27 +0800
Subject: [PATCH] merge branch 'dev'

---
 src/views/sales/salesDetails/index.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index bae53a7..990ee56 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -33,10 +33,10 @@
                     <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> -->
                     <el-button @click.stop="closeClick(scope.row)" type="text" size="small">鍏抽棴</el-button>
                   </template>
-                  <template v-if="scope.row.status === 3 || scope.row.status === 4">
+                  <template v-if="scope.row.status === 3">
                     <el-button @click.stop="shipmentsClick(scope.row)" type="text" size="small">鍙戣揣</el-button>
                   </template>
-                  <template v-if="scope.row.status === 3 || scope.row.status === 4">
+                  <template v-if="scope.row.status === 3">
                     <el-button @click.stop="confirmClick(scope.row)" type="text" size="small">纭瀹屾垚</el-button>
                   </template>
                 </template>
@@ -630,6 +630,7 @@
     },
     // 鑾峰彇鍒堕�犱俊鎭�
     async getProductOrderInfo(number) {
+      console.log(number,this.TabsIndex,"number")
       if (number) {
         if (this.TabsIndex == 0) {
           // 浜у搧淇℃伅鍒楄〃

--
Gitblit v1.8.0