hurx 8 tuntia sitten
vanhempi
sitoutus
b02e7127bd

+ 3 - 2
src/views/order/orderDeliver/index.vue

@@ -75,8 +75,9 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" v-if="scope.row.orderStatus != '4'" @click="handleDeliver(scope.row)">发货</el-button>
-            <el-button link type="primary" @click="handleReview(scope.row)">查看发货信息</el-button>
-            <el-button link type="primary" @click="handleCancel(scope.row)">取消订单</el-button>
+            <el-button link type="primary" v-if="scope.row.orderStatus > '2'" @click="handleReview(scope.row)">查看发货信息</el-button>
+            <el-button link type="primary" v-else @click="handleReview(scope.row)">查看订单信息</el-button>
+            <!-- <el-button link type="primary" @click="handleCancel(scope.row)">取消订单</el-button> -->
             <el-button
               link
               type="primary"

+ 3 - 2
src/views/order/orderDeliver/indexProject.vue

@@ -84,8 +84,9 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" v-if="scope.row.orderStatus != '4'" @click="handleDeliver(scope.row)">发货</el-button>
-            <el-button link type="primary" @click="handleReview(scope.row)">查看发货信息</el-button>
-            <el-button link type="primary" @click="handleCancel(scope.row)">取消订单</el-button>
+            <el-button link type="primary" v-if="scope.row.orderStatus > '2'" @click="handleReview(scope.row)">查看发货信息</el-button>
+            <el-button link type="primary" v-else @click="handleReview(scope.row)">查看订单信息</el-button>
+            <!-- <el-button link type="primary" @click="handleCancel(scope.row)">取消订单</el-button> -->
             <el-button
               link
               type="primary"

+ 1 - 1
src/views/order/saleOrder/index.vue

@@ -653,7 +653,7 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   }
 
   // 非已取消和已关闭状态:显示取消订单按钮
-  if (orderStatus !== OrderStatus.CANCELLED && orderStatus !== OrderStatus.CLOSED && orderStatus !== OrderStatus.SHIPMENT_COMPLETED) {
+  if ([OrderStatus.PENDING_PAYMENT, OrderStatus.PENDING_CONFIRM].includes(orderStatus as OrderStatus)) {
     buttons.push({ label: '取消订单', handler: handleCancel });
   }