From 2c16ab87fbbf07e5d48b132c991073c74b3d8b4e Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 22 四月 2026 17:17:07 +0800
Subject: [PATCH] 1
---
src/views/inventoryManagement/receiptManagement/Record.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 3000a8e..7a95c72 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -15,6 +15,11 @@
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
+ <span class="search_title ml10">鍚堝悓鍙凤細</span>
+ <el-input v-model="searchForm.salesContractNo"
+ style="width: 240px"
+ placeholder="璇疯緭鍏ュ悎鍚屽彿"
+ clearable/>
<span class="search_title ml10">鏉ユ簮锛�</span>
<el-select v-model="searchForm.recordType"
style="width: 240px"
@@ -22,8 +27,8 @@
clearable>
<el-option v-for="item in stockRecordTypeOptions"
:key="item.value"
- :label="item.value"
- :value="item.key"/>
+ :label="item.label"
+ :value="item.value"/>
</el-select>
<el-button type="primary"
@click="handleQuery"
@@ -58,6 +63,9 @@
prop="inboundBatches"
width="280"
show-overflow-tooltip/>
+ <el-table-column label="鍚堝悓鍙�"
+ prop="salesContractNo"
+ show-overflow-tooltip/>
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
show-overflow-tooltip/>
@@ -67,6 +75,9 @@
<el-table-column label="瑙勬牸鍨嬪彿"
prop="model"
show-overflow-tooltip/>
+ <el-table-column label="鍘氬害(mm)"
+ prop="thickness"
+ show-overflow-tooltip />
<el-table-column label="鍗曚綅"
prop="unit"
show-overflow-tooltip/>
@@ -108,7 +119,9 @@
getStockInRecordListPage,
batchDeleteStockInRecords,
} from "@/api/inventoryManagement/stockInRecord.js";
-import {findAllStockRecordTypeOptions} from "@/api/basicData/enum.js";
+import {
+ findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
+} from "@/api/basicData/enum.js";
const {proxy} = getCurrentInstance();
@@ -127,13 +140,14 @@
const stockRecordTypeOptions = ref([]);
const page = reactive({
current: 1,
- size: 100,
+ size: 10,
});
const total = ref(0);
const data = reactive({
searchForm: {
productName: "",
+ salesContractNo: "",
timeStr: "",
recordType: "",
},
@@ -147,7 +161,7 @@
};
const getRecordType = (recordType) => {
- return stockRecordTypeOptions.value.find(item => item.key === recordType)?.value || ''
+ return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
}
const pageProductChange = obj => {
@@ -161,9 +175,12 @@
const params = {...page, type: props.type};
params.timeStr = searchForm.value.timeStr;
params.productName = searchForm.value.productName;
+ params.salesContractNo = searchForm.value.salesContractNo;
+ params.recordType = searchForm.value.recordType;
getStockInRecordListPage(params)
.then(res => {
tableData.value = res.data.records;
+ total.value = res.data.total || 0;
}).finally(() => {
tableLoading.value = false;
})
@@ -171,7 +188,14 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
- findAllStockRecordTypeOptions()
+ if (props.type === '0') {
+ findAllQualifiedStockInRecordTypeOptions()
+ .then(res => {
+ stockRecordTypeOptions.value = res.data;
+ })
+ return
+ }
+ findAllUnQualifiedStockInRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
@@ -193,8 +217,7 @@
})
.then(() => {
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
- let exportUrl = "/stockin/export";
- proxy.download(exportUrl, {}, "鍏ュ簱鍙拌处.xlsx");
+ proxy.download("/stockInRecord/exportStockInRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍏ュ簱.xlsx" : "涓嶅悎鏍煎叆搴�.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
--
Gitblit v1.9.3