From aa802302cfe650e08806c8b87d5a8c5d3a79ffe1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 12 五月 2026 04:32:11 +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 | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 1637226..6ccb452 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,9 +58,15 @@
min-width="100"
show-overflow-tooltip
/>
+ <el-table-column
+ label="鍚堝悓鍙�"
+ prop="salesContractNo"
+ show-overflow-tooltip
+ />
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
+ :formatter="formatTableDateYmd"
show-overflow-tooltip
/>
<el-table-column
@@ -64,6 +77,11 @@
<el-table-column
label="瑙勬牸鍨嬪彿"
prop="model"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍘氬害(mm)"
+ prop="thickness"
show-overflow-tooltip
/>
<el-table-column
@@ -103,10 +121,11 @@
<script setup>
import pagination from "@/components/PIMTable/Pagination.vue";
-import { ref } from "vue";
+import { ref, reactive, toRefs, getCurrentInstance, onMounted } from "vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { getCurrentDate } from "@/utils/index.js";
+import { parseTime } from "@/utils/ruoyi";
import {
getStockOutPage,
delStockOut,
@@ -117,6 +136,13 @@
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
+
+const formatTableDateYmd = (row, column, cellValue) => {
+ if (cellValue == null || cellValue === "") {
+ return "";
+ }
+ return parseTime(cellValue, "{y}-{m}-{d}") || "";
+};
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
@@ -144,6 +170,7 @@
const data = reactive({
searchForm: {
supplierName: "",
+ salesContractNo: "",
timeStr: "",
recordType: "",
}
@@ -405,7 +432,6 @@
<div class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -417,7 +443,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