Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey

pagesA/workOrder/workOrderLlsit.vue

@@ -167,7 +167,6 @@
 						} else {
 							this.array=[...res.data];
 						}
-						console.log(this.array,777777);
                         if(this.statusId){
                             this.workeOrderStatusIndex = this.array.findIndex(item=>item.id==this.statusId);
                             if(this.workeOrderStatusIndex!=-1) {
@@ -235,7 +234,20 @@
 							}
 						}
 					})
-				}else if(uni.getStorageSync('type_id')==5){
+				}else if(uni.getStorageSync('type_id')==4) {
+					if(status==3){
+						// 待维修
+						uni.navigateTo({
+							url: `/pagesA/workOrder/workOrder?id=${id}`
+						})
+					}
+					if(status==4){
+						// 维修中
+						uni.navigateTo({
+							url: `/pagesA/workOrder/workOrder?id=${id}`
+						})
+					}
+				} else if(uni.getStorageSync('type_id')==5){
 					if(status==6){
 						// 财务点击审核工单
 						uni.navigateTo({