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

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;">
@@ -54,9 +59,69 @@
 								<view class="uni-media-list-text-top"
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									上门类型:{{value.zEngineeringMaterialBo[0].visitType}}</view>
-									<view class="uni-media-list-text-top"
-										style="font-size: 13px;color: #000;margin-top: 5px;">
-										自闭阀类型:{{value.zEngineeringMaterialBo[0].selfClosingValveType}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									自闭阀类型:{{value.zEngineeringMaterialBo[0].selfClosingValveType}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									规格:{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									数量:{{value.zEngineeringMaterialBo[0].number}}</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=='放线'||title=='挖沟'||title=='焊接'||title=='下沟'">
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									施工时间:{{value.constructTime}}</view>
+								<view class="uni-media-list-text-top">
+									<view class="uni-common-mt" style="width: 100%;">
+										<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;">施工内容:</text>
+										<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+											<textarea class="textarea" maxlength="255" :disabled="true"
+												placeholder-style="padding: 10rpx;"
+												style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+												auto-height>{{value.remark}}</textarea>
+										</view>
+									</view>
+								</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									规格:{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
+							</view>
+							<view v-else-if="title=='回填'">
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									施工时间:{{value.constructTime}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									回填时间:{{value.backfillTime}}</view>
+								<view class="uni-media-list-text-top">
+									<view class="uni-common-mt" style="width: 100%;">
+										<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;">施工内容:</text>
+										<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+											<textarea class="textarea" maxlength="255" :disabled="true"
+												placeholder-style="padding: 10rpx;"
+												style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+												auto-height>{{value.remark}}</textarea>
+										</view>
+									</view>
+								</view>
 								<view class="uni-media-list-text-top"
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
@@ -67,6 +132,47 @@
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									数量:{{value.zEngineeringMaterialBo[0].number}}</view>
 							</view>
+							<view v-else-if="title=='打压'">
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									施工时间:{{value.constructTime}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									分段打压是否台格:{{value.segmentedCompressionQualified=='Y'?'是':'否'}}</view>
+								<view class="uni-media-list-text-top">
+									<view class="uni-common-mt" style="width: 100%;">
+										<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;">施工内容:</text>
+										<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+											<textarea class="textarea" maxlength="255" :disabled="true"
+												placeholder-style="padding: 10rpx;"
+												style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+												auto-height>{{value.remark}}</textarea>
+										</view>
+									</view>
+								</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									材质:{{value.zEngineeringMaterialBo[0].materialQualityName}}</view>
+								<view class="uni-media-list-text-top"
+									style="font-size: 13px;color: #000;margin-top: 5px;">
+									规格:{{value.zEngineeringMaterialBo[0].specificationsName}}</view>
+								<view class="uni-media-list-text-top"
+									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/courtyard/courtyard.vue

@@ -730,12 +730,21 @@
 
 				onsubmit() {
 
-
+					let unitId = '';
+					let houseId = '';
+					let buildingId = '';
+					if (this.isEmpty(this.LDValue.id)) {
+						buildingId = '';
+					} else {
+						buildingId = this.LDValue.id
+					}
 					//提交
 					let param = {
 						district: this.XZQValue.dictValue,
 						areaId: this.XQValue.id,
-						buildingId: this.LDValue.id,
+						buildingId: buildingId, //不必传   如果没有传 ' ' 
+						unitId: unitId,
+						houseId: houseId, //传空
 
 						enginType: this.objValue.enginType, //写死 上一页面传过来的 
 						enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
@@ -781,23 +790,40 @@
 				history() {
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg("请选择工程周期")
-					} else if (this.isEmpty(this.XZQValue.dictValue)) {
+						return
+					}
+					if (this.isEmpty(this.XZQValue.dictValue)) {
 						this.$modal.msg("请选择行政区")
-					} else if (this.isEmpty(this.XQValue.id)) {
+						return
+					}
+					if (this.isEmpty(this.XQValue.id)) {
 						this.$modal.msg("请选择小区")
-					} else if (this.isEmpty(this.LDValue.id)) {
-						this.$modal.msg("请选择楼栋")
-					} else if (this.isEmpty(this.DYValue.id)) {
-						this.$modal.msg("请选择单元")
-					} else if (this.isEmpty(this.FJValue.id)) {
-						this.$modal.msg("请选择房间")
-					} else {
+						return
+					}
+					// if (this.isEmpty(this.LDValue.id)) {
+					// 	this.$modal.msg("请选择楼栋")
+					// }
+					// if (this.isEmpty(this.DYValue.id)) {
+					// 	this.$modal.msg("请选择单元")
+					// }
+					// if (this.isEmpty(this.FJValue.id)) {
+					// 	this.$modal.msg("请选择房间")
+					// } else {
+					else {
+						let unitId = '';
+						let houseId = '';
+						let buildingId = '';
+						if (this.isEmpty(this.LDValue.id)) {
+							buildingId = '';
+						} else {
+							buildingId = this.LDValue.id
+						}
 						let param = {
 							areaId: this.XQValue.id, // 小区id
-							buildingId: this.LDValue.id, // 楼宇id
-							unitId: this.DYValue.id, // 单元id
-							houseId: this.FJValue.id, // 房间id
-							enginCycle: this.projectValue.dictValue // 工程周期
+							buildingId: buildingId, // 楼宇id
+							enginCycle: this.projectValue.dictValue, // 工程周期
+							unitId: unitId,
+							houseId: houseId, //传空
 						}
 						getRoomProjectId(param).then(res => {
 

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;">
@@ -435,13 +460,13 @@
 				if ('params' in options) {
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
 
-				if (this.objValue.enginType == `old_renovation`) {
-					this.title = '旧改工程-室内'
-				
-				} else if (this.objValue.enginType == `new_built`) {
-					this.title = '新建工程-室内'
-				}
-				
+					if (this.objValue.enginType == `old_renovation`) {
+						this.title = '旧改工程-室内'
+
+					} else if (this.objValue.enginType == `new_built`) {
+						this.title = '新建工程-室内'
+					}
+
 					uni.setNavigationBarTitle({
 						title: this.title
 					})
@@ -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 //腐蚀等级 //孔距
 										}]
 									}
 								}
@@ -1085,7 +1123,7 @@
 							buildingId: this.LDValue.id, // 楼宇id
 							unitId: this.DYValue.id, // 单元id
 							houseId: this.FJValue.id, // 房间id
-							enginCycle: this.projectValue.dictValue // 工程周期
+							enginCycle: this.projectValue.dictValue, // 工程周期
 						}
 						getRoomProjectId(param).then(res => {
 

pages/work/index.vue

@@ -242,8 +242,7 @@
 
 			//二次弹窗 选择类型
 			showTypeSheet(item) {
-				this.showPopup = !this.showPopup; //隐藏第一次痰喘
-				console.log(item)
+				this.showPopup = !this.showPopup; //隐藏第一次弹窗
 				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({