From 286619b69e4004c6bcaff4cb19a40b77b053453d Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:33 +0800
Subject: [PATCH] feat: 前端补齐排产约束、风险监测与招投标比价界面

---
 src/views/aftersales/return/detail.vue |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/views/aftersales/return/detail.vue b/src/views/aftersales/return/detail.vue
index 7dab7ef..b91cd16 100644
--- a/src/views/aftersales/return/detail.vue
+++ b/src/views/aftersales/return/detail.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import type { AftersalesReturnApi } from '#/api/aftersales/return';
 import type { AftersalesTicketApi } from '#/api/aftersales/ticket';
-import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -9,13 +8,12 @@
 import { Page } from '@vben/common-ui';
 import { AftersaleReturnStatusEnum } from '@vben/constants';
 
-import { Button, Card, Descriptions, message, Popconfirm, Select, Tag } from 'ant-design-vue';
+import { Button, Card, Descriptions, InputNumber, message, Popconfirm, Select, Tag } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { approveReturn, createReturn, getReturn } from '#/api/aftersales/return';
 import { getTicket } from '#/api/aftersales/ticket';
 import { AftersalesTicketSelect } from '#/views/aftersales/ticket/components';
-import { getSaleOrder } from '#/api/erp/sale/order';
 
 defineOptions({ name: 'AftersalesReturnDetail' });
 
@@ -25,7 +23,7 @@
 const submitting = ref(false);
 const returnData = ref<AftersalesReturnApi.Return>();
 const ticketData = ref<AftersalesTicketApi.Ticket>();
-const saleOrderItems = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
+const returnUnitPrices = ref<Record<number, number | undefined>>({});
 
 const returnId = computed(() => route.params.id as string);
 const ticketIdFromQuery = computed(() => Number(route.query.ticketId || 0));
@@ -121,26 +119,18 @@
   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.items || [];
-    }
+    returnUnitPrices.value = {};
   } finally {
     loading.value = false;
   }
 }
 
 async function handleTicketChange(item: Record<string, unknown> | undefined) {
-  saleOrderItems.value = [];
+  returnUnitPrices.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.items || [];
-    }
   } finally {
     loading.value = false;
   }
@@ -165,6 +155,10 @@
       message.warning('璇峰厛鍦ㄥ敭鍚庡伐鍗曚腑濉啓鏈夋晥鐨勯��璐х墿鏂欏強鏁伴噺');
       return;
     }
+    if (needReturnItems.value.some((item) => item.id == null || returnUnitPrices.value[item.id] == null || !Number.isFinite(returnUnitPrices.value[item.id]) || returnUnitPrices.value[item.id]! < 0)) {
+      message.warning('璇蜂负姣忔潯閫�璐х墿鏂欏~鍐欑粡纭鐨勯潪璐熷崟浠�');
+      return;
+    }
     const newId = await createReturn({
       ticketId: ticketData.value!.id!,
       customerId: ticketData.value!.customerId!,
@@ -174,8 +168,7 @@
       defectCategory: formValues.defectCategory as string | undefined,
       remark: formValues.remark as string | undefined,
       items: needReturnItems.value.map((item) => {
-        const orderItem = saleOrderItems.value.find((oi) => oi.productId === item.itemId);
-        const unitPrice = orderItem?.productPrice || 0;
+        const unitPrice = returnUnitPrices.value[item.id!]!;
         const returnQuantity = item.returnQuantity || 0;
         return {
           ticketItemId: item.id,
@@ -253,6 +246,7 @@
                 <th class="border p-2 text-left">鐗╂枡鍚嶇О</th>
                 <th class="border p-2 text-left">鎵规鍙�</th>
                 <th class="border p-2 text-right">閫�璐ф暟閲�</th>
+                <th class="border p-2 text-right">閫�璐у崟浠�</th>
               </tr>
             </thead>
             <tbody>
@@ -261,6 +255,7 @@
                 <td class="border p-2">{{ item.itemName }}</td>
                 <td class="border p-2">{{ item.batchCode || '-' }}</td>
                 <td class="border p-2 text-right">{{ item.returnQuantity || '-' }}</td>
+                <td class="border p-2 text-right"><InputNumber v-if="item.id != null" v-model:value="returnUnitPrices[item.id]" :min="0" :precision="2" placeholder="璇疯緭鍏ュ崟浠�" /></td>
               </tr>
             </tbody>
           </table>

--
Gitblit v1.9.3