From 4a2da94a6f743609ed670710947bdfd4e41bf714 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期三, 30 八月 2023 19:00:42 +0800
Subject: [PATCH] 库存代码冲突调整

---
 src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue b/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
index 99045bd..7a030a3 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
@@ -118,20 +118,20 @@
           width: 150
 
         },
-        {
+       /*  {
           title: '杈呭崟浣�',
           align: 'center',
           dataIndex: 'auxiliaryUnitId_dictText',
           width: 150
 
-        },
-        {
+        }, */
+       /*  {
           title: '鎹㈢畻姣斾緥',
           align: 'center',
           width: 100,
           dataIndex: 'conversionRatio'
 
-        }
+        } */
 
       ],
       selectedRowKeys: [],

--
Gitblit v1.9.3