From 80c444af98cbd64039cc156da8b9a8c08096c19d Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Fri, 20 Jun 2025 20:24:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=AB=98=E5=BA=A6=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/craft/AddCraft/index.vue  |  2 +-
 src/components/home/StartClean/index.vue | 27 +++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/craft/AddCraft/index.vue b/src/components/craft/AddCraft/index.vue
index df755c9..6bfbc06 100644
--- a/src/components/craft/AddCraft/index.vue
+++ b/src/components/craft/AddCraft/index.vue
@@ -85,7 +85,7 @@ const okHandle = async () => {
           errorMsg.push(`步骤${index + 1}: 烘干温度不能超过${dryMax.value}℃`)
         }
       }
-      if (['clean', 'reduceLiquid'].includes(step.method)) {
+      if (['clean', 'reduceLiquid', 'addThick'].includes(step.method)) {
         if (+step.params.height > +heightMax.value) {
           errorMsg.push(`步骤${index + 1}: 针头高度不能超过${heightMax.value}mm`)
         }
diff --git a/src/components/home/StartClean/index.vue b/src/components/home/StartClean/index.vue
index e61db43..e7cc2a7 100644
--- a/src/components/home/StartClean/index.vue
+++ b/src/components/home/StartClean/index.vue
@@ -1,9 +1,19 @@
 <script setup lang="ts">
+import { configList } from 'apis/system'
 import { useHomeStore } from 'stores/homeStore'
-import { ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 
 const emits = defineEmits(['ok', 'cancel'])
 
+const configData = ref<any[]>([])
+onMounted(async () => {
+  configData.value = await configList()
+})
+
+const heightMax = computed(() => {
+  return configData.value.find(item => item.code === 'needle_drop_height')?.value || 0
+})
+
 const homeStore = useHomeStore()
 
 const form = ref({
@@ -23,6 +33,19 @@ const validateHandle = (rule: any, value: any, callback: any) => {
   }
 }
 
+const validateHandle1 = (rule: any, value: any, callback: any) => {
+  if (!value) {
+    callback(new Error('请输入高度'))
+  }
+  else
+    if (value && (value < 0 || +value > +heightMax.value)) {
+      callback(new Error(`针头高度范围0-${heightMax.value}mm`))
+    }
+    else {
+      callback()
+    }
+}
+
 const rules = {
   columns: [
     { required: true, message: '请选择试管', trigger: 'change', validator: validateHandle },
@@ -31,7 +54,7 @@ const rules = {
     { required: true, trigger: 'blur', message: '请输入清洗次数' },
   ],
   height: [
-    { required: true, trigger: 'blur', message: '请输入针头高度' },
+    { required: true, trigger: 'blur', validator: validateHandle1 },
   ],
   volume: [
     { required: true, trigger: 'blur', message: '请输入加水量' },