From d233572a40431aa56e665553a87df80c973ca5b2 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 29 三月 2025 14:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index 4755b92..103c747 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -103,6 +103,15 @@
</el-select>
</el-form-item>
</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>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="妫�楠屽�肩被鍨嬶細" prop="inspectionValueType">
<el-select v-model="editForm.inspectionValueType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
@@ -110,8 +119,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="鐗规畩鏍囪瘑锛�" prop="bsm">
<el-select v-model="editForm.bsm" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
@@ -119,6 +126,8 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="鍘熷璁板綍妯℃澘锛�" prop="templateId">
<el-select v-model="editForm.templateId" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
@@ -126,20 +135,18 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="妫�楠岄」鍒嗙被锛�" prop="inspectionItemClass">
<el-input v-model="editForm.inspectionItemClass" clearable size="small"></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="妫�楠岄」鍒嗙被EN锛�" prop="inspectionItemClassEn">
<el-input v-model="editForm.inspectionItemClassEn" clearable size="small"></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="璇曢獙鏂规硶锛�" prop="method">
<el-select v-model="editForm.method" clearable multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%">
@@ -147,6 +154,8 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="鏉′欢锛�" prop="radiusList">
<el-select v-model="editForm.radiusList" allow-create default-first-option filterable multiple
@@ -157,8 +166,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="鏀惰垂鏍囧噯(鍏�/娆�)锛�" prop="rates">
<el-input v-model="editForm.rates" clearable size="small"></el-input>
@@ -191,6 +198,7 @@
upItemParameter
} from "@/api/structural/capability";
import {selectStandardMethods} from "@/api/structural/standardMethod";
+import {search} from "@/api/business/inspectionTask";
export default {
name: "EditForm",
@@ -227,6 +235,7 @@
method: '', // 璇曢獙鏂规硶
radiusList: [], // 鏉′欢
rates: '', // 鏉′欢
+ deviceId: [], // 璁惧
},
sampleList: [], // 妫�楠屽璞′笅鎷夋
laboratoryList: [], // 鍦烘墍涓嬫媺妗�
@@ -262,7 +271,8 @@
{ required: true, message: '璇烽�夋嫨鍘熷璁板綍妯℃澘', trigger: 'change' }
]
},
- operationType: ''
+ operationType: '',
+ equipOptions: []
}
},
// 鏂规硶闆嗗悎
@@ -270,6 +280,7 @@
openDia (type, row) {
this.operationType = type
this.editFormDia = true
+ this.getEquipOptions() // 鑾峰彇鎵�鏈夎澶�
this.obtainItemParameterList() // 鍦烘墍绫诲瀷
this.getStandardTemplate() // 鍘熷璁板綍妯℃澘涓嬫媺妗�
this.getSelectStandardMethods() // 璇曢獙鏂规硶
@@ -305,8 +316,9 @@
} else {
this.editForm = this.HaveJson(row)
this.editForm.sample = JSON.parse(this.editForm.sample)
- this.editForm.radiusList = JSON.parse(this.editForm.radiusList)
+ this.editForm.radiusList = this.editForm.radiusList && JSON.parse(this.editForm.radiusList)
this.editForm.method = JSON.parse(this.editForm.method)
+ this.$set(this.editForm, 'deviceId', this.editForm.deviceIds && this.editForm.deviceIds.split(","))
}
},
// 鎻愪氦缂栬緫
@@ -321,6 +333,11 @@
obj.radiusList = JSON.stringify(obj.radiusList)
} else {
obj.radiusList = null
+ }
+ if (obj.deviceId?.length > 0) {
+ obj.deviceIds = obj.deviceId.join(',')
+ } else {
+ obj.deviceIds = null
}
if(obj.id){
// 淇敼
@@ -425,6 +442,21 @@
this.templateIdList = data
})
},
+ // 鑾峰彇鎵�鏈夎澶�
+ getEquipOptions() {
+ this.equipOptions = [];
+ search({ status: 0 }).then((res) => {
+ if (res.code === 200 && res.data) {
+ this.equipOptions = res.data.map((m) => {
+ m.value = m.managementNumber;
+ m.label = m.deviceName;
+ return m;
+ });
+ }
+ }).catch((error) => {
+ console.error(error);
+ });
+ },
},
}
</script>
--
Gitblit v1.9.3