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

pages/workOrder/workorderTwo.vue

@@ -218,10 +218,31 @@
             },
             goWorkorderTwo(){
 				console.log(this.targetObj);
-				uni.navigateTo({
+				if(this.checkEmpty()) {
-					url: "/pages/workOrder/workOrderThree"
+					uni.navigateTo({
-				}) 
+						url: "/pages/workOrder/workOrderThree"
+					}) 
+				}
+				
             },
+			// 判空事件
+			checkEmpty(){
+				let result = false;
+				if(!this.targetObj.endTime) {
+					this.$toolAll.tools.showToast('请选择结束时间');
+				} else if(!this.targetObj.workDescribe) {
+					this.$toolAll.tools.showToast('请填写工作描述');
+				} else if(this.targetObj.maintenanceImgList.length==0) {
+					this.$toolAll.tools.showToast('请上传维保图片');
+				} else if(!this.targetObj.faultReason) {
+					this.$toolAll.tools.showToast('请填写故障原因');
+				} else if(!this.targetObj.maintenancePersonnel) {
+					this.$toolAll.tools.showToast('请填写维保人员');
+				} else {
+					result = true;
+				}
+				return result;
+			},
             addMountingsList() {
                 uni.navigateTo({
                     url: "/pages/mountingsList/mountingsList"