From 0974555f13501dca9e16414177d543fad04d57a0 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 11 Jul 2024 11:35:49 +0800
Subject: [PATCH] =?UTF-8?q?WMS:=20=E2=80=94=E2=80=94>=20bug=20=20=E8=87=AA?=
 =?UTF-8?q?=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverJobMain/index.vue          | 24 ++++++++++++++++---
 .../deliver/deliverRecordMain/index.vue       | 24 ++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 925840fa2..83153f2cf 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -359,10 +359,28 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  console.log('searchData',searchData.filters);
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
+  let filters = [...searchData.filters]
+  if(!filters.find(item=>item.column=='business_type')){
+    if ( routeName.value == 'DeliverJobMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'Deliver',
+      }]
+    } else if ( routeName.value == 'ZZBJDeliverJobMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'ZZBJDeliver',
+      }]
+    }
   }
+  tableObject.params.filters = filters
   getList() // 刷新当前列表
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index c38bee76b..6c3944f96 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -200,10 +200,28 @@ const handlePoint = async (row) => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  console.log('searchData',searchData.filters);
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
+  let filters = [...searchData.filters]
+  if(!filters.find(item=>item.column=='business_type')){
+    if ( routeName.value == 'DeliverRecordMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'Deliver',
+      }]
+    } else if ( routeName.value == 'ZZBJDeliverRecordMain') {
+      filters = [...filters,{
+        action:'==',
+        column:'business_type',
+        value:'ZZBJDeliver',
+      }]
+    }
   }
+  tableObject.params.filters = filters
   getList() // 刷新当前列表
 }