From 63afcf7bd6eff23e4feee8b6d12053bd8e78abb8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 09 五月 2026 17:38:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/procurementManagement/purchaseReturnOrder/index.vue | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index 1ac769e..942b4dc 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -36,6 +36,7 @@
>
<template #operation="{ row }">
<el-button link type="primary" size="small" style="color: #67C23A" @click="handleDetail(row)">璇︽儏</el-button>
+ <el-button link size="small" @click="handleDelete(row)">鍒犻櫎</el-button>
</template>
</PIMTable>
</div>
@@ -87,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">
@@ -113,7 +114,7 @@
import PIMTable from '@/components/PIMTable/PIMTable.vue'
import { ref, reactive, toRefs, onMounted, defineAsyncComponent, getCurrentInstance } from 'vue'
const { proxy } = getCurrentInstance()
-import {findPurchaseReturnOrderListPage, getPurchaseReturnOrderDetail} from "@/api/procurementManagement/purchase_return_order.js";
+import {findPurchaseReturnOrderListPage, getPurchaseReturnOrderDetail, deletePurchaseReturnOrder} from "@/api/procurementManagement/purchase_return_order.js";
const New = defineAsyncComponent(() => import("@/views/procurementManagement/purchaseReturnOrder/New.vue"));
const tableData = ref([])
const selectedRows = ref([])
@@ -181,7 +182,7 @@
prop: 'returnUserName',
width: 110,
},
-
+
{
label: '鏁村崟鎶樻墸棰�',
prop: 'totalDiscountAmount',
@@ -218,13 +219,24 @@
width: 180,
},
{
- fixed: 'right',
- label: '鎿嶄綔',
- dataType: 'slot',
- slot: 'operation',
- width: 100,
- align: 'center',
+ dataType: "action",
+ width: 120,
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: "right",
+ operation: [
+ {
+ name: "璇︽儏",
+ type: "text",
+ clickFun: row => {handleDetail(row);},
+ },
+ {
+ name: "鍒犻櫎",
+ clickFun: row => {handleDelete(row)},
+ },
+ ],
},
+
])
const data = reactive({
searchForm: {
@@ -240,9 +252,27 @@
getList()
}
+// 鍒犻櫎鎿嶄綔
+const handleDelete = (row) => {
+ console.log('鍒犻櫎琛屾暟鎹細', row)
+ proxy?.$modal?.confirm('纭畾瑕佸垹闄ゅ悧锛熷垹闄ゅ皢鏃犳硶鎭㈠').then(() => {
+ // 杩欓噷璋冪敤鍒犻櫎鎺ュ彛锛屼紶鍏� row.id
+ deletePurchaseReturnOrder(row.id).then(() => {
+ proxy?.$modal?.msgSuccess?.("鍒犻櫎鎴愬姛");
+ getList()
+ }).catch(() => {
+ proxy?.$modal?.msgError?.('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {
+ // 鍙栨秷鍒犻櫎
+ proxy?.$modal?.msgInfo?.('宸插彇娑堝垹闄�')
+
+ })
+}
+// 鏌ョ湅璇︽儏
const handleDetail = (row) => {
if (!row?.id) {
- proxy?.$modal?.msgWarning('鏈幏鍙栧埌鍗曟嵁ID')
+ proxy?.$modal?.msgWarning?.('鏈幏鍙栧埌鍗曟嵁ID')
return
}
detailVisible.value = true
@@ -251,13 +281,13 @@
const payload = res?.data || {}
detailData.value = payload
// 鎷兼帴杩炰釜瀵硅薄鎴愪竴涓璞★紝鏂逛究灞曠ず item 鍜� item.salesLedgerProduct 閲岀殑瀛楁
-
-
+
+
detailProducts.value =
payload.purchaseReturnOrderProductsDetailVoList.map(item => ({ ...item, ...item.salesLedgerProduct })) ||
[]
}).catch(() => {
- proxy?.$modal?.msgError('鑾峰彇璇︽儏澶辫触')
+ proxy?.$modal?.msgError?.('鑾峰彇璇︽儏澶辫触')
}).finally(() => {
detailLoading.value = false
})
@@ -310,4 +340,9 @@
getList()
})
</script>
+<style scoped>
+.table_list {
+ margin-top: unset;
+}
+</style>
--
Gitblit v1.9.3