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

components/bottomSheet/bottomSheet.vue

@@ -54,7 +54,7 @@
 								<view class="uni-media-list-text-top" v-show="title=='报警器'||title=='切断阀'">
 									<view class="tit-text">厂家:</view>{{value.zEngineeringMaterialBo[0].brand}}
 								</view>
-								<view class="uni-media-list-text-top" v-show="title=='立杠'||title=='表后管'||title=='阀管'">
+								<view class="uni-media-list-text-top" v-show="title=='立杠'||title=='表后管'">
 									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}
 								</view>
 								<view class="uni-media-list-text-top">

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

@@ -1469,7 +1469,8 @@
 					} else if (this.objValue.enginClassValue == '阀管') { //自闭阀
 						var onlyNumbers = this.specificationValue.name.replace(/[^\d.]/g, '');
 
-						console.log(onlyNumbers); // 输出: "123456"
+						console.log(this.specificationValue)
+						console.log('数量========', onlyNumbers); // 输出: "123456"
 						param = {
 							district: this.XZQValue.dictValue,
 							areaId: this.XQValue.id,
@@ -1518,7 +1519,7 @@
 
 				},
 				history() {
-					if (this.isEmpty(this.projectValue.id)) {
+					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
 						return
 					}
@@ -1591,13 +1592,13 @@
 			justify-content: space-between;
 			padding: 10px;
 			position: relative;
-		
+
 		}
-		
+
 		.uni-list {
 			border: 1xp solid #eee;
 		}
-		
+
 		.to-right-icon {
 			width: 15px;
 			height: 15px;
@@ -1605,13 +1606,13 @@
 			top: 50%;
 			transform: translateY(-50%);
 		}
-		
-		
+
+
 		.text {
 			font-size: 16px;
 			color: #333;
 		}
-		
+
 		.background {
 			// border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
@@ -1620,10 +1621,10 @@
 			border-radius: 20rpx;
 			margin: 20rpx 10rpx;
 			/*从padding开始往外面裁剪背景*/
-		
-		
+
+
 		}
-		
+
 		.btn {
 			width: 715rpx;
 			height: 69rpx;
@@ -1637,8 +1638,8 @@
 			margin-top: 40rpx;
 			margin-bottom: 100rpx;
 		}
-		
-		
+
+
 		.number {
 			display: flex;
 			/* 水平居中显示子元素 */
@@ -1649,7 +1650,7 @@
 			padding: 10px;
 			/* 设置padding以提高视觉效果 */
 		}
-		
+
 		.tj-btn {
 			height: 69rpx;
 			background: #3184f0;
@@ -1659,9 +1660,9 @@
 			color: #FFFFFF;
 			line-height: 69rpx;
 			margin: 40rpx 70rpx;
-		
+
 		}
-		
+
 		.sc-btn {
 			height: 69rpx;
 			background: #f0686b;
@@ -1671,9 +1672,9 @@
 			color: #FFFFFF;
 			line-height: 69rpx;
 			margin: 40rpx;
-		
+
 		}
-		
+
 		.num-style {
 			background: #e8f4f9;
 			margin: 20rpx;
@@ -1681,8 +1682,8 @@
 			border-radius: 20rpx;
 			border: 1px solid #d4e3f0;
 		}
-		
-		
+
+
 		.textarea {
 			margin-top: 10upx;
 			width: 100%;
@@ -1690,16 +1691,16 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-		
+
 		page {
 			background: #f2f2f2;
 		}
-		
+
 		.flex-x {
 			display: flex;
 			align-items: center;
 		}
-		
+
 		.template_title,
 		.template_title1,
 		.template_title_list {
@@ -1709,15 +1710,15 @@
 			padding: 0 30rpx;
 			box-sizing: border-box;
 		}
-		
+
 		.template_title1 {
 			background: none;
 		}
-		
+
 		.template_title_list {
 			margin-bottom: 4rpx;
 		}
-		
+
 		.template_title>view,
 		.template_title1>view {
 			font-size: 32rpx;
@@ -1725,16 +1726,16 @@
 			flex-shrink: 0;
 			margin-right: 20rpx;
 		}
-		
+
 		.template_title>input {
 			font-size: 28rpx;
 			color: #808080;
 			text-align: right;
 			flex-grow: 1;
 		}
-		
+
 		/* 添加内容 */
-		
+
 		.add_con>text {
 			font-size: 40rpx;
 			color: #f16765;
@@ -1743,26 +1744,27 @@
 			margin-left: 10rpx;
 			line-height: 44rpx;
 		}
-		
+
 		.add_con>view {
 			font-size: 32rpx;
 			color: #7885cb;
 		}
-		
+
 		/* 删除内容 */
-		
+
 		.del {
 			font-size: 32rpx;
 			color: #f16765;
 			margin-right: 14rpx;
 			padding: 20rpx;
 		}
-		
+
 		input {
 			flex-grow: 1;
 			font-size: 28rpx;
 			color: #808080;
 		}
+
 		// .container {
 		// 	display: flex;
 		// 	align-items: center;