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

src/pages.json

@@ -1899,8 +1899,13 @@
 		"path": "pages/mes/orderDayPlan/orderDayPlan",
 		"style": {
 			"navigationBarTitleText": "日计划查询",
-			"navigationBarBackgroundColor": "#409eff",
+			"enablePullDownRefresh": true
-			"navigationBarTextStyle": "white"
+		}
+	},{
+			"path": "pages/mes/workOrder/processReport",
+			"style": {
+				"navigationBarTitleText": "工序报工",
+				"enablePullDownRefresh": true
 			}
 		}
 

src/pages/login/index.vue

@@ -94,10 +94,6 @@
 	import {
 		getCaptchaImage
 	} from '@/api/request2.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
 	import {
 		useCountStore
 	} from '@/store'

src/pages/mes/workOrder/processReport.vue

@@ -0,0 +1,14 @@
+<template>
+  <view>
+
+  </view>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+
+<style scoped lang="scss">
+
+</style>