From 1ffe9b9bf12e1670fbfae0b9acbec95d4aaebe16 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 20 五月 2026 16:23:23 +0800
Subject: [PATCH] fix: 完成财务模块接口对接
---
src/views/financialManagement/payable/purchaseIn.vue | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/views/financialManagement/payable/purchaseIn.vue b/src/views/financialManagement/payable/purchaseIn.vue
index 4fadcbb..ebc8f0c 100644
--- a/src/views/financialManagement/payable/purchaseIn.vue
+++ b/src/views/financialManagement/payable/purchaseIn.vue
@@ -6,7 +6,14 @@
<el-input v-model="filters.inboundBatches" placeholder="璇疯緭鍏ュ叆搴撳崟鍙�" clearable style="width: 200px;" />
</el-form-item>
<el-form-item label="渚涘簲鍟�:">
- <el-input v-model="filters.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢" clearable style="width: 200px;" />
+ <el-select v-model="filters.supplierId" placeholder="璇烽�夋嫨渚涘簲鍟�" clearable filterable style="width: 200px;">
+ <el-option
+ v-for="item in supplierList"
+ :key="item.id"
+ :label="item.supplierName"
+ :value="item.id"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鍏ュ簱鏃ユ湡:">
<el-date-picker
@@ -45,7 +52,7 @@
@pagination="changePage"
>
<template #inboundDate="{ row }">
- {{ row.InboundDate || row.inboundDate || "" }}
+ {{ row.inboundDate ?? row.InboundDate ?? "" }}
</template>
</PIMTable>
</div>
@@ -56,6 +63,7 @@
import { ref, reactive, onMounted, getCurrentInstance } from "vue";
import { ElMessage } from "element-plus";
import { listPageAccountPurchase } from "@/api/financialManagement/accountPurchase";
+import { listSupplier } from "@/api/basicData/supplierManageFile.js";
defineOptions({
name: "閲囪喘鍏ュ簱",
@@ -65,7 +73,7 @@
const filters = reactive({
inboundBatches: "",
- supplierName: "",
+ supplierId: "",
dateRange: [],
});
@@ -80,7 +88,7 @@
{ label: "渚涘簲鍟�", prop: "supplierName", minWidth: "180" },
{
label: "鍏ュ簱鏃ユ湡",
- prop: "InboundDate",
+ prop: "inboundDate",
minWidth: "170",
dataType: "slot",
slot: "inboundDate",
@@ -92,18 +100,30 @@
const dataList = ref([]);
const tableLoading = ref(false);
+const supplierList = ref([]);
-function buildFilterParams() {
- const params = {
- inboundBatches: filters.inboundBatches || undefined,
- supplierName: filters.supplierName || undefined,
- };
- if (filters.dateRange && filters.dateRange.length === 2) {
+const buildFilterParams = () => {
+ const params = {};
+ if (filters.inboundBatches) {
+ params.inboundBatches = filters.inboundBatches;
+ }
+ if (filters.supplierId) {
+ params.supplierId = filters.supplierId;
+ }
+ if (filters.dateRange?.length === 2) {
params.startDate = filters.dateRange[0];
params.endDate = filters.dateRange[1];
}
return params;
-}
+};
+
+const getSupplierList = () => {
+ listSupplier({ current: -1, size: -1, isWhite: 0 }).then((res) => {
+ if (res.code === 200) {
+ supplierList.value = res.data?.records ?? [];
+ }
+ });
+};
const onSearch = () => {
pagination.currentPage = 1;
@@ -125,10 +145,13 @@
} else {
ElMessage.error(res.msg || "鏌ヨ澶辫触");
dataList.value = [];
+ pagination.total = 0;
}
})
.catch(() => {
dataList.value = [];
+ pagination.total = 0;
+ ElMessage.error("鏌ヨ澶辫触");
})
.finally(() => {
tableLoading.value = false;
@@ -137,7 +160,7 @@
const resetFilters = () => {
filters.inboundBatches = "";
- filters.supplierName = "";
+ filters.supplierId = "";
filters.dateRange = [];
pagination.currentPage = 1;
getTableData();
@@ -153,11 +176,12 @@
proxy.download(
"/accountPurchase/exportAccountPurchaseInbound",
buildFilterParams(),
- `閲囪喘鍏ュ簱_${new Date().getTime()}.xlsx`
+ `閲囪喘鍏ュ簱_${Date.now()}.xlsx`
);
};
onMounted(() => {
+ getSupplierList();
getTableData();
});
</script>
--
Gitblit v1.9.3