From b6a007d417bf5eea80ec807d3f1201e220e5f651 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 13 五月 2026 10:24:33 +0800
Subject: [PATCH] 销售和采购退货
---
src/views/procurementManagement/purchaseReturnOrder/New.vue | 160 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 124 insertions(+), 36 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
index f130733..09e09d5 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/New.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -70,6 +70,7 @@
v-model="formState.supplierId"
placeholder="璇烽�夋嫨渚涘簲鍟�"
style="width: 240px"
+ filterable
@focus="fetchSupplierOptions"
@change="handleChangeSupplierId"
>
@@ -226,10 +227,11 @@
<span class="title-text">浜у搧鍒楄〃</span>
</div>
<el-button type="primary" size="small" style="margin-bottom: 20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
- <el-table :data="formState.purchaseReturnOrderProductsDtos"
+ <div class="product-table-scroll">
+ <el-table class="product-table-inner"
+ :data="formState.purchaseReturnOrderProductsDtos"
border
max-height="400"
- :scroll-y="true"
show-summary
:summary-method="summarizeChildrenTable">
<el-table-column align="center"
@@ -239,6 +241,12 @@
label="搴忓彿"
type="index"
width="60" />
+ <el-table-column label="鍏ュ簱鍗曞彿"
+ prop="inboundBatches"
+ width="150" />
+ <el-table-column label="鎵规鍙�"
+ prop="batchNo"
+ width="150" />
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿"
@@ -247,10 +255,13 @@
prop="unit"
width="70" />
<el-table-column label="鏁伴噺"
- prop="quantity"
+ prop="stockInNum"
width="100" />
<el-table-column label="鍙��璐ф暟閲�"
- prop="availableQuality"
+ prop="unQuantity"
+ width="130" />
+ <el-table-column label="宸查��璐ф暟閲�"
+ prop="totalReturnNum"
width="130" />
<el-table-column label="閫�璐ф暟閲�"
prop="returnQuantity"
@@ -267,27 +278,27 @@
placeholder="璇疯緭鍏ラ��璐ф暟閲�" />
</template>
</el-table-column>
- <el-table-column label="搴撳瓨棰勮鏁伴噺"
+ <!-- <el-table-column label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
width="120"
show-overflow-tooltip />
<el-table-column label="绋庣巼(%)"
prop="taxRate"
- width="80" />
+ width="80" /> -->
<el-table-column label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
:formatter="formattedNumber"
- width="150" />
+ width="120" />
<el-table-column label="閫�璐ф�讳环(鍏�)"
prop="taxInclusiveTotalPrice"
- width="180">
+ width="120">
<template #default="scope">
{{ formatAmount(getReturnTotal(scope.row)) || '--' }}
</template>
</el-table-column>
<el-table-column label="鏄惁璐ㄦ"
prop="isChecked"
- width="150">
+ width="100">
<template #default="scope">
<el-tag :type="scope.row.isChecked ? 'success' : 'info'">
{{ scope.row.isChecked ? '鏄�' : '鍚�' }}
@@ -310,6 +321,7 @@
</template>
</el-table-column>
</el-table>
+ </div>
</div>
<div class="section-title">
@@ -334,12 +346,17 @@
label="鏁村崟鎶樻墸鐜囷細"
prop="totalDiscountAmount"
>
- <el-input-number v-model="formState.totalDiscountRate"
+ <el-input v-model="formState.totalDiscountRate"
controls-position="right"
:step="0.01"
:precision="2"
style="width: 100%;"
- placeholder="璇疯緭鍏ユ暣鍗曟姌鎵ｇ巼"/>
+ @change="totalDiscount"
+ placeholder="璇疯緭鍏ユ暣鍗曟姌鎵ｇ巼">
+ <template #append>
+ %
+ </template>
+ </el-input>
</el-form-item>
<el-form-item
@@ -402,9 +419,6 @@
import {getOptions, purchaseList} from "@/api/procurementManagement/procurementLedger.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
const ProductList = defineAsyncComponent(() => import("@/views/procurementManagement/purchaseReturnOrder/ProductList.vue"));
- import {
- productList,
- } from "@/api/procurementManagement/procurementLedger.js";
const props = defineProps({
visible: {
type: Boolean,
@@ -412,7 +426,24 @@
}
});
let { proxy } = getCurrentInstance()
-const { payment_methods } = proxy.useDict("payment_methods");
+const payment_methods = [
+ {
+ "label": "鐜伴噾",
+ "value": "0",
+ },
+ {
+ "label": "鏀エ",
+ "value": "1",
+ },
+ {
+ "label": "閾惰杞处",
+ "value": "2",
+ },
+ {
+ "label": "鍏朵粬",
+ "value": "3",
+ },
+]
const emit = defineEmits(['update:visible', 'completed']);
// 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
@@ -509,8 +540,28 @@
row.taxInclusiveTotalPrice = getReturnTotal(row)
}
+const getBaseAmount = () => {
+ const rows = formState.value.purchaseReturnOrderProductsDtos || []
+ return rows.reduce((sum, item) => {
+ return sum + toNumber(item.taxInclusiveTotalPrice)
+ }, 0)
+}
+
+// 鍚屾鎶樻墸棰�
+const totalDiscount = () => {
+ const discountRate = toNumber(formState.value.totalDiscountRate)
+ if (discountRate < 0 || discountRate > 100) {
+ proxy.$modal.msgError("璇疯緭鍏�0-100涔嬮棿鐨勬姌鎵ｇ巼")
+ return
+ }
+ const baseAmount = getBaseAmount()
+ // 鎶樻墸棰� = 浜у搧閫�璐ф�讳环鍚堣 * 鎶樻墸鐜�
+ formState.value.totalDiscountAmount = Number((baseAmount * (discountRate / 100)).toFixed(2))
+ syncTotalAmount()
+}
+
const getReturnQtyMax = (row) => {
- const max = Number(row?.availableQuality)
+ const max = Number(row?.unQuantity)
if (Number.isNaN(max) || max < 0) {
return 0
}
@@ -525,30 +576,55 @@
return proxy.summarizeTable(
param,
[
- "quantity",
- "availableQuality",
+ "stockInNum",
+ "unQuantity",
"returnQuantity",
"taxInclusiveUnitPrice",
"taxInclusiveTotalPrice",
"taxExclusiveTotalPrice",
],
{
- quantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ stockInNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
returnQuantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
- availableQuality: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ unQuantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
);
};
const handleChangeTotalDiscountAmount= () => {
+ const discountAmount = toNumber(formState.value.totalDiscountAmount)
+ if (discountAmount < 0) {
+ proxy.$modal.msgError("鏁村崟鎶樻墸棰濅笉鑳藉皬浜�0")
+ formState.value.totalDiscountAmount = 0
+ }
+
+ const baseAmount = getBaseAmount()
+ const normalizedAmount = toNumber(formState.value.totalDiscountAmount)
+ if (baseAmount <= 0) {
+ formState.value.totalDiscountRate = 0
+ syncTotalAmount()
+ return
+ }
+
+ if (normalizedAmount > baseAmount) {
+ proxy.$modal.msgError("鏁村崟鎶樻墸棰濅笉鑳藉ぇ浜庝骇鍝侀��璐ф�讳环鍚堣")
+ formState.value.totalDiscountAmount = Number(baseAmount.toFixed(2))
+ }
+
+ const discountRate = (toNumber(formState.value.totalDiscountAmount) / baseAmount) * 100
+ formState.value.totalDiscountRate = Number(discountRate.toFixed(2))
syncTotalAmount()
}
+const resetFeeInfo = () => {
+ formState.value.totalDiscountAmount = 0
+ formState.value.totalDiscountRate = undefined
+ formState.value.totalAmount = 0
+ formState.value.incomeType = undefined
+}
+
const syncTotalAmount = () => {
- const rows = formState.value.purchaseReturnOrderProductsDtos || []
- const baseAmount = rows.reduce((sum, item) => {
- return sum + toNumber(item.taxInclusiveTotalPrice)
- }, 0)
+ const baseAmount = getBaseAmount()
const discount = toNumber(formState.value.totalDiscountAmount)
// 鎴愪氦閲戦 = 浜у搧閫�璐ф�讳环鍚堣 - 鎶樻墸棰�
formState.value.totalAmount = Number((baseAmount - discount).toFixed(2))
@@ -592,15 +668,10 @@
}
}
-// 澶勭悊鏀瑰彉閲囪喘鍙拌处鏁版嵁
-const handleChangePurchaseLedgerId = async () => {
- const res = await productList({ salesLedgerId: formState.value.purchaseLedgerId, type: 2 });
- formState.value.purchaseReturnOrderProductsDtos = res.data.map(item => ({
- ...item,
- returnQuantity: undefined,
- taxInclusiveTotalPrice: 0,
- salesLedgerProductId: item.id,
- }))
+// 澶勭悊鏀瑰彉閲囪喘鍙拌处鏁版嵁锛堜笉璇锋眰鎺ュ彛鍥炴樉浜у搧锛屼骇鍝佷粎鍦ㄣ�屾坊鍔犱骇鍝併�嶅脊绐楀嬀閫夊悗鍐欏叆锛�
+const handleChangePurchaseLedgerId = () => {
+ resetFeeInfo()
+ formState.value.purchaseReturnOrderProductsDtos = []
syncTotalAmount()
}
@@ -618,7 +689,7 @@
...item,
returnQuantity: undefined,
taxInclusiveTotalPrice: 0,
- salesLedgerProductId: item.id,
+ salesLedgerProductId: item.salesLedgerProductId ?? item.id,
}));
formState.value.purchaseReturnOrderProductsDtos.push(...newProducts);
syncTotalAmount()
@@ -644,7 +715,7 @@
// 閫愯鏍￠獙閫�璐ф暟閲忥細浠绘剰涓�琛屾湭濉�/闈炴硶/瓒呴檺閮戒笉鍏佽鎻愪氦
const invalidRowIndex = productList.findIndex((item) => {
const qty = Number(item.returnQuantity)
- const maxQty = Number(item.availableQuality)
+ const maxQty = Number(item.unQuantity)
if (item.returnQuantity === null || item.returnQuantity === undefined || item.returnQuantity === "") {
return true
@@ -665,7 +736,15 @@
proxy.$refs["formRef"].validate(valid => {
if (valid) {
- createPurchaseReturnOrder(formState.value).then(res => {
+ console.log(productList)
+ const submitPayload = {
+ ...formState.value,
+ purchaseReturnOrderProductsDtos: productList.map((row) => ({
+ ...row,
+ stockInRecordId: row.id,
+ })),
+ }
+ createPurchaseReturnOrder(submitPayload).then(res => {
// 鍏抽棴妯℃�佹
isShow.value = false;
// 鍛婄煡鐖剁粍浠跺凡瀹屾垚
@@ -712,4 +791,13 @@
border-radius: 50%;
margin-right: 8px;
}
+
+.product-table-scroll {
+ width: 100%;
+ overflow-x: auto;
+}
+
+.product-table-inner {
+ min-width: 1280px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3