From f3cec0341563c2c0dd4f5df609d0689c6c450bfc Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期六, 21 三月 2026 17:11:12 +0800
Subject: [PATCH] feat(采购退货): 增加退货详情查看功能并完善退货流程
---
src/views/procurementManagement/procurementLedger/index.vue | 5
src/views/procurementManagement/procurementReport/index.vue | 26 ++
src/api/procurementManagement/purchase_return_order.js | 9 +
src/views/procurementManagement/purchaseReturnOrder/New.vue | 201 ++++++++++++++++-----
src/views/procurementManagement/purchaseReturnOrder/index.vue | 254 +++++++++++++++++++++++++--
5 files changed, 416 insertions(+), 79 deletions(-)
diff --git a/src/api/procurementManagement/purchase_return_order.js b/src/api/procurementManagement/purchase_return_order.js
index 33ec33e..06a57f9 100644
--- a/src/api/procurementManagement/purchase_return_order.js
+++ b/src/api/procurementManagement/purchase_return_order.js
@@ -17,4 +17,13 @@
method: "post",
data
});
+}
+
+// 鏌ョ湅璇︽儏
+// purchaseReturnOrders/selectById/xxx
+export function getPurchaseReturnOrderDetail(id) {
+ return request({
+ url: "/purchaseReturnOrders/selectById/" + id,
+ method: "get",
+ });
}
\ No newline at end of file
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index befc5f7..8a293fc 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -90,6 +90,11 @@
prop="unit" />
<el-table-column label="鏁伴噺"
prop="quantity" />
+ <el-table-column label="鍙敤鏁伴噺"
+ prop="availableQuality" />
+ <el-table-column label="閫�璐ф暟閲�"
+ prop="returnQuality" />
+
<el-table-column label="绋庣巼(%)"
prop="taxRate" />
<el-table-column label="鍚◣鍗曚环(鍏�)"
diff --git a/src/views/procurementManagement/procurementReport/index.vue b/src/views/procurementManagement/procurementReport/index.vue
index adf554d..93eb7d9 100644
--- a/src/views/procurementManagement/procurementReport/index.vue
+++ b/src/views/procurementManagement/procurementReport/index.vue
@@ -54,6 +54,10 @@
<span class="stat-label">鍟嗗搧绉嶇被锛�</span>
<span class="stat-value">{{ businessSummaryStats.productTypes }}</span>
</div>
+ <div class="stat-item">
+ <span class="stat-label">閫�娆炬�婚锛�</span>
+ <span class="stat-value">{{ businessSummaryStats.returnAmount }}</span>
+ </div>
</div>
</div>
@@ -119,7 +123,23 @@
}
},
{
- label: '閲囪喘閲戦',
+ label: '閫�璐ф暟閲�',
+ prop: 'returnQuantity',
+ width: 120,
+ formatData: (val) => {
+ return val ? parseFloat(val).toLocaleString() : '0'
+ }
+ },
+ {
+ label: '閫�璐ч噾棰�',
+ prop: 'returnAmount',
+ width: 120,
+ formatData: (val) => {
+ return val ? `楼${parseFloat(val).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : '楼0.00'
+ }
+ },
+ {
+ label: '閫�娆惧偍閲�',
prop: 'purchaseAmount',
formatData: (val) => {
return val ? `楼${parseFloat(val).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : '楼0.00'
@@ -239,7 +259,9 @@
businessSummaryStats.value.totalAmount = businessSummaryData.value.reduce((sum, item) => {
return sum + (parseFloat(item.purchaseAmount) || 0)
}, 0)
- businessSummaryStats.value.productTypes = new Set(businessSummaryData.value.map(item => item.productCategory)).size
+ businessSummaryStats.value.returnAmount = businessSummaryData.value.reduce((sum, item) => {
+ return sum + (parseFloat(item.returnAmount) || 0)
+ }, 0)
} else {
businessSummaryStats.value = {
totalAmount: 0,
diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
index d2fe2a9..f130733 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/New.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -26,6 +26,7 @@
v-model="formState.no"
:placeholder="formState.isDefaultNo ? '浣跨敤绯荤粺缂栧彿' : '璇疯緭鍏ラ��鏂欏崟鍙�'"
:disabled="formState.isDefaultNo"
+ style="width: 240px"
>
<template #append>
<el-checkbox v-model="formState.isDefaultNo" size="large" @change="handleChangeIsDefaultNo" />
@@ -77,25 +78,6 @@
:key="item.id"
:label="item.supplierName"
:value="item.id"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item
- label="椤圭洰"
- prop="projectId"
- >
- <el-select
- v-model="formState.projectId"
- placeholder="璇烽�夋嫨椤圭洰"
- style="width: 240px"
- @focus="fetchProjectOptions"
- >
- <el-option
- v-for="item in projectOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
/>
</el-select>
</el-form-item>
@@ -159,6 +141,7 @@
:reserve-keyword="false"
style="width: 240px"
@focus="fetchUserOptions"
+ @change="formState.preparedUserName = userOptions.find(item => item.userId === formState.preparedUserId)?.nickName || ''"
>
<el-option
v-for="item in userOptions"
@@ -189,6 +172,7 @@
style="width: 240px"
:reserve-keyword="false"
@focus="fetchUserOptions"
+ @change="formState.returnUserName = userOptions.find(item => item.userId === formState.returnUserId)?.nickName || ''"
>
<el-option
v-for="item in userOptions"
@@ -233,7 +217,7 @@
label="澶囨敞锛�"
prop="remark"
>
- <el-input v-model="formState.remark" type="textarea" placeholder="璇疯緭鍏ュ娉�"/>
+ <el-input style="width: 240px" v-model="formState.remark" :rows="1" type="textarea" placeholder="璇疯緭鍏ュ娉�"/>
</el-form-item>
<div style="margin: 20px 0;">
@@ -264,7 +248,10 @@
width="70" />
<el-table-column label="鏁伴噺"
prop="quantity"
- width="70" />
+ width="100" />
+ <el-table-column label="鍙��璐ф暟閲�"
+ prop="availableQuality"
+ width="130" />
<el-table-column label="閫�璐ф暟閲�"
prop="returnQuantity"
width="180">
@@ -272,8 +259,10 @@
<el-input-number v-model="scope.row.returnQuantity"
controls-position="right"
:step="1"
- :min="1"
- :max="scope.row.quantity"
+ :min="0"
+ :max="getReturnQtyMax(scope.row)"
+ :disabled="getReturnQtyMax(scope.row) <= 0"
+ @change="syncReturnTotal(scope.row)"
required
placeholder="璇疯緭鍏ラ��璐ф暟閲�" />
</template>
@@ -289,14 +278,13 @@
prop="taxInclusiveUnitPrice"
:formatter="formattedNumber"
width="150" />
- <el-table-column label="鍚◣鎬讳环(鍏�)"
+ <el-table-column label="閫�璐ф�讳环(鍏�)"
prop="taxInclusiveTotalPrice"
- :formatter="formattedNumber"
- width="150" />
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
- prop="taxExclusiveTotalPrice"
- :formatter="formattedNumber"
- width="150" />
+ width="180">
+ <template #default="scope">
+ {{ formatAmount(getReturnTotal(scope.row)) || '--' }}
+ </template>
+ </el-table-column>
<el-table-column label="鏄惁璐ㄦ"
prop="isChecked"
width="150">
@@ -357,15 +345,38 @@
<el-form-item
label="鎴愪氦閲戦锛�"
prop="totalAmount"
+ :rules="[
+ {
+ required: true,
+ message: '璇疯緭鍏ユ垚浜ら噾棰�',
+ trigger: 'change',
+ }
+ ]"
>
<el-input-number v-model="formState.totalAmount"
controls-position="right"
:step="0.01"
:precision="2"
style="width: 100%;"
- @change="handleChangeTotalAmount"
placeholder="璇疯緭鍏ユ垚浜ら噾棰�"/>
</el-form-item>
+ <el-form-item label="鏀舵鏂瑰紡" prop="incomeType" :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨鏀舵鏂瑰紡',
+ trigger: 'change',
+ }
+ ]">
+ <el-select
+ style="width: 240px;"
+ v-model="formState.incomeType"
+ placeholder="璇烽�夋嫨"
+ clearable
+
+ >
+ <el-option :label="item.label" :value="item.value" v-for="(item,index) in payment_methods" :key="index" />
+ </el-select>
+ </el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -386,11 +397,14 @@
</template>
<script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+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 {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,
@@ -398,6 +412,7 @@
}
});
let { proxy } = getCurrentInstance()
+const { payment_methods } = proxy.useDict("payment_methods");
const emit = defineEmits(['update:visible', 'completed']);
// 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
@@ -405,6 +420,7 @@
no: '',
isDefaultNo: true,
returnType: 0,
+ incomeType: undefined,
remark: '',
supplierId: undefined,
projectId: undefined,
@@ -420,8 +436,6 @@
});
// 渚涘簲鍟嗛�夐」
const supplierOptions = ref([])
-// 椤圭洰閫夐」
-const projectOptions = ref([])
// 椤圭洰闃舵閫夐」
const projectStageOptions = ref([
{
@@ -465,6 +479,44 @@
return parseFloat(cellValue).toFixed(2);
};
+const formatAmount = (value) => {
+ if (value === null || value === undefined || value === '') {
+ return '--'
+ }
+ const num = Number(value)
+ if (Number.isNaN(num)) {
+ return '--'
+ }
+ return num.toFixed(2)
+}
+
+const toNumber = (val) => {
+ const num = Number(val)
+ return Number.isNaN(num) ? 0 : num
+}
+
+const getReturnTotal = (row) => {
+ const qty = toNumber(row?.returnQuantity)
+ const unitPrice = toNumber(row?.taxInclusiveUnitPrice)
+ const total = qty * unitPrice
+ return Number(total.toFixed(2))
+}
+
+const syncReturnTotal = (row) => {
+ if (!row) {
+ return
+ }
+ row.taxInclusiveTotalPrice = getReturnTotal(row)
+}
+
+const getReturnQtyMax = (row) => {
+ const max = Number(row?.availableQuality)
+ if (Number.isNaN(max) || max < 0) {
+ return 0
+ }
+ return max
+}
+
const closeModal = () => {
isShow.value = false;
};
@@ -474,6 +526,7 @@
param,
[
"quantity",
+ "availableQuality",
"returnQuantity",
"taxInclusiveUnitPrice",
"taxInclusiveTotalPrice",
@@ -482,16 +535,23 @@
{
quantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
returnQuantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ availableQuality: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
);
};
const handleChangeTotalDiscountAmount= () => {
- formState.value.totalAmount = formState.value.totalDiscountAmount * -1
+ syncTotalAmount()
}
-const handleChangeTotalAmount= () => {
- formState.value.totalDiscountAmount = formState.value.totalAmount * -1
+const syncTotalAmount = () => {
+ const rows = formState.value.purchaseReturnOrderProductsDtos || []
+ const baseAmount = rows.reduce((sum, item) => {
+ return sum + toNumber(item.taxInclusiveTotalPrice)
+ }, 0)
+ const discount = toNumber(formState.value.totalDiscountAmount)
+ // 鎴愪氦閲戦 = 浜у搧閫�璐ф�讳环鍚堣 - 鎶樻墸棰�
+ formState.value.totalAmount = Number((baseAmount - discount).toFixed(2))
}
// 鑾峰彇渚涘簲鍟嗛�夐」
@@ -504,13 +564,6 @@
});
}
-// 鑾峰彇椤圭洰閫夐」
-const fetchProjectOptions = () => {
- if (projectOptions.value.length > 0) {
- return
- }
- // todo 椤圭洰閫夐」
-}
// 鑾峰彇鐢ㄦ埛閫夐」
const fetchUserOptions = () => {
@@ -525,6 +578,7 @@
// 澶勭悊鏀瑰彉渚涘簲鍟嗘暟鎹�
const handleChangeSupplierId = () => {
formState.value.purchaseLedgerId = undefined
+ formState.value.supplierName = supplierOptions.value.find(item => item.id === formState.value.supplierId)?.supplierName || ''
fetchPurchaseLedgerOptions()
}
@@ -532,15 +586,22 @@
const fetchPurchaseLedgerOptions = () => {
purchaseLedgerOptions.value = []
if (formState.value.supplierId) {
- purchaseList({supplierId: formState.value.supplierId}).then((res) => {
+ purchaseList({supplierId: formState.value.supplierId,approvalStatus:3}).then((res) => {
purchaseLedgerOptions.value = res.rows;
});
}
}
// 澶勭悊鏀瑰彉閲囪喘鍙拌处鏁版嵁
-const handleChangePurchaseLedgerId = () => {
- formState.value.purchaseReturnOrderProductsDtos = []
+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,
+ }))
+ syncTotalAmount()
}
// 澶勭悊鏀瑰彉鏄惁榛樿缂栧彿
@@ -556,23 +617,50 @@
const newProducts = selectedRows.filter(item => !existingIds.has(item.id)).map(item => ({
...item,
returnQuantity: undefined,
+ taxInclusiveTotalPrice: 0,
salesLedgerProductId: item.id,
}));
formState.value.purchaseReturnOrderProductsDtos.push(...newProducts);
+ syncTotalAmount()
}
// 鍒犻櫎鍗曢」浜у搧
const delProduct = (index) => {
formState.value.purchaseReturnOrderProductsDtos.splice(index, 1)
+ syncTotalAmount()
}
// 鎻愪氦琛ㄥ崟
const handleSubmit = () => {
- // 楠岃瘉閫�璐ф暟閲�
- const hasEmptyReturnQuantity = formState.value.purchaseReturnOrderProductsDtos.some(item => !item.returnQuantity || item.returnQuantity <= 0);
- if (hasEmptyReturnQuantity) {
- proxy.$modal.msgError("璇蜂负鎵�鏈変骇鍝佸～鍐欓��璐ф暟閲�");
- return;
+ const productList = formState.value.purchaseReturnOrderProductsDtos || []
+
+ productList.forEach(syncReturnTotal)
+
+ if (productList.length === 0) {
+ proxy.$modal.msgError("璇峰厛閫夋嫨浜у搧")
+ return
+ }
+
+ // 閫愯鏍￠獙閫�璐ф暟閲忥細浠绘剰涓�琛屾湭濉�/闈炴硶/瓒呴檺閮戒笉鍏佽鎻愪氦
+ const invalidRowIndex = productList.findIndex((item) => {
+ const qty = Number(item.returnQuantity)
+ const maxQty = Number(item.availableQuality)
+
+ if (item.returnQuantity === null || item.returnQuantity === undefined || item.returnQuantity === "") {
+ return true
+ }
+ if (Number.isNaN(qty) || qty <= 0) {
+ return true
+ }
+ if (!Number.isNaN(maxQty) && maxQty > 0 && qty > maxQty) {
+ return true
+ }
+ return false
+ })
+
+ if (invalidRowIndex !== -1) {
+ proxy.$modal.msgError(`绗�${invalidRowIndex + 1}琛岄��璐ф暟閲忔湭濉啓鎴栦笉鍚堟硶`)
+ return
}
proxy.$refs["formRef"].validate(valid => {
@@ -588,6 +676,15 @@
})
};
+watch(
+ () => formState.value.purchaseReturnOrderProductsDtos,
+ (rows) => {
+ (rows || []).forEach(syncReturnTotal)
+ syncTotalAmount()
+ },
+ { deep: true }
+)
+
defineExpose({
closeModal,
handleSubmit,
diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index df5ae07..1ac769e 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -23,37 +23,97 @@
</div>
<div class="table_list">
- <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange" :row-key="row => row.id" style="width: 100%" height="calc(100vh - 18.5em)">
- <el-table-column align="center" type="selection" width="55" />
- <el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="閫�鏂欏崟鍙�" prop="no" show-overflow-tooltip />
- <el-table-column label="閫�璐ф柟寮�" prop="returnType" show-overflow-tooltip />
- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip />
- <el-table-column label="鍏宠仈鍗曞彿" prop="purchaseContractNumber" show-overflow-tooltip />
- <el-table-column label="閫�鏂欎汉" prop="returnUserName" show-overflow-tooltip />
- <el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鍒涘缓浜�" prop="createUserName" show-overflow-tooltip />
- <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
- <template #default="scope">
- <el-button link type="primary" size="small" style="color: #67C23A">璇︽儏</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
- :page="page.current" :limit="page.size" @pagination="paginationChange" />
+ <PIMTable
+ rowKey="id"
+ :column="tableColumn"
+ :tableData="tableData"
+ :tableLoading="tableLoading"
+ :isSelection="true"
+ :page="page"
+ :height="'calc(100vh - 18.5em)'"
+ @selection-change="handleSelectionChange"
+ @pagination="paginationChange"
+ >
+ <template #operation="{ row }">
+ <el-button link type="primary" size="small" style="color: #67C23A" @click="handleDetail(row)">璇︽儏</el-button>
+ </template>
+ </PIMTable>
</div>
<new v-if="isShowNewModal"
v-model:visible="isShowNewModal"
@completed="handleQuery" />
+
+ <el-dialog
+ v-model="detailVisible"
+ title="閲囪喘閫�璐ц鎯�"
+ width="1200"
+ destroy-on-close
+ >
+ <div v-loading="detailLoading">
+ <el-descriptions :column="3" border>
+ <el-descriptions-item label="閫�鏂欏崟鍙�">{{ detailData.no || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="閫�璐ф柟寮�">{{ getReturnTypeLabel(detailData.returnType) }}</el-descriptions-item>
+ <el-descriptions-item label="渚涘簲鍟嗗悕绉�">{{ detailData.supplierName || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰闃舵">{{ getProjectPhaseLabel(detailData.projectPhase) }}</el-descriptions-item>
+ <el-descriptions-item label="鍏宠仈鍗曞彿">{{ detailData.purchaseContractNumber || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鍒朵綔鏃ユ湡">{{ detailData.preparedAt || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鍒跺崟浜�">{{ detailData.preparedUserName || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="閫�鏂欎汉">{{ detailData.returnUserName || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鏁村崟鎶樻墸棰�">{{ formatAmount(detailData.totalDiscountAmount) }}</el-descriptions-item>
+ <el-descriptions-item label="鏁村崟鎶樻墸鐜�">{{ detailData.totalDiscountRate ?? '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鎴愪氦閲戦">{{ formatAmount(detailData.totalAmount) }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓浜�">{{ detailData.createUserName || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿">{{ detailData.createTime || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戞洿鏂版椂闂�">{{ detailData.updateTime || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="澶囨敞" :span="3">{{ detailData.remark || '--' }}</el-descriptions-item>
+ </el-descriptions>
+
+ <el-divider content-position="left">浜у搧鍒楄〃</el-divider>
+
+ <el-table
+ :data="detailProducts"
+ border
+ max-height="420"
+ style="width: 100%"
+ >
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="浜у搧澶х被" prop="productCategory" min-width="120" show-overflow-tooltip />
+ <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" min-width="140" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅" prop="unit" width="80" />
+ <el-table-column label="鏁伴噺" prop="quantity" width="80" />
+ <el-table-column label="閫�璐ф暟閲�" prop="returnQuantity" width="100" />
+ <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="120" />
+ <el-table-column label="绋庣巼(%)" prop="taxRate" width="90" />
+ <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">
+ <template #default="scope">{{ formatAmount(scope.row.taxInclusiveTotalPrice) }}</template>
+ </el-table-column>
+ <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">
+ <template #default="scope">
+ <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
+ {{ scope.row.isChecked ? '鏄�' : '鍚�' }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <template #footer>
+ <el-button @click="detailVisible = false">鍏抽棴</el-button>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup>
-import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref, reactive, toRefs, onMounted } from 'vue'
-import {findPurchaseReturnOrderListPage} from "@/api/procurementManagement/purchase_return_order.js";
+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";
const New = defineAsyncComponent(() => import("@/views/procurementManagement/purchaseReturnOrder/New.vue"));
const tableData = ref([])
const selectedRows = ref([])
@@ -61,10 +121,111 @@
const page = reactive({
current: 1,
size: 100,
+ total: 0,
})
-const total = ref(0)
+const detailVisible = ref(false)
+const detailLoading = ref(false)
+const detailData = ref({})
+const detailProducts = ref([])
// 鏄惁鏄剧ず鏂板寮规
const isShowNewModal = ref(false)
+const returnTypeOptions = [
+ { label: '閫�璐ч��娆�', value: 0 },
+ { label: '鎷掓敹', value: 1 },
+]
+const projectPhaseOptions = [
+ { label: '绔嬮」', value: 0 },
+ { label: '璁捐', value: 1 },
+ { label: '閲囪喘', value: 2 },
+ { label: '鐢熶骇', value: 3 },
+ { label: '鍑鸿揣', value: 4 },
+]
+const tableColumn = ref([
+ {
+ label: '閫�鏂欏崟鍙�',
+ prop: 'no',
+ },
+ {
+ label: '閫�璐ф柟寮�',
+ prop: 'returnType',
+ formatData: (val) => returnTypeOptions.find(item => item.value === val)?.label || '--',
+ },
+ {
+ label: '渚涘簲鍟嗗悕绉�',
+ prop: 'supplierName',
+ width: 180,
+ },
+ {
+ label: '椤圭洰闃舵',
+ prop: 'projectPhase',
+ width: 100,
+ formatData: (val) => projectPhaseOptions.find(item => String(item.value) === String(val))?.label || '--',
+ },
+ {
+ label: '鍏宠仈鍗曞彿',
+ prop: 'purchaseContractNumber',
+ width: 160,
+ },
+ {
+ label: '鍒朵綔鏃ユ湡',
+ prop: 'preparedAt',
+ width: 130,
+ },
+ {
+ label: '鍒跺崟浜�',
+ prop: 'preparedUserName',
+ width: 110,
+ },
+ {
+ label: '閫�鏂欎汉',
+ prop: 'returnUserName',
+ width: 110,
+ },
+
+ {
+ label: '鏁村崟鎶樻墸棰�',
+ prop: 'totalDiscountAmount',
+ width: 120,
+ },
+ {
+ label: '鏁村崟鎶樻墸鐜�',
+ prop: 'totalDiscountRate',
+ width: 120,
+ },
+ {
+ label: '鎴愪氦閲戦',
+ prop: 'totalAmount',
+ width: 120,
+ },
+ {
+ label: '鍒涘缓浜�',
+ prop: 'createUserName',
+ width: 110,
+ },
+ {
+ label: '鍒涘缓鏃堕棿',
+ prop: 'createTime',
+ width: 170,
+ },
+ {
+ label: '鏈�杩戞洿鏂版椂闂�',
+ prop: 'updateTime',
+ width: 170,
+ },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
+ width: 180,
+ },
+ {
+ fixed: 'right',
+ label: '鎿嶄綔',
+ dataType: 'slot',
+ slot: 'operation',
+ width: 100,
+ align: 'center',
+ },
+])
const data = reactive({
searchForm: {
no: '',
@@ -79,6 +240,30 @@
getList()
}
+const handleDetail = (row) => {
+ if (!row?.id) {
+ proxy?.$modal?.msgWarning('鏈幏鍙栧埌鍗曟嵁ID')
+ return
+ }
+ detailVisible.value = true
+ detailLoading.value = true
+ getPurchaseReturnOrderDetail(row.id).then(res => {
+ const payload = res?.data || {}
+ detailData.value = payload
+ // 鎷兼帴杩炰釜瀵硅薄鎴愪竴涓璞★紝鏂逛究灞曠ず item 鍜� item.salesLedgerProduct 閲岀殑瀛楁
+
+
+ detailProducts.value =
+ payload.purchaseReturnOrderProductsDetailVoList.map(item => ({ ...item, ...item.salesLedgerProduct })) ||
+ []
+ }).catch(() => {
+ proxy?.$modal?.msgError('鑾峰彇璇︽儏澶辫触')
+ }).finally(() => {
+ detailLoading.value = false
+ })
+}
+
+
const paginationChange = (obj) => {
page.current = obj.page;
page.size = obj.limit;
@@ -90,7 +275,7 @@
findPurchaseReturnOrderListPage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
- total.value = res.data.total
+ page.total = res.data.total
}).catch(() => {
tableLoading.value = false
})
@@ -102,6 +287,25 @@
selectedRows.value = selection.filter(item => item.id);
}
+const getReturnTypeLabel = (value) => {
+ return returnTypeOptions.find(item => String(item.value) === String(value))?.label || '--'
+}
+
+const getProjectPhaseLabel = (value) => {
+ return projectPhaseOptions.find(item => String(item.value) === String(value))?.label || '--'
+}
+
+const formatAmount = (value) => {
+ if (value === null || value === undefined || value === '') {
+ return '--'
+ }
+ const num = Number(value)
+ if (Number.isNaN(num)) {
+ return value
+ }
+ return num.toFixed(2)
+}
+
onMounted(() => {
getList()
})
--
Gitblit v1.9.3