From ff6fba29a6bd4710a4478c354473ec9afde8e9a9 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 24 Feb 2025 16:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderManagement/components/order-home.vue    | 10 +++++-----
 .../orderManagementCz/components/order-home.vue  | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue
index a1176bd..30a490e 100644
--- a/src/views/user/orderManagement/components/order-home.vue
+++ b/src/views/user/orderManagement/components/order-home.vue
@@ -383,17 +383,17 @@ const downloadContract = () => {
     // }
 }
 
-const confirmFail = async (index: number) => {
+const confirmFail = async (item: any) => {
     ElMessageBox.confirm('是否确定取消订单？', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
     })
         .then(() => {
-            return failApi({ orderId: cardList.value[index].orderId, orderStatus: 99 })
+            return failApi({ orderId: item.orderId, orderStatus: 99 })
             // return removeDeviceApi([row.maId])
         })
-        .then((res) => {
+        .then((res: any) => {
             if (res.code === 200) {
                 ElMessage({
                     type: 'success',
@@ -865,10 +865,10 @@ const costSubmit = () => {
                             </el-button>
                             <!-- <el-button type="primary" size="small"> 发起减免 </el-button> -->
                             <el-button
-                                v-if="item.orderStatus == '2'"
+                                v-if="item.orderStatus == '1' || item.orderStatus == '2'"
                                 type="primary"
                                 size="small"
-                                @click="confirmFail(index)"
+                                @click="confirmFail(item)"
                             >
                                 取消订单
                             </el-button>
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue
index b492bee..c5bb235 100644
--- a/src/views/user/orderManagementCz/components/order-home.vue
+++ b/src/views/user/orderManagementCz/components/order-home.vue
@@ -200,17 +200,18 @@ const confirmPass = async (index: number) => {
 }
 
 // 驳回按钮
-const confirmFail = async (index: number) => {
+const confirmFail = async (item: any) => {
+    // console.log(item.orderId, '-->>>')
     ElMessageBox.confirm('是否确定取消？', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
     })
         .then(() => {
-            return failApi({ orderId: cardList.value[index].orderId, orderStatus: 99 })
+            return failApi({ orderId: item.orderId, orderStatus: 99 })
             // return removeDeviceApi([row.maId])
         })
-        .then((res) => {
+        .then((res: any) => {
             if (res.code === 200) {
                 ElMessage({
                     type: 'success',
@@ -703,6 +704,11 @@ const downloadContract = () => {
 }
 
 const wordUrl = ref('')
+
+// 取消订单
+const handleCancel = () => {
+    
+}
 </script>
 
 <template>
@@ -1130,8 +1136,8 @@ const wordUrl = ref('')
                             <el-button
                                 size="small"
                                 type="primary"
-                                v-if="item.orderStatus == '2'"
-                                @click="confirmFail(index)"
+                                v-if="item.orderStatus == '1'"
+                                @click="confirmFail(item)"
                             >
                                 取消订单
                             </el-button>