新建 室内和庭院

components/bottomSheet/bottomSheet.vue

@@ -19,6 +19,11 @@
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									腐蚀等级:{{value.zEngineeringMaterialBo[0].corrosionLevel}}</view>
 							</view>
+							<view v-if="title=='打孔'">
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									孔距:{{value.zEngineeringMaterialBo[0].corrosionLevel}}</view>
+							</view>
 							<view v-else-if="title=='立杠'">
 								<view class="uni-media-list-text-top"
 									style="font-size: 13px;color: #000;margin-top: 5px;">
@@ -156,6 +161,18 @@
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
 							</view>
+							<view class="uni-media-list-text-top">
+
+								<text style="font-size: 13px;color: #000;margin-top: 5px;">负责人:</text>
+								<text
+									style="font-size: 13px;color: #000;margin-top: 5px;">{{value.constructUser}}</text>
+							</view>
+							<view class="uni-media-list-text-top">
+
+								<text style="font-size: 13px;color: #000;margin-top: 5px;">负责人联系电话:</text>
+								<text
+									style="font-size: 13px;color: #000;margin-top: 5px;">{{value.constructPhone}}</text>
+							</view>
 							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
 								<text style="margin-left: 30rpx;margin-top: 6rpx;">{{ value.published_at }}</text>
 								<view v-for="(item,index) in value.zEngiineeringPhotoBoList" :key="index"

components/selectPicker/select_picker.vue

@@ -4,17 +4,17 @@
 			<view class="liy-search-warp">
 
 				<view class="liy-search-input">
-					<view @click="closeOverlay">
+				<!-- 	<view @click="closeOverlay">
 						取消
-					</view>
+					</view> -->
 					<view class="lsi-warp">
 						<image src="../../static/images/search.png" mode="widthFix" class="lsi-icon"></image>
 						<input class="lsi-input" v-model="keyword" placeholder="请输入搜索内容" @input="getParamsList" />
 
 					</view>
-					<view @click="confirm">
+				<!-- 	<view @click="confirm">
 						确定
-					</view>
+					</view> -->
 				</view>
 				<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="lower">
 					<view class="liy-search-list" v-if="outPutList.length > 0">

pages/oldrenovation/indoor/indoor.vue

@@ -130,6 +130,31 @@
 						</view>
 					</view>
 				</view>
+				<view v-if="objValue.enginClassValue=='打孔'">
+					<view class="uni-list">
+						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+							打孔
+
+							<span
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								@click="history">历史</span>
+						</view>
+
+						<view class="container" style="margin-bottom: 20PX;">
+
+							<view>
+								孔距
+							</view>
+							<view v-if="this.isEmpty(this.LevelValue.dictValue)" style="margin-top: 10;"
+								@click="pickerShow('kj')">
+								<span style="color: darkgray;">请选择孔距</span>
+							</view>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('kj')">
+								<span style="color: black;">{{LevelValue.dictLabel}}</span>
+							</view>
+						</view>
+					</view>
+				</view>
 				<!--立杠-->
 				<view v-else-if="objValue.enginClassValue=='立杠'">
 					<view class="uni-list" style="margin-bottom: 20px;">
@@ -670,6 +695,13 @@
 							this.dictOptions = response.data;
 						});
 
+					} else if (e == 'kj') {
+						//孔距
+						this.openDict = true;
+						getDicts("perforated_pipe_diameter").then(response => {
+							this.dictOptions = response.data;
+						});
+
 					} else if (e == 'gczq') { //工程周期
 						this.openDict = true;
 						getDicts("engin_cycle").then(response => {
@@ -829,6 +861,12 @@
 						this.$modal.msg("请选择单元")
 					} else if (this.isEmpty(this.FJValue.id)) {
 						this.$modal.msg("请选择房间")
+					} else if (this.objValue.enginClassValue == '打孔') {
+						if (this.isEmpty(this.LevelValue.dictValue)) {
+							this.$modal.msg("请选择孔距") //打孔  判断孔距
+						} else {
+							this.onsubmit();
+						}
 					} else if (this.objValue.enginClassValue == '拆旧管') {
 
 						if (this.isEmpty(this.LevelValue.dictValue)) {
@@ -871,9 +909,9 @@
 							this.$modal.msg('照片或视频未上传完毕，无法提交！')
 						} else {
 							const hasImage = this.imgArr.some(item => item.endsWith('.jpg') || item.endsWith('.png') || item
-								.endsWith('.jpeg'));
-							const hasVideo = this.imgArr.some(item => item.endsWith('.mp4') || item.endsWith('.avi') || item
-								.endsWith('.mov'));
+								.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) {
 								//表后管  特殊  提交
@@ -945,7 +983,7 @@
 					} else {
 						//提交
 						let param = ';'
-						if (this.objValue.enginClassValue == '拆旧管') { //拆旧管
+						if (this.objValue.enginClassValue == '拆旧管'||this.objValue.enginClassValue == '打孔') { //拆旧管  打孔
 							param = {
 								district: this.XZQValue.dictValue,
 								areaId: this.XQValue.id,
@@ -962,7 +1000,7 @@
 										zEngiineeringPhotoBoList: this.imgArr, //照片集合
 
 										zEngineeringMaterialBo: [{
-											corrosionLevel: this.LevelValue.dictValue //腐蚀等级
+											corrosionLevel: this.LevelValue.dictValue //腐蚀等级 //孔距
 										}]
 									}
 								}

pages/work/index.vue

@@ -243,7 +243,6 @@
 			//二次弹窗 选择类型
 			showTypeSheet(item) {
 				this.showPopup = !this.showPopup; //隐藏第一次弹窗
-				console.log(item)
 				this.enginClassValue = item.dictValue; //二次节点赋值
 				const obj = {
 					enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
@@ -251,7 +250,7 @@
 					enginClassification: this.enginClassification //室内  庭院  架空
 
 				};
-
+				console.log(obj)
 				this.handleHiddenShare();
 				// 室内
 				if (this.enginClassification == 'indoor_engin') {
@@ -263,8 +262,9 @@
 				// 庭院
 				else if (this.enginClassification == 'courtyard') {
 					uni.navigateTo({
-						url: '/pages/oldrenovation/courtyard/courtyard?params=' + encodeURIComponent(JSON.stringify(
-							obj))
+						url: '/pages/oldrenovation/courtyard/courtyard?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
 					})
 				} else if (this.enginClassification == 'overhead') { //架空
 					uni.navigateTo({