庭院历史

components/bottomSheet/bottomSheet.vue

@@ -54,9 +54,98 @@
 								<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>
+								<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.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>

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

@@ -435,13 +435,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
 					})
@@ -1085,7 +1085,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,7 +242,7 @@
 
 			//二次弹窗 选择类型
 			showTypeSheet(item) {
-				this.showPopup = !this.showPopup; //隐藏第一次痰喘
+				this.showPopup = !this.showPopup; //隐藏第一次弹窗
 				console.log(item)
 				this.enginClassValue = item.dictValue; //二次节点赋值
 				const obj = {