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/bindPartDialog.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue
index 23bf010..8d13703 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue
@@ -22,7 +22,8 @@
<el-form-item label="鑹叉爣锛�" prop="colorCode">
<el-input v-model="bindPartData.colorCode" size="small"></el-input>
</el-form-item>
- <el-form-item label="杩涘巶妫�楠岄」锛�" prop="inspectionItem" v-if="currentObj.objectType == '鍘熸潗鏂�'" label-width="100px">
+ <el-form-item label="杩涘巶妫�楠岄」锛�" prop="inspectionItem"
+ v-if="currentObj.objectType == '鍘熻緟鏉�' || currentObj.objectType == '鍖呮潗'" label-width="100px">
<!-- <el-input v-model="bindPartData.inspectionItem" disabled placeholder="閫夋嫨妫�楠岄」" size="small">
<template slot="append">
<el-button slot="append" icon="el-icon-search" @click="openItems"></el-button>
@@ -200,7 +201,7 @@
partNo: '', // 闆朵欢鍙�
color: '', // 棰滆壊
colorCode: '', // 鑹叉爣
- inspectionItem: [],//鍘熸潗鏂欒繘鍘傛楠屽璞″垪琛�
+ inspectionItem: [],//鍘熻緟鏉愯繘鍘傛楠屽璞″垪琛�
},
bindPartDataRules: {
partNo: [
@@ -211,7 +212,7 @@
upIndex: 0,
addBindLoad: false,
- itemList: [],//鍘熸潗鏂欒繘鍘傛楠屽璞″垪琛�
+ itemList: [],//鍘熻緟鏉愯繘鍘傛楠屽璞″垪琛�
editItem: false,
editList: [],
editColumn: [
--
Gitblit v1.9.3