From 4e920b761cb2b21eca614ed4c437e30f92655ebd Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 21 四月 2026 15:19:34 +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 | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 6fa29c8..61fdc1b 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -12,6 +12,13 @@
clearable
@change="handleQuery"
/>
+ <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"
@@ -51,6 +58,11 @@
min-width="100"
show-overflow-tooltip
/>
+ <el-table-column
+ label="鍚堝悓鍙�"
+ prop="salesContractNo"
+ show-overflow-tooltip
+ />
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
@@ -64,6 +76,11 @@
<el-table-column
label="瑙勬牸鍨嬪彿"
prop="model"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍘氬害(mm)"
+ prop="thickness"
show-overflow-tooltip
/>
<el-table-column
@@ -112,9 +129,7 @@
delStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {
- findAllQualifiedStockRecordTypeOptions,
- findAllStockRecordTypeOptions,
- findAllUnqualifiedStockRecordTypeOptions
+ findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";
const userStore = useUserStore();
@@ -146,6 +161,7 @@
const data = reactive({
searchForm: {
supplierName: "",
+ salesContractNo: "",
timeStr: "",
recordType: "",
}
@@ -186,13 +202,13 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
if (props.type === '0') {
- findAllQualifiedStockRecordTypeOptions()
+ findAllQualifiedStockOutRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
return
}
- findAllUnqualifiedStockRecordTypeOptions()
+ findAllUnQualifiedStockOutRecordTypeOptions()
.then(res => {
stockRecordTypeOptions.value = res.data;
})
@@ -407,7 +423,6 @@
<div class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -419,7 +434,7 @@
</div>
<div>
<span class="label">瀹㈡埛鍚嶇О锛�</span>
- <span class="value">${item.supplierName || '寮犵埍鏈�'}</span>
+ <span class="value">${item.supplierName}</span>
</div>
</div>
<div class="info-row">
--
Gitblit v1.9.3