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/EditForm.vue | 171 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 92 insertions(+), 79 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index 3543847..c9cd538 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -30,9 +30,8 @@
<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: 'name', 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">
@@ -45,14 +44,16 @@
<el-col :span="12">
<el-form-item label="鍦烘墍锛�" prop="laboratory">
<el-select v-model="editForm.laboratory" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in laboratoryList" :key="item.label" :label="item.label" :value="item.label"></el-option>
+ <el-option v-for="item in laboratoryList" :key="item.label" :label="item.label"
+ :value="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="璇曢獙瀹わ細" prop="sonLaboratory">
<el-select v-model="editForm.sonLaboratory" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in dict.type.sys_sub_lab" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-option v-for="item in dict.type.sys_sub_lab" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -73,7 +74,8 @@
<el-col :span="12">
<el-form-item label="璁￠噺鍗曚綅锛�" prop="unit">
<el-select v-model="editForm.unit" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in dict.type.sys_unit" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-option v-for="item in dict.type.sys_unit" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -98,15 +100,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="妫�楠岄」绫诲瀷锛�" prop="inspectionItemType">
- <el-select v-model="editForm.inspectionItemType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in dict.type.inspection_item_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-select v-model="editForm.inspectionItemType" clearable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%">
+ <el-option v-for="item in dict.type.inspection_item_type" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="妫�楠屽�肩被鍨嬶細" prop="inspectionValueType">
- <el-select v-model="editForm.inspectionValueType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in dict.type.inspection_value_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-select v-model="editForm.inspectionValueType" clearable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%">
+ <el-option v-for="item in dict.type.inspection_value_type" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -115,14 +121,16 @@
<el-col :span="12">
<el-form-item label="鐗规畩鏍囪瘑锛�" prop="bsm">
<el-select v-model="editForm.bsm" 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-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-col :span="12">
<el-form-item label="鍘熷璁板綍妯℃澘锛�" prop="templateId">
<el-select v-model="editForm.templateId" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="item in templateIdList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-option v-for="item in templateIdList" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -142,21 +150,22 @@
<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%">
- <el-option v-for="item in methodList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ <el-select v-model="editForm.method" clearable multiple placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%">
+ <el-option v-for="item in methodList" :key="item.value" :label="item.label"
+ :value="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏉′欢锛�" prop="radiusList">
+ <!-- <el-col :span="12">
+ <el-form-item label="璇曢獙鏉′欢锛�" prop="radiusList">
<el-select v-model="editForm.radiusList" allow-create default-first-option filterable multiple
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100%">
- <el-option v-for="item in radiusListList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-option v-for="item in radiusListList" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="12">
@@ -165,13 +174,13 @@
</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%">-->
-<!-- <el-option v-for="item in dicList" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
+ <!-- <el-col :span="12">-->
+ <!-- <el-form-item label="瀛楀吀绫诲瀷锛�" prop="dic">-->
+ <!-- <el-select v-model="editForm.dic" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">-->
+ <!-- <el-option v-for="item in dicList" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="closeDia">鍙� 娑�</el-button>
@@ -190,7 +199,7 @@
obtainItemParameterList,
upItemParameter
} from "@/api/structural/capability";
-import {selectStandardMethods} from "@/api/structural/standardMethod";
+import { selectStandardMethods } from "@/api/structural/standardMethod";
export default {
name: "EditForm",
@@ -267,7 +276,7 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia (type, row) {
+ openDia(type, row) {
this.operationType = type
this.editFormDia = true
this.obtainItemParameterList() // 鍦烘墍绫诲瀷
@@ -277,29 +286,29 @@
if (type === 'add') {
this.editForm = {
inspectionItem: '', // 妫�楠岄」
- inspectionItemEn: '', // 妫�楠岄」EN
- inspectionItemSubclass: '', // 妫�楠屽瓙椤�
- inspectionItemSubclassEn: '', // 妫�楠屽瓙椤笶N
- sample: [], // 妫�楠屽璞�
- price: '', // 鍗曚环
- laboratory: '', // 鍦烘墍
- sonLaboratory: '', // 璇曢獙瀹�
- askTell: '', // 瑕佹眰鎻忚堪
- ask: '', // 瑕佹眰鍊�
- unit: '', // 璁￠噺鍗曚綅
- manHour: '', // 宸ユ椂
- manDay: '', // 棰勮鏃堕棿
- manHourGroup: '', // 宸ユ椂鍒嗙粍
- inspectionItemType: '', // 妫�楠岄」绫诲瀷
- inspectionValueType: '', // 妫�楠屽�肩被鍨�
- dic: '', // 瀛楀吀绫诲瀷
- bsm: '', // 鐗规畩鏍囪瘑
- templateId: '', // 鍘熷璁板綍妯℃澘
- inspectionItemClass: '', // 妫�楠岄」鍒嗙被
- inspectionItemClassEn: '', // 妫�楠岄」鍒嗙被EN
- method: '', // 璇曢獙鏂规硶
- radiusList: [], // 鏉′欢
- rates: '', // 鏉′欢
+ inspectionItemEn: '', // 妫�楠岄」EN
+ inspectionItemSubclass: '', // 妫�楠屽瓙椤�
+ inspectionItemSubclassEn: '', // 妫�楠屽瓙椤笶N
+ sample: [], // 妫�楠屽璞�
+ price: '', // 鍗曚环
+ laboratory: '', // 鍦烘墍
+ sonLaboratory: '', // 璇曢獙瀹�
+ askTell: '', // 瑕佹眰鎻忚堪
+ ask: '', // 瑕佹眰鍊�
+ unit: '', // 璁￠噺鍗曚綅
+ manHour: '', // 宸ユ椂
+ manDay: '', // 棰勮鏃堕棿
+ manHourGroup: '', // 宸ユ椂鍒嗙粍
+ inspectionItemType: '', // 妫�楠岄」绫诲瀷
+ inspectionValueType: '', // 妫�楠屽�肩被鍨�
+ dic: '', // 瀛楀吀绫诲瀷
+ bsm: '', // 鐗规畩鏍囪瘑
+ templateId: '', // 鍘熷璁板綍妯℃澘
+ inspectionItemClass: '', // 妫�楠岄」鍒嗙被
+ inspectionItemClassEn: '', // 妫�楠岄」鍒嗙被EN
+ method: '', // 璇曢獙鏂规硶
+ radiusList: [], // 鏉′欢
+ rates: '', // 鏉′欢
}
this.resetForm('editForm')
} else {
@@ -310,15 +319,19 @@
}
},
// 鎻愪氦缂栬緫
- handleEdit () {
+ handleEdit() {
this.$refs.editForm.validate(valid => {
if (valid) {
this.editLoad = true
let obj = this.HaveJson(this.editForm)
obj.method = JSON.stringify(obj.method)
obj.sample = JSON.stringify(obj.sample)
- obj.radiusList = JSON.stringify(obj.radiusList)
- if(obj.id){
+ if (obj.radiusList?.length > 0) {
+ obj.radiusList = JSON.stringify(obj.radiusList)
+ } else {
+ obj.radiusList = null
+ }
+ if (obj.id) {
// 淇敼
upItemParameter(obj).then(res => {
this.editLoad = false
@@ -331,7 +344,7 @@
}).catch(e => {
this.editLoad = false
})
- }else{
+ } else {
// 鏂板
addItemParameter(obj).then(res => {
this.editLoad = false
@@ -349,31 +362,31 @@
})
},
// 鍏抽棴寮规
- closeDia () {
+ closeDia() {
this.editFormDia = false
this.resetForm("editForm");
},
selectTestObjectByName() {
getItemTree().then(res => {
if (res.data.length > 0) {
- res.data.forEach(a=>{
+ res.data.forEach(a => {
this.cascaderFieldData(a)
})
this.itemParameterData.cascaderField.sample.tree = res.data
}
})
},
- cascaderFieldData(val){
- if(val.children === undefined) {
+ cascaderFieldData(val) {
+ if (val.children === undefined) {
return
- }else if(val.children.length==0){
+ } else if (val.children.length == 0) {
val.label = val.name
val.value = val.id
delete val.children
- }else{
+ } else {
val.label = val.name
val.value = val.id
- val.children.forEach(a=>{
+ val.children.forEach(a => {
a.label = a.name
a.value = a.id
this.cascaderFieldData(a)
@@ -383,28 +396,28 @@
getSelectStandardMethods() {
selectStandardMethods().then(res => {
let data = []
- if (res.data.length > 0) {
- res.data.forEach(a => {
- data.push({
- label: a.code,
- value: a.code
- })
+ if (res.data.length > 0) {
+ res.data.forEach(a => {
+ data.push({
+ label: a.code,
+ value: a.id,
})
- this.methodList = data
- }
+ })
+ this.methodList = data
+ }
})
},
obtainItemParameterList() {
obtainItemParameterList().then(res => {
let data = []
- if (res.data.length > 0) {
- res.data.forEach(a => {
- data.push({
- label: a.laboratoryName,
- value: a.id
- })
+ if (res.data.length > 0) {
+ res.data.forEach(a => {
+ data.push({
+ label: a.laboratoryName,
+ value: a.id
})
- }
+ })
+ }
this.laboratoryList = data
})
},
--
Gitblit v1.9.3