From 727b16f040f8e6eb9921ab784126c691fc025429 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 10 Apr 2026 17:38:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E4=BB=AA=E5=99=A8=E9=80=89=E6=8B=A9]?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/dialog/SelectInstrumentDialog.vue     | 43 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
index f22b9b1..4180bdf 100644
--- a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
@@ -7,6 +7,12 @@
             :listApi="listApi"
             :selectedCode="selectedCode"
             @radioSelect="handleSelect"/>
+
+        <div class="other-reagent">
+            <el-checkbox v-model="otherChecked" @change="handleOtherChange">其他</el-checkbox>
+            <el-input class="other-reagent-input" v-model="otherReagent"></el-input>
+        </div>
+
         <template slot="footer" class="dialog-footer">
             <el-button @click="onCancel">{{$t('form.cancel')}}</el-button>
             <el-button :disabled="isDisabled" type="primary" @click="onSubmit">{{$t('form.saveConfirm')}}</el-button>
@@ -86,10 +92,19 @@ export default {
             currentRow: {},
             studyFormId:'',//有个studyFormId需要从外面动态传过来
             uuid:'',//为了标识eventBus的事件id,
+
+            otherChecked: false,
+            otherReagent: "",//其他试剂
         }
     },
     computed: {
         isDisabled() {
+            if (this.otherChecked && this.otherReagent) {//如果选中了其他，那么就不校验是否选择了试剂
+                return false;
+            }else if(this.checkType === "checkbox"){
+                console.log(this.currentRow,"this.currentRow")
+                return !this.currentRow || this.currentRow.length === 0;
+            }
             return !this.selectedId;
         }
     },
@@ -106,6 +121,9 @@ export default {
                 }
             }, 10);
             this.studyFormId = studyFormId
+
+            this.otherChecked = false;
+            this.otherReagent = "";
         },
         onCancel() {
             this.visible = false
@@ -113,21 +131,30 @@ export default {
         },
         onSubmit() {
             let row = this.currentRow;
-            this.$emit('submit', this.selectedId,row);
-            const selectInfo = {
+            const selectedValue = this.otherChecked ? this.otherReagent : this.selectedId;
+
+            this.$emit('submit', selectedValue,row);
+            const selectInfo = this.otherChecked ?{}: {
                 mc: row.mc,
                 bh: row.bh,
                 xh: row.xh,
                 jzrq: row.jzrq,
             }
             // 触发eventBus事件
-            EventBus.$emit("onInstrumentSubmit",{selectInfo,uuid:this.uuid,selectedId:this.selectedId,row,type:"yq"});
+            EventBus.$emit("onInstrumentSubmit",{selectInfo,uuid:this.uuid,selectedId:selectedValue,row,type:"yq"});
             this.visible = false;
         },
         handleSelect(code,row) {
             this.selectedId = code;
             this.currentRow = row;
         },
+        handleOtherChange(val) {
+            this.otherChecked = val;
+            if (val) {//如果选中了其他，那么就清空选中的id
+                this.selectedId = "";
+                this.currentRow = null;
+            }
+        },
     }
 }
 </script>
@@ -138,4 +165,14 @@ export default {
         align-items: center;
         padding: 20px 0;
     }
+    .other-reagent {
+        display: flex;
+        align-items: center;
+        padding: 20px 0;
+    }
+
+    .other-reagent-input {
+        width: 200px;
+        margin-left: 5px;
+    }
 </style>
\ No newline at end of file