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/capabilityComponents/testObjectEditForm.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
index e8052d0..bc88919 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
@@ -24,7 +24,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="杞﹂棿锛�" prop="objectType" v-if="editForm.objectType == '鍘熻緟鏂�' || editForm.objectType == '鍖呮潗'">
+ <el-form-item label="杞﹂棿锛�" prop="objectType" v-if="editForm.objectType == '鍘熻緟鏉�' || editForm.objectType == '鍖呮潗'">
<el-select v-model="editForm.workShopId" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in workshopList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -107,7 +107,7 @@
this.$refs.editForm.validate(valid => {
if (valid) {
this.editLoad = true
- if (this.editForm.objectType != '鍘熻緟鏂�' && this.editForm.objectType != '鍖呮潗') {
+ if (this.editForm.objectType != '鍘熻緟鏉�' && this.editForm.objectType != '鍖呮潗') {
this.editForm.workShopId = ''
}
this.editForm.workShopName = this.editForm.workShopId ? this.workshopList.find(m => m.id == this.editForm.workShopId).name : ''
--
Gitblit v1.9.3