From 12afd5c45d5afc25cd6d6650399401537870dbcd Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 09 五月 2026 17:08:57 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/procurementManagement/purchaseReturnOrder/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index cd2c7f4..942b4dc 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -88,10 +88,10 @@
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="130">
<template #default="scope">{{ formatAmount(scope.row.taxInclusiveUnitPrice) }}</template>
</el-table-column>
- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="130">
+ <el-table-column label="閫�璐ф�讳环(鍏�)" prop="taxInclusiveTotalPrice" width="130">
<template #default="scope">{{ formatAmount(scope.row.taxInclusiveTotalPrice) }}</template>
</el-table-column>
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="140">
+ <el-table-column label="涓嶉��璐ф�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="140">
<template #default="scope">{{ formatAmount(scope.row.taxExclusiveTotalPrice) }}</template>
</el-table-column>
<el-table-column label="鏄惁璐ㄦ" prop="isChecked" width="100" align="center">
@@ -182,7 +182,7 @@
prop: 'returnUserName',
width: 110,
},
-
+
{
label: '鏁村崟鎶樻墸棰�',
prop: 'totalDiscountAmount',
@@ -236,7 +236,7 @@
},
],
},
-
+
])
const data = reactive({
searchForm: {
@@ -281,8 +281,8 @@
const payload = res?.data || {}
detailData.value = payload
// 鎷兼帴杩炰釜瀵硅薄鎴愪竴涓璞★紝鏂逛究灞曠ず item 鍜� item.salesLedgerProduct 閲岀殑瀛楁
-
-
+
+
detailProducts.value =
payload.purchaseReturnOrderProductsDetailVoList.map(item => ({ ...item, ...item.salesLedgerProduct })) ||
[]
--
Gitblit v1.9.3