From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue
index c97e5cf..5b81724 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue
@@ -179,44 +179,44 @@
ellipsis: true
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitIdName',
},
{
- title: '搴撳瓨涓绘暟閲�',
+ title: '搴撳瓨鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitIdName',
ellipsis: true
- },
- {
+ }, */
+ /* {
title: '搴撳瓨杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity',
- },
+ }, */
{
- title: '鎶ュ簾涓绘暟閲�',
+ title: '鎶ュ簾鏁伴噺',
align: 'center',
dataIndex: 'scrapMainQuantity',
},
- {
+ /* {
title: '鎶ュ簾杈呮暟閲�',
align: 'center',
dataIndex: 'scrapAuxiliaryQuantity',
- },
+ }, */
{
title: '鎶ュ簾鍘熷洜',
align: 'center',
--
Gitblit v1.9.3