From 0676d819e46a20c25093d537422a26bf381e30e1 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 22 Jul 2024 13:06:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/count/job/fuzzyCountJob.vue | 52 +++++++++++++++------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue
index cc2e55ff..4c7f271f 100644
--- a/src/pages/count/job/fuzzyCountJob.vue
+++ b/src/pages/count/job/fuzzyCountJob.vue
@@ -165,7 +165,6 @@
 					column: "isOpenCount",
 					action: "==",
 					value: "FALSE"
-
 				})
 				// filters.push({
 				// 	column: "accept_user_id",
@@ -335,17 +334,21 @@
 					action: "==",
 					value: code
 				})
-
-				filters.push({
-					column: "countSplitType",
-					action: "==",
-					value: "locationCode"
-				})
 				filters.push({
-					column: "accept_user_id",
+					column: "isOpenCount",
 					action: "==",
-					value: this.$store.state.user.id
+					value: "FALSE"
 				})
+				// filters.push({
+				// 	column: "countSplitType",
+				// 	action: "==",
+				// 	value: "locationCode"
+				// })
+				// filters.push({
+				// 	column: "accept_user_id",
+				// 	action: "==",
+				// 	value: this.$store.state.user.id
+				// })
 
 				var params = {
 					filters: filters,
@@ -387,24 +390,29 @@
 					action: "in",
 					value: '1,2'
 				})
-
+				
 				filters.push({
-					column: "countSplitType",
+					column: "isOpenCount",
 					action: "==",
-					value: "locationCode"
+					value: "FALSE"
 				})
+				// filters.push({
+				// 	column: "countSplitType",
+				// 	action: "==",
+				// 	value: "locationCode"
+				// })
 
-				filters.push({
-					column: "countSplitCode",
-					action: "==",
-					value: result.label.code
-				})
+				// filters.push({
+				// 	column: "countSplitCode",
+				// 	action: "==",
+				// 	value: result.label.code
+				// })
 
-				filters.push({
-					column: "accept_user_id",
-					action: "==",
-					value: this.$store.state.user.id
-				})
+				// filters.push({
+				// 	column: "accept_user_id",
+				// 	action: "==",
+				// 	value: this.$store.state.user.id
+				// })
 
 				var params = {
 					filters: filters,

From c6c7a03dfaadb1c390d9c8912de750ce2716a55a Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 24 Jul 2024 09:14:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=8E=E7=9B=98?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/count/job/countJob.vue | 47 +++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index f0040e84..0deb5e36 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -156,22 +156,24 @@
 					action: "in",
 					value: this.status
 				})
+
+				// filters.push({
+				// 	column: "countSplitType",
+				// 	action: "==",
+				// 	value: "locationCode"
+				// })
+				
 				filters.push({
-					column: "countSplitType",
+					column: "isOpenCount",
 					action: "==",
-					value: "locationCode"
+					value: "TRUE"
 				})
 				
-				// filters.push({
-				// 	column: "accept_user_id",
-				// 	action: "==",
-				// 	value: this.$store.state.user.id
-				// })
-				// filters.push({
-				// 	column: "accept_user_id",
-				// 	action: "==",
-				// 	value: this.$store.state.user.id
-				// })
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
 				var params = {
 					filters: filters,
 					pageNo: this.pageNo,
@@ -310,11 +312,18 @@
 					value: code
 				})
 				
+				// filters.push({
+				// 	column: "countSplitType",
+				// 	action: "==",
+				// 	value: "locationCode"
+				// })
+				
 				filters.push({
-					column: "countSplitType",
+					column: "isOpenCount",
 					action: "==",
-					value: "locationCode"
+					value: "TRUE"
 				})
+				
 				filters.push({
 					column: "accept_user_id",
 					action: "==",
@@ -362,11 +371,11 @@
 					value: '1,2'
 				})
 				
-				filters.push({
-					column: "countSplitType",
-					action: "==",
-					value: "locationCode"
-				})
+				// filters.push({
+				// 	column: "countSplitType",
+				// 	action: "==",
+				// 	value: "locationCode"
+				// })
 				
 				filters.push({
 					column: "countSplitCode",