From 3e60922de43102d506f3d23caea9b26239f452d9 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 09:18:31 +0800
Subject: [PATCH] 完善售后退货及检验页面操作

---
 src/views/aftersales/return/modules/form.vue |    2 ++
 src/views/aftersales/return/detail.vue       |   24 +++++++++++++++++++-----
 src/views/wls/returnsales/modules/form.vue   |    6 ++++++
 src/views/aftersales/return/index.vue        |    2 ++
 src/views/mes/qc/rqc/modules/form.vue        |    6 ++++++
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/views/aftersales/return/detail.vue b/src/views/aftersales/return/detail.vue
index 2254f0f..7dab7ef 100644
--- a/src/views/aftersales/return/detail.vue
+++ b/src/views/aftersales/return/detail.vue
@@ -121,9 +121,10 @@
   loading.value = true;
   try {
     ticketData.value = await getTicket(ticketIdFromQuery.value);
+    saleOrderItems.value = [];
     if (ticketData.value?.saleOrderId) {
       const order = await getSaleOrder(ticketData.value.saleOrderId);
-      saleOrderItems.value = (order as Record<string, unknown>).items as ErpSaleOrderApi.SaleOrderItem[] || [];
+      saleOrderItems.value = order.items || [];
     }
   } finally {
     loading.value = false;
@@ -131,13 +132,14 @@
 }
 
 async function handleTicketChange(item: Record<string, unknown> | undefined) {
+  saleOrderItems.value = [];
   if (!item?.id) { ticketData.value = undefined; return; }
   loading.value = true;
   try {
     ticketData.value = await getTicket(item.id as number);
     if (ticketData.value?.saleOrderId) {
       const order = await getSaleOrder(ticketData.value.saleOrderId);
-      saleOrderItems.value = (order as Record<string, unknown>).items as ErpSaleOrderApi.SaleOrderItem[] || [];
+      saleOrderItems.value = order.items || [];
     }
   } finally {
     loading.value = false;
@@ -155,6 +157,14 @@
   submitting.value = true;
   try {
     const formValues = await createFormApi.getValues();
+    if (Number(formValues.returnType) === 3) {
+      message.warning('浠呴��娆炬祦绋嬪皻鏈帴鍏ヨ储鍔″鏍革紝鏆備笉鑳藉垱寤洪��璐х敵璇�');
+      return;
+    }
+    if (!needReturnItems.value.length || needReturnItems.value.some((item) => !item.itemId || !item.returnQuantity || item.returnQuantity <= 0)) {
+      message.warning('璇峰厛鍦ㄥ敭鍚庡伐鍗曚腑濉啓鏈夋晥鐨勯��璐х墿鏂欏強鏁伴噺');
+      return;
+    }
     const newId = await createReturn({
       ticketId: ticketData.value!.id!,
       customerId: ticketData.value!.customerId!,
@@ -190,9 +200,13 @@
 }
 
 async function handleApprove() {
-  await approveReturn(returnData.value!.id!);
-  message.success('瀹℃牳閫氳繃锛屽凡鍚屾MES鍒涘缓閫�璐у崟');
-  await loadReturn();
+  try {
+    await approveReturn(returnData.value!.id!);
+    message.success('瀹℃牳閫氳繃锛屽凡鍚屾MES鍒涘缓閫�璐у崟');
+    await loadReturn();
+  } catch {
+    // 璇锋眰灞傚凡鏄剧ず澶辫触鍘熷洜锛涗繚鐣欒崏绋夸緵鐢ㄦ埛淇銆�
+  }
 }
 
 function goBack() {
diff --git a/src/views/aftersales/return/index.vue b/src/views/aftersales/return/index.vue
index b2ed5b7..a87cd76 100644
--- a/src/views/aftersales/return/index.vue
+++ b/src/views/aftersales/return/index.vue
@@ -50,6 +50,8 @@
     await approveReturn(row.id!);
     message.success(`閫�璐у崟 [${row.no}] 瀹℃牳閫氳繃`);
     handleRefresh();
+  } catch {
+    // 璇锋眰灞傚凡鏄剧ず澶辫触鍘熷洜锛涗繚鐣欏綋鍓嶅垪琛ㄣ��
   } finally {
     hideLoading();
   }
diff --git a/src/views/aftersales/return/modules/form.vue b/src/views/aftersales/return/modules/form.vue
index b25821d..a2cc180 100644
--- a/src/views/aftersales/return/modules/form.vue
+++ b/src/views/aftersales/return/modules/form.vue
@@ -80,6 +80,8 @@
     message.success('瀹℃牳閫氳繃鎴愬姛');
     await modalApi.close();
     emit('success');
+  } catch {
+    // 璇锋眰灞傚凡鏄剧ず澶辫触鍘熷洜锛涗繚鐣欒鎯呬緵鐢ㄦ埛鏍稿銆�
   } finally {
     modalApi.unlock();
   }
diff --git a/src/views/mes/qc/rqc/modules/form.vue b/src/views/mes/qc/rqc/modules/form.vue
index b931684..5451be4 100644
--- a/src/views/mes/qc/rqc/modules/form.vue
+++ b/src/views/mes/qc/rqc/modules/form.vue
@@ -104,6 +104,10 @@
   if (!valid) {
     return;
   }
+  if ((await formApi.getValues()).checkResult == null) {
+    message.warning('璇峰厛閫夋嫨妫�娴嬬粨鏋�');
+    return;
+  }
   try {
     await confirm('鏄惁瀹屾垚閫�璐ф楠屽崟缂栧埗锛熴�愬畬鎴愬悗灏嗕笉鑳芥洿鏀广��');
   } catch {
@@ -129,6 +133,8 @@
     message.success('瀹屾垚鎴愬姛');
     await modalApi.close();
     emit('success');
+  } catch {
+    // 璇锋眰灞傚凡灞曠ず澶辫触鍘熷洜锛屼繚鐣欐楠屽崟浠ヤ究淇敼銆�
   } finally {
     modalApi.unlock();
   }
diff --git a/src/views/wls/returnsales/modules/form.vue b/src/views/wls/returnsales/modules/form.vue
index 2f57364..3919b7a 100644
--- a/src/views/wls/returnsales/modules/form.vue
+++ b/src/views/wls/returnsales/modules/form.vue
@@ -92,6 +92,8 @@
     message.success('鎻愪氦鎴愬姛');
     await modalApi.close();
     emit('success');
+  } catch {
+    // 璇锋眰灞傚凡灞曠ず澶辫触鍘熷洜锛屼繚鐣欓��璐у崟渚涚敤鎴锋牳瀵广��
   } finally {
     modalApi.unlock();
   }
@@ -108,6 +110,8 @@
     message.success('涓婃灦鎴愬姛');
     await modalApi.close();
     emit('success');
+  } catch {
+    // 璇锋眰灞傚凡灞曠ず澶辫触鍘熷洜锛屼笉鍏抽棴涓婃灦绐楀彛銆�
   } finally {
     modalApi.unlock();
   }
@@ -124,6 +128,8 @@
     message.success('鎵ц閫�璐ф垚鍔�');
     await modalApi.close();
     emit('success');
+  } catch {
+    // 璇锋眰灞傚凡灞曠ず澶辫触鍘熷洜锛屼笉鍏抽棴閫�璐х獥鍙c��
   } finally {
     modalApi.unlock();
   }

--
Gitblit v1.9.3