Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0

pages/statistics/historyDetailsMouth.vue

@@ -14,7 +14,7 @@
 							<text>{{title}}</text>
 							<input class="uni-input" type="digit"
 								v-model="title=='管道压力'?value.constructAccordingDrawings:value.constructAddre"
-								:placeholder="placeholder" maxlength="100"
+								:placeholder="placeholder" maxlength="100" @blur="bindText($event.target.value,key)"
 								style="margin-left: 10px;text-align: right;"></input>
 						</view>
 					</view>
@@ -157,7 +157,15 @@
 				this.open = false
 			},
 
+			bindText(e, index) {
+				if (this.title == '管道压力') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[index].constructAccordingDrawings = e;
+				} else {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[index].constructAddre = e;
+				}
+
 
+			},
 
 			bindTextAreaBlur(e, index) {
 
@@ -348,44 +356,21 @@
 
 				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
 					if (res.createBy == this.$user.state.name) {
-						if (this.title == '焊接、防腐' || this.title == '下管' || this.title ==
-							' 沟下连头') {
-							res.zEngineeringMaterialBo.forEach((itme) => {
-								if (itme.specifications == '') {
-									this.$modal.msg("请选择规格");
-									isSubmit = false;
-								}
-								if (itme.number == '') {
-									this.$modal.msg("请输入米数");
-									isSubmit = false;
-								}
-								if (this.getIntegerPart(itme.number, 0) == '') {
-									this.$modal.msg("请输入米数");
-									isSubmit = false;
-								}
 
-							})
+						if (this.title == '原有管线压力' && this.isEmpty(res.constructAddre)) {
+
+							this.$modal.msg(this.placeholder)
+							isSubmit = false;
+
+						} else if (this.title == '管道压力' && this.isEmpty(res.constructAccordingDrawings)) {
+							this.$modal.msg(this.placeholder)
+							isSubmit = false;
 
 						}
 
-						if (this.title == '回填、撤场') {
-							if (res.zEngiineeringPhotoBoListOne.length <= 0) {
-								this.$modal.msg('请上传回填前照片')
-								isSubmit = false;
-							}
-							if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
-								this.$modal.msg('请上传警示带铺设照片')
-								isSubmit = false;
-							}
-							if (res.zEngiineeringPhotoBoListThree.length <= 0) {
-								this.$modal.msg('请上传回填后照片')
-								isSubmit = false;
-							}
-						} else {
-							if (res.zEngiineeringPhotoBoList.length == 0) {
-								this.$modal.msg("请上传照片");
-								isSubmit = false;
-							}
+						if (res.zEngiineeringPhotoBoList.length == 0) {
+							this.$modal.msg("请上传照片");
+							isSubmit = false;
 						}
 					}
 				})