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 | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 103e8cc..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' },
@@ -283,16 +283,16 @@
this.bindPartFirst(row);
},
},
- {
- name: '杞﹂棿缁戝畾',
- type: 'text',
- clickFun: (row) => {
- this.bindWokshop1(row);
- },
- disabled: (row) => {
- return row.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗'
- }
- },
+ // {
+ // name: '杞﹂棿缁戝畾',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.bindWokshop1(row);
+ // },
+ // disabled: (row) => {
+ // return row.objectType != '鍘熻緟鏉�' && row.objectType != '鍖呮潗'
+ // }
+ // },
]
}
],
@@ -315,7 +315,7 @@
productColumn: [
{ label: '浜у搧鍚嶇О', prop: 'name' },
{ label: '浜у搧鍚嶇ОEN', prop: 'nameEn' },
- { label: '杞﹂棿鍚嶇О', prop: 'workShopName' },
+ // { label: '杞﹂棿鍚嶇О', prop: 'workShopName' },
{
dataType: 'action',
label: '鎿嶄綔',
@@ -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
@@ -413,7 +413,7 @@
this.getDicts("product_classification").then((response) => {
this.productClassification = this.dictToValue(response.data);
});
- this.selectWorkShop()
+ // this.selectWorkShop()
},
computed: {
title() {
@@ -586,15 +586,15 @@
// 浜у搧缁存姢
upProduct(row) {
this.currentObj = row;
- if (this.currentObj.objectType == '鍘熻緟鏂�') {
- if (this.productColumn.length < 4) {
- this.productColumn.splice(2, 0, { label: '杞﹂棿鍚嶇О', prop: 'workShopName' })
- }
- } else {
- if (this.productColumn.length == 4) {
- this.productColumn.splice(2, 1)
- }
- }
+ // if (this.currentObj.objectType == '鍘熻緟鏉�') {
+ // if (this.productColumn.length < 4) {
+ // this.productColumn.splice(2, 0, { label: '杞﹂棿鍚嶇О', prop: 'workShopName' })
+ // }
+ // } else {
+ // if (this.productColumn.length == 4) {
+ // this.productColumn.splice(2, 1)
+ // }
+ // }
this.diaProduct = true
this.objectId = row.id
this.productPage.current = 1
--
Gitblit v1.9.3