Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

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",

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,