修改bug

pages/oldrenovation/courtyard/courtyard.vue

@@ -68,13 +68,13 @@
 						</view>
 						<view class=" container" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									施工时间
-								</view>
-								<view @click="openDatetimePicker('sg')">
-									<span style="color: black;">{{time}}</span>
-									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-								</view>
+							<view>
+								施工时间
+							</view>
+							<view @click="openDatetimePicker('sg')">
+								<span style="color: black;">{{time}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 
 
@@ -834,17 +834,20 @@
 					// 	this.$modal.msg('请上传管道施工记录照片')
 					// 	return
 					// }
-					if (this.imgGuanArr.length <= 0) {
-						this.$modal.msg('请上传管上皮深度测量照片')
-						return
-					}
-					if (this.imgArr.length <= 0) {
-						this.$modal.msg('请上传管沟远景照片')
-						return
-					}
-					if (this.videoArr.length <= 0) {
-						this.$modal.msg('请上传视频')
-						return
+
+					if (e == 'submit') {
+						if (this.imgGuanArr.length <= 0) {
+							this.$modal.msg('请上传管上皮深度测量照片')
+							return
+						}
+						if (this.imgArr.length <= 0) {
+							this.$modal.msg('请上传管沟远景照片')
+							return
+						}
+						if (this.videoArr.length <= 0) {
+							this.$modal.msg('请上传视频')
+							return
+						}
 					}
 					// if (this.loading == false) {
 					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -68,13 +68,13 @@
 						</view>
 						<view class=" container" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									施工时间
-								</view>
-								<view @click="openDatetimePicker('sg')">
-									<span style="color: black;">{{time}}</span>
-									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-								</view>
+							<view>
+								施工时间
+							</view>
+							<view @click="openDatetimePicker('sg')">
+								<span style="color: black;">{{time}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 
 
@@ -358,7 +358,7 @@
 
 				</view>
 			</view>
-			<view class="action-btn" v-show="reviewStatus!='1'"  style="display: flex;padding: 5px;">
+			<view class="action-btn" v-show="reviewStatus!='1'" style="display: flex;padding: 5px;">
 				<button @click="submit('submit')" class="btn cu-btn block bg-blue lg round" style="margin-right: 10px;">确认上传</button>
 				<button @click="submit('save')" class="btn cu-btn block bg-blue lg round" v-if="objValue.enginType == 'old_renovation'">暂存</button>
 			</view>
@@ -1024,70 +1024,71 @@
 					// 	this.$modal.msg("请选择楼栋")
 					// }
 
+					if (e == 'submit') {
+						if (this.objValue.enginClassValue == '回填') {
+							// if (this.stonePowderArr.length <= 0) {
+							// 	this.$modal.msg('请上传石粉回填照片')
+							// 	return
+							// }
+							if (this.warningtTapeArr.length <= 0) {
+								this.$modal.msg('请上传警示带铺设照片')
+								return
+							}
+							if (this.photosAfterArr.length <= 0) {
+								this.$modal.msg('请上传回填后照片')
+								return
+							}
 
-					if (this.objValue.enginClassValue == '回填') {
-						// if (this.stonePowderArr.length <= 0) {
-						// 	this.$modal.msg('请上传石粉回填照片')
-						// 	return
-						// }
-						if (this.warningtTapeArr.length <= 0) {
-							this.$modal.msg('请上传警示带铺设照片')
-							return
-						}
-						if (this.photosAfterArr.length <= 0) {
-							this.$modal.msg('请上传回填后照片')
-							return
-						}
-
-					} else if (this.objValue.enginClassValue == '调压柜') {
-						if (this.imgBoxArr.length <= 0) {
-							this.$modal.msg('请上传调压箱名牌照片')
-							return
-						}
-						if (this.imgSfhtArr.length <= 0) {
-							this.$modal.msg('请上传调压箱内石粉回填照片')
-							return
-						}
-						if (this.imgFljdArr.length <= 0) {
-							this.$modal.msg('请上传调压箱防雷接地照片')
-							return
-						}
-						if (this.imgDtljArr.length <= 0) {
-							this.$modal.msg('请上传调压箱底腿连接照片')
-							return
-						}
-						if (this.imgHldmyhArr.length <= 0) {
-							this.$modal.msg('请上传调压箱护栏及地面硬化（远景）照片')
-							return
-						}
+						} else if (this.objValue.enginClassValue == '调压柜') {
+							if (this.imgBoxArr.length <= 0) {
+								this.$modal.msg('请上传调压箱名牌照片')
+								return
+							}
+							if (this.imgSfhtArr.length <= 0) {
+								this.$modal.msg('请上传调压箱内石粉回填照片')
+								return
+							}
+							if (this.imgFljdArr.length <= 0) {
+								this.$modal.msg('请上传调压箱防雷接地照片')
+								return
+							}
+							if (this.imgDtljArr.length <= 0) {
+								this.$modal.msg('请上传调压箱底腿连接照片')
+								return
+							}
+							if (this.imgHldmyhArr.length <= 0) {
+								this.$modal.msg('请上传调压箱护栏及地面硬化（远景）照片')
+								return
+							}
 
-					} else if (this.objValue.enginClassValue == '阀井') {
-						if (this.imgTgArr.length <= 0) {
-							this.$modal.msg('请上传套管照片')
-							return
-						}
-						if (this.imgNbmhArr.length <= 0) {
-							this.$modal.msg('请上传内壁抹灰照片')
-							return
-						}
-						if (this.imgFhwArr.length <= 0) {
-							this.$modal.msg('请上传防护网照片')
-							return
-						}
-						if (this.imgBjArr.length <= 0) {
-							this.$modal.msg('请上传八角照片')
-							return
-						}
+						} else if (this.objValue.enginClassValue == '阀井') {
+							if (this.imgTgArr.length <= 0) {
+								this.$modal.msg('请上传套管照片')
+								return
+							}
+							if (this.imgNbmhArr.length <= 0) {
+								this.$modal.msg('请上传内壁抹灰照片')
+								return
+							}
+							if (this.imgFhwArr.length <= 0) {
+								this.$modal.msg('请上传防护网照片')
+								return
+							}
+							if (this.imgBjArr.length <= 0) {
+								this.$modal.msg('请上传八角照片')
+								return
+							}
 
 
-					} else {
+						} else {
 
-						if (this.imgArr.length <= 0) {
-							this.$modal.msg('请上传照片或视频')
-							return
-						}
+							if (this.imgArr.length <= 0) {
+								this.$modal.msg('请上传照片或视频')
+								return
+							}
 
 
+						}
 					}
 					// if (this.loading == false) {
 					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')

pages/oldrenovation/indoor/indoor.vue

@@ -477,31 +477,31 @@
 						</view>
 					</view>
 
-			
-				<view v-if="objValue.enginType == 'old_renovation'" style="margin-top: 10px;">
-					<view v-if="objValue.enginClassValue=='拆旧管'">
-						<span class="container-text">（1）拆除前照片(能体现出周边环境的宏观照片）</span>
-						<span class="container-text">（2）拆除的立杠照片（如腐蚀严重需增加腐蚀处特写照片）</span>
-						<span class="container-text">（3）立杠腐蚀照片</span>
-					</view>
-					<view v-if="objValue.enginClassValue=='立杠'">
-						<span class="container-text">改造完成后的宏观照片，热收缩套照片，立杠要求有卡子及三通、表弯头、立杠刷油均匀</span>
-					</view>
-					<view v-if="objValue.enginClassValue=='挂表'">
-						<span class="container-text">安装后的业主家燃气表正面能看清相关信息的照片</span>
-					</view>
-					<view v-if="objValue.enginClassValue=='表后管'">
-						<span class="container-text">表后管整体照片+表至自闭阀区间的管道走向视频，表后管需按照施工标准横平竖直且有卡子固定</span>
-					</view>
-					<view v-if="objValue.enginClassValue=='阀管'">
-						<span class="container-text">（1）自闭阀照片（自闭阀必须安装底座）</span>
-						<span class="container-text">（2）灶具连接处照片</span>
-						<span class="container-text">（3）打压照片</span>
-						<span class="container-text">（4）回执单照片</span>
+
+					<view v-if="objValue.enginType == 'old_renovation'" style="margin-top: 10px;">
+						<view v-if="objValue.enginClassValue=='拆旧管'">
+							<span class="container-text">（1）拆除前照片(能体现出周边环境的宏观照片）</span>
+							<span class="container-text">（2）拆除的立杠照片（如腐蚀严重需增加腐蚀处特写照片）</span>
+							<span class="container-text">（3）立杠腐蚀照片</span>
+						</view>
+						<view v-if="objValue.enginClassValue=='立杠'">
+							<span class="container-text">改造完成后的宏观照片，热收缩套照片，立杠要求有卡子及三通、表弯头、立杠刷油均匀</span>
+						</view>
+						<view v-if="objValue.enginClassValue=='挂表'">
+							<span class="container-text">安装后的业主家燃气表正面能看清相关信息的照片</span>
+						</view>
+						<view v-if="objValue.enginClassValue=='表后管'">
+							<span class="container-text">表后管整体照片+表至自闭阀区间的管道走向视频，表后管需按照施工标准横平竖直且有卡子固定</span>
+						</view>
+						<view v-if="objValue.enginClassValue=='阀管'">
+							<span class="container-text">（1）自闭阀照片（自闭阀必须安装底座）</span>
+							<span class="container-text">（2）灶具连接处照片</span>
+							<span class="container-text">（3）打压照片</span>
+							<span class="container-text">（4）回执单照片</span>
+						</view>
 					</view>
 				</view>
 			</view>
-	</view>
 			<view class=" action-btn" v-show="reviewStatus!='1'" style="display: flex;padding: 5px;">
 				<button @click="submit('submit')" class="btn cu-btn block bg-blue lg round" style="margin-right: 10px;">确认上传</button>
 				<button @click="submit('save')" class="btn cu-btn block bg-blue lg round" v-if="objValue.enginType == 'old_renovation'">暂存</button>
@@ -1238,14 +1238,14 @@
 						if (this.isEmpty(this.brandValue.id)) {
 							this.$modal.msg("请选择厂家")
 						} else {
-							this.onsubmit();
+							this.onsubmit(e);
 						}
 
 					} else if (this.objValue.enginClassValue == '打孔') {
 						// if (this.isEmpty(this.LevelValue.id)) {
 						// 	this.$modal.msg("请选择孔距") //打孔  判断孔距
 						// } else {
-						this.onsubmit();
+						this.onsubmit(e);
 						//}
 					} else if (this.objValue.enginClassValue == '拆旧管') {
 
@@ -1254,7 +1254,7 @@
 						} else if (this.isEmpty(this.LevelValue.id)) {
 							this.$modal.msg("请选择腐蚀等级") //拆旧管  判断腐蚀等级
 						} else {
-							this.onsubmit();
+							this.onsubmit(e);
 						}
 					} else if (this.objValue.enginClassValue == '立杠') {
 						//立杠  判断  材质  规格  米数
@@ -1271,14 +1271,14 @@
 							} else {
 								this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
 							}
-							this.onsubmit();
+							this.onsubmit(e);
 						}
 					} else if (this.objValue.enginClassValue == '挂表') {
 						//挂表  判断  品牌
 						if (this.isEmpty(this.brandValue.id)) {
 							this.$modal.msg("请选择品牌")
 						} else {
-							this.onsubmit();
+							this.onsubmit(e);
 						}
 
 					} else if (this.objValue.enginClassValue == '表后管') {
@@ -1289,83 +1289,33 @@
 							this.$modal.msg("请选择规格")
 						} else if (this.isEmpty(this.inputIntegerNumberValue)) {
 							this.$modal.msg("请输入米数")
-						} else if (this.imgArr.length <= 0) {
-							this.$modal.msg('请上传照片或视频')
 						}
+						// else if (this.imgArr.length <= 0) {
+						// 	this.$modal.msg('请上传照片或视频')
+						// }
 						// else if (this.loading == false) {
 						// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')
 						// }
 						else {
-							const hasImage = this.imgArr.some(item => item.endsWith('.jpg') || item.endsWith(
-									'.png') || item
-								.endsWith('.jpeg') || item.endsWith('.JPG') || item.endsWith('.PNG') || item
-								.endsWith('.JPEG'));
-							const hasVideo = this.imgArr.some(item => item.endsWith('.mp4') || item.endsWith('.MP4'));
-
-							if (hasImage && hasVideo) {
-								//表后管  特殊  提交
-								if (this.isEmpty(this.inputDecimalNumberValue)) {
-									this.inputNumberValue = this.inputIntegerNumberValue;
-								} else {
-									this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
-								}
-
-								let phoneArr = [];
-								this.currentResidentsPhoe.forEach((list) => {
-									phoneArr.push(list.phone)
-								})
-
-								putRoomDetails(this.FJValue.id, phoneArr
-										.join())
-									.then(res => {
-
-										if (res.code == '200') {
-											let param = {
-												district: this.XZQValue.dictValue,
-												areaId: this.XQValue.id,
-												buildingId: this.LDValue.id,
-												unitId: this.DYValue.id,
-												houseId: this.FJValue.id,
-												enginType: this.objValue.enginType, //写死 上一页面传过来的
-												enginClassification: this.objValue
-													.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-												enginCycle: this.projectValue.dictValue, //工程周期
-												zEngineeringNodeBo: {
-													type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-													zEngineeringInfoBo: {
-														constructAccordingDrawings: this.isCheck, //是否按图纸施工
-														state: this.tempState,
-														zEngiineeringPhotoBoList: this.imgArr, //照片集合
-
-														zEngineeringMaterialBo: [{
-															materialQuality: this.materialValue.id, //材质
-															specifications: this.specificationValue.id, //规格
-															number: this.inputNumberValue //米数
-														}]
-													}
-												}
+							if (e == 'submit') {
 
-											}
-											uni.showLoading()
-											addTearOldPipe(param).then(res => {
-												if (res.code == '200') {
-													uni.hideLoading()
-													uni.showToast({
-														title: res.msg,
-														icon: 'none',
-														//显示持续时间为 1秒
-														duration: 1000
-													});
-													uni.navigateBack();
-												}
-											})
-										}
+								const hasImage = this.imgArr.some(item => item.endsWith('.jpg') || item.endsWith(
+										'.png') || item
+									.endsWith('.jpeg') || item.endsWith('.JPG') || item.endsWith('.PNG') || item
+									.endsWith('.JPEG'));
+								const hasVideo = this.imgArr.some(item => item.endsWith('.mp4') || item.endsWith('.MP4'));
 
-									})
+								if (hasImage && hasVideo) {
 
+									//表后管
+									this.againSubmitBHG();
 
+								} else {
+									this.$modal.msg('请至少上传一张照片和一个视频')
+								}
 							} else {
-								this.$modal.msg('请至少上传一张照片和一个视频')
+								//暂存
+								this.againSubmitBHG();
 							}
 						}
 					} else if (this.objValue.enginClassValue == '阀管') {
@@ -1389,37 +1339,102 @@
 							} else {
 								this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
 							}
-							this.onsubmit();
+							this.onsubmit(e);
 						}
 					}
 				},
 
-				onsubmit() {
+				onsubmit(e) {
 
-					if (this.imgArr.length <= 0) {
-						this.$modal.msg('请上传照片或视频')
+					if (e == 'submit') {
+						if (this.imgArr.length <= 0) {
+							this.$modal.msg('请上传照片或视频')
+						}
 					}
 					// else if (this.loading == false) {
 					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')
 					// } 
-					else {
-						let phoneArr = [];
-						this.currentResidentsPhoe.forEach((list) => {
-							phoneArr.push(list.phone)
+					//else {
+					let phoneArr = [];
+					this.currentResidentsPhoe.forEach((list) => {
+						phoneArr.push(list.phone)
+					})
+
+					putRoomDetails(this.FJValue.id, phoneArr.join())
+						.then(res => {
+
+							if (res.code == '200') {
+								this.againSubmit();
+							}
+
 						})
+					//}
 
-						putRoomDetails(this.FJValue.id, phoneArr.join())
-							.then(res => {
+				},
 
-								if (res.code == '200') {
-									this.againSubmit();
-								}
+				againSubmitBHG() {
 
-							})
+					//表后管  特殊  提交
+					if (this.isEmpty(this.inputDecimalNumberValue)) {
+						this.inputNumberValue = this.inputIntegerNumberValue;
+					} else {
+						this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
 					}
 
-				},
+					let phoneArr = [];
+					this.currentResidentsPhoe.forEach((list) => {
+						phoneArr.push(list.phone)
+					})
 
+					putRoomDetails(this.FJValue.id, phoneArr
+							.join())
+						.then(res => {
+
+							if (res.code == '200') {
+								let param = {
+									district: this.XZQValue.dictValue,
+									areaId: this.XQValue.id,
+									buildingId: this.LDValue.id,
+									unitId: this.DYValue.id,
+									houseId: this.FJValue.id,
+									enginType: this.objValue.enginType, //写死 上一页面传过来的
+									enginClassification: this.objValue
+										.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+									enginCycle: this.projectValue.dictValue, //工程周期
+									zEngineeringNodeBo: {
+										type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+										zEngineeringInfoBo: {
+											constructAccordingDrawings: this.isCheck, //是否按图纸施工
+											state: this.tempState,
+											zEngiineeringPhotoBoList: this.imgArr, //照片集合
+
+											zEngineeringMaterialBo: [{
+												materialQuality: this.materialValue.id, //材质
+												specifications: this.specificationValue.id, //规格
+												number: this.inputNumberValue //米数
+											}]
+										}
+									}
+
+								}
+								uni.showLoading()
+								addTearOldPipe(param).then(res => {
+									if (res.code == '200') {
+										uni.hideLoading()
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											//显示持续时间为 1秒
+											duration: 1000
+										});
+										uni.navigateBack();
+									}
+								})
+							}
+
+						})
+
+				},
 				againSubmit() {
 					//提交
 					let param = '';

pages/oldrenovation/overhead/newoverhead.vue

@@ -82,13 +82,13 @@
 						</view>
 						<view class=" container" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									施工时间
-								</view>
-								<view @click="openDatetimePicker('sg')">
-									<span style="color: black;">{{time}}</span>
-									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-								</view>
+							<view>
+								施工时间
+							</view>
+							<view @click="openDatetimePicker('sg')">
+								<span style="color: black;">{{time}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 
 
@@ -757,9 +757,11 @@
 					} catch (e) {
 						if (e.message === 'End Loop') throw e
 					}
-					if (this.imgArr.length <= 0) {
-						this.$modal.msg('请上传照片或视频')
-						return
+					if (e == 'submit') {
+						if (this.imgArr.length <= 0) {
+							this.$modal.msg('请上传照片或视频')
+							return
+						}
 					}
 					// if (this.loading == false) {
 					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')

pages/oldrenovation/overhead/overhead.vue

@@ -82,13 +82,13 @@
 						</view>
 						<view class=" container" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									施工时间
-								</view>
-								<view @click="openDatetimePicker('sg')">
-									<span style="color: black;">{{time}}</span>
-									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-								</view>
+							<view>
+								施工时间
+							</view>
+							<view @click="openDatetimePicker('sg')">
+								<span style="color: black;">{{time}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 
 
@@ -128,7 +128,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="action-btn" v-show="reviewStatus!='1'"  style="display: flex;padding: 5px;">
+			<view class="action-btn" v-show="reviewStatus!='1'" style="display: flex;padding: 5px;">
 				<button @click="submit('submit')" class="btn cu-btn block bg-blue lg round" style="margin-right: 10px;">确认上传</button>
 				<button @click="submit('save')" class="btn cu-btn block bg-blue lg round" v-if="objValue.enginType == 'old_renovation'">暂存</button>
 			</view>
@@ -640,10 +640,12 @@
 						this.$modal.msg("请选择楼栋")
 					}
 
+					if (e == 'submit') {
 
-					if (this.imgArr.length <= 0) {
-						this.$modal.msg('请上传照片或视频')
-						return
+						if (this.imgArr.length <= 0) {
+							this.$modal.msg('请上传照片或视频')
+							return
+						}
 					}
 					// if (this.loading == false) {
 					// 	this.$modal.msg('照片或视频未上传完毕，无法提交！')