From 10903aca3b8fd5dd7cd8573fa5c99ccf19cb8f29 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio-frequency-cable' into radio-frequency-cable
---
src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index b060f50..e989c0c 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -30,8 +30,9 @@
<el-col :span="12">
<el-form-item label="妫�楠屽璞★細" prop="sample">
<el-cascader v-model="editForm.sample" :options="itemParameterData.cascaderField.sample.tree"
- :props="{ value: 'name', label: 'name', checkStrictly: true, multiple: true }" :show-all-levels="false"
- clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;"></el-cascader>
+ :props="{ value: 'labelName', label: 'name', checkStrictly: true, multiple: true }"
+ :show-all-levels="false" clearable filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%;"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -148,7 +149,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="璇曢獙鏂规硶锛�" prop="method">
<el-select v-model="editForm.method" clearable multiple placeholder="璇烽�夋嫨" size="small"
style="width: 100%">
@@ -156,7 +157,7 @@
:value="item.label"></el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="璇曢獙鏉′欢锛�" prop="radiusList">
<el-select v-model="editForm.radiusList" allow-create default-first-option filterable multiple
@@ -166,11 +167,18 @@
</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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏄惁濮旀墭瑕佹眰锛�" prop="rates">
+ <el-select v-model="editForm.delegateRequestFlag" clearable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%">
+ <el-option v-for="item in dict.type.inspection_bsm" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -236,6 +244,7 @@
method: '', // 璇曢獙鏂规硶
radiusList: [], // 鏉′欢
rates: '', // 鏉′欢
+ delegateRequestFlag: null,//鏄惁濮旀墭瑕佹眰
},
sampleList: [], // 妫�楠屽璞′笅鎷夋
laboratoryList: [], // 鍦烘墍涓嬫媺妗�
@@ -309,6 +318,7 @@
method: '', // 璇曢獙鏂规硶
radiusList: [], // 鏉′欢
rates: '', // 鏉′欢
+ delegateRequestFlag: null,//鏄惁濮旀墭瑕佹眰
}
this.resetForm('editForm')
} else {
@@ -389,6 +399,7 @@
val.children.forEach(a => {
a.label = a.name
a.value = a.id
+ a.labelName = a.name
this.cascaderFieldData(a)
})
}
--
Gitblit v1.9.3