路由跳转修复bug

interceptor/routeInterceptor.js

@@ -17,18 +17,31 @@ let repaireRouterList = [
         // 调用前拦截
         const url = e.url.split('?')[0];
         // 报修人不可以访问除了登录页,绑定工号页,报修入口页的其他页面
-        if (!repaireRouterList.includes(url) && !url.includes("repair") && loginUserStore.loginUser.user && loginUserStore.loginUser.user
-          .engineer !== 1) {
-						if(loginType==1){
-							uni.reLaunch({
-							  url: "/pages/repairEntrance/repairEntrance"
-							})
-						}else if(loginType==2){
-							uni.reLaunch({
-							  url: "/pages/repair/home"
-							})
+        if (!repaireRouterList.includes(url) && !url.includes("repair") && loginUserStore.loginUser.user) {
+						if(loginUserStore.loginUser.user.engineer == 0){
+							if(loginType==1){
+								uni.reLaunch({
+								  url: "/pages/repairEntrance/repairEntrance"
+								})
+							}else if(loginType==2){
+								uni.reLaunch({
+								  url: "/pages/repair/home"
+								})
+							}
+							return false
+						}else{
+							if(loginType==1){
+								uni.reLaunch({
+								  url: "/pages/incidentList/incidentList"
+								})
+							}else if(loginType==2){
+								uni.reLaunch({
+								  url: "/pages/repair/home"
+								})
+							}
+							return false
 						}
-          return false
+						
         }
         return true
       },

pages/repair/rapidRepNext.vue

@@ -264,6 +264,14 @@
     dataInfo.tabActiveValue = tabValue;
     isSubmit.value = false;
     reset();
+		if(tabValue=='doing'){
+			let user = loginUserStore.loginUser.user
+			if(user){
+				dataInfo.department = user.dept.id
+			}
+		}else{
+			dataInfo.department = ''
+		}
     dataInfo.category = dataInfo.incidentData.category || {};
     dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
 		newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine

share/useLoginSuccess.js

@@ -11,9 +11,15 @@ export function useLoginSuccess() {
 		let loginType = uni.getStorageSync('loginType'); //1:处理 2:报修
     // 判断用户标识是否为处理人
     if (user.user.engineer === 1) {
-      uni.reLaunch({
-        url: '/pages/incidentList/incidentList'
-      })
+			if(loginType==1){
+				uni.reLaunch({
+				  url: "/pages/incidentList/incidentList"
+				})
+			}else if(loginType==2){
+				uni.reLaunch({
+				  url: "/pages/repair/home"
+				})
+			}
     } else {
 			if(loginType==1){
 				uni.reLaunch({