From 10d13c202497ac0499767c2e4bb250086b293310 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 15 二月 2025 16:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lims_new_20250213' into lims_new_20250213
---
src/components/capability/testObjectEditForm.vue | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/components/capability/testObjectEditForm.vue b/src/components/capability/testObjectEditForm.vue
index 5b1a799..e92119c 100644
--- a/src/components/capability/testObjectEditForm.vue
+++ b/src/components/capability/testObjectEditForm.vue
@@ -4,7 +4,7 @@
<el-form ref="editForm" :model="editForm" :rules="editFormRules" label-width="120px" label-position="right">
<el-form-item label="鍦烘墍锛�" prop="laboratoryId">
<el-select v-model="editForm.laboratoryId" 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.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="妫�楠屽璞★細" prop="specimenName">
@@ -46,6 +46,7 @@
editFormDia: false,
editLoad: false,
editForm: {
+ id: '',
laboratoryId: '', // 鍦烘墍
specimenName: '', // 妫�楠屽璞�
specimenNameEn: '', // 妫�楠屽璞N
@@ -74,9 +75,9 @@
this.obtainItemParameterList()
this.editFormDia = true
if (type === 'add') {
- this.$refs.editForm.resetFields()
+ this.resetForm("editForm");
} else {
- this.editForm = this.HaveJson(row)
+ this.editForm = {...row}
}
},
// 鎻愪氦缂栬緫
@@ -84,32 +85,31 @@
this.$refs.editForm.validate(valid => {
if (valid) {
this.editLoad = true
- let obj = this.HaveJson(this.editForm)
- if(obj.id){
+ if(this.editForm.id){
// 淇敼
- upTestObject(obj).then(res => {
+ upTestObject(this.editForm).then(res => {
this.editLoad = false
- if (res.code === 201) {
+ if (res.code === 500) {
return
}
this.$message.success('淇敼鎴愬姛')
this.closeDia()
+ this.$emit('refreshList')
}).catch(e => {
this.editLoad = false
- this.editFormDia = false
})
}else{
// 鏂板
- addTestObject(obj).then(res => {
+ addTestObject(this.editForm).then(res => {
this.editLoad = false
- if (res.code === 201) {
+ if (res.code === 500) {
return
}
this.$message.success('娣诲姞鎴愬姛')
this.closeDia()
+ this.$emit('refreshList')
}).catch(e => {
this.editLoad = false
- this.editFormDia = false
})
}
}
@@ -118,8 +118,7 @@
// 鍏抽棴寮规
closeDia () {
this.editFormDia = false
- this.$refs.editForm.resetFields()
- this.$parent.refreshTable('page')
+ this.resetForm("editForm");
},
// 鑾峰彇鍦烘墍涓嬫媺妗嗙殑鍊�
obtainItemParameterList() {
--
Gitblit v1.9.3