From 9aced09ef31ab77663e6ee052785d87ca3c671ba Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 31 三月 2026 10:44:00 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材
---
src/views/inventoryManagement/receiptManagement/Record.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index a477547..3715fb5 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -54,10 +54,24 @@
label="搴忓彿"
type="index"
width="60"/>
- <el-table-column label="鍏ュ簱鎵规"
+ <!-- <el-table-column label="鍏ュ簱鎵规"
prop="inboundBatches"
width="280"
- show-overflow-tooltip/>
+ show-overflow-tooltip/> -->
+ <el-table-column label="鎵瑰彿"
+ min-width="160"
+ show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.batchNo || '' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="渚涘簲鍟�"
+ min-width="200"
+ show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.supplierName || scope.row.customer || '' }}
+ </template>
+ </el-table-column>
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
show-overflow-tooltip/>
@@ -66,6 +80,9 @@
show-overflow-tooltip/>
<el-table-column label="瑙勬牸鍨嬪彿"
prop="model"
+ show-overflow-tooltip/>
+ <el-table-column label="UID鐮�"
+ prop="uidNo"
show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
prop="unit"
@@ -109,8 +126,7 @@
batchDeleteStockInRecords,
} from "@/api/inventoryManagement/stockInRecord.js";
import {
- findAllQualifiedStockRecordTypeOptions,
- findAllUnqualifiedStockRecordTypeOptions
+ findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";
const {proxy} = getCurrentInstance();
@@ -130,7 +146,7 @@
const stockRecordTypeOptions = ref([]);
const page = reactive({
current: 1,
- size: 100,
+ size: 10,
});
const total = ref(0);
@@ -164,9 +180,11 @@
const params = {...page, type: props.type};
params.timeStr = searchForm.value.timeStr;
params.productName = searchForm.value.productName;
+ params.recordType = searchForm.value.recordType;
getStockInRecordListPage(params)
.then(res => {
tableData.value = res.data.records;
+ total.value = res.data.total || 0;
}).finally(() => {
tableLoading.value = false;
})
@@ -175,13 +193,13 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
if (props.type === '0') {
- findAllQualifiedStockRecordTypeOptions()
+ findAllQualifiedStockInRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
return
}
- findAllUnqualifiedStockRecordTypeOptions()
+ findAllUnQualifiedStockInRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
@@ -203,8 +221,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