From f8d17ac2666198f513a4d5f83dce1135a911f2ee Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 02 四月 2025 17:15:07 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index ff4930d..9fadf61 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -155,7 +155,7 @@
{ label: '璇曢獙瀹�', prop: 'sonLaboratory' },
{ label: '瑕佹眰鎻忚堪', prop: 'askTell' },
{ label: '瑕佹眰鍊�', prop: 'ask' },
- { label: '璇曢獙鏉′欢', prop: 'radiusList' },
+ // { label: '璇曢獙鏉′欢', prop: 'radiusList' },
{ label: '璁￠噺鍗曚綅', prop: 'unit' },
{ label: '宸ユ椂(H)', prop: 'manHour' },
{ label: '棰勮鏃堕棿(H)', prop: 'manDay' },
@@ -290,7 +290,7 @@
// this.bindWokshop1(row);
// },
// disabled: (row) => {
- // return row.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗'
+ // return row.objectType != '鍘熻緟鏉�' && row.objectType != '鍖呮潗'
// }
// },
]
@@ -348,7 +348,7 @@
// this.bindWokshop(row);
// },
// showHide: (row) => {
- // if (this.currentObj.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗') {
+ // if (this.currentObj.objectType != '鍘熻緟鏉�' && row.objectType != '鍖呮潗') {
// return false
// } else {
// return true
@@ -586,7 +586,7 @@
// 浜у搧缁存姢
upProduct(row) {
this.currentObj = row;
- // if (this.currentObj.objectType == '鍘熻緟鏂�') {
+ // if (this.currentObj.objectType == '鍘熻緟鏉�') {
// if (this.productColumn.length < 4) {
// this.productColumn.splice(2, 0, { label: '杞﹂棿鍚嶇О', prop: 'workShopName' })
// }
--
Gitblit v1.9.3