底腿、管道施工记录 提交

components/bottomSheet/bottomSheet.vue

@@ -174,6 +174,127 @@
 									</view>
 								</view>
 							</view>
+							<view v-if="title=='底腿'">
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.constructTime}}
+								</view>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人:</view>
+									<text>{{value.constructUser}}</text>
+								</view>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人联系电话:</view>
+									<text>{{value.constructPhone}}</text>
+								</view>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">米数:</view>
+									<text>{{value.zEngineeringMaterialBo[0].number}}</text>
+								</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.beforeBottom" :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.beforeBottom)">
+											</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.legBackfilling" :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.legBackfilling)">
+											</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.inferiorSulcus" :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.inferiorSulcus)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+
+									</view>
+								</view>
+							</view>
+							<view v-if="title=='管道施工记录'">
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人:</view>
+									<text>{{value.constructUser}}</text>
+								</view>
+								<view class="uni-media-list-text-top">
+
+									<view class="tit-text">负责人联系电话:</view>
+									<text>{{value.constructPhone}}</text>
+								</view>
+
+								<view class="uni-media-list-text-top">
+									<view class="tit-text">施工时间:</view>{{value.constructTime}}
+								</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.zEngiineeringPhotoBoList" :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.zEngiineeringPhotoBoList)">
+											</image>
+										</view>
+										<view v-else>
+											<video :src="item"
+												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										</view>
+
+									</view>
+								</view>
+							</view>
 							<view v-else>
 								<view class="uni-media-list-text-top">
 

config.js

@@ -3,8 +3,8 @@ module.exports = {
 
 	// baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	// baseUrl: 'http://192.168.4.20:8080',
-	baseUrl: 'http://192.168.4.11:8080',
+	baseUrl: 'http://192.168.4.20:8080',
+	// baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

pages/bottom_leg/bottom_leg.vue

@@ -1,29 +1,6 @@
 	<template>
 		<scroll-view>
 			<view class="background">
-				<!-- 	<view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view>
-							工程周期
-						</view>	
-						<view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
-							<view>
-
-
-								<span style="color: darkgray;">请选择工程周期
-
-								</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
-							<span style="color: black;">{{projectValue.dictLabel}}
-							</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-
-					</view>
-				</view> -->
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
@@ -102,6 +79,17 @@
 							style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 							@click="history">历史</span>
 					</view>
+
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+
+						<view>
+							施工时间
+						</view>
+						<view @click="openDatetimePicker()">
+							<span style="color: black;">{{time}}</span>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view>
+					</view>
 				</view>
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>米 数</text>
@@ -115,19 +103,20 @@
 				<view class="container" style="color: #b2b2b2;">*开挖前照片</view>
 				<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 					<image :src="loadImgSrc('updateimg.png')" mode=""
-						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage()"
+						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(1)"
 						v-show="reviewStatus!='1'"></image>
-					<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+					<view v-for="(item,index) in imgArr1" :key="index" style="position: relative;">
 						<view
 							v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
 							<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-								@click="showPhoto(index)">
+								@click="showPhoto(index,1)">
 							</image>
 						</view>
 						<view v-else>
 							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+						<view @click="remove(index,1)"
+							style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 							<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 							</image>
 						</view>
@@ -136,19 +125,20 @@
 				<view class="container" style="color: #b2b2b2;">*下沟照片</view>
 				<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 					<image :src="loadImgSrc('updateimg.png')" mode=""
-						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage()"
+						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(2)"
 						v-show="reviewStatus!='1'"></image>
-					<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+					<view v-for="(item,index) in imgArr2" :key="index" style="position: relative;">
 						<view
 							v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
 							<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-								@click="showPhoto(index)">
+								@click="showPhoto(index,2)">
 							</image>
 						</view>
 						<view v-else>
 							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+						<view @click="remove(index,2)"
+							style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 							<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 							</image>
 						</view>
@@ -157,19 +147,20 @@
 				<view class="container" style="color: #b2b2b2;">*回填照片</view>
 				<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 					<image :src="loadImgSrc('updateimg.png')" mode=""
-						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage()"
+						style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(3)"
 						v-show="reviewStatus!='1'"></image>
-					<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
+					<view v-for="(item,index) in imgArr3" :key="index" style="position: relative;">
 						<view
 							v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
 							<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-								@click="showPhoto(index)">
+								@click="showPhoto(index,3)">
 							</image>
 						</view>
 						<view v-else>
 							<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+						<view @click="remove(index,3)"
+							style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 							<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 							</image>
 						</view>
@@ -189,6 +180,9 @@
 
 			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
 				titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
+
+			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
+				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
 		</scroll-view>
 	</template>
 
@@ -205,62 +199,58 @@
 			getUnitList,
 			getHousesList,
 			addTearOldPipe,
-			getEnginMaterialQualityList,
-			getEnginSpecificationsList,
 			getRoomProjectList,
 			getRoomProjectId,
-		} from '@/api/common'
+		} from '@/api/common';
+		import {
+			getToken
+		} from '../../utils/auth';
 		export default {
 			components: {
-				SelectPicker
+				SelectPicker,
+				bottomSheet,
 			},
 			data() {
 				return {
 					title: '',
 					name: '底腿',
-					// headers: {
-					// 	Authorization: "Bearer " + getToken()
-					// },
+					headers: {
+						Authorization: "Bearer " + getToken()
+					},
 					type: '',
 					open: false,
-					// reviewStatus: '', //是否可以点击
-					// objValue: '', //上一页面传过来的值  新增接口用
+					reviewStatus: '', //是否可以点击
+					objValue: '', //上一页面传过来的值  新增接口用
 					openDict: false,
 					selectList: [],
 					dictOptions: [],
-					imgArr: [],
+					imgArr1: [],
+					imgArr2: [],
+					imgArr3: [],
 					XQValue: {},
 					XZQValue: {},
 					projectValue: {
 						'dictValue': '0'
 					},
-					// LevelValue: {},
 					LDValue: {},
 					DYValue: {},
-					FJValue: {},
-					// FSValue: {},
-					// specificationValue: {}, //规格
-					// materialValue: {}, //材质
-					// brandValue: {}, //品牌
-					// doorValue: {}, //上门类型
-					// SelfClosValve: {}, //自闭阀类型
-					// materialList: '', //材质list
+					time: '', //施工时间
 					XQList: '',
 					LDList: '',
 					DYList: '',
 					FJList: '',
 					progress: 0, //上传图片进度百分比
 					loading: false,
-					// isCheck: true, //是否按照施工图纸施工
-					// inputNumberValue: '',
-					// inputIntegerNumberValue: '',
-					// inputDecimalNumberValue: '',
 					historyList: {}, //历史数据
 					inputNumberValue: '',
 					inputIntegerNumberValue: '',
 					inputDecimalNumberValue: '',
 				}
 			},
+
+			created() {
+				this.time = this.traversalTime(new Date().getTime()) //在data里定义变量-nowTime
+			},
 			onLoad(options) {
 				if ('params' in options) {
 
@@ -277,31 +267,146 @@
 						title: this.title
 					})
 				}
-
-
 			},
 			methods: {
 				//判断是否选择
 				isEmpty(str) {
 					return (!str || 0 === str.length);
 				},
-				history() {
+
+				//获取当前时间
+				traversalTime(timestamp) {
+					//timestamp(时间戳)是整数，否则要parseInt转换
+					let time = new Date(timestamp);
+					let y = time.getFullYear();
+					let m = time.getMonth() + 1;
+					let d = time.getDate();
+					let h = time.getHours();
+					let mm = time.getMinutes();
+					let s = time.getSeconds();
+					return y + '-' + this.addTimes(m) + '-' + this.addTimes(d) + ' ' + this.addTimes(h) + ':' + this.addTimes(
+						mm) + ':' + this.addTimes(s);
+
+
+				},
+				addTimes(m) {
+					return m < 10 ? '0' + m : m
+				},
+				// 打开picker
+				openDatetimePicker() {
+					this.$refs.myPicker.show();
+				},
+				// 关闭picker
+				closeDatetimePicker() {
+					this.$refs.myPicker.hide();
+				},
+				handleSubmit(e) {
+					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+				},
+				
+				getStatus() {
+					let buildingId = '';
 					if (this.isEmpty(this.LDValue.id)) {
-						this.$modal.msg('请选择楼栋')
+						buildingId = '';
 					} else {
-						this.$modal.msg('历史')
+						buildingId = this.LDValue.id
+					}
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: buildingId, // 楼宇id
+						unitId: this.DYValue.id,
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						enginType: this.objValue.enginType, //写死 上一页面传过来的
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 					}
+					getRoomProjectId(param).then(res => {
+				
+						if (res.code == '200') {
+				
+							if (res.data != null && res.data.zEngineeringNodeBoList != null) {
+				
+								res.data.zEngineeringNodeBoList.forEach((item, index) => {
+									if (this.objValue.enginClassValue == item.type) {
+										this.reviewStatus = item.reviewStatus;
+										if (item.reviewStatus == '1')
+											this.$modal.msg('当前工程已结束')
+									}
+				
+								})
+				
+				
+							} else {
+								this.reviewStatus = '' //置空
+							}
+				
+						} else {
+							this.$modal.msg(res.msg)
+							this.reviewStatus = '' //置空
+						}
+					})
 				},
-
 				submit() {
-					if (this.isEmpty(this.inputIntegerNumberValue)) {
+					if (this.isEmpty(this.projectValue.dictValue)) {
+						this.$modal.msg("请选择工程周期")
+					} else if (this.isEmpty(this.XZQValue.dictValue)) {
+						this.$modal.msg("请选择行政区")
+					} else if (this.isEmpty(this.XQValue.id)) {
+						this.$modal.msg("请选择小区")
+					} else if (this.isEmpty(this.LDValue.id)) {
+						this.$modal.msg("请选择楼栋")
+					} else if (this.isEmpty(this.inputIntegerNumberValue)) {
 						this.$modal.msg("请输入米数")
-					} else {
+					} else if (this.imgArr1.length <= 0) {
+						this.$modal.msg("请上传开挖前照片")
+					} else if (this.imgArr2.length <= 0) {
+						this.$modal.msg("请上传下沟照片")
+					} else if (this.imgArr3.length <= 0) {
+						this.$modal.msg("请上传回填照片")
+					}else {
 						if (this.isEmpty(this.inputDecimalNumberValue)) {
 							this.inputNumberValue = this.inputIntegerNumberValue;
 						} else {
 							this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
 						}
+						let param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructTime: this.time, //施工时间
+									beforeBottom: this.imgArr1, //照片集合
+									legBackfilling: this.imgArr2, //照片集合
+									inferiorSulcus: this.imgArr3, //照片集合
+
+									zEngineeringMaterialBo: [{
+										number: this.inputNumberValue //米数
+									}]
+								}
+							}
+
+						}
+
+						addTearOldPipe(param).then(res => {
+							if (res.code == '200') {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									//显示持续时间为 3秒
+									duration: 2000
+								});
+								setTimeout(function() {
+									uni.navigateBack();
+								}, 1000)
+
+							}
+						})
 						//提交接口执行逻辑
 					}
 				},
@@ -314,27 +419,63 @@
 				handleHiddenShare() {
 					this.shareState = false;
 				},
-				showPhoto(index) {
-					uni.previewImage({
-						current: index,
-						urls: this.imgArr,
-					})
-
+				showPhoto(index, type) {
+					if (type == 1) {
+						uni.previewImage({
+							current: index,
+							urls: this.imgArr1,
+						})
+					} else if (type == 2) {
+						uni.previewImage({
+							current: index,
+							urls: this.imgArr2,
+						})
+					} else {
+						uni.previewImage({
+							current: index,
+							urls: this.imgArr3,
+						})
+					}
 				},
-				remove(index) {
-					uni.showModal({
-						title: '提示',
-						content: '是否删除该图片或视频？',
-						success: (res) => {
-							if (res.confirm) {
-								this.imgArr.splice(index, 1)
-								console.log('this.imgarr', this.imgArr)
-								if (this.imgArr.length <= 0) {
-									this.photo = true;
+				remove(index, type) {
+					if (type == 1) {
+						uni.showModal({
+							title: '提示',
+							content: '是否删除该图片或视频？',
+							success: (res) => {
+								if (res.confirm) {
+									this.imgArr1.splice(index, 1)
+									console.log('this.imgArr1', this.imgArr1)
 								}
 							}
-						}
-					})
+						})
+
+					} else if (type == 2) {
+						uni.showModal({
+							title: '提示',
+							content: '是否删除该图片或视频？',
+							success: (res) => {
+								if (res.confirm) {
+									this.imgArr2.splice(index, 1)
+									console.log('this.imgArr2', this.imgArr2)
+								}
+							}
+						})
+
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: '是否删除该图片或视频？',
+							success: (res) => {
+								if (res.confirm) {
+									this.imgArr3.splice(index, 1)
+									console.log('this.imgArr3', this.imgArr3)
+								}
+							}
+						})
+
+					}
+
 				},
 				choose() {
 					let _this = this;
@@ -351,7 +492,7 @@
 						}
 					})
 				},
-				chooseimage() {
+				chooseimage(type) {
 
 					let _this = this;
 					console.log('图片', _this.headers)
@@ -369,33 +510,32 @@
 									success: res => {
 										// 判断是否json字符串，将其转为json格式
 										console.log("结果", res)
-										// let data = _this.$u.test.jsonString(res
-										// 	.data) ? JSON.parse(res.data) : res.data;
 										let data = JSON.parse(res.data);
 										if (![200].includes(data.code)) {
-											// this.uploadError(index, data);
 											_this.$modal.msg(data.msg)
 										} else {
 											if (_this.progress === 100) {
-												console.log('_this.progress', _this.progress)
-												//console.log('data----', data)data
-												console.log('res--', res)
-												_this.imgArr.push(data.data.url)
-												console.log('imgArr', _this.imgArr)
+												if (type == 1) {
+													_this.imgArr1.push(data.data.url)
+													console.log('imgArr1', _this.imgArr1)
+												} else if (type == 2) {
+													_this.imgArr2.push(data.data.url)
+													console.log('imgArr2', _this.imgArr2)
+												} else {
+													_this.imgArr3.push(data.data.url)
+													console.log('imgArr3', _this.imgArr3)
+												}
 												_this.$modal.msg('上传成功！')
-												_this.photo = false;
 											}
 										}
 									},
 									fail: e => {
 										console.log(e)
 										_this.$modal.msg('上传失败！')
-										//_this.uploadError(index, e);
 									},
 									complete: res => {
 										uni.hideLoading();
 										_this.uploading = false;
-
 									}
 								});
 								task.onProgressUpdate(res => {
@@ -419,72 +559,8 @@
 						},
 					})
 				},
-
-				choosevideo() {
-					let _this = this;
-					console.log('视频')
-					uni.chooseVideo({
-						sourceType: ['album', 'camera'],
-						maxDuration: 30,
-						success(resp) {
-							const task = uni.uploadFile({
-								url: _this.$HTTP + `/obs`,
-								filePath: resp.tempFilePath,
-								name: 'file',
-								formData: {},
-								header: _this.headers,
-								success: res => {
-									// 判断是否json字符串，将其转为json格式
-									let data = JSON.parse(res.data);
-									if (![200].includes(res.statusCode)) {
-										this.uploadError(index, data);
-									} else {
-										//上传成功
-										if (_this.progress === 100) {
-											console.log('_this.progress', _this.progress)
-											_this.imgArr.push(data.data.url)
-											console.log('imgArr', _this.imgArr)
-											_this.$modal.msg('上传成功！')
-											_this.photo = false;
-										}
-									}
-								},
-								fail: e => {
-									_this.$modal.msg('上传失败！')
-									this.uploadError(index, e);
-								},
-								complete: res => {
-									uni.hideLoading();
-									_this.uploading = false;
-								}
-							});
-							task.onProgressUpdate(res => {
-								_this.progress = res.progress;
-								console.log('onProgressUpdate', res)
-								uni.showLoading({
-									title: '上传中'
-								})
-								if (_this.progress != 100) {
-									_this.loading = false
-									console.log('_this.loading false', _this.loading)
-								} else {
-									_this.loading = true
-									console.log('_this.loading true', _this.loading)
-								}
-							});
-
-						},
-					})
-				},
 				pickerShow(e) {
 					this.type = e; //赋值类型
-					// if (e == 'gczq') { //工程周期
-					// 	this.openDict = true;
-					// 	getDicts("engin_cycle").then(response => {
-					// 		this.dictOptions = response.data;
-					// 	});
-
-					// } else
 					if (e == 'xzq') { //行政区
 						if (this.isEmpty(this.projectValue.dictValue)) {
 							this.$modal.msg('请选择工程周期')
@@ -542,7 +618,6 @@
 						this.XQValue = ''; //重置小区数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
 						getAreaList(item.dictValue).then(res => {
 							this.XQList = res.data;
 						})
@@ -550,8 +625,6 @@
 
 				},
 				changeSelect(item, index) {
-					// this.index = index;
-					// this.address = item.communityName;
 					this.open = false;
 
 					if (this.type == 'xq') {
@@ -559,31 +632,31 @@
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
 						getBuildingList(item.id).then(res => {
 							this.LDList = res.data
-							// console.log("楼栋=", res)
 						})
 					} else if (this.type == 'ld') {
 						this.LDValue = item;
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
+						
+						if (!this.isEmpty(this.projectValue.dictValue)) {
+							//选完 判断 工程周期
+							this.getStatus();
+						
+						}
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
-							// console.log("单元=", res)
 						})
 					} else if (this.type == 'dy') {
 						this.DYValue = item;
-						//根据单元数据 获取房间数据 
-						this.FJValue = ''; //重置房间数据
-						getHousesList(item.id).then(res => {
-							this.FJList = res.data
-							// console.log("房间=", res)
-						})
-					} else if (this.type == 'fj') {
-						this.FJValue = item;
-
+						
+						if (!this.isEmpty(this.projectValue.dictValue)) {
+						
+							//选完 判断 工程周期
+							this.getStatus();
+						
+						}
 					}
 
 				},
@@ -596,6 +669,69 @@
 					this.openDict = false
 				},
 
+				history() {
+					if (this.isEmpty(this.projectValue.dictValue)) {
+						this.$modal.msg("请选择工程周期")
+						return
+					}
+					if (this.isEmpty(this.XZQValue.dictValue)) {
+						this.$modal.msg("请选择行政区")
+						return
+					}
+					if (this.isEmpty(this.XQValue.id)) {
+						this.$modal.msg("请选择小区")
+						return
+					}
+					if (this.isEmpty(this.LDValue.id)) {
+						this.$modal.msg("请选择楼栋")
+						return
+					}
+
+					let unitId = '';
+					let houseId = '';
+					if (this.isEmpty(this.DYValue.id)) {
+						unitId = '';
+					} else {
+						unitId = this.DYValue.id
+					}
+
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: this.LDValue.id, // 楼宇id
+						unitId: unitId, // 单元id
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
+
+						if (res.code == '200') {
+
+							if (res.data != null) {
+
+								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(
+									res => {
+
+										this.historyList = res.data
+										if (res.data.zEngineeringNodeBo != null) {
+											this.showHistoryList();
+										} else {
+											this.$modal.msg("暂无历史信息")
+										}
+
+									})
+
+							} else {
+								this.$modal.msg("暂无工程信息")
+							}
+						} else {
+							this.$modal.msg(res.msg)
+						}
+					})
+				},
+				showHistoryList() {
+					this.$refs.refShare.handleShowShare();
+				}
 			}
 		}
 	</script>

pages/piping_record/piping_record.vue

@@ -1,29 +1,6 @@
 	<template>
 		<scroll-view>
 			<view class="background">
-				<!-- 	<view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view>
-							工程周期
-						</view>	
-						<view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
-							<view>
-
-
-								<span style="color: darkgray;">请选择工程周期
-
-								</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
-							<span style="color: black;">{{projectValue.dictLabel}}
-							</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-
-					</view>
-				</view> -->
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
@@ -103,14 +80,17 @@
 							@click="history">历史</span>
 					</view>
 				</view>
-				<!-- 		<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-					<text>米 数</text>
-					<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
-						style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-					<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
-					<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
-						style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-				</view> -->
+
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+
+					<view>
+						施工时间
+					</view>
+					<view @click="openDatetimePicker()">
+						<span style="color: black;">{{time}}</span>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+				</view>
 				<view class="container" style="color: #b2b2b2;">*请上传照片</view>
 				<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 					<image :src="loadImgSrc('updateimg.png')" mode=""
@@ -147,6 +127,9 @@
 
 			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
 				titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
+
+			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
+				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
 		</scroll-view>
 	</template>
 
@@ -161,28 +144,29 @@
 			getAreaList,
 			getBuildingList,
 			getUnitList,
-			getHousesList,
 			addTearOldPipe,
-			getEnginMaterialQualityList,
-			getEnginSpecificationsList,
 			getRoomProjectList,
 			getRoomProjectId,
-		} from '@/api/common'
+		} from '@/api/common';
+		import {
+			getToken
+		} from '../../utils/auth';
 		export default {
 			components: {
-				SelectPicker
+				SelectPicker,
+				bottomSheet,
 			},
 			data() {
 				return {
 					title: '',
 					name: '管道施工记录',
-					// headers: {
-					// 	Authorization: "Bearer " + getToken()
-					// },
+					headers: {
+						Authorization: "Bearer " + getToken()
+					},
 					type: '',
 					open: false,
-					// reviewStatus: '', //是否可以点击
-					// objValue: '', //上一页面传过来的值  新增接口用
+					reviewStatus: '', //是否可以点击
+					objValue: '', //上一页面传过来的值  新增接口用
 					openDict: false,
 					selectList: [],
 					dictOptions: [],
@@ -192,33 +176,24 @@
 					projectValue: {
 						'dictValue': '0'
 					},
-					// LevelValue: {},
+					time: '', //施工时间
 					LDValue: {},
 					DYValue: {},
-					FJValue: {},
-					// FSValue: {},
-					// specificationValue: {}, //规格
-					// materialValue: {}, //材质
-					// brandValue: {}, //品牌
-					// doorValue: {}, //上门类型
-					// SelfClosValve: {}, //自闭阀类型
-					// materialList: '', //材质list
 					XQList: '',
 					LDList: '',
 					DYList: '',
 					FJList: '',
 					progress: 0, //上传图片进度百分比
 					loading: false,
-					// isCheck: true, //是否按照施工图纸施工
-					// inputNumberValue: '',
-					// inputIntegerNumberValue: '',
-					// inputDecimalNumberValue: '',
 					historyList: {}, //历史数据
 					inputNumberValue: '',
 					inputIntegerNumberValue: '',
 					inputDecimalNumberValue: '',
 				}
 			},
+			created() {
+				this.time = this.traversalTime(new Date().getTime()) //在data里定义变量-nowTime
+			},
 			onLoad(options) {
 				if ('params' in options) {
 
@@ -236,33 +211,184 @@
 					})
 				}
 
-
 			},
 			methods: {
 				//判断是否选择
 				isEmpty(str) {
 					return (!str || 0 === str.length);
 				},
-				history() {
-
+				//获取当前时间
+				traversalTime(timestamp) {
+					//timestamp(时间戳)是整数，否则要parseInt转换
+					let time = new Date(timestamp);
+					let y = time.getFullYear();
+					let m = time.getMonth() + 1;
+					let d = time.getDate();
+					let h = time.getHours();
+					let mm = time.getMinutes();
+					let s = time.getSeconds();
+					return y + '-' + this.addTimes(m) + '-' + this.addTimes(d) + ' ' + this.addTimes(h) + ':' + this.addTimes(
+						mm) + ':' + this.addTimes(s);
+				},
+				addTimes(m) {
+					return m < 10 ? '0' + m : m
+				},
+				// 打开picker
+				openDatetimePicker() {
+					this.$refs.myPicker.show();
+				},
+				// 关闭picker
+				closeDatetimePicker() {
+					this.$refs.myPicker.hide();
+				},
+				handleSubmit(e) {
+					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+				},
+				
+				getStatus() {
+					let buildingId = '';
 					if (this.isEmpty(this.LDValue.id)) {
-						this.$modal.msg('请选择楼栋')
+						buildingId = '';
 					} else {
-						this.$modal.msg('历史')
+						buildingId = this.LDValue.id
 					}
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: buildingId, // 楼宇id
+						unitId: this.DYValue.id,
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						enginType: this.objValue.enginType, //写死 上一页面传过来的
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
+				
+						if (res.code == '200') {
+				
+							if (res.data != null && res.data.zEngineeringNodeBoList != null) {
+				
+								res.data.zEngineeringNodeBoList.forEach((item, index) => {
+									if (this.objValue.enginClassValue == item.type) {
+										this.reviewStatus = item.reviewStatus;
+										if (item.reviewStatus == '1')
+											this.$modal.msg('当前工程已结束')
+									}
+				
+								})
+				
+				
+							} else {
+								this.reviewStatus = '' //置空
+							}
+				
+						} else {
+							this.$modal.msg(res.msg)
+							this.reviewStatus = '' //置空
+						}
+					})
 				},
+				history() {
+					if (this.isEmpty(this.projectValue.dictValue)) {
+						this.$modal.msg("请选择工程周期")
+						return
+					}
+					if (this.isEmpty(this.XZQValue.dictValue)) {
+						this.$modal.msg("请选择行政区")
+						return
+					}
+					if (this.isEmpty(this.XQValue.id)) {
+						this.$modal.msg("请选择小区")
+						return
+					}
+					if (this.isEmpty(this.LDValue.id)) {
+						this.$modal.msg("请选择楼栋")
+						return
+					}
 
+					let unitId = '';
+					if (this.isEmpty(this.DYValue.id)) {
+						unitId = '';
+					} else {
+						unitId = this.DYValue.id
+					}
+
+					let param = {
+						areaId: this.XQValue.id, // 小区id
+						buildingId: this.LDValue.id, // 楼宇id
+						unitId: unitId, // 单元id
+						enginCycle: this.projectValue.dictValue, // 工程周期
+						enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
+						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+					}
+					getRoomProjectId(param).then(res => {
+						if (res.code == '200') {
+							if (res.data != null) {
+								getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
+									console.log(res)
+									this.historyList = res.data
+									if (res.data.zEngineeringNodeBo != null) {
+										this.showHistoryList();
+									} else {
+										this.$modal.msg("暂无历史信息")
+									}
+								})
+							} else {
+								this.$modal.msg("暂无工程信息")
+							}
+						} else {
+							this.$modal.msg(res.msg)
+						}
+					})
+				},
+				showHistoryList() {
+					this.$refs.refShare.handleShowShare();
+				},
 				submit() {
-					// if (this.isEmpty(this.inputIntegerNumberValue)) {
-					// 	this.$modal.msg("请输入米数")
-					// } else {
-					// 	if (this.isEmpty(this.inputDecimalNumberValue)) {
-					// 		this.inputNumberValue = this.inputIntegerNumberValue;
-					// 	} else {
-					// 		this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
-					// 	}
-					// 	//提交接口执行逻辑
-					// }
+					if (this.isEmpty(this.projectValue.dictValue)) {
+						this.$modal.msg("请选择工程周期")
+					} else if (this.isEmpty(this.XZQValue.dictValue)) {
+						this.$modal.msg("请选择行政区")
+					} else if (this.isEmpty(this.XQValue.id)) {
+						this.$modal.msg("请选择小区")
+					} else if (this.isEmpty(this.LDValue.id)) {
+						this.$modal.msg("请选择楼栋")
+					}else if (this.imgArr.length <= 0) {
+						this.$modal.msg("请上传照片")
+					} else {
+						let param = {
+							district: this.XZQValue.dictValue,
+							areaId: this.XQValue.id,
+							buildingId: this.LDValue.id,
+							unitId: this.DYValue.id,
+							enginType: this.objValue.enginType, //写死 上一页面传过来的 
+							enginClassification: this.objValue
+								.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
+							enginCycle: this.projectValue.dictValue, //工程周期
+							zEngineeringNodeBo: {
+								type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
+								zEngineeringInfoBo: {
+									constructTime: this.time,
+									zEngiineeringPhotoBoList: this.imgArr, //照片集合
+								}
+							}
+
+						}
+
+						addTearOldPipe(param).then(res => {
+							if (res.code == '200') {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									//显示持续时间为 3秒
+									duration: 2000
+								});
+								setTimeout(function() {
+									uni.navigateBack();
+								}, 1000)
+
+							}
+						})
+						//提交接口执行逻辑
+					}
 				},
 
 				// 显示历史弹窗
@@ -328,16 +454,12 @@
 									success: res => {
 										// 判断是否json字符串，将其转为json格式
 										console.log("结果", res)
-										// let data = _this.$u.test.jsonString(res
-										// 	.data) ? JSON.parse(res.data) : res.data;
 										let data = JSON.parse(res.data);
 										if (![200].includes(data.code)) {
-											// this.uploadError(index, data);
 											_this.$modal.msg(data.msg)
 										} else {
 											if (_this.progress === 100) {
 												console.log('_this.progress', _this.progress)
-												//console.log('data----', data)data
 												console.log('res--', res)
 												_this.imgArr.push(data.data.url)
 												console.log('imgArr', _this.imgArr)
@@ -349,7 +471,6 @@
 									fail: e => {
 										console.log(e)
 										_this.$modal.msg('上传失败！')
-										//_this.uploadError(index, e);
 									},
 									complete: res => {
 										uni.hideLoading();
@@ -437,13 +558,6 @@
 				},
 				pickerShow(e) {
 					this.type = e; //赋值类型
-					// if (e == 'gczq') { //工程周期
-					// 	this.openDict = true;
-					// 	getDicts("engin_cycle").then(response => {
-					// 		this.dictOptions = response.data;
-					// 	});
-
-					// } else
 					if (e == 'xzq') { //行政区
 						if (this.isEmpty(this.projectValue.dictValue)) {
 							this.$modal.msg('请选择工程周期')
@@ -501,7 +615,6 @@
 						this.XQValue = ''; //重置小区数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
 						getAreaList(item.dictValue).then(res => {
 							this.XQList = res.data;
 						})
@@ -509,8 +622,6 @@
 
 				},
 				changeSelect(item, index) {
-					// this.index = index;
-					// this.address = item.communityName;
 					this.open = false;
 
 					if (this.type == 'xq') {
@@ -518,33 +629,31 @@
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
 						getBuildingList(item.id).then(res => {
 							this.LDList = res.data
-							// console.log("楼栋=", res)
 						})
 					} else if (this.type == 'ld') {
 						this.LDValue = item;
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
+						
+						if (!this.isEmpty(this.projectValue.dictValue)) {
+							//选完 判断 工程周期
+							this.getStatus();
+						
+						}
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
-							// console.log("单元=", res)
 						})
 					} else if (this.type == 'dy') {
 						this.DYValue = item;
-						//根据单元数据 获取房间数据 
-						this.FJValue = ''; //重置房间数据
-						getHousesList(item.id).then(res => {
-							this.FJList = res.data
-							// console.log("房间=", res)
-						})
-					} else if (this.type == 'fj') {
-						this.FJValue = item;
-
+						
+						if (!this.isEmpty(this.projectValue.dictValue)) {
+							//选完 判断 工程周期
+							this.getStatus();
+						
+						}
 					}
-
 				},
 				//关闭弹窗
 				close(e) {

pages/work/index.vue

@@ -32,7 +32,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					</view>
 					<view class="line2 btn-grp">
 						<view class="btn-grp-item" v-for="(item, index) in OldProjectList" :key="index"
-							@click="OldProject(item.dictValue)">
+							@click="OldProject(item)">
 							<image :src="loadImgSrc('sn.png')" class="line2-btn-big" v-if="item.dictLabel == '室内工程'">
 							</image>
 							<image :src="loadImgSrc('ty.png')" class="line2-btn-big" v-if="item.dictLabel == '庭院工程'">
@@ -59,7 +59,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					</view>
 					<view class="line2 btn-grp">
 						<view class="btn-grp-item" v-for="(item, index) in NewProjectList" :key="index"
-							@click="NewProject(item.dictValue)">
+							@click="NewProject(item)">
 							<image :src="loadImgSrc('sn2.png')" class="line2-btn-big" v-if="item.dictLabel == '室内工程'">
 							</image>
 							<image :src="loadImgSrc('ty2.png')" class="line2-btn-big" v-if="item.dictLabel == '庭院工程'">
@@ -220,10 +220,11 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 			NewProject(e) {
 				this.enginType = 'new_built'; //写死
-				this.enginClassification = e;
+				this.enginClassification = e.dictValue;
+				this.enginClassValue = e.dictLabel; //(拆旧管等 字典值)
 				this.typeList = ''; //置空
-				console.log("新建", e)
-				if (e == 'indoor_engin') {
+				console.log("新建", e.dictValue);
+				if (e.dictValue == 'indoor_engin') {
 					//新建室内
 					getDicts("new_built_indoor_engin").then(response => {
 
@@ -232,14 +233,14 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 
 					this.handleShowSheet();
-				} else if (e == 'courtyard') {
+				} else if (e.dictValue == 'courtyard') {
 					//新建庭院
 					getDicts("new_built_courtyard").then(response => {
 						console.log("庭院", response.data)
 						this.typeList = response.data;
 
 					});
-				} else if (e == 'overhead') {
+				} else if (e.dictValue == 'overhead') {
 					//新建架空
 					getDicts("new_built_courtyard").then(response => {
 						console.log("架空", response.data)
@@ -249,9 +250,10 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					});
 
 					this.handleShowSheet();
-				} else if (e == 'bottom_leg') {
+				} else if (e.dictValue == 'bottom_leg') {
 					//新建底腿
 					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
 						enginType: this.enginType, //旧改 还是新建  写死
 						enginClassification: this.enginClassification //室内  庭院  架空
 
@@ -262,9 +264,10 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								obj))
 					})
 
-				} else if (e == 'construction_records') {
+				} else if (e.dictValue == 'construction_records') {
 					//新建管道施工记录
 					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
 						enginType: this.enginType, //旧改 还是新建  写死
 						enginClassification: this.enginClassification //室内  庭院  架空
 
@@ -280,10 +283,12 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 			},
 			OldProject(e) {
 				this.enginType = 'old_renovation'; //写死
-				this.enginClassification = e;
-				console.log("旧改", e)
+				this.enginClassification = e.dictValue;
+				this.enginClassValue = e.dictLabel; //(拆旧管等 字典值)
+
+				console.log("旧改", e.dictValue);
 				this.typeList = ''; //置空
-				if (e == 'indoor_engin') {
+				if (e.dictValue == 'indoor_engin') {
 					//旧改室内
 					getDicts("old_renovation_indoor_engin").then(response => {
 
@@ -291,7 +296,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					});
 
 					this.handleShowSheet();
-				} else if (e == 'courtyard') {
+				} else if (e.dictValue == 'courtyard') {
 					//旧改庭院
 					getDicts("old_renovation_courtyard").then(response => {
 						console.log("庭院", response.data)
@@ -299,16 +304,17 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 					});
 					this.handleShowSheet();
-				} else if (e == 'overhead') {
+				} else if (e.dictValue == 'overhead') {
 					//旧改架空
 					getDicts("old_renovation_overhead").then(response => {
 						console.log("架空", response.data)
 						this.typeList = response.data;
 					});
 					this.handleShowSheet();
-				} else if (e == 'bottom_leg') {
+				} else if (e.dictValue == 'bottom_leg') {
 					//旧改底腿
 					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
 						enginType: this.enginType, //旧改 还是新建  写死
 						enginClassification: this.enginClassification //室内  庭院  架空
 
@@ -319,9 +325,10 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								obj))
 					})
 
-				} else if (e == 'construction_records') {
+				} else if (e.dictValue == 'construction_records') {
 					//旧改管道施工记录
 					const obj = {
+						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
 						enginType: this.enginType, //旧改 还是新建  写死
 						enginClassification: this.enginClassification //室内  庭院  架空