From d476be7eda60a04e0cbbc28c5aa048dfceffd789 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 15:39:23 +0800
Subject: [PATCH] 新增采购退货后，如果对应的采购退货审批也通过，采购退货记录不能删除，删除按钮置灰
---
src/views/procurementManagement/purchaseReturnOrder/New.vue | 118 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 20 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
index 09e09d5..186a552 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/New.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -3,8 +3,10 @@
<el-dialog
v-model="isShow"
title="鏂板閲囪喘閫�璐�"
- width="1600"
+ width="70%"
+ top="3vh"
@close="closeModal"
+ class="purchase-return-dialog"
>
<el-form label-width="140px" :model="formState" label-position="top" ref="formRef" :inline="true">
<div class="section-title">
@@ -54,6 +56,63 @@
<el-option label="鎷掓敹" :value="1" />
</el-select>
</el-form-item>
+
+ <el-form-item
+ label="鍙戣揣绫诲瀷"
+ prop="shippingType"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨鍙戣揣绫诲瀷',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select
+ v-model="formState.shippingType"
+ placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
+ style="width: 240px"
+ @change="handleShippingTypeChange"
+ >
+ <el-option label="璐ц溅" :value="1" />
+ <el-option label="蹇��" :value="2" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ v-if="formState.shippingType === 1"
+ label="鍙戣揣杞︾墝鍙�"
+ prop="truckPlateNo"
+ >
+ <el-input
+ v-model="formState.truckPlateNo"
+ placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+ style="width: 240px"
+ />
+ </el-form-item>
+
+ <template v-else-if="formState.shippingType === 2">
+ <el-form-item
+ label="蹇�掑叕鍙�"
+ prop="expressCompany"
+ >
+ <el-input
+ v-model="formState.expressCompany"
+ placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
+ style="width: 240px"
+ />
+ </el-form-item>
+ <el-form-item
+ label="蹇�掑崟鍙�"
+ prop="expressNo"
+ >
+ <el-input
+ v-model="formState.expressNo"
+ placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
+ style="width: 240px"
+ />
+ </el-form-item>
+ </template>
<el-form-item
label="渚涘簲鍟嗗悕绉�"
@@ -221,19 +280,19 @@
<el-input style="width: 240px" v-model="formState.remark" :rows="1" type="textarea" placeholder="璇疯緭鍏ュ娉�"/>
</el-form-item>
- <div style="margin: 20px 0;">
+ <div style="margin:20px 0;min-width:0;">
<div class="section-title">
<span class="title-dot"></span>
<span class="title-text">浜у搧鍒楄〃</span>
</div>
- <el-button type="primary" size="small" style="margin-bottom: 20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
- <div class="product-table-scroll">
- <el-table class="product-table-inner"
+ <el-button type="primary" size="small" style="margin-bottom:20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
+ <el-table
:data="formState.purchaseReturnOrderProductsDtos"
border
max-height="400"
show-summary
- :summary-method="summarizeChildrenTable">
+ :summary-method="summarizeChildrenTable"
+ style="width:100%;min-width:0;">
<el-table-column align="center"
type="selection"
width="55" />
@@ -257,12 +316,18 @@
<el-table-column label="鏁伴噺"
prop="stockInNum"
width="100" />
+ <el-table-column label="閿�鍞彂璐ф暟閲�"
+ prop="saleOutQuantity"
+ width="120" />
<el-table-column label="鍙��璐ф暟閲�"
prop="unQuantity"
width="130" />
<el-table-column label="宸查��璐ф暟閲�"
- prop="totalReturnNum"
- width="130" />
+ width="130">
+ <template #default="scope">
+ {{ formattedNumber(scope.row, null, scope.row.totalReturnNum || 0) }}
+ </template>
+ </el-table-column>
<el-table-column label="閫�璐ф暟閲�"
prop="returnQuantity"
width="180">
@@ -321,7 +386,6 @@
</template>
</el-table-column>
</el-table>
- </div>
</div>
<div class="section-title">
@@ -416,7 +480,7 @@
<script setup>
import {ref, computed, getCurrentInstance, watch, defineAsyncComponent} from "vue";
import {createPurchaseReturnOrder} from "@/api/procurementManagement/purchase_return_order.js";
-import {getOptions, purchaseList} from "@/api/procurementManagement/procurementLedger.js";
+import {getOptions, purchaseReturnableList} from "@/api/procurementManagement/procurementLedger.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
const ProductList = defineAsyncComponent(() => import("@/views/procurementManagement/purchaseReturnOrder/ProductList.vue"));
const props = defineProps({
@@ -451,6 +515,10 @@
no: '',
isDefaultNo: true,
returnType: 0,
+ shippingType: undefined,
+ truckPlateNo: '',
+ expressCompany: '',
+ expressNo: '',
incomeType: undefined,
remark: '',
supplierId: undefined,
@@ -496,6 +564,19 @@
const purchaseLedgerOptions = ref([])
// 鏄惁灞曠ず浜у搧鍒楄〃鏁版嵁
const isShowProductsModal = ref(false)
+
+const handleShippingTypeChange = (val) => {
+ if (val === 1) {
+ formState.value.expressCompany = '';
+ formState.value.expressNo = '';
+ } else if (val === 2) {
+ formState.value.truckPlateNo = '';
+ } else {
+ formState.value.truckPlateNo = '';
+ formState.value.expressCompany = '';
+ formState.value.expressNo = '';
+ }
+};
const isShow = computed({
get() {
@@ -569,6 +650,10 @@
}
const closeModal = () => {
+ formState.value.shippingType = undefined;
+ formState.value.truckPlateNo = '';
+ formState.value.expressCompany = '';
+ formState.value.expressNo = '';
isShow.value = false;
};
@@ -662,7 +747,7 @@
const fetchPurchaseLedgerOptions = () => {
purchaseLedgerOptions.value = []
if (formState.value.supplierId) {
- purchaseList({supplierId: formState.value.supplierId,approvalStatus:3}).then((res) => {
+ purchaseReturnableList({ supplierId: formState.value.supplierId }).then((res) => {
purchaseLedgerOptions.value = res.rows;
});
}
@@ -689,7 +774,7 @@
...item,
returnQuantity: undefined,
taxInclusiveTotalPrice: 0,
- salesLedgerProductId: item.salesLedgerProductId ?? item.id,
+ // salesLedgerProductId: item.salesLedgerProductId,
}));
formState.value.purchaseReturnOrderProductsDtos.push(...newProducts);
syncTotalAmount()
@@ -792,12 +877,5 @@
margin-right: 8px;
}
-.product-table-scroll {
- width: 100%;
- overflow-x: auto;
-}
-.product-table-inner {
- min-width: 1280px;
-}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3