From 83f051915bbe4562abfb5f1589642dd393ea8490 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:43:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mes/MesMaterialTransferRequestList.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/MesMaterialTransferRequestList.vue b/src/views/mes/MesMaterialTransferRequestList.vue
index c2242c4..1f757c4 100644
--- a/src/views/mes/MesMaterialTransferRequestList.vue
+++ b/src/views/mes/MesMaterialTransferRequestList.vue
@@ -106,9 +106,9 @@
dataIndex: 'requestCode'
},
{
- title: '宸ュ崟ID',
+ title: '浠诲姟鍙�',
align: 'center',
- dataIndex: 'workOrderId'
+ dataIndex: 'workOrderId_dictText'
},
{
title: 'SAP棰勭暀鍙�',
@@ -116,9 +116,34 @@
dataIndex: 'reservationCode'
},
{
+ title: '鐗╂枡缂栫爜',
+ align: 'center',
+ dataIndex: 'materialNumber'
+ },
+ {
+ title: '鐗╂枡鍚嶇О',
+ align: 'center',
+ dataIndex: 'materialName'
+ },
+ {
+ title: '鐞嗚鎷夊姩鏁伴噺',
+ align: 'center',
+ dataIndex: 'specifiedQuantity'
+ },
+ {
+ title: '瀹為檯鎷夊姩鏁伴噺',
+ align: 'center',
+ dataIndex: 'actualQuantity'
+ },
+ {
title: '鍙戝竷鐘舵��',
align: 'center',
dataIndex: 'publishStatus_dictText'
+ },
+ {
+ title: '鍙戝竷鏃堕棿',
+ align: 'center',
+ dataIndex: 'publishTime'
},
{
title: '璇锋眰鐘舵��',
@@ -133,17 +158,17 @@
{
title: '鍘熷簱瀛樺湴',
align: 'center',
- dataIndex: 'originalWarehouseId'
+ dataIndex: 'originalWarehouseId_dictText'
},
{
title: '鐩爣搴撳瓨鍦�',
align: 'center',
- dataIndex: 'targetWarehouseId'
+ dataIndex: 'targetWarehouseId_dictText'
},
{
- title: '浼樺厛绾э紙鎷夊姩绫诲瀷锛�',
+ title: '鎷夊姩绫诲瀷',
align: 'center',
- dataIndex: 'priority_dictText'
+ dataIndex: 'materialTransferCategory_dictText'
},
{
title: '鏈�鏅氶厤閫佹椂闂�',
--
Gitblit v1.9.3