From 5eaf46f45ece0287f8a2582931e089428a7cd12a Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sat, 17 Aug 2024 16:22:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=8E=B0=E5=9C=BA=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 src/views/collect/fieldOperation.vue | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index 389dcf64..eb07b5c9 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -5,6 +5,19 @@
     
     
     
+    
+      
+        
+      
+
+      
+        
+          搜索
+        
+      
+
+    
+
 
     
       
@@ -76,6 +89,13 @@ export default {
   name: 'fieldOperation',
   data() {
     return {
+      query:{
+        key: '',
+        status: 1,
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 200
+      },
       // 假设这是你的卡片数据
       stationList: []
     };
@@ -91,13 +111,7 @@ export default {
       window.open(url, '_blank');
     },
     getStationList() {
-      let param = {
-        status: 1,
-        invCode: this.$store.getters.locInvCode,
-        page: 1,
-        limit: 200
-      }
-      listPage(param).then(res => {
+      listPage(this.query).then(res => {
         this.stationList = res.data?.list || []
       })
     },
From 7231cd8229401afe4b868b2dff959773a4ea7f88 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sat, 17 Aug 2024 16:39:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8D=95=E6=8D=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E3=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=8B=86=E9=9B=B6=E5=BC=80=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 src/views/basic/product/drug/drugAdd.vue  | 10 +++++++++-
 src/views/collect/PanelOrderEndSearch.vue |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 5b27495c..54f210d8 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -279,7 +279,7 @@
             
           
           
-            
+            
               
                 选入
               
             
+            
+              
+                
+                  
+                  
+                
+              
+            
           
           
             
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 4e56c356..8c7477ac 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -273,6 +273,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        tagStatus: 3,
         billNo: null,
         page: 1,
         limit: 10,