From e9c7fa1915cd2afbadaef1884324fa7cd5aaaf25 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:06 +0800
Subject: [PATCH] Merge branch 'dev_y_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_y_ztns
---
src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index 58b2753..a236a5b 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -105,8 +105,11 @@
</el-col>
<el-col :span="12" v-if="editForm.inspectionItemType == 1">
<el-form-item label="璁惧缁戝畾锛�" prop="deviceId">
- <el-select v-model="editForm.deviceId" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%" multiple>
- <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-select v-model="editForm.deviceId" clearable placeholder="璇烽�夋嫨"
+ size="small" style="width: 100%" multiple filterable>
+ <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.value">
+ {{item.label + ' - ' + item.managementNumber}}
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -172,6 +175,15 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎶芥绫诲瀷缁戝畾锛�" prop="spotCheckType">
+ <el-select v-model="editForm.spotCheckType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-option v-for="item in dict.type.spot_check_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="瀛楀吀绫诲瀷锛�" prop="dic">-->
<!-- <el-select v-model="editForm.dic" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">-->
@@ -204,7 +216,7 @@
name: "EditForm",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {},
- dicts: ['sys_sub_lab', 'inspection_item_type', 'sys_unit', 'inspection_value_type', 'inspection_bsm'],
+ dicts: ['sys_sub_lab', 'inspection_item_type', 'sys_unit', 'inspection_value_type', 'inspection_bsm', 'spot_check_type'],
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -234,7 +246,8 @@
inspectionItemClassEn: '', // 妫�楠岄」鍒嗙被EN
method: '', // 璇曢獙鏂规硶
radiusList: [], // 鏉′欢
- rates: '', // 鏉′欢
+ rates: '', // 鏀惰垂鏍囧噯(鍏�/娆�)
+ spotCheckType: '', // 鎶芥绫诲瀷缁戝畾
deviceId: [], // 璁惧
},
sampleList: [], // 妫�楠屽璞′笅鎷夋
@@ -310,7 +323,8 @@
inspectionItemClassEn: '', // 妫�楠岄」鍒嗙被EN
method: '', // 璇曢獙鏂规硶
radiusList: [], // 鏉′欢
- rates: '', // 鏉′欢
+ rates: '', // 鏀惰垂鏍囧噯(鍏�/娆�)
+ spotCheckType: '', // 鎶芥绫诲瀷缁戝畾
}
this.resetForm('editForm')
} else {
@@ -452,6 +466,7 @@
this.equipOptions = res.data.map((m) => {
m.value = m.id;
m.label = m.deviceName;
+ m.managementNumber = m.managementNumber;
return m;
});
}
--
Gitblit v1.9.3