From 4228413fb94652826d623f991775d78e3cf0eb29 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 六月 2024 16:29:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
index 412978b..d32d913 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -233,12 +233,20 @@
 }
 
 const handleChange = () => {
-  console.log(basic.value.basicType[1])
-  request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
-    if(res.code==='200'){
-      xGrid.value.reloadData(res.data)
-    }
-  })
+  if(basic.value.basicType==null){
+    request.get('/basicData/getBasicData').then(res => {
+      if(res.code==='200'){
+        xGrid.value.reloadData(res.data)
+      }
+    })
+  }else{
+    request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
+      if(res.code==='200'){
+        xGrid.value.reloadData(res.data)
+      }
+    })
+  }
+
 
 }
 

--
Gitblit v1.8.0