管道施工记录

components/bottomSheet/bottomSheetMore.vue

@@ -68,9 +68,31 @@
 							<view v-if="title=='下沟'">
 								<view class="uni-common-mt" style="width: 100%;">
 									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">管道施工记录:</text>
+								</view>
+
+								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+									<view v-for="(item,index) in value.constructionRecords
+" :key="index" style="position: relative;">
+										<view
+											v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+											<image :src="item" mode=""
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;" @click="showPhoto(index,value.constructionRecords
+)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+									</view>
+								</view>
+
+								<view class="uni-common-mt" style="width: 100%;">
+									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
 											#000;margin-top: 5px; margin-left: 8px;">管上皮深度测量照片:</text>
 								</view>
-								
+
 								<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
 									<view v-for="(item,index) in value.ductalEpithelium" :key="index"
 										style="position: relative;">

pages/oldrenovation/courtyard/courtyard.vue

@@ -145,7 +145,7 @@
 						}})" class="tj-btn">添加</button>
 
 					</view>
-				<!-- 	<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
+					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
 						<view class="container" style="color: #b2b2b2;">*请上传管道施工记录照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 							<image :src="loadImgSrc('updateimg.png')" mode=""
@@ -168,7 +168,7 @@
 								</view>
 							</view>
 						</view>
-					</view> -->
+					</view>
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
 						<view class="container" style="color: #b2b2b2;">*请上传管上皮深度测量照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
@@ -838,7 +838,10 @@
 						})
 					})
 
-
+					if (this.imgPipelineArr.length <= 0) {
+						this.$modal.msg('请上传管道施工记录照片')
+						return
+					}
 					if (this.imgGuanArr.length <= 0) {
 						this.$modal.msg('请上传管上皮深度测量照片')
 						return
@@ -886,6 +889,7 @@
 							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
 							zEngineeringInfoBo: {
 								ductalEpithelium: this.imgGuanArr, //照片集合
+								constructionRecords: this.imgPipelineArr,
 								trenchProspect: this.imgArr,
 								video: this.videoArr,
 								constructTime: this.time, //施工时间

pages/oldrenovation/indoor/indoor.vue

@@ -1518,7 +1518,7 @@
 
 				},
 				history() {
-					if (this.isEmpty(this.projectValue.id)) {
+					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
 						return
 					}