From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index f5e358c..294fc0a 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -565,7 +565,7 @@
         <el-row style="">
           <el-col :span="4">{{$t('craft.TrademarkOptions')}}:</el-col>
           <el-col :span="6">
-            <el-select v-model="trademarkAttr.trademark" @change ="iconChange">
+            <el-select v-model="trademarkAttr.trademark" @change ="iconChange" filterable>
               <el-option :value="item.basicName" v-for="item in trademarkList" />
             </el-select>
           </el-col>

--
Gitblit v1.8.0