From 752030a34315629a07810faff9bcd6522c1ebf41 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 23 五月 2025 09:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/spare/modules/EamSpareParts/EamSparePartInventoryList.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/spare/modules/EamSpareParts/EamSparePartInventoryList.vue b/src/views/eam/spare/modules/EamSpareParts/EamSparePartInventoryList.vue
index edfc5b8..80dbf4f 100644
--- a/src/views/eam/spare/modules/EamSpareParts/EamSparePartInventoryList.vue
+++ b/src/views/eam/spare/modules/EamSpareParts/EamSparePartInventoryList.vue
@@ -81,11 +81,11 @@
return parseInt(index) + 1;
}
},
- // {
- // title: '澶囧搧澶囦欢ID',
- // align: "center",
- // dataIndex: 'sparePartId'
- // },
+ {
+ title: '鏉ユ簮绫诲瀷',
+ align: "center",
+ dataIndex: 'sparePartIntoType_dictText'
+ },
{
title: '鎵规鍙�',
align: "center",
@@ -116,12 +116,12 @@
align: "center",
dataIndex: 'location'
},
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: "center",
- scopedSlots: { customRender: 'action' },
- }
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // align: "center",
+ // scopedSlots: { customRender: 'action' },
+ // }
],
url: {
list: "/eam/eamSparePartInventory/list",
--
Gitblit v1.9.3