From 44ee58a99afe19ba5ae962200f2bebab8da4618b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 07 五月 2024 15:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue |   11 ++---------
 1 files changed, 2 insertions(+), 9 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 9b73710..601b4e5 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
@@ -342,14 +342,7 @@
 }
 
 const tagCheck =  (state) => {
-  if(typeof trademarkAttr.value.location === 'string'){
-    return false
-  }
-  const filterArr = trademarkAttr.value.location.filter((item) =>{
-    return item === state
-  })
-  return filterArr.length > 0
-
+  return trademarkAttr.value.location === state
 }
 const resetTrademark = () => {
   for(const key in trademarkAttr.value){
@@ -556,7 +549,7 @@
         <el-row>
           <el-col :span="4">鍟嗘爣浣嶇疆:</el-col>
           <el-col :span="25">
-            <el-checkbox v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item"  />
+            <el-radio v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item"  />
           </el-col>
         </el-row>
 

--
Gitblit v1.8.0