工单权限修改

pages/incidentList/incidentList.vue

@@ -109,14 +109,14 @@
 		if(loginUserStore.loginUser.user&&loginUserStore.loginUser.user.group){
 			loginUserStore.loginUser.user.group.forEach(item => {
 			    if(data.currentLog){
-			        if (item.id == data.candidateGroupId) {
+			        if (item.id == data.currentLog.groupId) {
 			            inGroup = true;
 			        }
 			    }
 			})
 		}
     
-    return data.state.value === 'pending' && (inUser || inUser2 || inGroup) && qiangdan.value;
+    return data.state.value === 'pending' && (inUser2 || inGroup) && qiangdan.value;
   })
 
   // 转换协同人

pages/repair/rapidRepNext.vue

@@ -387,7 +387,10 @@
         value: v.id,
 				floor: v.floor
       }));
-			
+			let isDeptId = dataInfo.repairTypeList.filter(i=>i.value==dataInfo.department)
+			if(isDeptId.length==0){
+				dataInfo.department = ''
+			}
     })
   }
   
@@ -458,7 +461,10 @@
 			let data = repairIncident.value.find(i=>i.value=='dept')
 			dataInfo.incidentData.repairIncidentType.id = data.id
 			let deptItem = dataInfo.repairTypeList.find(i=>i.value == dataInfo.department)
-			postData.incident.place.id = deptItem.floor.id
+			console.log(333,deptItem)
+			if(deptItem){
+				postData.incident.place.id = deptItem.floor.id
+			}
 		}else if(dataInfo.tabActiveValue === 'overtime'){
 			let data = repairIncident.value.find(i=>i.value=='public')
 			dataInfo.incidentData.repairIncidentType.id = data.id
@@ -584,7 +590,7 @@
   function submitHandler(){
     console.log(dataInfo);
 		if(dataInfo.tabActiveValue=='doing'){
-			if(dataInfo.dept==''){
+			if(dataInfo.department==''){
 			  uni.showToast({
 			  	icon: 'none',
 			    title: '请选择报修科室'