From 8d4c67323bee47d6225f150e9f61868c6434a358 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 03 九月 2025 17:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
index bd2790d..bf1de53 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -231,6 +231,17 @@
           </a-col>
         </a-row>
         <a-row>
+           <a-col :span="8">
+            <a-form-model-item label="铻虹汗绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType">
+              <j-dict-select-tag
+                type="list"
+                v-model="model.threadType"
+                :triggerChange="true"
+                dictCode="thread_type"
+                placeholder="璇烽�夋嫨铻虹汗绫诲瀷"
+              />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="8">
             <a-form-model-item label="鎺掑睉妲藉瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
               <j-dict-select-tag
@@ -257,6 +268,9 @@
               ></a-input>
             </a-form-item>
           </a-col>
+          
+        </a-row>
+        <a-row>
           <a-col :span="8">
             <a-form-item label="鍒囧墛鍒冮暱">
               <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
@@ -264,8 +278,6 @@
               <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :span="8">
             <a-form-item label="鍒�鍏锋�婚暱">
               <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallTotalLength"></a-input>

--
Gitblit v1.9.3