From de83f5112fecda011bce0192dce152e66bb56f87 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 17:37:24 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management into dev_衡阳_鹏创电子
---
src/views/inventoryManagement/dispatchLog/Record.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 73792da..e6cee3f 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -66,6 +66,11 @@
prop="model"
show-overflow-tooltip
/>
+ <el-table-column
+ label="鏂欏彿"
+ prop="materialCode"
+ show-overflow-tooltip
+ />
<el-table-column
label="鍗曚綅"
prop="unit"
@@ -112,9 +117,7 @@
delStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {
- findAllQualifiedStockRecordTypeOptions,
- findAllStockRecordTypeOptions,
- findAllUnqualifiedStockRecordTypeOptions
+ findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";
const userStore = useUserStore();
@@ -186,13 +189,13 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
if (props.type === '0') {
- findAllQualifiedStockRecordTypeOptions()
+ findAllQualifiedStockOutRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
return
}
- findAllUnqualifiedStockRecordTypeOptions()
+ findAllUnQualifiedStockOutRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
@@ -214,7 +217,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/stockmanagement/export", {}, "鍑哄簱鍙拌处.xlsx");
+ proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍑哄簱鍙拌处.xlsx" : "涓嶅悎鏍煎嚭搴撳彴璐�.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -407,7 +410,7 @@
<div class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+ <div class="company-name">婀栧崡楣忓垱鐢靛瓙鏈夐檺鍏徃</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -434,6 +437,7 @@
<tr>
<th>浜у搧鍚嶇О</th>
<th>瑙勬牸鍨嬪彿</th>
+ <th>鏂欏彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
@@ -444,6 +448,7 @@
<tr>
<td>${item.productName || '鐮傜伆鐮�'}</td>
<td>${item.model || '鏍囧噯'}</td>
+ <td>${item.materialCode || ''}</td>
<td>${item.unit || '鍧�'}</td>
<td>${item.taxInclusiveUnitPrice || '0'}</td>
<td>${item.inboundNum || '2000'}</td>
--
Gitblit v1.9.3