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

mycomponents/job/jobFilter.vue

@@ -47,11 +47,7 @@
 			winScanJobNumber,
 			winScanAsnNumber
 		},
-		data() {
-			return {
-				dataContent: {},
-			}
-		},
+		
 		props: {
 			checkedToday: {
 				type: Boolean,
@@ -70,10 +66,18 @@
 				default: false
 			}
 		},
+		data() {
+			return {
+				dataContent: {},
+				checkedToday:'',
+				checkedWaitTask:'',
+			}
+		},
 		watch: {
 		},
 		mounted() {
-			
+			this.checkedToday = this.checkedToday
+			this.checkedWaitTask = this.checkedWaitTask
 		},
 		methods: {
 			// 点击遮罩